projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A few bug fixes; some improvements spurred by paper writing
[ghc-hetmet.git]
/
compiler
/
nativeGen
/
AsmCodeGen.lhs
diff --git
a/compiler/nativeGen/AsmCodeGen.lhs
b/compiler/nativeGen/AsmCodeGen.lhs
index
d4fa102
..
119e118
100644
(file)
--- a/
compiler/nativeGen/AsmCodeGen.lhs
+++ b/
compiler/nativeGen/AsmCodeGen.lhs
@@
-25,7
+25,6
@@
import Alpha.CodeGen
import Alpha.Regs
import Alpha.RegInfo
import Alpha.Instr
import Alpha.Regs
import Alpha.RegInfo
import Alpha.Instr
-import Alpha.Ppr
#elif i386_TARGET_ARCH || x86_64_TARGET_ARCH
import X86.CodeGen
#elif i386_TARGET_ARCH || x86_64_TARGET_ARCH
import X86.CodeGen
@@
-37,12
+36,13
@@
import X86.Ppr
#elif sparc_TARGET_ARCH
import SPARC.CodeGen
import SPARC.Regs
#elif sparc_TARGET_ARCH
import SPARC.CodeGen
import SPARC.Regs
-import SPARC.RegInfo
import SPARC.Instr
import SPARC.Ppr
import SPARC.Instr
import SPARC.Ppr
+import SPARC.ShortcutJump
#elif powerpc_TARGET_ARCH
import PPC.CodeGen
#elif powerpc_TARGET_ARCH
import PPC.CodeGen
+import PPC.Cond
import PPC.Regs
import PPC.RegInfo
import PPC.Instr
import PPC.Regs
import PPC.RegInfo
import PPC.Instr
@@
-476,9
+476,8
@@
makeImportsDoc dflags imports
-- fallthroughs.
sequenceTop
-- fallthroughs.
sequenceTop
- :: Instruction instr
- => NatCmmTop instr
- -> NatCmmTop instr
+ :: NatCmmTop Instr
+ -> NatCmmTop Instr
sequenceTop top@(CmmData _ _) = top
sequenceTop (CmmProc info lbl params (ListGraph blocks)) =
sequenceTop top@(CmmData _ _) = top
sequenceTop (CmmProc info lbl params (ListGraph blocks)) =
@@
-552,9
+551,8
@@
reorder id accum (b@(block,id',out) : rest)
-- big, we have to work around this limitation.
makeFarBranches
-- big, we have to work around this limitation.
makeFarBranches
- :: Instruction instr
- => [NatBasicBlock instr]
- -> [NatBasicBlock instr]
+ :: [NatBasicBlock Instr]
+ -> [NatBasicBlock Instr]
#if powerpc_TARGET_ARCH
makeFarBranches blocks
#if powerpc_TARGET_ARCH
makeFarBranches blocks