import Llvm
import LlvmCodeGen.Regs
-import CgUtils ( activeStgRegs )
import CLabel
-import Cmm
-
+import CgUtils ( activeStgRegs )
+import Constants
import FastString
+import OldCmm
import qualified Outputable as Outp
-import Unique
import UniqFM
+import Unique
-- ----------------------------------------------------------------------------
-- * Some Data Types
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)
-- | Alignment to use for functions
llvmFunAlign :: LMAlign
-llvmFunAlign = Just 4
+llvmFunAlign = Just wORD_SIZE
-- | Alignment to use for into tables
llvmInfAlign :: LMAlign
-llvmInfAlign = Just 4
+llvmInfAlign = Just wORD_SIZE
-- | A Function's arguments
llvmFunArgs :: [LlvmVar]