diff options
| author | Siddhanathan Shanmugam <siddhanathan@gmail.com> | 2015-09-11 16:10:41 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2015-09-11 18:33:32 -0500 |
| commit | 7ad4b3c1419fefbb01fd4643f374150abd1d11e2 (patch) | |
| tree | 46fed56f87cfd2b32ce5ec2537b04be95cbbda23 /compiler | |
| parent | 4275028c744ef8ee6bbc26c3a301ef2e3e8708a0 (diff) | |
| download | haskell-7ad4b3c1419fefbb01fd4643f374150abd1d11e2.tar.gz | |
s/StgArrWords/StgArrBytes/
Rename StgArrWords to StgArrBytes (see Trac #8552)
Reviewed By: austin
Differential Revision: https://phabricator.haskell.org/D1233
GHC Trac Issues: #8552
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/cmm/SMRep.hs | 4 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmPrim.hs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/compiler/cmm/SMRep.hs b/compiler/cmm/SMRep.hs index ca272fc984..6c0076122e 100644 --- a/compiler/cmm/SMRep.hs +++ b/compiler/cmm/SMRep.hs @@ -317,12 +317,12 @@ minClosureSize dflags = fixedHdrSizeW dflags + mIN_PAYLOAD_SIZE dflags arrWordsHdrSize :: DynFlags -> ByteOff arrWordsHdrSize dflags - = fixedHdrSize dflags + sIZEOF_StgArrWords_NoHdr dflags + = fixedHdrSize dflags + sIZEOF_StgArrBytes_NoHdr dflags arrWordsHdrSizeW :: DynFlags -> WordOff arrWordsHdrSizeW dflags = fixedHdrSizeW dflags + - (sIZEOF_StgArrWords_NoHdr dflags `quot` wORD_SIZE dflags) + (sIZEOF_StgArrBytes_NoHdr dflags `quot` wORD_SIZE dflags) arrPtrsHdrSize :: DynFlags -> ByteOff arrPtrsHdrSize dflags diff --git a/compiler/codeGen/StgCmmPrim.hs b/compiler/codeGen/StgCmmPrim.hs index e7b709f5ba..4400d72639 100644 --- a/compiler/codeGen/StgCmmPrim.hs +++ b/compiler/codeGen/StgCmmPrim.hs @@ -318,17 +318,17 @@ emitPrimOp dflags [] WriteMutVarOp [mutv,var] [(CmmReg (CmmGlobal BaseReg), AddrHint), (mutv,AddrHint)] -- #define sizzeofByteArrayzh(r,a) \ --- r = ((StgArrWords *)(a))->bytes +-- r = ((StgArrBytes *)(a))->bytes emitPrimOp dflags [res] SizeofByteArrayOp [arg] = emit $ mkAssign (CmmLocal res) (cmmLoadIndexW dflags arg (fixedHdrSizeW dflags) (bWord dflags)) -- #define sizzeofMutableByteArrayzh(r,a) \ --- r = ((StgArrWords *)(a))->bytes +-- r = ((StgArrBytes *)(a))->bytes emitPrimOp dflags [res] SizeofMutableByteArrayOp [arg] = emitPrimOp dflags [res] SizeofByteArrayOp [arg] -- #define getSizzeofMutableByteArrayzh(r,a) \ --- r = ((StgArrWords *)(a))->bytes +-- r = ((StgArrBytes *)(a))->bytes emitPrimOp dflags [res] GetSizeofMutableByteArrayOp [arg] = emitAssign (CmmLocal res) (cmmLoadIndexW dflags arg (fixedHdrSizeW dflags) (bWord dflags)) @@ -1640,7 +1640,7 @@ doNewByteArrayOp res_r n = do base <- allocHeapClosure rep info_ptr curCCS [ (mkIntExpr dflags n, - hdr_size + oFFSET_StgArrWords_bytes dflags) + hdr_size + oFFSET_StgArrBytes_bytes dflags) ] emit $ mkAssign (CmmLocal res_r) base |