From 062c0fae294e229350b1500a7cd716ad8d3e6a95 Mon Sep 17 00:00:00 2001
From: rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Tue, 22 Oct 2019 02:15:28 +0000
Subject: [PATCH] Tidy up main_full.c and change alignment of variable accesses
 in RegTest.S for the RISC-V_Renode_Emulator_SoftConsole demo.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2748 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 .../.settings/language.settings.xml                         | 2 +-
 .../RISC-V_Renode_Emulator_SoftConsole/full_demo/RegTest.S  | 6 ++++++
 .../full_demo/main_full.c                                   | 5 +----
 3 files changed, 8 insertions(+), 5 deletions(-)

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 5a51ff933..199f873dc 100644
--- 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 @@
             			
             <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"/>
                 				
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 67d902a0c..f2602c430 100644
--- 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.
  */
 
+.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
 
 
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 53f79d9fd..0bd63ebf2 100644
--- 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();
 
 	/* 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();
-- 
2.39.5