Set ARM byte alignment to 8.

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

diff --git a/Source/portable/RVDS/ARM7_LPC21xx/port.c b/Source/portable/RVDS/ARM7_LPC21xx/port.c
index 8b6d462ec5eace1d9315c8c5538196d02436f774..500cee1a84913b665671a29921f8ca8c7fe0c154 100644 (file)
--- 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. */\r
        *pxTopOfStack = ( portSTACK_TYPE ) portINITIAL_SPSR;\r
 \r
-       #ifdef KEIL_THUMB_INTERWORK\r
-       {               \r
+       if( ( ( unsigned long ) pxCode & 0x01UL ) != 0x00UL )\r
+       {\r
                /* We want the task to start in thumb mode. */\r
                *pxTopOfStack |= portTHUMB_MODE_BIT;\r
        }\r
-       #endif\r
 \r
        pxTopOfStack--;\r
 \r

diff --git a/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h b/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h
index e978bcb8fbc7f92a390c74db29c7972bf1f4f774..4b2b0f9e0fd1b9e54bf47c39d922eff13d882129 100644 (file)
--- a/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h
+++ b/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h
@@ -84,7 +84,7 @@ extern "C" {
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
 #define portTICK_RATE_MS                       ( ( portTickType ) 1000 / configTICK_RATE_HZ )          \r
-#define portBYTE_ALIGNMENT                     4\r
+#define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/        \r
 \r
 /* Task utilities. */\r

diff --git a/Source/portable/RVDS/ARM_CM3/portmacro.h b/Source/portable/RVDS/ARM_CM3/portmacro.h
index a8010ed07e297eb673072a54104a3860cf14ed11..c0dd2609881872d59a6885340f561c15887fe918 100644 (file)
--- a/Source/portable/RVDS/ARM_CM3/portmacro.h
+++ b/Source/portable/RVDS/ARM_CM3/portmacro.h
@@ -84,7 +84,7 @@ extern "C" {
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
 #define portTICK_RATE_MS                       ( ( portTickType ) 1000 / configTICK_RATE_HZ )          \r
-#define portBYTE_ALIGNMENT                     4\r
+#define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/        \r
 \r
 \r