diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-18 18:38:28 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2015-08-18 18:42:12 +0200 |
| commit | 3849dac59209cc2608636ae120eac54237d882c5 (patch) | |
| tree | df6a9cb2fc80dcfde31785188641b4b193016d16 /compiler/nativeGen/TargetReg.hs | |
| parent | e43350573b7a6f233bc7ef2a8badaeb15fb46f34 (diff) | |
| download | haskell-wip/d1141.tar.gz | |
Refactor: delete most of the module FastTypeswip/d1141
This reverses some of the work done in #1405, and goes back to the
assumption that the bootstrap compiler understands GHC-haskell.
In particular:
* use MagicHash instead of _ILIT and _CLIT
* pattern matching on I# if possible, instead of using iUnbox
unnecessarily
* use Int#/Char#/Addr# instead of the following type synonyms:
- type FastInt = Int#
- type FastChar = Char#
- type FastPtr a = Addr#
* inline the following functions:
- iBox = I#
- cBox = C#
- fastChr = chr#
- fastOrd = ord#
- eqFastChar = eqChar#
- shiftLFastInt = uncheckedIShiftL#
- shiftR_FastInt = uncheckedIShiftRL#
- shiftRLFastInt = uncheckedIShiftRL#
* delete the following unused functions:
- minFastInt
- maxFastInt
- uncheckedIShiftRA#
- castFastPtr
- panicDocFastInt and pprPanicFastInt
* rename panicFastInt back to panic#
These functions remain, since they actually do something:
* iUnbox
* bitAndFastInt
* bitOrFastInt
Test Plan: validate
Reviewers: austin, bgamari
Subscribers: rwbarton
Differential Revision: https://phabricator.haskell.org/D1141
GHC Trac Issues: #1405
Diffstat (limited to 'compiler/nativeGen/TargetReg.hs')
| -rw-r--r-- | compiler/nativeGen/TargetReg.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/nativeGen/TargetReg.hs b/compiler/nativeGen/TargetReg.hs index 606e6f5d9e..9bd470b0d6 100644 --- a/compiler/nativeGen/TargetReg.hs +++ b/compiler/nativeGen/TargetReg.hs @@ -27,7 +27,6 @@ import Format import Outputable import Unique -import FastTypes import Platform import qualified X86.Regs as X86 @@ -37,7 +36,7 @@ import qualified PPC.Regs as PPC import qualified SPARC.Regs as SPARC -targetVirtualRegSqueeze :: Platform -> RegClass -> VirtualReg -> FastInt +targetVirtualRegSqueeze :: Platform -> RegClass -> VirtualReg -> Int targetVirtualRegSqueeze platform = case platformArch platform of ArchX86 -> X86.virtualRegSqueeze @@ -54,7 +53,7 @@ targetVirtualRegSqueeze platform ArchUnknown -> panic "targetVirtualRegSqueeze ArchUnknown" -targetRealRegSqueeze :: Platform -> RegClass -> RealReg -> FastInt +targetRealRegSqueeze :: Platform -> RegClass -> RealReg -> Int targetRealRegSqueeze platform = case platformArch platform of ArchX86 -> X86.realRegSqueeze |