X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FllvmGen%2FLlvmCodeGen%2FPpr.hs;h=cdf968afb33a0f2b4186ead9946219e5f9ea9eae;hp=bccc336093c600fcf249327e0e40b5ad322bdba6;hb=24a3fee9f3ff6cef6fe471ab6f0a7ba9ac001faf;hpb=1d8585bc1160be0c21c34d1f9d9c62e22b3948a8

diff --git a/compiler/llvmGen/LlvmCodeGen/Ppr.hs b/compiler/llvmGen/LlvmCodeGen/Ppr.hs
index bccc336..cdf968a 100644
--- a/compiler/llvmGen/LlvmCodeGen/Ppr.hs
+++ b/compiler/llvmGen/LlvmCodeGen/Ppr.hs
@@ -16,8 +16,10 @@ import CLabel
 import Cmm
 
 import DynFlags
+import FastString
 import Pretty
 import Unique
+import Util
 
 -- ----------------------------------------------------------------------------
 -- * Top level
@@ -25,22 +27,22 @@ import Unique
 
 -- | LLVM module layout description for the host target
 moduleLayout :: Doc
-moduleLayout = 
+moduleLayout =
 #ifdef i386_TARGET_ARCH
 
 #ifdef darwin_TARGET_OS
-    (text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128\"")
-    $+$ (text "target triple = \"i386-apple-darwin9.8\"")
+    text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128\""
+    $+$ text "target triple = \"i386-apple-darwin9.8\""
 #else
-    (text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32\"")
-    $+$ (text "target triple = \"i386-linux-gnu\"")
+    text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32\""
+    $+$ text "target triple = \"i386-linux-gnu\""
 #endif
 
 #else
 
-#ifdef x86_64_TARGET_ARCH 
-    (text "target datalayout = \"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128\"")
-    $+$ (text "target triple = \"x86_64-linux-gnu\"")
+#ifdef x86_64_TARGET_ARCH
+    text "target datalayout = \"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128\""
+    $+$ text "target triple = \"x86_64-linux-gnu\""
 
 #else /* Not i386 */
     -- FIX: Other targets
@@ -49,43 +51,68 @@ moduleLayout =
 
 #endif
 
+
 -- | Header code for LLVM modules
 pprLlvmHeader :: Doc
 pprLlvmHeader = moduleLayout
 
+
 -- | Pretty print LLVM code
-pprLlvmCmmTop :: DynFlags -> LlvmCmmTop -> Doc
-pprLlvmCmmTop dflags (CmmData _ lmdata)
-  = vcat $ map (pprLlvmData dflags) lmdata
-
-pprLlvmCmmTop dflags (CmmProc info lbl _ (ListGraph blocks))
-  = (
-        let static = CmmDataLabel (entryLblToInfoLbl lbl) : info
-        in if not (null info)
-            then pprCmmStatic dflags static
-            else empty
-    ) $+$ (
-        let link = if (externallyVisibleCLabel lbl)
-                        then ExternallyVisible else Internal
-            funDec = llvmFunSig lbl link
-            lmblocks = map (\(BasicBlock id stmts) -> LlvmBlock (getUnique id) stmts) blocks
-            fun = LlvmFunction funDec [NoUnwind] lmblocks
+pprLlvmCmmTop :: DynFlags -> LlvmEnv -> Int -> LlvmCmmTop -> (Doc, [LlvmVar])
+pprLlvmCmmTop dflags _ _ (CmmData _ lmdata)
+  = (vcat $ map (pprLlvmData dflags) lmdata, [])
+
+pprLlvmCmmTop dflags env count (CmmProc info lbl _ (ListGraph blks))
+  = let static = CmmDataLabel lbl : info
+        (idoc, ivar) = if not (null info)
+                          then pprCmmStatic dflags env count static
+                          else (empty, [])
+    in (idoc $+$ (
+        let sec = mkLayoutSection (count + 1)
+            (lbl',sec') = if not (null info)
+                            then (entryLblToInfoLbl lbl, sec)
+                            else (lbl, Nothing)
+            link = if externallyVisibleCLabel lbl'
+                      then ExternallyVisible
+                      else Internal
+            funDec = llvmFunSig lbl' link
+            lmblocks = map (\(BasicBlock id stmts) ->
+                                LlvmBlock (getUnique id) stmts) blks
+            fun = LlvmFunction funDec [NoUnwind] sec' lmblocks
         in ppLlvmFunction fun
-    )
+    ), ivar)
 
 
 -- | Pretty print LLVM data code
 pprLlvmData :: DynFlags -> LlvmData -> Doc
-pprLlvmData _ (globals, types ) =
+pprLlvmData _ (globals, types) =
     let globals' = ppLlvmGlobals globals
         types'   = ppLlvmTypes types
     in types' $+$ globals'
 
 
 -- | Pretty print CmmStatic
-pprCmmStatic :: DynFlags -> [CmmStatic] -> Doc
-pprCmmStatic dflags stat
+pprCmmStatic :: DynFlags -> LlvmEnv -> Int -> [CmmStatic] -> (Doc, [LlvmVar])
+pprCmmStatic dflags env count stat
   = let unres = genLlvmData dflags (Data,stat)
-        (_, ldata) = resolveLlvmData dflags initLlvmEnv unres
-    in pprLlvmData dflags ldata
+        (_, (ldata, ltypes)) = resolveLlvmData dflags env unres
+
+        setSection (gv@(LMGlobalVar s ty l _ _), d)
+            = let v = if l == Internal then [gv] else []
+                  sec = mkLayoutSection count
+              in ((LMGlobalVar s ty l sec llvmInfAlign, d), v)
+        setSection v = (v,[])
+
+        (ldata', llvmUsed) = mapAndUnzip setSection ldata
+    in (pprLlvmData dflags (ldata', ltypes), concat llvmUsed)
+
+
+-- | Create an appropriate section declaration for subsection <n> of text
+-- WARNING: This technique could fail as gas documentation says it only
+-- supports up to 8192 subsections per section. Inspection of the source
+-- code and some test programs seem to suggest it supports more than this
+-- so we are hoping it does.
+mkLayoutSection :: Int -> LMSection
+mkLayoutSection n
+  = Just (fsLit $ ".text;.text " ++ show n ++ " #")