diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-05-13 20:45:11 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-05-13 21:46:45 +0100 |
| commit | b8447a93b36d19f4c1dd81881ff10adf8c781fbe (patch) | |
| tree | 06dcc065a3c6e3cd7e0ec090d49f2fd0f3fdac21 /compiler/nativeGen/NCGMonad.hs | |
| parent | 58dccedb6a9c522907e9009616df2eff74ddf4c9 (diff) | |
| download | haskell-b8447a93b36d19f4c1dd81881ff10adf8c781fbe.tar.gz | |
Make the current module available to labelDynamic
It doesn't actually use it yet
Diffstat (limited to 'compiler/nativeGen/NCGMonad.hs')
| -rw-r--r-- | compiler/nativeGen/NCGMonad.hs | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/compiler/nativeGen/NCGMonad.hs b/compiler/nativeGen/NCGMonad.hs index dd7eccb594..fec6805b4e 100644 --- a/compiler/nativeGen/NCGMonad.hs +++ b/compiler/nativeGen/NCGMonad.hs @@ -16,6 +16,7 @@ module NCGMonad ( mapAccumLNat, setDeltaNat, getDeltaNat, + getThisModuleNat, getBlockIdNat, getNewLabelNat, getNewRegNat, @@ -38,14 +39,16 @@ import CLabel ( CLabel, mkAsmTempLabel ) import UniqSupply import Unique ( Unique ) import DynFlags +import Module data NatM_State = NatM_State { - natm_us :: UniqSupply, - natm_delta :: Int, - natm_imports :: [(CLabel)], - natm_pic :: Maybe Reg, - natm_dflags :: DynFlags + natm_us :: UniqSupply, + natm_delta :: Int, + natm_imports :: [(CLabel)], + natm_pic :: Maybe Reg, + natm_dflags :: DynFlags, + natm_this_module :: Module } newtype NatM result = NatM (NatM_State -> (result, NatM_State)) @@ -53,9 +56,9 @@ newtype NatM result = NatM (NatM_State -> (result, NatM_State)) unNat :: NatM a -> NatM_State -> (a, NatM_State) unNat (NatM a) = a -mkNatM_State :: UniqSupply -> Int -> DynFlags -> NatM_State -mkNatM_State us delta dflags - = NatM_State us delta [] Nothing dflags +mkNatM_State :: UniqSupply -> Int -> DynFlags -> Module -> NatM_State +mkNatM_State us delta dflags this_mod + = NatM_State us delta [] Nothing dflags this_mod initNat :: NatM_State -> NatM a -> (a, NatM_State) initNat init_st m @@ -105,6 +108,10 @@ setDeltaNat :: Int -> NatM () setDeltaNat delta = NatM $ \ st -> ((), st {natm_delta = delta}) +getThisModuleNat :: NatM Module +getThisModuleNat = NatM $ \ st -> (natm_this_module st, st) + + addImportNat :: CLabel -> NatM () addImportNat imp = NatM $ \ st -> ((), st {natm_imports = imp : natm_imports st}) |