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

diff --git a/compiler/llvmGen/LlvmCodeGen.hs b/compiler/llvmGen/LlvmCodeGen.hs
index e0485e7..c4848c9 100644
--- a/compiler/llvmGen/LlvmCodeGen.hs
+++ b/compiler/llvmGen/LlvmCodeGen.hs
@@ -6,11 +6,14 @@ module LlvmCodeGen ( llvmCodeGen ) where
 
 #include "HsVersions.h"
 
+import Llvm
+
 import LlvmCodeGen.Base
 import LlvmCodeGen.CodeGen
 import LlvmCodeGen.Data
 import LlvmCodeGen.Ppr
 
+import CLabel
 import Cmm
 import CgUtils ( fixStgRegisters )
 import PprCmm
@@ -18,9 +21,11 @@ import PprCmm
 import BufWrite
 import DynFlags
 import ErrUtils
+import FastString
 import Outputable
 import qualified Pretty as Prt
 import UniqSupply
+import Util
 
 import System.IO
 
@@ -30,21 +35,19 @@ import System.IO
 llvmCodeGen :: DynFlags -> Handle -> UniqSupply -> [RawCmm] -> IO ()
 llvmCodeGen dflags h us cmms
   = do
-      let cmm = concat $ map extractRawCmm cmms
+      let cmm = concat $ map (\(Cmm top) -> top) cmms
 
       bufh <- newBufHandle h
 
       Prt.bufLeftRender bufh $ pprLlvmHeader
 
       env <- cmmDataLlvmGens dflags bufh cmm
-      cmmProcLlvmGens dflags bufh us env cmm
+      cmmProcLlvmGens dflags bufh us env cmm 1 []
 
       bFlush bufh
 
       return  ()
 
-  where extractRawCmm (Cmm tops) = tops
-
 
 -- -----------------------------------------------------------------------------
 -- | Do llvm code generation on all these cmms data sections.
@@ -62,12 +65,13 @@ cmmDataLlvmGens dflags h cmm =
     let exData (CmmData s d) = [(s,d)]
         exData  _            = []
 
-        exProclbl (CmmProc _ l _ _) = [(strCLabel_llvm l)]
-        exProclbl  _                = []
+        exProclbl (CmmProc i l _ _)
+                | not (null i) = [strCLabel_llvm $ entryLblToInfoLbl l]
+        exProclbl (CmmProc _ l _ _) | otherwise = [strCLabel_llvm l]
+        exProclbl _                             = []
 
-        cdata = concat $ map exData cmm
-        -- put the functions into the enviornment
         cproc = concat $ map exProclbl cmm
+        cdata = concat $ map exData cmm
         env = foldl (\e l -> funInsert l llvmFunTy e) initLlvmEnv cproc
     in cmmDataLlvmGens' dflags h env cdata []
 
@@ -105,18 +109,30 @@ cmmProcLlvmGens
       -> UniqSupply
       -> LlvmEnv
       -> [RawCmmTop]
+      -> Int          -- ^ count, used for generating unique subsections
+      -> [LlvmVar]    -- ^ info tables that need to be marked as 'used'
       -> IO ()
 
-cmmProcLlvmGens _ _ _ _ []
-    = return ()
+cmmProcLlvmGens _ _ _ _ [] _ []
+  = return ()
 
-cmmProcLlvmGens dflags h us env (cmm : cmms)
+cmmProcLlvmGens dflags h _ _ [] _ ivars
+  = do
+      let cast x = LMBitc (LMStaticPointer (pVarLift x)) i8Ptr
+      let ty = (LMArray (length ivars) i8Ptr)
+      let usedArray = LMStaticArray (map cast ivars) ty
+      let lmUsed = (LMGlobalVar (fsLit "llvm.used") ty Appending
+                      (Just $ fsLit "llvm.metadata") Nothing, Just usedArray)
+      Prt.bufLeftRender h $ pprLlvmData dflags ([lmUsed], [])
+
+cmmProcLlvmGens dflags h us env (cmm : cmms) count ivars
   = do
       (us', env', llvm) <- cmmLlvmGen dflags us (clearVars env) cmm
 
-      Prt.bufLeftRender h $ Prt.vcat $ map (pprLlvmCmmTop dflags) llvm
+      let (docs, ivar) = mapAndUnzip (pprLlvmCmmTop dflags env' count) llvm
+      Prt.bufLeftRender h $ Prt.vcat docs
 
-      cmmProcLlvmGens dflags h us' env' cmms
+      cmmProcLlvmGens dflags h us' env' cmms (count + 2) (concat ivar ++ ivars)
 
 
 -- | Complete llvm code generation phase for a single top-level chunk of Cmm.
@@ -141,7 +157,7 @@ cmmLlvmGen dflags us env cmm
     let ((env', llvmBC), usGen) = initUs us $ genLlvmCode dflags env fixed_cmm
 
     dumpIfSet_dyn dflags Opt_D_dump_llvm "LLVM Code"
-        (vcat $ map (docToSDoc . pprLlvmCmmTop dflags) llvmBC)
+        (vcat $ map (docToSDoc . fst . pprLlvmCmmTop dflags env' 0) llvmBC)
 
     return (usGen, env', llvmBC)