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

* kern/arm/cache.S: Correct access to ilinesz/dlinesz variables.

Browse source 
Clean up stack manipulation (sync_caches_armv*)
This commit is contained in:
Leif Lindholm 2013-09-19 09:21:24 +02:00 • committed by Vladimir 'phcoder' Serbinenko
parent 90379808b6
commit e70d6736ff
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
grub-core/kern/arm/cache.S
View file

@ -37,6 +37,7 @@
clean_dcache_range:
@ Clean data cache for range to point-of-unification
ldr r2, =EXT_C(grub_arch_cache_dlinesz)
ldr r2, [r2]
sub r3, r2, #1 @ align "beg" to start of line
mvn r3, r3
and r0, r0, r3
@ -57,6 +58,7 @@ clean_dcache_range:
invalidate_icache_range:
@ Invalidate instruction cache for range to point-of-unification
ldr r2, =EXT_C(grub_arch_cache_ilinesz)
ldr r2, [r2]
sub r3, r2, #1 @ align "beg" to start of line
mvn r3, r3
and r0, r0, r3
@ -77,14 +79,13 @@ FUNCTION(grub_arch_sync_caches_armv6)
#else
FUNCTION(grub_arch_sync_caches_armv7)
#endif
add r1, r0, r1
DSB
push {r0-r1, r4-r6, lr}
ldrdeq r0, r1, [sp]
add r1, r0, r1
push {r0-r2, lr}
bl clean_dcache_range
pop {r0, r1}
bl invalidate_icache_range
pop {r4-r6, pc}
pop {r2, pc}
#ifdef ARMV6
FUNCTION(grub_arm_disable_caches_mmu_armv6)