leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[XTENSA] Add missing a2 register restore in register spill routine

Browse Source 
Register a2 is saved in depc but wasn't getting restored before
returning from _spill_registers when there weren't any registers
to spill. The mask to cut the top bit from the rotated WINDOWMASK
register was also one bit short.

Signed-off-by: CHris Zankel <chris@zankel.net>
This commit is contained in:
Chris Zankel 2007-11-14 13:47:02 -08:00
parent ed3174d93c
commit 50c0716aa2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/xtensa/kernel/entry.S
View File

@ -1344,7 +1344,7 @@ ENTRY(_spill_registers)
/* We are done if there are no more than the current register frame. */
extui a3, a3, 1, WSBITS-2 # a3 = 0yyxxxwww
extui a3, a3, 1, WSBITS-1 # a3 = 0yyxxxwww
movi a2, (1 << (WSBITS-1))
_beqz a3, .Lnospill # only one active frame? jump
@ -1394,6 +1394,10 @@ ENTRY(_spill_registers)
l32e a4, a1, -16
j .Lc12c
.Lnospill:
rsr a2, DEPC # restore a2 and 'return'
jx a0
.Lloop: _bbsi.l a3, 1, .Lc4
_bbci.l a3, 2, .Lc12
@ -1419,8 +1423,6 @@ ENTRY(_spill_registers)
movi a3, 1
sll a3, a3
wsr a3, WINDOWSTART
.Lnospill:
jx a0
.Lc4: s32e a4, a9, -16