Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
a12e8456
Commit
a12e8456
authored
Feb 04, 2009
by
Ben.Lippmeier@anu.edu.au
Browse files
NCG: Rename MachRegs, MachInstrs -> Regs, Instrs to reflect arch specific naming
parent
9de520b7
Changes
28
Hide whitespace changes
Inline
Side-by-side
compiler/ghc.cabal.in
View file @
a12e8456
...
...
@@ -455,17 +455,17 @@ Library
Exposed-Modules:
AsmCodeGen
MachCodeGen
MachInstrs
Alpha.Instr
X86.Instr
PPC.Instr
SPARC.Instr
MachRegs
Regs
RegsBase
Instrs
Alpha.Regs
Alpha.Instr
X86.Regs
X86.Instr
PPC.Regs
PPC.Instr
SPARC.Regs
Alpha.Regs
SPARC.Instr
NCGMonad
PositionIndependentCode
PprMach
...
...
compiler/nativeGen/Alpha/Instr.hs
View file @
a12e8456
...
...
@@ -18,7 +18,7 @@ module Alpha.Instr (
where
import
BlockId
import
Mach
Regs
import
Regs
import
Cmm
import
FastString
import
CLabel
...
...
compiler/nativeGen/AsmCodeGen.lhs
View file @
a12e8456
...
...
@@ -19,8 +19,8 @@ module AsmCodeGen ( nativeCodeGen ) where
#include "HsVersions.h"
#include "nativeGen/NCG.h"
import
Mach
Instrs
import
Mach
Regs
import Instrs
import Regs
import MachCodeGen
import PprMach
import RegAllocInfo
...
...
compiler/nativeGen/
Mach
Instrs.hs
→
compiler/nativeGen/Instrs.hs
View file @
a12e8456
...
...
@@ -16,7 +16,7 @@
#
include
"nativeGen/NCG.h"
module
Mach
Instrs
(
module
Instrs
(
NatCmm
,
NatCmmTop
,
NatBasicBlock
,
...
...
@@ -33,7 +33,7 @@ module MachInstrs (
#
elif
sparc_TARGET_ARCH
module
SPARC
.
Instr
#
else
#
error
"
Mach
Instrs
:
not
defined
for
this
architecture
"
#
error
"
Instrs
:
not
defined
for
this
architecture
"
#
endif
)
...
...
@@ -42,7 +42,7 @@ where
#
include
"HsVersions.h"
import
BlockId
import
Mach
Regs
import
Regs
import
Cmm
import
CLabel
(
CLabel
,
pprCLabel
)
import
Panic
(
panic
)
...
...
@@ -61,7 +61,7 @@ import X86.Instr
#
elif
sparc_TARGET_ARCH
import
SPARC.Instr
#
else
#
error
"
Mach
Instrs: not defined for this architecture"
#
error
"Instrs: not defined for this architecture"
#
endif
...
...
compiler/nativeGen/MachCodeGen.hs
View file @
a12e8456
...
...
@@ -25,12 +25,11 @@ module MachCodeGen ( cmmTopCodeGen, InstrBlock ) where
#
include
"MachDeps.h"
-- NCG stuff:
import
Mach
Instrs
import
Mach
Regs
import
Instrs
import
Regs
import
NCGMonad
import
PositionIndependentCode
import
RegAllocInfo
(
mkBranchInstr
,
mkRegRegMoveInstr
)
import
MachRegs
import
PprMach
-- Our intermediate code:
...
...
@@ -5190,7 +5189,7 @@ coerceFP2Int fromRep toRep x = do
-- We (allegedly) put the first six C-call arguments in registers;
-- where do we start putting the rest of them?
-- Moved from
Mach
Instrs (SDM):
-- Moved from Instrs (SDM):
#
if
alpha_TARGET_ARCH
||
sparc_TARGET_ARCH
eXTRA_STK_ARGS_HERE
::
Int
...
...
compiler/nativeGen/NCGMonad.hs
View file @
a12e8456
...
...
@@ -20,7 +20,7 @@ module NCGMonad (
import
BlockId
import
CLabel
(
CLabel
,
mkAsmTempLabel
)
import
Mach
Regs
import
Regs
import
UniqSupply
import
Unique
(
Unique
)
import
DynFlags
...
...
compiler/nativeGen/PPC/Instr.hs
View file @
a12e8456
...
...
@@ -19,7 +19,7 @@ module PPC.Instr (
where
import
BlockId
import
Mach
Regs
import
Regs
import
Cmm
import
Outputable
import
FastString
...
...
compiler/nativeGen/PositionIndependentCode.hs
View file @
a12e8456
...
...
@@ -65,8 +65,8 @@ import CLabel ( CLabel, pprCLabel,
import
CLabel
(
mkForeignLabel
)
#
endif
import
Mach
Regs
import
Mach
Instrs
import
Regs
import
Instrs
import
NCGMonad
(
NatM
,
getNewRegNat
,
getNewLabelNat
)
import
StaticFlags
(
opt_PIC
,
opt_Static
)
...
...
compiler/nativeGen/PprMach.hs
View file @
a12e8456
...
...
@@ -28,8 +28,8 @@ module PprMach (
import
BlockId
import
Cmm
import
Mach
Regs
-- may differ per-platform
import
Mach
Instrs
import
Regs
-- may differ per-platform
import
Instrs
import
CLabel
(
CLabel
,
pprCLabel
,
externallyVisibleCLabel
,
labelDynamic
,
mkAsmTempLabel
,
entryLblToInfoLbl
)
...
...
compiler/nativeGen/RegAlloc/Graph/Coalesce.hs
View file @
a12e8456
...
...
@@ -9,7 +9,7 @@ module RegAlloc.Graph.Coalesce (
where
import
Cmm
import
Mach
Regs
import
Regs
import
RegLiveness
import
RegAllocInfo
...
...
compiler/nativeGen/RegAlloc/Graph/Main.hs
View file @
a12e8456
...
...
@@ -17,8 +17,8 @@ import RegAlloc.Graph.Spill
import
RegAlloc.Graph.SpillClean
import
RegAlloc.Graph.SpillCost
import
RegAlloc.Graph.Stats
import
Mach
Regs
import
Mach
Instrs
import
Regs
import
Instrs
import
PprMach
import
UniqSupply
...
...
compiler/nativeGen/RegAlloc/Graph/Spill.hs
View file @
a12e8456
...
...
@@ -11,8 +11,8 @@ where
import
RegLiveness
import
RegAllocInfo
import
Mach
Regs
import
Mach
Instrs
import
Regs
import
Instrs
import
Cmm
import
State
...
...
compiler/nativeGen/RegAlloc/Graph/SpillClean.hs
View file @
a12e8456
...
...
@@ -32,8 +32,8 @@ where
import
BlockId
import
RegLiveness
import
RegAllocInfo
import
Mach
Regs
import
Mach
Instrs
import
Regs
import
Instrs
import
Cmm
import
UniqSet
...
...
compiler/nativeGen/RegAlloc/Graph/SpillCost.hs
View file @
a12e8456
...
...
@@ -19,8 +19,8 @@ where
import
GraphBase
import
RegLiveness
import
RegAllocInfo
import
Mach
Instrs
import
Mach
Regs
import
Instrs
import
Regs
import
BlockId
import
Cmm
...
...
compiler/nativeGen/RegAlloc/Graph/Stats.hs
View file @
a12e8456
...
...
@@ -25,8 +25,8 @@ import RegLiveness
import
RegAllocInfo
import
RegAlloc.Graph.Spill
import
RegAlloc.Graph.SpillCost
import
Mach
Regs
import
Mach
Instrs
import
Regs
import
Instrs
import
Cmm
import
Outputable
...
...
compiler/nativeGen/RegAlloc/Linear/Base.hs
View file @
a12e8456
...
...
@@ -22,7 +22,7 @@ import RegAlloc.Linear.FreeRegs
import
RegAlloc.Linear.StackMap
import
RegLiveness
import
Mach
Regs
import
Regs
import
Outputable
import
Unique
...
...
compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs
View file @
a12e8456
...
...
@@ -20,8 +20,8 @@ import RegAlloc.Linear.Base
import
RegAlloc.Linear.FreeRegs
import
BlockId
import
Mach
Instrs
import
Mach
Regs
import
Instrs
import
Regs
import
RegAllocInfo
import
RegLiveness
import
Cmm
hiding
(
RegSet
)
...
...
compiler/nativeGen/RegAlloc/Linear/Main.hs
View file @
a12e8456
...
...
@@ -98,8 +98,8 @@ import RegAlloc.Linear.Stats
import
RegAlloc.Linear.JoinToTargets
import
BlockId
import
Mach
Regs
import
Mach
Instrs
import
Regs
import
Instrs
import
RegAllocInfo
import
RegLiveness
import
Cmm
hiding
(
RegSet
)
...
...
compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs
View file @
a12e8456
...
...
@@ -3,7 +3,7 @@
module
RegAlloc.Linear.PPC.FreeRegs
where
import
Mach
Regs
import
Regs
import
Outputable
...
...
compiler/nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs
View file @
a12e8456
...
...
@@ -3,7 +3,7 @@
module
RegAlloc.Linear.SPARC.FreeRegs
where
import
Mach
Regs
import
Regs
import
Outputable
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment