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

This commit is contained in:
Richard Barry 2019-10-22 02:15:28 +00:00
parent 343fbe795f
commit 11c391dfb3
3 changed files with 8 additions and 5 deletions

View file

@ -38,6 +38,7 @@
* main_full.c.
*/
.align( 4 )
vRegTest1Implementation:
/* Fill the core registers with known values. */
@ -144,12 +145,15 @@ reg1_loop:
reg1_error_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. */
ebreak
jal reg1_error_loop
.align( 4 )
ulRegTest1LoopCounterConst: .word ulRegTest1LoopCounter
/*-----------------------------------------------------------*/
.align( 4 )
vRegTest2Implementation:
/* Fill the core registers with known values. */
@ -253,8 +257,10 @@ Reg2_loop:
reg2_error_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. */
ebreak
jal reg2_error_loop
.align( 4 )
ulRegTest2LoopCounterConst: .word ulRegTest2LoopCounter

View file

@ -209,6 +209,7 @@ void main_full( void )
prvSetupPeripheralTimers();
/* Start the scheduler. */
vSendString( "Starting" );
vTaskStartScheduler();
/* 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. */
( 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()
works correctly. */
xLastExecutionTime = xTaskGetTickCount();