mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
powerpc: do not fixup NULL ptrs
The fixup routine must not fixup NULL pointers. Problem can be seen by char *testfun(void) __attribute__((weak)); char *(*myfun)(void) = testfun; Then add printf("myfun:%p, &myfun:%p\n", myfun, &myfun); before relocation and after relocation. myfun should be NULL in both cases but it is not. Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
This commit is contained in:
parent
d98b0523cf
commit
d1e0b10acc
12 changed files with 36 additions and 12 deletions
|
@ -709,10 +709,12 @@ in_ram:
|
|||
beq 4f
|
||||
3: lwzu r4,4(r3)
|
||||
lwzux r0,r4,r11
|
||||
cmpwi r0,0
|
||||
add r0,r0,r11
|
||||
stw r10,0(r3)
|
||||
beq- 5f
|
||||
stw r0,0(r4)
|
||||
bdnz 3b
|
||||
5: bdnz 3b
|
||||
4:
|
||||
/* clear_bss: */
|
||||
/*
|
||||
|
|
|
@ -613,10 +613,12 @@ in_ram:
|
|||
beq 4f
|
||||
3: lwzu r4,4(r3)
|
||||
lwzux r0,r4,r11
|
||||
cmpwi r0,0
|
||||
add r0,r0,r11
|
||||
stw r10,0(r3)
|
||||
beq- 5f
|
||||
stw r0,0(r4)
|
||||
bdnz 3b
|
||||
5: bdnz 3b
|
||||
4:
|
||||
clear_bss:
|
||||
/*
|
||||
|
|
|
@ -453,10 +453,12 @@ in_ram:
|
|||
beq 4f
|
||||
3: lwzu r4,4(r3)
|
||||
lwzux r0,r4,r11
|
||||
cmpwi r0,0
|
||||
add r0,r0,r11
|
||||
stw r10,0(r3)
|
||||
beq- 5f
|
||||
stw r0,0(r4)
|
||||
bdnz 3b
|
||||
5: bdnz 3b
|
||||
4:
|
||||
clear_bss:
|
||||
/*
|
||||
|
|
|
@ -668,10 +668,12 @@ in_ram:
|
|||
beq 4f
|
||||
3: lwzu r4,4(r3)
|
||||
lwzux r0,r4,r11
|
||||
cmpwi r0,0
|
||||
add r0,r0,r11
|
||||
stw r10,0(r3)
|
||||
beq- 5f
|
||||
stw r0,0(r4)
|
||||
bdnz 3b
|
||||
5: bdnz 3b
|
||||
4:
|
||||
clear_bss:
|
||||
/*
|
||||
|
|
|
@ -641,10 +641,12 @@ in_ram:
|
|||
beq 4f
|
||||
3: lwzu r4,4(r3)
|
||||
lwzux r0,r4,r11
|
||||
cmpwi r0,0
|
||||
add r0,r0,r11
|
||||
stw r10,0(r3)
|
||||
beq- 5f
|
||||
stw r0,0(r4)
|
||||
bdnz 3b
|
||||
5: bdnz 3b
|
||||
4:
|
||||
clear_bss:
|
||||
/*
|
||||
|
|
|
@ -583,10 +583,12 @@ in_ram:
|
|||
beq 4f
|
||||
3: lwzu r4,4(r3)
|
||||
lwzux r0,r4,r11
|
||||
cmpwi r0,0
|
||||
add r0,r0,r11
|
||||
stw r10,0(r3)
|
||||
beq- 5f
|
||||
stw r0,0(r4)
|
||||
bdnz 3b
|
||||
5: bdnz 3b
|
||||
4:
|
||||
clear_bss:
|
||||
/*
|
||||
|
|
|
@ -904,10 +904,12 @@ in_ram:
|
|||
beq 4f
|
||||
3: lwzu r4,4(r3)
|
||||
lwzux r0,r4,r11
|
||||
cmpwi r0,0
|
||||
add r0,r0,r11
|
||||
stw r10,0(r3)
|
||||
beq- 5f
|
||||
stw r0,0(r4)
|
||||
bdnz 3b
|
||||
5: bdnz 3b
|
||||
4:
|
||||
clear_bss:
|
||||
/*
|
||||
|
|
|
@ -952,10 +952,12 @@ in_ram:
|
|||
beq 4f
|
||||
3: lwzu r4,4(r3)
|
||||
lwzux r0,r4,r11
|
||||
cmpwi r0,0
|
||||
add r0,r0,r11
|
||||
stw r10,0(r3)
|
||||
beq- 5f
|
||||
stw r0,0(r4)
|
||||
bdnz 3b
|
||||
5: bdnz 3b
|
||||
4:
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1037,10 +1037,12 @@ in_ram:
|
|||
beq 4f
|
||||
3: lwzu r4,4(r3)
|
||||
lwzux r0,r4,r11
|
||||
cmpwi r0,0
|
||||
add r0,r0,r11
|
||||
stw r10,0(r3)
|
||||
beq- 5f
|
||||
stw r0,0(r4)
|
||||
bdnz 3b
|
||||
5: bdnz 3b
|
||||
4:
|
||||
clear_bss:
|
||||
/*
|
||||
|
|
|
@ -727,10 +727,12 @@ in_ram:
|
|||
beq 4f
|
||||
3: lwzu r4,4(r3)
|
||||
lwzux r0,r4,r11
|
||||
cmpwi r0,0
|
||||
add r0,r0,r11
|
||||
stw r10,0(r3)
|
||||
beq- 5f
|
||||
stw r0,0(r4)
|
||||
bdnz 3b
|
||||
5: bdnz 3b
|
||||
4:
|
||||
/* clear_bss: */
|
||||
/*
|
||||
|
|
|
@ -584,10 +584,12 @@ in_ram:
|
|||
beq 4f
|
||||
3: lwzu r4,4(r3)
|
||||
lwzux r0,r4,r11
|
||||
cmpwi r0,0
|
||||
add r0,r0,r11
|
||||
stw r10,0(r3)
|
||||
beq- 5f
|
||||
stw r0,0(r4)
|
||||
bdnz 3b
|
||||
5: bdnz 3b
|
||||
4:
|
||||
clear_bss:
|
||||
/*
|
||||
|
|
|
@ -1608,10 +1608,12 @@ in_ram:
|
|||
beq 4f
|
||||
3: lwzu r4,4(r3)
|
||||
lwzux r0,r4,r11
|
||||
cmpwi r0,0
|
||||
add r0,r0,r11
|
||||
stw r10,0(r3)
|
||||
beq- 5f
|
||||
stw r0,0(r4)
|
||||
bdnz 3b
|
||||
5: bdnz 3b
|
||||
4:
|
||||
clear_bss:
|
||||
/*
|
||||
|
|
Loading…
Add table
Reference in a new issue