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

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2748 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml
index 5a51ff9335983b92dab3dfdf6e470eef3eca5fad..199f873dc05573c0d96206679feb817e3185f831 100644 (file)
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml
+++ b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml
@@ -11,7 +11,7 @@
                                \r
             <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>\r
                                \r
-            <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">\r
+            <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">\r
                                                \r
                 <language-scope id="org.eclipse.cdt.core.gcc"/>\r
                                                \r

diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/full_demo/RegTest.S b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/full_demo/RegTest.S
index 67d902a0cab58e607827d66bc1f059af39f2ebf8..f2602c430bfd980ba089898e01ca82a271711ca8 100644 (file)
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/full_demo/RegTest.S
+++ b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/full_demo/RegTest.S
@@ -38,6 +38,7 @@
  * main_full.c.\r
  */\r
 \r
+.align( 4 )\r
 vRegTest1Implementation:\r
 \r
        /* Fill the core registers with known values. */\r
@@ -144,12 +145,15 @@ reg1_loop:
 reg1_error_loop:\r
        /* Jump here if a register contains an uxpected value.  This stops the loop\r
        counter being incremented so the check task knows an error was found. */\r
+       ebreak\r
        jal reg1_error_loop\r
 \r
+.align( 4 )\r
 ulRegTest1LoopCounterConst: .word ulRegTest1LoopCounter\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
+.align( 4 )\r
 vRegTest2Implementation:\r
 \r
        /* Fill the core registers with known values. */\r
@@ -253,8 +257,10 @@ Reg2_loop:
 reg2_error_loop:\r
        /* Jump here if a register contains an uxpected value.  This stops the loop\r
        counter being incremented so the check task knows an error was found. */\r
+       ebreak\r
        jal reg2_error_loop\r
 \r
+.align( 4 )\r
 ulRegTest2LoopCounterConst: .word ulRegTest2LoopCounter\r
 \r
 \r

diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/full_demo/main_full.c b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/full_demo/main_full.c
index 53f79d9fd3bc74f19e7460d180ce6cec23f7a1ba..0bd63ebf2b07a596164637231b511d5ff756d849 100644 (file)
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/full_demo/main_full.c
+++ b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/full_demo/main_full.c
@@ -209,6 +209,7 @@ void main_full( void )
        prvSetupPeripheralTimers();\r
 \r
        /* Start the scheduler. */\r
+       vSendString( "Starting" );\r
        vTaskStartScheduler();\r
 \r
        /* If all is well, the scheduler will now be running, and the following\r
@@ -235,10 +236,6 @@ extern void vToggleLED( void );
        /* Just to stop compiler warnings. */\r
        ( void ) pvParameters;\r
 \r
-       /* Start with a pass message, after which a '.' character will be printed\r
-       out on each successful loop. */\r
-       vSendString( "Pass" );\r
-\r
        /* Initialise xLastExecutionTime so the first call to vTaskDelayUntil()\r
        works correctly. */\r
        xLastExecutionTime = xTaskGetTickCount();\r