Follow Cabal changes

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

diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
index 9216969..a45439d 100644 (file)
--- a/rts/PrimOps.cmm
+++ b/rts/PrimOps.cmm
@@ -1551,7 +1551,7 @@ takeMVarzh_fast
 #endif
         
     if (info == stg_MVAR_CLEAN_info) {
-        foreign "C" dirty_MVAR(BaseReg "ptr", mvar "ptr");
+        foreign "C" dirty_MVAR(BaseReg "ptr", mvar "ptr") [];
     }
 
     /* If the MVar is empty, put ourselves on its blocking queue,
@@ -1561,8 +1561,9 @@ takeMVarzh_fast
        if (StgMVar_head(mvar) == stg_END_TSO_QUEUE_closure) {
            StgMVar_head(mvar) = CurrentTSO;
        } else {
-            foreign "C" setTSOLink(MyCapability() "ptr", StgMVar_tail(mvar),
-                                   CurrentTSO);
+            foreign "C" setTSOLink(MyCapability() "ptr", 
+                                   StgMVar_tail(mvar) "ptr",
+                                   CurrentTSO) [];
        }
        StgTSO__link(CurrentTSO)       = stg_END_TSO_QUEUE_closure;
        StgTSO_why_blocked(CurrentTSO) = BlockedOnMVar::I16;
@@ -1586,19 +1587,13 @@ takeMVarzh_fast
       tso = StgMVar_head(mvar);
       PerformPut(tso,StgMVar_value(mvar));
 
-      if (StgTSO_flags(tso) & TSO_DIRTY == 0) {
-          foreign "C" dirty_TSO(MyCapability(), tso);
+      if (TO_W_(StgTSO_flags(tso)) & TSO_DIRTY == 0) {
+          foreign "C" dirty_TSO(MyCapability() "ptr", tso "ptr") [];
       }
 
-#if defined(GRAN) || defined(PAR)
-      /* ToDo: check 2nd arg (mvar) is right */
-      ("ptr" tso) = foreign "C" unblockOne(StgMVar_head(mvar),mvar) [];
-      StgMVar_head(mvar) = tso;
-#else
       ("ptr" tso) = foreign "C" unblockOne_(MyCapability() "ptr", 
                                             StgMVar_head(mvar) "ptr", 1) [];
       StgMVar_head(mvar) = tso;
-#endif
 
       if (StgMVar_head(mvar) == stg_END_TSO_QUEUE_closure) {
          StgMVar_tail(mvar) = stg_END_TSO_QUEUE_closure;
@@ -1668,19 +1663,13 @@ tryTakeMVarzh_fast
        /* actually perform the putMVar for the thread that we just woke up */
        tso = StgMVar_head(mvar);
        PerformPut(tso,StgMVar_value(mvar));
-        if (StgTSO_flags(tso) & TSO_DIRTY == 0) {
-            foreign "C" dirty_TSO(MyCapability(), tso);
+        if (TO_W_(StgTSO_flags(tso)) & TSO_DIRTY == 0) {
+            foreign "C" dirty_TSO(MyCapability() "ptr", tso "ptr") [];
         }
 
-#if defined(GRAN) || defined(PAR)
-       /* ToDo: check 2nd arg (mvar) is right */
-       ("ptr" tso) = foreign "C" unblockOne(StgMVar_head(mvar) "ptr", mvar "ptr") [];
-       StgMVar_head(mvar) = tso;
-#else
         ("ptr" tso) = foreign "C" unblockOne_(MyCapability() "ptr", 
                                               StgMVar_head(mvar) "ptr", 1) [];
        StgMVar_head(mvar) = tso;
-#endif
 
        if (StgMVar_head(mvar) == stg_END_TSO_QUEUE_closure) {
            StgMVar_tail(mvar) = stg_END_TSO_QUEUE_closure;
@@ -1727,8 +1716,9 @@ putMVarzh_fast
        if (StgMVar_head(mvar) == stg_END_TSO_QUEUE_closure) {
            StgMVar_head(mvar) = CurrentTSO;
        } else {
-            foreign "C" setTSOLink(MyCapability() "ptr", StgMVar_tail(mvar),
-                                   CurrentTSO);
+            foreign "C" setTSOLink(MyCapability() "ptr", 
+                                   StgMVar_tail(mvar) "ptr",
+                                   CurrentTSO) [];
        }
        StgTSO__link(CurrentTSO)       = stg_END_TSO_QUEUE_closure;
        StgTSO_why_blocked(CurrentTSO) = BlockedOnMVar::I16;
@@ -1747,19 +1737,13 @@ putMVarzh_fast
        /* actually perform the takeMVar */
        tso = StgMVar_head(mvar);
        PerformTake(tso, R2);
-        if (StgTSO_flags(tso) & TSO_DIRTY == 0) {
-            foreign "C" dirty_TSO(MyCapability(), tso);
+        if (TO_W_(StgTSO_flags(tso)) & TSO_DIRTY == 0) {
+            foreign "C" dirty_TSO(MyCapability() "ptr", tso "ptr") [];
         }
       
-#if defined(GRAN) || defined(PAR)
-       /* ToDo: check 2nd arg (mvar) is right */
-       ("ptr" tso) = foreign "C" unblockOne(MyCapability() "ptr", StgMVar_head(mvar) "ptr",mvar "ptr") [];
-       StgMVar_head(mvar) = tso;
-#else
         ("ptr" tso) = foreign "C" unblockOne_(MyCapability() "ptr", 
                                               StgMVar_head(mvar) "ptr", 1) [];
        StgMVar_head(mvar) = tso;
-#endif
 
        if (StgMVar_head(mvar) == stg_END_TSO_QUEUE_closure) {
            StgMVar_tail(mvar) = stg_END_TSO_QUEUE_closure;
@@ -1822,19 +1806,13 @@ tryPutMVarzh_fast
        /* actually perform the takeMVar */
        tso = StgMVar_head(mvar);
        PerformTake(tso, R2);
-        if (StgTSO_flags(tso) & TSO_DIRTY == 0) {
-            foreign "C" dirty_TSO(MyCapability(), tso);
+        if (TO_W_(StgTSO_flags(tso)) & TSO_DIRTY == 0) {
+            foreign "C" dirty_TSO(MyCapability() "ptr", tso "ptr") [];
         }
       
-#if defined(GRAN) || defined(PAR)
-       /* ToDo: check 2nd arg (mvar) is right */
-       ("ptr" tso) = foreign "C" unblockOne(MyCapability() "ptr", StgMVar_head(mvar) "ptr",mvar "ptr") [];
-       StgMVar_head(mvar) = tso;
-#else
         ("ptr" tso) = foreign "C" unblockOne_(MyCapability() "ptr", 
                                               StgMVar_head(mvar) "ptr", 1) [];
        StgMVar_head(mvar) = tso;
-#endif
 
        if (StgMVar_head(mvar) == stg_END_TSO_QUEUE_closure) {
            StgMVar_tail(mvar) = stg_END_TSO_QUEUE_closure;
@@ -2054,7 +2032,7 @@ for2:
     if (W_[blocked_queue_hd] == END_TSO_QUEUE) {       \
       W_[blocked_queue_hd] = tso;                      \
     } else {                                           \
-      foreign "C" setTSOLink(MyCapability() "ptr", W_[blocked_queue_tl], tso); \
+      foreign "C" setTSOLink(MyCapability() "ptr", W_[blocked_queue_tl] "ptr", tso) []; \
     }                                                  \
     W_[blocked_queue_tl] = tso;
 
@@ -2158,7 +2136,7 @@ while:
     if (prev == NULL) {
        W_[sleeping_queue] = CurrentTSO;
     } else {
-        foreign "C" setTSOLink(MyCapability() "ptr", prev, CurrentTSO) [];
+        foreign "C" setTSOLink(MyCapability() "ptr", prev "ptr", CurrentTSO) [];
     }
     jump stg_block_noregs;
 #endif