make the smp way RTS-only, normal libraries now work with -smp

[ghc-hetmet.git] / ghc / rts / Apply.cmm

diff --git a/ghc/rts/Apply.cmm b/ghc/rts/Apply.cmm
index c627995..8d19d14 100644 (file)
--- a/ghc/rts/Apply.cmm
+++ b/ghc/rts/Apply.cmm
@@ -41,13 +41,13 @@ INFO_TABLE_RET( stg_ap_0,
     // fn is in R1, no args on the stack
 
     IF_DEBUG(apply,
-       foreign "C" debugBelch(stg_ap_0_ret_str);
-       foreign "C" printClosure(R1 "ptr"));
+       foreign "C" debugBelch(stg_ap_0_ret_str) [R1];
+       foreign "C" printClosure(R1 "ptr") [R1]);
 
     IF_DEBUG(sanity,
        foreign "C" checkStackChunk(Sp+WDS(1) "ptr",
-                                   CurrentTSO + OFFSET_StgTSO_stack +
-                                   WDS(StgTSO_stack_size(CurrentTSO)) "ptr"));
+                                   CurrentTSO + TSO_OFFSET_StgTSO_stack +
+                                   WDS(StgTSO_stack_size(CurrentTSO)) "ptr") [R1]);
 
     Sp_adj(1);
     ENTER();
@@ -264,7 +264,7 @@ INFO_TABLE(stg_AP_STACK,/*special layout*/0,0,AP_STACK,"AP_STACK","AP_STACK")
   // Reload the stack
   W_ i;
   W_ p;
-  p = ap + SIZEOF_StgThunkHeader + OFFSET_StgAP_STACK_payload;
+  p = ap + SIZEOF_StgHeader + OFFSET_StgAP_STACK_payload;
   i = 0;
 for:
   if (i < Words) {