Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

arm: optimize relocate_code routine

Browse source 
Use section symbols directly
Drop support for R_ARM_ABS32 record types
Eliminate unneeded intermediate registers
Optimize relocation table iteration

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Tested-by: Lubomir Popov <lpopov@mm-sol.com>
Tested-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
This commit is contained in:
Albert ARIBAUD 2013-06-11 14:17:35 +02:00
parent 47bd65ef05
commit fbf87b1823
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
arch/arm/lib/relocate.S
View file

@ -37,19 +37,15 @@
*/ */
ENTRY(relocate_code) ENTRY(relocate_code)
mov r6, r0 /* save addr of destination */ ldr r1, =__image_copy_start /* r1 <- SRC &__image_copy_start */
subs r9, r0, r1 /* r9 <- relocation offset */
ldr r0, =__image_copy_start /* r0 <- SRC &__image_copy_start */
subs r9, r6, r0 /* r9 <- relocation offset */
beq relocate_done /* skip relocation */ beq relocate_done /* skip relocation */
mov r1, r6 /* r1 <- scratch for copy loop */
adr r7, relocate_code /* r7 <- SRC &relocate_code */
ldr r2, =__image_copy_end /* r2 <- SRC &__image_copy_end */ ldr r2, =__image_copy_end /* r2 <- SRC &__image_copy_end */
copy_loop: copy_loop:
ldmia r0!, {r10-r11} /* copy from source address [r0] */ ldmia r1!, {r10-r11} /* copy from source address [r1] */
stmia r1!, {r10-r11} /* copy to target address [r1] */ stmia r0!, {r10-r11} /* copy to target address [r0] */
cmp r0, r2 /* until source end address [r2] */ cmp r1, r2 /* until source end address [r2] */
blo copy_loop blo copy_loop
/* /*
@ -58,21 +54,17 @@ copy_loop:
ldr r2, =__rel_dyn_start /* r2 <- SRC &__rel_dyn_start */ ldr r2, =__rel_dyn_start /* r2 <- SRC &__rel_dyn_start */
ldr r3, =__rel_dyn_end /* r3 <- SRC &__rel_dyn_end */ ldr r3, =__rel_dyn_end /* r3 <- SRC &__rel_dyn_end */
fixloop: fixloop:
ldr r0, [r2] /* r0 <- SRC location to fix up */ ldmia r2!, {r0-r1} /* (r0,r1) <- (SRC location,fixup) */
add r0, r0, r9 /* r0 <- DST location to fix up */ and r1, r1, #0xff
ldr r1, [r2, #4] cmp r1, #23 /* relative fixup? */
and r7, r1, #0xff bne fixnext
cmp r7, #23 /* relative fixup? */
beq fixrel
/* ignore unknown type of fixup */
b fixnext
fixrel:
/* relative fix: increase location by offset */ /* relative fix: increase location by offset */
add r0, r0, r9
ldr r1, [r0] ldr r1, [r0]
add r1, r1, r9 add r1, r1, r9
fixnext:
str r1, [r0] str r1, [r0]
add r2, r2, #8 /* each rel.dyn entry is 8 bytes */ fixnext:
cmp r2, r3 cmp r2, r3
blo fixloop blo fixloop