Set ARM byte alignment to 8.

16 years ago · 2cb1578b30
parent 2d958d3d2c
commit 2cb1578b30
3 changed files with 4 additions and 5 deletions
--- a/Source/portable/RVDS/ARM7_LPC21xx/port.c
+++ b/Source/portable/RVDS/ARM7_LPC21xx/port.c
@ -153,12 +153,11 @@ portSTACK_TYPE *pxOriginalTOS;
 	system mode, with interrupts enabled. */
 	*pxTopOfStack = ( portSTACK_TYPE ) portINITIAL_SPSR;

-	#ifdef KEIL_THUMB_INTERWORK
-	{		
+	if( ( ( unsigned long ) pxCode & 0x01UL ) != 0x00UL )
+	{
 		/* We want the task to start in thumb mode. */
 		*pxTopOfStack |= portTHUMB_MODE_BIT;
 	}
-	#endif

 	pxTopOfStack--;

--- a/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h
+++ b/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h
@ -84,7 +84,7 @@ extern "C" {
 /* Hardware specifics. */
 #define portSTACK_GROWTH			( -1 )
 #define portTICK_RATE_MS			( ( portTickType ) 1000 / configTICK_RATE_HZ )		
-#define portBYTE_ALIGNMENT			4
+#define portBYTE_ALIGNMENT			8
 /*-----------------------------------------------------------*/	

 /* Task utilities. */
--- a/Source/portable/RVDS/ARM_CM3/portmacro.h
+++ b/Source/portable/RVDS/ARM_CM3/portmacro.h
@ -84,7 +84,7 @@ extern "C" {
 /* Architecture specifics. */
 #define portSTACK_GROWTH			( -1 )
 #define portTICK_RATE_MS			( ( portTickType ) 1000 / configTICK_RATE_HZ )		
-#define portBYTE_ALIGNMENT			4
+#define portBYTE_ALIGNMENT			8
 /*-----------------------------------------------------------*/