[commit: ghc] ghc-7.4: ARM StgRun: Ensure r11 state is preserved (5a984f4)
Ian Lynagh
igloo at earth.li
Tue Jan 31 15:22:51 CET 2012
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : ghc-7.4
http://hackage.haskell.org/trac/ghc/changeset/5a984f4388ef85d5c3af973b21a12c12b36c1ed4
>---------------------------------------------------------------
commit 5a984f4388ef85d5c3af973b21a12c12b36c1ed4
Author: Ben Gamari <bgamari.foss at gmail.com>
Date: Mon Jan 30 16:52:40 2012 -0500
ARM StgRun: Ensure r11 state is preserved
>---------------------------------------------------------------
rts/StgCRun.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rts/StgCRun.c b/rts/StgCRun.c
index 8fcb550..17aefb6 100644
--- a/rts/StgCRun.c
+++ b/rts/StgCRun.c
@@ -632,7 +632,7 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
/*
* save callee-saves registers on behalf of the STG code.
*/
- "stmfd sp!, {r4-r10, fp, ip, lr}\n\t"
+ "stmfd sp!, {r4-r11, fp, ip, lr}\n\t"
#if !defined(arm_HOST_ARCH_PRE_ARMv6)
"vstmdb sp!, {d8-d11}\n\t"
#endif
@@ -669,10 +669,10 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
#if !defined(arm_HOST_ARCH_PRE_ARMv6)
"vldmia sp!, {d8-d11}\n\t"
#endif
- "ldmfd sp!, {r4-r10, fp, ip, lr}\n\t"
+ "ldmfd sp!, {r4-r11, fp, ip, lr}\n\t"
: "=r" (r)
: "r" (f), "r" (basereg), "i" (RESERVED_C_STACK_BYTES)
- : "%r4", "%r5", "%r6", "%r8", "%r9", "%r10", "%fp", "%ip", "%lr"
+ : "%r4", "%r5", "%r6", "%r8", "%r9", "%r10", "%r11", "%fp", "%ip", "%lr"
);
return r;
}
More information about the Cvs-ghc
mailing list