Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/c21ddffb76e4e0191641a6e8df490125fdbfb982 >--------------------------------------------------------------- commit c21ddffb76e4e0191641a6e8df490125fdbfb982 Author: David Terei <[email protected]> Date: Tue Nov 22 12:30:32 2011 -0800 Show LLVM mangler and code gen passes at v2 >--------------------------------------------------------------- compiler/llvmGen/LlvmCodeGen.hs | 1 + compiler/llvmGen/LlvmMangler.hs | 7 +++++-- compiler/main/DriverPipeline.hs | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/compiler/llvmGen/LlvmCodeGen.hs b/compiler/llvmGen/LlvmCodeGen.hs index 53b8591..b29c215 100644 --- a/compiler/llvmGen/LlvmCodeGen.hs +++ b/compiler/llvmGen/LlvmCodeGen.hs @@ -45,6 +45,7 @@ llvmCodeGen dflags h us cmms env' = funInsert lbl llvmFunTy e in (d,env') in do + showPass dflags "LlVM CodeGen" bufh <- newBufHandle h Prt.bufLeftRender bufh $ pprLlvmHeader ver <- (fromMaybe defaultLlvmVersion) `fmap` figureLlvmVersion dflags diff --git a/compiler/llvmGen/LlvmMangler.hs b/compiler/llvmGen/LlvmMangler.hs index d5624e5..ff1dfa2 100644 --- a/compiler/llvmGen/LlvmMangler.hs +++ b/compiler/llvmGen/LlvmMangler.hs @@ -14,6 +14,8 @@ module LlvmMangler ( llvmFixupAsm ) where #include "HsVersions.h" +import DynFlags ( DynFlags ) +import ErrUtils ( showPass ) import LlvmCodeGen.Ppr ( infoSection ) import Control.Exception @@ -54,8 +56,9 @@ dollarPred = ((==) '$') commaPred = ((==) ',') -- | Read in assembly file and process -llvmFixupAsm :: FilePath -> FilePath -> IO () -llvmFixupAsm f1 f2 = do +llvmFixupAsm :: DynFlags -> FilePath -> FilePath -> IO () +llvmFixupAsm dflags f1 f2 = do + showPass dflags "LlVM Mangler" r <- openBinaryFile f1 ReadMode w <- openBinaryFile f2 WriteMode ss <- readSections r w diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index 6228d10..b378cfe 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1372,7 +1372,7 @@ runPhase LlvmMangle input_fn dflags = do let next_phase = if dopt Opt_SplitObjs dflags then Splitter else As output_fn <- phaseOutputFilename next_phase - io $ llvmFixupAsm input_fn output_fn + io $ llvmFixupAsm dflags input_fn output_fn return (next_phase, output_fn) ----------------------------------------------------------------------------- _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
