projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make dumpIfSet_dyn_or use dumpSDoc
[ghc-hetmet.git]
/
compiler
/
llvmGen
/
LlvmCodeGen
/
Data.hs
diff --git
a/compiler/llvmGen/LlvmCodeGen/Data.hs
b/compiler/llvmGen/LlvmCodeGen/Data.hs
index
3cf6cda
..
3e486a5
100644
(file)
--- a/
compiler/llvmGen/LlvmCodeGen/Data.hs
+++ b/
compiler/llvmGen/LlvmCodeGen/Data.hs
@@
-13,7
+13,7
@@
import LlvmCodeGen.Base
import BlockId
import CLabel
import BlockId
import CLabel
-import Cmm
+import OldCmm
import FastString
import qualified Outputable
import FastString
import qualified Outputable
@@
-47,7
+47,7
@@
genLlvmData (sec, CmmDataLabel lbl:xs) =
getStatTypes (Right x) = getStatType x
strucTy = LMStruct types
getStatTypes (Right x) = getStatType x
strucTy = LMStruct types
- alias = LMAlias (label `appendFS` structStr) strucTy
+ alias = LMAlias ((label `appendFS` structStr), strucTy)
in (lbl, sec, alias, static)
genLlvmData _ = panic "genLlvmData: CmmData section doesn't start with label!"
in (lbl, sec, alias, static)
genLlvmData _ = panic "genLlvmData: CmmData section doesn't start with label!"
@@
-106,7
+106,7
@@
resDatas env (cmm : rest) (stats, globs)
--
-- We check the 'LlvmEnv' to see if the reference has been defined in this
-- module. If it has we can retrieve its type and make a pointer, otherwise
--
-- We check the 'LlvmEnv' to see if the reference has been defined in this
-- module. If it has we can retrieve its type and make a pointer, otherwise
--- we introduce a generic external defenition for the referenced label and
+-- we introduce a generic external definition for the referenced label and
-- then make a pointer.
resData :: LlvmEnv -> UnresStatic -> (LlvmEnv, LlvmStatic, [Maybe LMGlobal])
-- then make a pointer.
resData :: LlvmEnv -> UnresStatic -> (LlvmEnv, LlvmStatic, [Maybe LMGlobal])