diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-11-12 11:47:51 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-11-12 15:20:25 +0000 |
| commit | d92bd17ffd8715f77fd49de0fed6e39c8d0ec28b (patch) | |
| tree | a721be9b82241dbcce19f66defcbfa41ffefe581 /compiler/llvmGen/LlvmCodeGen.hs | |
| parent | 121768dec30facc5c9ff94cf84bc9eac71e7290b (diff) | |
| download | haskell-d92bd17ffd8715f77fd49de0fed6e39c8d0ec28b.tar.gz | |
Remove OldCmm, convert backends to consume new Cmm
This removes the OldCmm data type and the CmmCvt pass that converts
new Cmm to OldCmm. The backends (NCGs, LLVM and C) have all been
converted to consume new Cmm.
The main difference between the two data types is that conditional
branches in new Cmm have both true/false successors, whereas in OldCmm
the false case was a fallthrough. To generate slightly better code we
occasionally need to invert a conditional to ensure that the
branch-not-taken becomes a fallthrough; this was previously done in
CmmCvt, and it is now done in CmmContFlowOpt.
We could go further and use the Hoopl Block representation for native
code, which would mean that we could use Hoopl's postorderDfs and
analyses for native code, but for now I've left it as is, using the
old ListGraph representation for native code.
Diffstat (limited to 'compiler/llvmGen/LlvmCodeGen.hs')
| -rw-r--r-- | compiler/llvmGen/LlvmCodeGen.hs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/compiler/llvmGen/LlvmCodeGen.hs b/compiler/llvmGen/LlvmCodeGen.hs index 571348f577..241e52e392 100644 --- a/compiler/llvmGen/LlvmCodeGen.hs +++ b/compiler/llvmGen/LlvmCodeGen.hs @@ -14,8 +14,9 @@ import LlvmCodeGen.Ppr import LlvmMangler import CgUtils ( fixStgRegisters ) -import OldCmm -import OldPprCmm +import Cmm +import Hoopl +import PprCmm import BufWrite import DynFlags @@ -41,10 +42,11 @@ llvmCodeGen dflags h us cmms (cdata,env) = {-# SCC "llvm_split" #-} foldr split ([], initLlvmEnv dflags) cmm split (CmmData s d' ) (d,e) = ((s,d'):d,e) - split p@(CmmProc _ l live _) (d,e) = - let lbl = strCLabel_llvm env $ case topInfoTable p of - Nothing -> l - Just (Statics info_lbl _) -> info_lbl + split p@(CmmProc h l live g) (d,e) = + let lbl = strCLabel_llvm env $ + case mapLookup (g_entry g) h of + Nothing -> l + Just (Statics info_lbl _) -> info_lbl env' = funInsert lbl (llvmFunTy dflags live) e in (d,env') in do @@ -129,9 +131,6 @@ cmmProcLlvmGens dflags h _ _ [] _ ivars cmmProcLlvmGens dflags h us env ((CmmData _ _) : cmms) count ivars = cmmProcLlvmGens dflags h us env cmms count ivars -cmmProcLlvmGens dflags h us env ((CmmProc _ _ _ (ListGraph [])) : cmms) count ivars - = cmmProcLlvmGens dflags h us env cmms count ivars - cmmProcLlvmGens dflags h us env (cmm : cmms) count ivars = do (us', env', llvm) <- cmmLlvmGen dflags us (clearVars env) cmm let (docs, ivar) = mapAndUnzip (pprLlvmCmmDecl env' count) llvm |