summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorChris Zankel <chris@zankel.net>2008-01-09 09:22:36 -0800
committerChris Zankel <chris@zankel.net>2008-02-13 17:22:18 -0800
commitea0b6b066304d9f7e24b273c71fab5d67ce54f96 (patch)
treee4f461b76a4afc9ea2105067e2f30c935cca4b27 /arch/xtensa
parent50c0716aa2f49a9d34589e380fad73402464c088 (diff)
downloadlinux-ea0b6b066304d9f7e24b273c71fab5d67ce54f96.tar.bz2
[XTENSA] Fix comments regarding the number of frames to save
Signed-off-by: Marc Gauthier <marc@tensilica.com> Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/kernel/entry.S12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 401b33bfd9c0..b4b14a579a3c 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -1336,11 +1336,11 @@ ENTRY(_spill_registers)
wsr a2, DEPC # preserve a2
rsr a2, WINDOWBASE
- rsr a3, WINDOWSTART
+ rsr a3, WINDOWSTART # a3 = xxxwww1yy
ssr a2 # holds WB
slli a2, a3, WSBITS
- or a3, a3, a2 # a2 = xxxwww1yyxxxwww1yy
- srl a3, a3
+ or a3, a3, a2 # a3 = xxxwww1yyxxxwww1yy
+ srl a3, a3 # a3 = 00xxxwww1yyxxxwww1
/* We are done if there are no more than the current register frame. */
@@ -1395,8 +1395,8 @@ ENTRY(_spill_registers)
j .Lc12c
.Lnospill:
- rsr a2, DEPC # restore a2 and 'return'
- jx a0
+ rsr a2, DEPC
+ ret
.Lloop: _bbsi.l a3, 1, .Lc4
_bbci.l a3, 2, .Lc12
@@ -1423,7 +1423,7 @@ ENTRY(_spill_registers)
movi a3, 1
sll a3, a3
wsr a3, WINDOWSTART
- jx a0
+ ret
.Lc4: s32e a4, a9, -16
s32e a5, a9, -12