diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-03-01 16:37:59 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-03-15 10:57:10 -0400 |
| commit | 2e82465fff5851f00449131fdc8bacd3ca95f90f (patch) | |
| tree | cb8c8f57b1c1bf9950c514d91286b3a5463778f4 /compiler/GHC/Cmm | |
| parent | dd6ffe6be742cf3ec98406704fef53ad86cc1560 (diff) | |
| download | haskell-2e82465fff5851f00449131fdc8bacd3ca95f90f.tar.gz | |
Refactor CmmToAsm (disentangle DynFlags)
This patch disentangles a bit more DynFlags from the native code
generator (CmmToAsm).
In more details:
- add a new NCGConfig datatype in GHC.CmmToAsm.Config which contains the
configuration of a native code generation session
- explicitly pass NCGConfig/Platform arguments when necessary
- as a consequence `sdocWithPlatform` is gone and there are only a few
`sdocWithDynFlags` left
- remove the use of `unsafeGlobalDynFlags` from GHC.CmmToAsm.CFG
- remove `sdocDebugLevel` (now we pass the debug level via NCGConfig)
There are still some places where DynFlags is used, especially because
of pretty-printing (CLabel), because of Cmm helpers (such as
`cmmExprType`) and because of `Outputable` instance for the
instructions. These are left for future refactoring as this patch is
already big.
Diffstat (limited to 'compiler/GHC/Cmm')
| -rw-r--r-- | compiler/GHC/Cmm/CLabel.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/GHC/Cmm/CLabel.hs b/compiler/GHC/Cmm/CLabel.hs index 34217d317f..eea71d0ce9 100644 --- a/compiler/GHC/Cmm/CLabel.hs +++ b/compiler/GHC/Cmm/CLabel.hs @@ -1355,18 +1355,18 @@ instance Outputable ForeignLabelSource where internalNamePrefix :: Name -> SDoc internalNamePrefix name = getPprStyle $ \ sty -> if asmStyle sty && isRandomGenerated then - sdocWithPlatform $ \platform -> - ptext (asmTempLabelPrefix platform) + sdocWithDynFlags $ \dflags -> + ptext (asmTempLabelPrefix (targetPlatform dflags)) else empty where isRandomGenerated = not $ isExternalName name tempLabelPrefixOrUnderscore :: SDoc -tempLabelPrefixOrUnderscore = sdocWithPlatform $ \platform -> +tempLabelPrefixOrUnderscore = sdocWithDynFlags $ \dflags -> getPprStyle $ \ sty -> if asmStyle sty then - ptext (asmTempLabelPrefix platform) + ptext (asmTempLabelPrefix (targetPlatform dflags)) else char '_' |