diff options
| author | Edward Z. Yang <ezyang@mit.edu> | 2013-07-12 18:12:25 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@mit.edu> | 2013-07-12 18:12:25 -0700 |
| commit | 48f462f3ea7951fbf3774ad3d57b47eee2de4e04 (patch) | |
| tree | 76b18dd7dfd23be8af0c7020ff7cb61212ee7c97 /rts/HeapStackCheck.cmm | |
| parent | f6e9d4fce344e3a6e12ba4011aab0d1bd0a7a48e (diff) | |
| download | haskell-48f462f3ea7951fbf3774ad3d57b47eee2de4e04.tar.gz | |
Rename atomicReadMVar and friends to readMVar.
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
Diffstat (limited to 'rts/HeapStackCheck.cmm')
| -rw-r--r-- | rts/HeapStackCheck.cmm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm index 20cd9dffb9..e130cb3660 100644 --- a/rts/HeapStackCheck.cmm +++ b/rts/HeapStackCheck.cmm @@ -487,7 +487,7 @@ stg_block_noregs /* ----------------------------------------------------------------------------- * takeMVar/putMVar-specific blocks * - * Stack layout for a thread blocked in takeMVar/atomicReadMVar: + * Stack layout for a thread blocked in takeMVar/readMVar: * * ret. addr * ptr to MVar (R1) @@ -531,14 +531,14 @@ stg_block_takemvar /* mvar passed in R1 */ BLOCK_BUT_FIRST(stg_block_takemvar_finally); } -INFO_TABLE_RET ( stg_block_atomicreadmvar, RET_SMALL, W_ info_ptr, P_ mvar ) +INFO_TABLE_RET ( stg_block_readmvar, RET_SMALL, W_ info_ptr, P_ mvar ) return () { - jump stg_atomicReadMVarzh(mvar); + jump stg_readMVarzh(mvar); } // code fragment executed just before we return to the scheduler -stg_block_atomicreadmvar_finally +stg_block_readmvar_finally { W_ r1, r3; r1 = R1; @@ -549,13 +549,13 @@ stg_block_atomicreadmvar_finally jump StgReturn [R1]; } -stg_block_atomicreadmvar /* mvar passed in R1 */ +stg_block_readmvar /* mvar passed in R1 */ { Sp_adj(-2); Sp(1) = R1; - Sp(0) = stg_block_atomicreadmvar_info; - R3 = R1; // mvar communicated to stg_block_atomicreadmvar_finally in R3 - BLOCK_BUT_FIRST(stg_block_atomicreadmvar_finally); + Sp(0) = stg_block_readmvar_info; + R3 = R1; // mvar communicated to stg_block_readmvar_finally in R3 + BLOCK_BUT_FIRST(stg_block_readmvar_finally); } INFO_TABLE_RET( stg_block_putmvar, RET_SMALL, W_ info_ptr, |