Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/e24091b0d1b898ccdcb986ebbcc9635352b51d43 >--------------------------------------------------------------- commit e24091b0d1b898ccdcb986ebbcc9635352b51d43 Author: Ian Lynagh <[email protected]> Date: Tue Mar 20 01:32:03 2012 +0000 Fix stg_block_async on registerised Win64 >--------------------------------------------------------------- rts/HeapStackCheck.cmm | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm index 199f0cd..469cecd 100644 --- a/rts/HeapStackCheck.cmm +++ b/rts/HeapStackCheck.cmm @@ -679,15 +679,22 @@ INFO_TABLE_RET( stg_block_async, RET_SMALL, W_ unused ) len = TO_W_(StgAsyncIOResult_len(ares)); errC = TO_W_(StgAsyncIOResult_errCode(ares)); foreign "C" free(ares "ptr"); -#ifdef GhcUnregisterised +#if defined(GhcUnregisterised) Sp(1) = errC; Sp(0) = len; jump %ENTRY_CODE(Sp(2)); -#else +#elif defined(i386_HOST_ARCH) R1 = len; Sp_adj(1); Sp(0) = errC; jump %ENTRY_CODE(Sp(1)); +#elif defined(x86_64_HOST_ARCH) + R1 = len; + R2 = errC; + Sp_adj(2); + jump %ENTRY_CODE(Sp(0)); +#else +#error Unexpected arch #endif } _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
