Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8986122779d3e96d839aadc7a4094b67c1422205 >--------------------------------------------------------------- commit 8986122779d3e96d839aadc7a4094b67c1422205 Author: Ian Lynagh <[email protected]> Date: Tue Mar 20 15:00:08 2012 +0000 Code tidy-up: Use RET_NN in stg_block_async >--------------------------------------------------------------- rts/HeapStackCheck.cmm | 17 +---------------- rts/ghc.mk | 1 - 2 files changed, 1 insertions(+), 17 deletions(-) diff --git a/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm index 469cecd..90691fa 100644 --- a/rts/HeapStackCheck.cmm +++ b/rts/HeapStackCheck.cmm @@ -679,23 +679,8 @@ 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"); -#if defined(GhcUnregisterised) - Sp(1) = errC; - Sp(0) = len; - jump %ENTRY_CODE(Sp(2)); -#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 + RET_NN(len, errC); } stg_block_async diff --git a/rts/ghc.mk b/rts/ghc.mk index e5fff56..95faea8 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -312,7 +312,6 @@ rts/RtsUtils_CC_OPTS += -DGhcUnregisterised=\"$(GhcUnregisterised)\" rts/RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=\"$(GhcEnableTablesNextToCode)\" ifeq "$(GhcUnregisterised)" "YES" -rts/HeapStackCheck_HC_OPTS += -DGhcUnregisterised=1 rts/PrimOps_HC_OPTS += -DGhcUnregisterised=1 rts/Schedule_CC_OPTS += -DGhcUnregisterised=1 endif _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
