projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do some stack fiddling in stg_unblockAsyncExceptionszh_ret
[ghc-hetmet.git]
/
compiler
/
nativeGen
/
AsmCodeGen.lhs
diff --git
a/compiler/nativeGen/AsmCodeGen.lhs
b/compiler/nativeGen/AsmCodeGen.lhs
index
e0608cb
..
5ba620b
100644
(file)
--- a/
compiler/nativeGen/AsmCodeGen.lhs
+++ b/
compiler/nativeGen/AsmCodeGen.lhs
@@
-40,7
+40,7
@@
import MachOp
import CLabel
import State
import CLabel
import State
-import LazyUniqFM
+import UniqFM
import Unique ( Unique, getUnique )
import UniqSupply
import List ( groupBy, sortBy )
import Unique ( Unique, getUnique )
import UniqSupply
import List ( groupBy, sortBy )
@@
-719,9
+719,9
@@
cmmStmtConFold stmt
e' <- cmmExprConFold CallReference e
return $ CmmCallee e' conv
other -> return other
e' <- cmmExprConFold CallReference e
return $ CmmCallee e' conv
other -> return other
- args' <- mapM (\(CmmHinted arg hint) -> do
+ args' <- mapM (\(CmmKinded arg hint) -> do
arg' <- cmmExprConFold DataReference arg
arg' <- cmmExprConFold DataReference arg
- return (CmmHinted arg' hint)) args
+ return (CmmKinded arg' hint)) args
return $ CmmCall target' regs args' srt returns
CmmCondBranch test dest
return $ CmmCall target' regs args' srt returns
CmmCondBranch test dest
@@
-774,11
+774,11
@@
cmmExprConFold referenceKind expr
CmmReg (CmmGlobal GCEnter1)
| not opt_PIC
-> cmmExprConFold referenceKind $
CmmReg (CmmGlobal GCEnter1)
| not opt_PIC
-> cmmExprConFold referenceKind $
- CmmLit (CmmLabel (mkRtsCodeLabel SLIT( "__stg_gc_enter_1")))
+ CmmLit (CmmLabel (mkRtsCodeLabel (sLit "__stg_gc_enter_1")))
CmmReg (CmmGlobal GCFun)
| not opt_PIC
-> cmmExprConFold referenceKind $
CmmReg (CmmGlobal GCFun)
| not opt_PIC
-> cmmExprConFold referenceKind $
- CmmLit (CmmLabel (mkRtsCodeLabel SLIT( "__stg_gc_fun")))
+ CmmLit (CmmLabel (mkRtsCodeLabel (sLit "__stg_gc_fun")))
#endif
CmmReg (CmmGlobal mid)
#endif
CmmReg (CmmGlobal mid)