X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FApply.cmm;h=f9ac3b353c385bbe4af3c4cf3e143902330fce97;hb=0885017a4e92fe5710d1427c214adb87b92987e5;hp=a98edeef91a22c9ab1992d062b16395f38f1d3c6;hpb=2777940384ce4740954062bedd0f6813698fc72a;p=ghc-hetmet.git

diff --git a/rts/Apply.cmm b/rts/Apply.cmm
index a98edee..f9ac3b3 100644
--- a/rts/Apply.cmm
+++ b/rts/Apply.cmm
@@ -30,9 +30,7 @@ stg_ap_0_fast
 	foreign "C" printClosure(R1 "ptr") [R1]);
 
     IF_DEBUG(sanity,
-	foreign "C" checkStackChunk(Sp "ptr",
-				    CurrentTSO + TSO_OFFSET_StgTSO_stack +
-				    WDS(TO_W_(StgTSO_stack_size(CurrentTSO))) "ptr") [R1]);
+	foreign "C" checkStackFrame(Sp "ptr") [R1]);
 
     ENTER();
 }
@@ -352,3 +350,56 @@ for:
 
   ENTER();
 }
+
+/* -----------------------------------------------------------------------------
+   AP_STACK_NOUPD - exactly like AP_STACK, but doesn't push an update frame.
+   -------------------------------------------------------------------------- */
+
+INFO_TABLE(stg_AP_STACK_NOUPD,/*special layout*/0,0,AP_STACK,
+                                        "AP_STACK_NOUPD","AP_STACK_NOUPD")
+{
+  W_ Words;
+  W_ ap;
+
+  ap = R1;
+  
+  Words = StgAP_STACK_size(ap);
+
+  /* 
+   * Check for stack overflow.  IMPORTANT: use a _NP check here,
+   * because if the check fails, we might end up blackholing this very
+   * closure, in which case we must enter the blackhole on return rather
+   * than continuing to evaluate the now-defunct closure.
+   */
+  STK_CHK_NP(WDS(Words) + WDS(AP_STACK_SPLIM));
+  /* ensure there is at least AP_STACK_SPLIM words of headroom available
+   * after unpacking the AP_STACK. See bug #1466 */
+
+  Sp = Sp - WDS(Words);
+
+  TICK_ENT_AP();
+  LDV_ENTER(ap);
+
+  // Enter PAP cost centre
+  ENTER_CCS_PAP_CL(ap);   // ToDo: ENTER_CC_AP_CL 
+
+  // Reload the stack
+  W_ i;
+  W_ p;
+  p = ap + SIZEOF_StgHeader + OFFSET_StgAP_STACK_payload;
+  i = 0;
+for:
+  if (i < Words) {
+    Sp(i) = W_[p];
+    p = p + WDS(1);
+    i = i + 1;
+    goto for;
+  }
+
+  // Off we go!
+  TICK_ENT_VIA_NODE();
+
+  R1 = StgAP_STACK_fun(ap);
+
+  ENTER();
+}