Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/0bca11de22e7ad274608dc1198e51f68aae91694 >--------------------------------------------------------------- commit 0bca11de22e7ad274608dc1198e51f68aae91694 Author: Karel Gardas <[email protected]> Date: Tue Feb 14 08:03:07 2012 +0100 fix ARM StgCRun to not save and restore r11/fp register twice >--------------------------------------------------------------- rts/StgCRun.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rts/StgCRun.c b/rts/StgCRun.c index 9ca22d2..3654b33 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-r11, fp, ip, lr}\n\t" + "stmfd sp!, {r4-r10, fp, ip, lr}\n\t" #if !defined(arm_HOST_ARCH_PRE_ARMv6) "vstmdb sp!, {d8-d11}\n\t" #endif @@ -669,7 +669,7 @@ StgRun(StgFunPtr f, StgRegTable *basereg) { #if !defined(arm_HOST_ARCH_PRE_ARMv6) "vldmia sp!, {d8-d11}\n\t" #endif - "ldmfd sp!, {r4-r11, fp, ip, lr}\n\t" + "ldmfd sp!, {r4-r10, fp, ip, lr}\n\t" : "=r" (r) : "r" (f), "r" (basereg), "i" (RESERVED_C_STACK_BYTES) #if !defined(__thumb__) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
