[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (8623be0)
Ian Lynagh <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/8623be0b37449cd8b2149c9928d39d5acb80fd36 >--------------------------------------------------------------- commit 8623be0b37449cd8b2149c9928d39d5acb80fd36 Merge: 8d226e2... a50cd57... Author: Ian Lynagh <[email protected]> Date: Wed Oct 31 01:25:55 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/cmm/Cmm.hs | 12 ++- compiler/cmm/CmmBuildInfoTables.hs | 8 +- compiler/cmm/CmmCallConv.hs | 57 ++++++--- compiler/cmm/CmmContFlowOpt.hs | 2 +- compiler/cmm/CmmCvt.hs | 4 +- compiler/cmm/CmmExpr.hs | 141 ++++++++++++-------- compiler/cmm/CmmInfo.hs | 8 +- compiler/cmm/CmmLayoutStack.hs | 16 +- compiler/cmm/CmmLint.hs | 23 ++-- compiler/cmm/CmmLive.hs | 78 +++++++---- compiler/cmm/CmmNode.hs | 60 +++++++-- compiler/cmm/CmmOpt.hs | 4 +- compiler/cmm/CmmParse.y | 5 +- compiler/cmm/CmmPipeline.hs | 6 +- compiler/cmm/CmmProcPoint.hs | 25 +++-- compiler/cmm/CmmRewriteAssignments.hs | 62 +++++----- compiler/cmm/CmmSink.hs | 30 ++-- compiler/cmm/MkGraph.hs | 12 +- compiler/cmm/OldCmm.hs | 36 +++--- compiler/cmm/OldCmmLint.hs | 2 +- compiler/cmm/OldPprCmm.hs | 4 +- compiler/cmm/PprC.hs | 2 +- compiler/cmm/PprCmmDecl.hs | 4 +- compiler/codeGen/CgUtils.hs | 14 ++- compiler/codeGen/StgCmmExpr.hs | 2 +- compiler/codeGen/StgCmmForeign.hs | 2 +- compiler/codeGen/StgCmmHeap.hs | 2 +- compiler/codeGen/StgCmmLayout.hs | 4 +- compiler/codeGen/StgCmmMonad.hs | 20 ++-- compiler/llvmGen/LlvmCodeGen.hs | 6 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 38 ++++-- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 69 +++++----- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 4 +- compiler/llvmGen/LlvmCodeGen/Regs.hs | 6 + compiler/main/DynFlags.hs | 3 - compiler/nativeGen/AsmCodeGen.lhs | 28 ++-- compiler/nativeGen/PIC.hs | 16 +- compiler/nativeGen/PPC/CodeGen.hs | 4 +- compiler/nativeGen/PPC/Ppr.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/Coalesce.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/Spill.hs | 4 +- compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 4 +- compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 2 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 10 +- compiler/nativeGen/RegAlloc/Liveness.hs | 42 +++--- compiler/nativeGen/SPARC/CodeGen.hs | 4 +- compiler/nativeGen/SPARC/CodeGen/Expand.hs | 4 +- compiler/nativeGen/SPARC/Ppr.hs | 2 +- compiler/nativeGen/X86/CodeGen.hs | 9 +- compiler/nativeGen/X86/Instr.hs | 4 +- compiler/nativeGen/X86/Ppr.hs | 2 +- includes/Cmm.h | 18 ++- includes/CodeGen.Platform.hs | 161 +++++++++++++++++++++++ includes/mkDerivedConstants.c | 8 + includes/rts/Constants.h | 5 +- includes/stg/MachRegs.h | 62 ++++++++- includes/stg/Regs.h | 42 ++++++ rts/AutoApply.h | 4 +- rts/HeapStackCheck.cmm | 13 ++ utils/genapply/GenApply.hs | 54 ++++++-- 60 files changed, 877 insertions(+), 400 deletions(-)