vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* grub-core/kern/arm/cache.S: Don't switch back to ARM mode when 

compiling to thumb2.
	* grub-core/kern/arm/cache_armv7.S: Likewise.
	* grub-core/lib/arm/setjmp.S: Likewise.
This commit is contained in:
Vladimir Serbinenko 2013-11-16 17:37:06 +01:00
parent 11a7793221
commit 9ef81064a3
4 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2013-11-16 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/arm/cache.S: Don't switch back to ARM mode when
compiling to thumb2.
* grub-core/kern/arm/cache_armv7.S: Likewise.
* grub-core/lib/arm/setjmp.S: Likewise.
2013-11-16 Leif Lindholm <leif.lindholm@linaro.org> 2013-11-16 Leif Lindholm <leif.lindholm@linaro.org>
* grub-core/kern/arm/uboot/startup.S: delete superflouous save of r8 * grub-core/kern/arm/uboot/startup.S: delete superflouous save of r8

5
grub-core/kern/arm/cache.S
View File

@ -21,7 +21,12 @@
.file "cache.S" .file "cache.S"
.text .text
.syntax unified .syntax unified
#if !defined (__thumb2__) || !defined (ARMV7)
.arm .arm
#else
.thumb
#endif
#if !defined (ARMV6) && !defined (ARMV7) #if !defined (ARMV6) && !defined (ARMV7)
# error Unsupported architecture version! # error Unsupported architecture version!
#endif #endif

21
grub-core/kern/arm/cache_armv7.S
View File

@ -21,8 +21,13 @@
.file "cache_armv7.S" .file "cache_armv7.S"
.text .text
.syntax unified .syntax unified
.arm #if !defined (__thumb2__)
.arch armv7a .arch armv7a
.arm
#else
.arch armv7
.thumb
#endif
# define DMB dmb # define DMB dmb
# define DSB dsb # define DSB dsb
# define ISB isb # define ISB isb
@ -58,11 +63,17 @@ clean_invalidate_dcache:
@ read current cache information @ read current cache information
mrc p15, 1, r8, c0, c0, 0 @ Read CCSIDR mrc p15, 1, r8, c0, c0, 0 @ Read CCSIDR
lsr r3, r8, #13 @ Number of sets -1 lsr r3, r8, #13 @ Number of sets -1
ldr r9, =0x3fff
and r3, r3, r9 @ Keep only 14 bits of r3
lsl r3, r3, #18
lsr r3, r3, #18
lsr r4, r8, #3 @ Number of ways -1 lsr r4, r8, #3 @ Number of ways -1
ldr r9, =0x1ff
and r4, r4, r9 @ Keep only 9 bits of r4
lsl r4, r4, #23
lsr r4, r4, #23
and r7, r8, #7 @ log2(line size in words) - 2 and r7, r8, #7 @ log2(line size in words) - 2
add r7, r7, #2 @ adjust add r7, r7, #2 @ adjust
mov r8, #1 mov r8, #1

11
grub-core/lib/arm/setjmp.S
View File

@ -24,7 +24,11 @@
GRUB_MOD_LICENSE "GPLv3+" GRUB_MOD_LICENSE "GPLv3+"
.syntax unified .syntax unified
#if !defined (__thumb2__)
.arm .arm
#else
.thumb
#endif
.text .text
@ -32,7 +36,8 @@ GRUB_MOD_LICENSE "GPLv3+"
* int grub_setjmp (grub_jmp_buf env) * int grub_setjmp (grub_jmp_buf env)
*/ */
FUNCTION(grub_setjmp) FUNCTION(grub_setjmp)
stm r0, { r4-r11, sp, lr } mov r12, sp
stm r0, { r4-r12, lr }
mov r0, #0 mov r0, #0
bx lr bx lr
@ -40,7 +45,9 @@ FUNCTION(grub_setjmp)
* int grub_longjmp (grub_jmp_buf env, int val) * int grub_longjmp (grub_jmp_buf env, int val)
*/ */
FUNCTION(grub_longjmp) FUNCTION(grub_longjmp)
ldm r0, { r4-r11, sp, lr } ldm r0, { r4-r12, lr }
mov sp, r12
movs r0, r1 movs r0, r1
it eq
moveq r0, #1 moveq r0, #1
bx lr bx lr