diff options
author | Michal Terepeta <michal.terepeta@gmail.com> | 2017-06-23 11:41:50 -0400 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2017-06-23 13:07:30 -0400 |
commit | 42eee6eac3d4bf4b2b557cdc13f2d5acae93d4e8 (patch) | |
tree | 68a7bfe0f71a983784afb6c3ba1fcfdbaf62a546 /compiler/nativeGen/SPARC | |
parent | 9077120918b78f5152bf3596fe6df07b91cead79 (diff) | |
download | haskell-42eee6eac3d4bf4b2b557cdc13f2d5acae93d4e8.tar.gz |
Hoopl: remove dependency on Hoopl package
This copies the subset of Hoopl's functionality needed by GHC to
`cmm/Hoopl` and removes the dependency on the Hoopl package.
The main motivation for this change is the confusing/noisy interface
between GHC and Hoopl:
- Hoopl has `Label` which is GHC's `BlockId` but different than
GHC's `CLabel`
- Hoopl has `Unique` which is different than GHC's `Unique`
- Hoopl has `Unique{Map,Set}` which are different than GHC's
`Uniq{FM,Set}`
- GHC has its own specialized copy of `Dataflow`, so `cmm/Hoopl` is
needed just to filter the exposed functions (filter out some of the
Hoopl's and add the GHC ones)
With this change, we'll be able to simplify this significantly.
It'll also be much easier to do invasive changes (Hoopl is a public
package on Hackage with users that depend on the current behavior)
This should introduce no changes in functionality - it merely
copies the relevant code.
Signed-off-by: Michal Terepeta <michal.terepeta@gmail.com>
Test Plan: ./validate
Reviewers: austin, bgamari, simonmar
Reviewed By: bgamari, simonmar
Subscribers: simonpj, kavon, rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D3616
Diffstat (limited to 'compiler/nativeGen/SPARC')
-rw-r--r-- | compiler/nativeGen/SPARC/CodeGen.hs | 3 | ||||
-rw-r--r-- | compiler/nativeGen/SPARC/Ppr.hs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/nativeGen/SPARC/CodeGen.hs b/compiler/nativeGen/SPARC/CodeGen.hs index 3e9058bdfd..71d320fa63 100644 --- a/compiler/nativeGen/SPARC/CodeGen.hs +++ b/compiler/nativeGen/SPARC/CodeGen.hs @@ -44,7 +44,8 @@ import BlockId import Cmm import CmmUtils import CmmSwitch -import Hoopl +import Hoopl.Block +import Hoopl.Graph import PIC import Reg import CLabel diff --git a/compiler/nativeGen/SPARC/Ppr.hs b/compiler/nativeGen/SPARC/Ppr.hs index 5d6b6f70dc..88b04b952a 100644 --- a/compiler/nativeGen/SPARC/Ppr.hs +++ b/compiler/nativeGen/SPARC/Ppr.hs @@ -39,7 +39,8 @@ import PprBase import Cmm hiding (topInfoTable) import PprCmm() import CLabel -import Hoopl +import Hoopl.Label +import Hoopl.Collections import Unique ( Uniquable(..), pprUniqueAlways ) import Outputable |