Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/6260064eb5cb05778e2b66d556154e2045e89bf2 >--------------------------------------------------------------- commit 6260064eb5cb05778e2b66d556154e2045e89bf2 Author: Ian Lynagh <[email protected]> Date: Mon Mar 19 12:07:41 2012 +0000 Fix the registers used in StgRun on Win64 >--------------------------------------------------------------- rts/StgCRun.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/rts/StgCRun.c b/rts/StgCRun.c index f08e35d..70244fe 100644 --- a/rts/StgCRun.c +++ b/rts/StgCRun.c @@ -259,11 +259,19 @@ StgRunIsImplementedInAssembler(void) /* * Set BaseReg */ +#if defined(mingw32_HOST_OS) + "movq %%rdx,%%r13\n\t" +#else "movq %%rsi,%%r13\n\t" +#endif /* * grab the function argument from the stack, and jump to it. */ +#if defined(mingw32_HOST_OS) + "movq %%rcx,%%rax\n\t" +#else "movq %%rdi,%%rax\n\t" +#endif "jmp *%%rax\n\t" ".globl " STG_RETURN "\n" _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
