Browse Source

ARM: Align stack to 8 bytes

The ARM ABI requires that the stack be aligned to 8 bytes as it is noted
in Procedure Call Standard for the ARM Architecture:
http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042d/index.html

Unaligned SP also causes the problem with variable-length arrays
allocation when VLA address becomes less than stack pointer during
aligning of this address, so the next 'push' in the stack overwrites
first 4 bytes of VLA.

Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>

Tested on tx25(mx25), imx27lite(mx27), qong(mx31) and trab(s3c2400)
Tested-by: Wolfgang Denk <wd@denx.de>
Vitaly Kuzmichev 15 years ago
parent
commit
a71da1b6c9

+ 1 - 0
arch/arm/cpu/arm1136/start.S

@@ -185,6 +185,7 @@ stack_setup:
 #endif
 #endif
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 #endif	/* CONFIG_PRELOADER */
 #endif	/* CONFIG_PRELOADER */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 clear_bss:
 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment	    */
 	ldr	r0, _bss_start		/* find start of bss segment	    */

+ 1 - 0
arch/arm/cpu/arm1176/start.S

@@ -276,6 +276,7 @@ stack_setup:
 	sub	r0, r0, #CONFIG_SYS_MALLOC_LEN	/* malloc area                      */
 	sub	r0, r0, #CONFIG_SYS_MALLOC_LEN	/* malloc area                      */
 	sub	r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo                        */
 	sub	r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo                        */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 clear_bss:
 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment        */
 	ldr	r0, _bss_start		/* find start of bss segment        */

+ 1 - 0
arch/arm/cpu/arm720t/start.S

@@ -172,6 +172,7 @@ stack_setup:
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif
 #endif
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 clear_bss:
 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment	    */
 	ldr	r0, _bss_start		/* find start of bss segment	    */

+ 1 - 0
arch/arm/cpu/arm920t/start.S

@@ -204,6 +204,7 @@ stack_setup:
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif
 #endif
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 clear_bss:
 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment        */
 	ldr	r0, _bss_start		/* find start of bss segment        */

+ 1 - 0
arch/arm/cpu/arm925t/start.S

@@ -196,6 +196,7 @@ stack_setup:
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif
 #endif
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 clear_bss:
 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment        */
 	ldr	r0, _bss_start		/* find start of bss segment        */

+ 1 - 1
arch/arm/cpu/arm926ejs/start.S

@@ -196,7 +196,7 @@ stack_setup:
 #endif
 #endif
 #endif /* CONFIG_PRELOADER */
 #endif /* CONFIG_PRELOADER */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
-	bic	sp, r0, #7		/* 8-byte align stack for ABI compliance */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 clear_bss:
 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment        */
 	ldr	r0, _bss_start		/* find start of bss segment        */

+ 1 - 0
arch/arm/cpu/arm946es/start.S

@@ -163,6 +163,7 @@ stack_setup:
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif
 #endif
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 clear_bss:
 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment        */
 	ldr	r0, _bss_start		/* find start of bss segment        */

+ 1 - 1
arch/arm/cpu/arm_cortexa8/start.S

@@ -164,7 +164,7 @@ stack_setup:
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ + CONFIG_STACKSIZE_FIQ)
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ + CONFIG_STACKSIZE_FIQ)
 #endif
 #endif
 	sub	sp, r0, #12		@ leave 3 words for abort-stack
 	sub	sp, r0, #12		@ leave 3 words for abort-stack
-	and	sp, sp, #~7		@ 8 byte alinged for (ldr/str)d
+	bic	sp, sp, #7		@ 8-byte alignment for ABI compliance
 
 
 	/* Clear BSS (if any). Is below tx (watch load addr - need space) */
 	/* Clear BSS (if any). Is below tx (watch load addr - need space) */
 clear_bss:
 clear_bss:

+ 1 - 0
arch/arm/cpu/arm_intcm/start.S

@@ -161,6 +161,7 @@ stack_setup:
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif
 #endif
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 clear_bss:
 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment        */
 	ldr	r0, _bss_start		/* find start of bss segment        */

+ 1 - 0
arch/arm/cpu/ixp/start.S

@@ -289,6 +289,7 @@ stack_setup:
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif
 #endif
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 clear_bss:
 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment        */
 	ldr	r0, _bss_start		/* find start of bss segment        */

+ 1 - 0
arch/arm/cpu/lh7a40x/start.S

@@ -178,6 +178,7 @@ stack_setup:
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif
 #endif
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 clear_bss:
 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment        */
 	ldr	r0, _bss_start		/* find start of bss segment        */

+ 2 - 4
arch/arm/cpu/pxa/start.S

@@ -140,10 +140,8 @@ stack_setup:
 #ifdef CONFIG_USE_IRQ
 #ifdef CONFIG_USE_IRQ
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif /* CONFIG_USE_IRQ */
 #endif /* CONFIG_USE_IRQ */
-	sub	r0, r0, #12		/* leave 3 words for abort-stack    */
-	bic	sp, r0, #7		/* NOTE: stack MUST be aligned to   */
-					/* 8 bytes in case we want to use   */
-					/* 64bit datatypes (eg. VSPRINTF64) */
+	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 clear_bss:
 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment	    */
 	ldr	r0, _bss_start		/* find start of bss segment	    */

+ 1 - 0
arch/arm/cpu/s3c44b0/start.S

@@ -163,6 +163,7 @@ stack_setup:
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif
 #endif
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 	ldr	pc, _start_armboot
 	ldr	pc, _start_armboot
 
 

+ 1 - 0
arch/arm/cpu/sa1100/start.S

@@ -153,6 +153,7 @@ stack_setup:
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif
 #endif
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
 	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+	bic	sp, sp, #7		/* 8-byte alignment for ABI compliance */
 
 
 clear_bss:
 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment        */
 	ldr	r0, _bss_start		/* find start of bss segment        */