From: Simon Marlow <simonmarhaskell@gmail.com>
Date: Wed, 16 Apr 2008 23:41:35 +0000 (+0000)
Subject: remove GRAN/PAR code
X-Git-Tag: Before_cabalised-GHC~194
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=777bb600402d333b53e5bf8c94fc8ea7dbacf999

remove GRAN/PAR code
---

diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
index 9216969..c2b53f9 100644
--- a/rts/PrimOps.cmm
+++ b/rts/PrimOps.cmm
@@ -1590,15 +1590,9 @@ takeMVarzh_fast
           foreign "C" dirty_TSO(MyCapability(), tso);
       }
 
-#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;
@@ -1672,15 +1666,9 @@ tryTakeMVarzh_fast
             foreign "C" dirty_TSO(MyCapability(), tso);
         }
 
-#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;
@@ -1751,15 +1739,9 @@ putMVarzh_fast
             foreign "C" dirty_TSO(MyCapability(), tso);
         }
       
-#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;
@@ -1826,15 +1808,9 @@ tryPutMVarzh_fast
             foreign "C" dirty_TSO(MyCapability(), tso);
         }
       
-#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;