Tidy up main_full.c and change alignment of variable accesses in RegTest.S for the RISC-V_Renode_Emulator_SoftConsole demo.

pull/8/head
Richard Barry 5 years ago
parent 343fbe795f
commit 11c391dfb3

@ -11,7 +11,7 @@
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1004974576630085650" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1790871989465787416" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>

@ -38,6 +38,7 @@
* main_full.c. * main_full.c.
*/ */
.align( 4 )
vRegTest1Implementation: vRegTest1Implementation:
/* Fill the core registers with known values. */ /* Fill the core registers with known values. */
@ -144,12 +145,15 @@ reg1_loop:
reg1_error_loop: reg1_error_loop:
/* Jump here if a register contains an uxpected value. This stops the loop /* Jump here if a register contains an uxpected value. This stops the loop
counter being incremented so the check task knows an error was found. */ counter being incremented so the check task knows an error was found. */
ebreak
jal reg1_error_loop jal reg1_error_loop
.align( 4 )
ulRegTest1LoopCounterConst: .word ulRegTest1LoopCounter ulRegTest1LoopCounterConst: .word ulRegTest1LoopCounter
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
.align( 4 )
vRegTest2Implementation: vRegTest2Implementation:
/* Fill the core registers with known values. */ /* Fill the core registers with known values. */
@ -253,8 +257,10 @@ Reg2_loop:
reg2_error_loop: reg2_error_loop:
/* Jump here if a register contains an uxpected value. This stops the loop /* Jump here if a register contains an uxpected value. This stops the loop
counter being incremented so the check task knows an error was found. */ counter being incremented so the check task knows an error was found. */
ebreak
jal reg2_error_loop jal reg2_error_loop
.align( 4 )
ulRegTest2LoopCounterConst: .word ulRegTest2LoopCounter ulRegTest2LoopCounterConst: .word ulRegTest2LoopCounter

@ -209,6 +209,7 @@ void main_full( void )
prvSetupPeripheralTimers(); prvSetupPeripheralTimers();
/* Start the scheduler. */ /* Start the scheduler. */
vSendString( "Starting" );
vTaskStartScheduler(); vTaskStartScheduler();
/* If all is well, the scheduler will now be running, and the following /* If all is well, the scheduler will now be running, and the following
@ -235,10 +236,6 @@ extern void vToggleLED( void );
/* Just to stop compiler warnings. */ /* Just to stop compiler warnings. */
( void ) pvParameters; ( void ) pvParameters;
/* Start with a pass message, after which a '.' character will be printed
out on each successful loop. */
vSendString( "Pass" );
/* Initialise xLastExecutionTime so the first call to vTaskDelayUntil() /* Initialise xLastExecutionTime so the first call to vTaskDelayUntil()
works correctly. */ works correctly. */
xLastExecutionTime = xTaskGetTickCount(); xLastExecutionTime = xTaskGetTickCount();

Loading…
Cancel
Save