projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Formatting fixes in Lexer.x
[ghc-hetmet.git]
/
compiler
/
llvmGen
/
LlvmCodeGen
/
Base.hs
diff --git
a/compiler/llvmGen/LlvmCodeGen/Base.hs
b/compiler/llvmGen/LlvmCodeGen/Base.hs
index
ba74a7f
..
80d88e6
100644
(file)
--- a/
compiler/llvmGen/LlvmCodeGen/Base.hs
+++ b/
compiler/llvmGen/LlvmCodeGen/Base.hs
@@
-25,14
+25,14
@@
module LlvmCodeGen.Base (
import Llvm
import LlvmCodeGen.Regs
import Llvm
import LlvmCodeGen.Regs
-import CgUtils ( activeStgRegs )
import CLabel
import CLabel
-import Cmm
-
+import CgUtils ( activeStgRegs )
+import Constants
import FastString
import FastString
+import OldCmm
import qualified Outputable as Outp
import qualified Outputable as Outp
-import Unique
import UniqFM
import UniqFM
+import Unique
-- ----------------------------------------------------------------------------
-- * Some Data Types
-- ----------------------------------------------------------------------------
-- * Some Data Types
@@
-42,7
+42,7
@@
type LlvmCmmTop = GenCmmTop LlvmData [CmmStatic] (ListGraph LlvmStatement)
type LlvmBasicBlock = GenBasicBlock LlvmStatement
-- | Unresolved code.
type LlvmBasicBlock = GenBasicBlock LlvmStatement
-- | Unresolved code.
--- Of the form: (data label, data type, unresovled data)
+-- Of the form: (data label, data type, unresolved data)
type LlvmUnresData = (CLabel, Section, LlvmType, [UnresStatic])
-- | Top level LLVM Data (globals and type aliases)
type LlvmUnresData = (CLabel, Section, LlvmType, [UnresStatic])
-- | Top level LLVM Data (globals and type aliases)
@@
-105,11
+105,11
@@
mkLlvmFunc lbl link sec blks
-- | Alignment to use for functions
llvmFunAlign :: LMAlign
-- | Alignment to use for functions
llvmFunAlign :: LMAlign
-llvmFunAlign = Just 4
+llvmFunAlign = Just wORD_SIZE
-- | Alignment to use for into tables
llvmInfAlign :: LMAlign
-- | Alignment to use for into tables
llvmInfAlign :: LMAlign
-llvmInfAlign = Just 4
+llvmInfAlign = Just wORD_SIZE
-- | A Function's arguments
llvmFunArgs :: [LlvmVar]
-- | A Function's arguments
llvmFunArgs :: [LlvmVar]