|
@@ -175,16 +175,15 @@ ENTRY(relocate_code)
|
|
mov r6, r2 /* save addr of destination */
|
|
mov r6, r2 /* save addr of destination */
|
|
|
|
|
|
adr r0, _start
|
|
adr r0, _start
|
|
- cmp r0, r6
|
|
|
|
- moveq r9, #0 /* no relocation. relocation offset(r9) = 0 */
|
|
|
|
|
|
+ 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 */
|
|
mov r1, r6 /* r1 <- scratch for copy_loop */
|
|
ldr r3, _image_copy_end_ofs
|
|
ldr r3, _image_copy_end_ofs
|
|
add r2, r0, r3 /* r2 <- source end address */
|
|
add r2, r0, r3 /* r2 <- source end address */
|
|
|
|
|
|
copy_loop:
|
|
copy_loop:
|
|
- ldmia r0!, {r9-r10} /* copy from source address [r0] */
|
|
|
|
- stmia r1!, {r9-r10} /* copy to target address [r1] */
|
|
|
|
|
|
+ ldmia r0!, {r10-r11} /* copy from source address [r0] */
|
|
|
|
+ stmia r1!, {r10-r11} /* copy to target address [r1] */
|
|
cmp r0, r2 /* until source end address [r2] */
|
|
cmp r0, r2 /* until source end address [r2] */
|
|
blo copy_loop
|
|
blo copy_loop
|
|
|
|
|
|
@@ -192,7 +191,6 @@ copy_loop:
|
|
* fix .rel.dyn relocations
|
|
* fix .rel.dyn relocations
|
|
*/
|
|
*/
|
|
ldr r0, _TEXT_BASE /* r0 <- Text base */
|
|
ldr r0, _TEXT_BASE /* r0 <- Text base */
|
|
- sub r9, r6, r0 /* r9 <- relocation offset */
|
|
|
|
ldr r10, _dynsym_start_ofs /* r10 <- sym table ofs */
|
|
ldr r10, _dynsym_start_ofs /* r10 <- sym table ofs */
|
|
add r10, r10, r0 /* r10 <- sym table in FLASH */
|
|
add r10, r10, r0 /* r10 <- sym table in FLASH */
|
|
ldr r2, _rel_dyn_start_ofs /* r2 <- rel dyn start ofs */
|
|
ldr r2, _rel_dyn_start_ofs /* r2 <- rel dyn start ofs */
|