Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/37710de28d4e080241c48c1b54d20d9b8fd3a529 >--------------------------------------------------------------- commit 37710de28d4e080241c48c1b54d20d9b8fd3a529 Merge: 0564a63... a1ebe37... Author: Ian Lynagh <i...@well-typed.com> Date: Tue Nov 13 00:26:28 2012 +0000 Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc compiler/cmm/Cmm.hs | 39 +++- compiler/cmm/CmmContFlowOpt.hs | 45 +++- compiler/cmm/CmmCvt.hs | 117 -------- compiler/cmm/CmmInfo.hs | 32 +-- compiler/cmm/CmmNode.hs | 14 +- compiler/cmm/CmmOpt.hs | 8 +- compiler/cmm/CmmPipeline.hs | 12 + compiler/cmm/CmmProcPoint.hs | 5 +- compiler/cmm/CmmUtils.hs | 14 +- compiler/cmm/OldCmm.hs | 279 -------------------- compiler/cmm/OldCmmLint.hs | 212 --------------- compiler/cmm/OldCmmUtils.hs | 100 ------- compiler/cmm/OldPprCmm.hs | 224 ---------------- compiler/cmm/PprC.hs | 134 +++++----- compiler/cmm/PprCmmExpr.hs | 1 - compiler/codeGen/CgUtils.hs | 87 ++---- compiler/ghc.cabal.in | 5 - compiler/llvmGen/LlvmCodeGen.hs | 17 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 2 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 201 ++++++++------- compiler/llvmGen/LlvmCodeGen/Data.hs | 2 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 2 +- compiler/main/CodeOutput.lhs | 4 +- compiler/main/HscMain.hs | 16 +- compiler/nativeGen/AsmCodeGen.lhs | 67 +++--- compiler/nativeGen/Instruction.hs | 13 +- compiler/nativeGen/PIC.hs | 2 +- compiler/nativeGen/PPC/CodeGen.hs | 72 +++--- compiler/nativeGen/PPC/Instr.hs | 2 +- compiler/nativeGen/PPC/Ppr.hs | 2 +- compiler/nativeGen/PPC/RegInfo.hs | 2 +- compiler/nativeGen/PPC/Regs.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/Coalesce.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/Spill.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/Stats.hs | 3 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 1 - compiler/nativeGen/RegAlloc/Linear/Main.hs | 15 +- compiler/nativeGen/RegAlloc/Linear/Stats.hs | 2 - compiler/nativeGen/RegAlloc/Liveness.hs | 13 +- compiler/nativeGen/SPARC/CodeGen.hs | 73 +++--- compiler/nativeGen/SPARC/CodeGen/Amode.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Base.hs | 3 +- compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Expand.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Sanity.hs | 4 +- compiler/nativeGen/SPARC/Imm.hs | 2 +- compiler/nativeGen/SPARC/Instr.hs | 2 +- compiler/nativeGen/SPARC/Ppr.hs | 4 +- compiler/nativeGen/SPARC/ShortcutJump.hs | 2 +- compiler/nativeGen/Size.hs | 2 +- compiler/nativeGen/X86/CodeGen.hs | 220 ++++++++-------- compiler/nativeGen/X86/Instr.hs | 2 +- compiler/nativeGen/X86/Ppr.hs | 2 +- compiler/nativeGen/X86/Regs.hs | 2 +- compiler/parser/Parser.y.pp | 1 + compiler/types/TyCon.lhs | 68 ++++- 61 files changed, 689 insertions(+), 1486 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
