oops, forgot some more SMP->THREADED_RTS conversions

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

diff --git a/ghc/rts/PrimOps.cmm b/ghc/rts/PrimOps.cmm
index 01b4138..7d57092 100644 (file)
--- a/ghc/rts/PrimOps.cmm
+++ b/ghc/rts/PrimOps.cmm
@@ -159,7 +159,7 @@ newMutVarzh_fast
     ALLOC_PRIM( SIZEOF_StgMutVar, R1_PTR, newMutVarzh_fast);
 
     mv = Hp - SIZEOF_StgMutVar + WDS(1);
-    SET_HDR(mv,stg_MUT_VAR_info,W_[CCCS]);
+    SET_HDR(mv,stg_MUT_VAR_DIRTY_info,W_[CCCS]);
     StgMutVar_var(mv) = R1;
     
     RET_P(mv);
@@ -206,8 +206,8 @@ atomicModifyMutVarzh_fast
 
    HP_CHK_GEN_TICKY(SIZE, R1_PTR & R2_PTR, atomicModifyMutVarzh_fast);
 
-#if defined(SMP)
-    foreign "C" ACQUIRE_LOCK(sm_mutex "ptr");
+#if defined(THREADED_RTS)
+    foreign "C" ACQUIRE_LOCK(sm_mutex "ptr") [R1,R2];
 #endif
 
    x = StgMutVar_var(R1);
@@ -228,6 +228,7 @@ atomicModifyMutVarzh_fast
    StgThunk_payload(y,0) = z;
 
    StgMutVar_var(R1) = y;
+   foreign "C" dirty_MUT_VAR(BaseReg "ptr", R1 "ptr") [R1];
 
    TICK_ALLOC_THUNK_1();
    CCCS_ALLOC(THUNK_1_SIZE);
@@ -236,7 +237,7 @@ atomicModifyMutVarzh_fast
    LDV_RECORD_CREATE(r);
    StgThunk_payload(r,0) = z;
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
     foreign "C" RELEASE_LOCK(sm_mutex "ptr") [];
 #endif
 
@@ -511,7 +512,7 @@ word64ToIntegerzh_fast
 
 /* ToDo: this is shockingly inefficient */
 
-#ifndef SMP
+#ifndef THREADED_RTS
 section "bss" {
   mp_tmp1:
     bits8 [SIZEOF_MP_INT];
@@ -533,7 +534,7 @@ section "bss" {
 }
 #endif
 
-#ifdef SMP
+#ifdef THREADED_RTS
 #define FETCH_MP_TEMP(X) \
 W_ X; \
 X = BaseReg + (OFFSET_StgRegTable_r ## X);
@@ -654,7 +655,7 @@ GMP_TAKE1_RET1(complementIntegerzh_fast, mpz_com)
 GMP_TAKE2_RET2(quotRemIntegerzh_fast, mpz_tdiv_qr)
 GMP_TAKE2_RET2(divModIntegerzh_fast,  mpz_fdiv_qr)
 
-#ifndef SMP
+#ifndef THREADED_RTS
 section "bss" {
   mp_tmp_w:  W_; // NB. mp_tmp_w is really an here mp_limb_t
 }
@@ -1468,7 +1469,7 @@ takeMVarzh_fast
     /* args: R1 = MVar closure */
     mvar = R1;
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
     "ptr" info = foreign "C" lockClosure(mvar "ptr");
 #else
     info = GET_INFO(mvar);
@@ -1519,7 +1520,7 @@ takeMVarzh_fast
          StgMVar_tail(mvar) = stg_END_TSO_QUEUE_closure;
       }
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
       foreign "C" unlockClosure(mvar "ptr", stg_FULL_MVAR_info);
 #endif
       RET_P(val);
@@ -1529,7 +1530,7 @@ takeMVarzh_fast
       /* No further putMVars, MVar is now empty */
       StgMVar_value(mvar) = stg_END_TSO_QUEUE_closure;
  
-#if defined(SMP)
+#if defined(THREADED_RTS)
       foreign "C" unlockClosure(mvar "ptr", stg_EMPTY_MVAR_info);
 #else
       SET_INFO(mvar,stg_EMPTY_MVAR_info);
@@ -1548,14 +1549,14 @@ tryTakeMVarzh_fast
 
     mvar = R1;
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
     "ptr" info = foreign "C" lockClosure(mvar "ptr");
 #else
     info = GET_INFO(mvar);
 #endif
 
     if (info == stg_EMPTY_MVAR_info) {
-#if defined(SMP)
+#if defined(THREADED_RTS)
         foreign "C" unlockClosure(mvar "ptr", stg_EMPTY_MVAR_info);
 #endif
        /* HACK: we need a pointer to pass back, 
@@ -1591,7 +1592,7 @@ tryTakeMVarzh_fast
        if (StgMVar_head(mvar) == stg_END_TSO_QUEUE_closure) {
            StgMVar_tail(mvar) = stg_END_TSO_QUEUE_closure;
        }
-#if defined(SMP)
+#if defined(THREADED_RTS)
         foreign "C" unlockClosure(mvar "ptr", stg_FULL_MVAR_info);
 #endif
     }
@@ -1599,7 +1600,7 @@ tryTakeMVarzh_fast
     {
        /* No further putMVars, MVar is now empty */
        StgMVar_value(mvar) = stg_END_TSO_QUEUE_closure;
-#if defined(SMP)
+#if defined(THREADED_RTS)
        foreign "C" unlockClosure(mvar "ptr", stg_EMPTY_MVAR_info);
 #else
        SET_INFO(mvar,stg_EMPTY_MVAR_info);
@@ -1617,7 +1618,7 @@ putMVarzh_fast
     /* args: R1 = MVar, R2 = value */
     mvar = R1;
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
     "ptr" info = foreign "C" lockClosure(mvar "ptr");
 #else
     info = GET_INFO(mvar);
@@ -1660,7 +1661,7 @@ putMVarzh_fast
            StgMVar_tail(mvar) = stg_END_TSO_QUEUE_closure;
        }
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
        foreign "C" unlockClosure(mvar "ptr", stg_EMPTY_MVAR_info);
 #endif
        jump %ENTRY_CODE(Sp(0));
@@ -1670,7 +1671,7 @@ putMVarzh_fast
        /* No further takes, the MVar is now full. */
        StgMVar_value(mvar) = R2;
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
        foreign "C" unlockClosure(mvar "ptr", stg_FULL_MVAR_info);
 #else
        SET_INFO(mvar,stg_FULL_MVAR_info);
@@ -1689,14 +1690,14 @@ tryPutMVarzh_fast
     /* args: R1 = MVar, R2 = value */
     mvar = R1;
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
     "ptr" info = foreign "C" lockClosure(mvar "ptr");
 #else
     info = GET_INFO(mvar);
 #endif
 
     if (info == stg_FULL_MVAR_info) {
-#if defined(SMP)
+#if defined(THREADED_RTS)
        foreign "C" unlockClosure(mvar "ptr", stg_FULL_MVAR_info);
 #endif
        RET_N(0);
@@ -1725,24 +1726,23 @@ tryPutMVarzh_fast
            StgMVar_tail(mvar) = stg_END_TSO_QUEUE_closure;
        }
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
        foreign "C" unlockClosure(mvar "ptr", stg_EMPTY_MVAR_info);
 #endif
-       jump %ENTRY_CODE(Sp(0));
     }
     else
     {
        /* No further takes, the MVar is now full. */
        StgMVar_value(mvar) = R2;
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
        foreign "C" unlockClosure(mvar "ptr", stg_FULL_MVAR_info);
 #else
        SET_INFO(mvar,stg_FULL_MVAR_info);
 #endif
-       jump %ENTRY_CODE(Sp(0));
     }
     
+    RET_N(1);
     /* ToDo: yield afterward for better communication performance? */
 }