[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (8c3b9ac)
Simon Peyton Jones <[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/8c3b9aca3aaf946a91c9af6c07fc9d2afb6bbb76 >--------------------------------------------------------------- commit 8c3b9aca3aaf946a91c9af6c07fc9d2afb6bbb76 Merge: 7b8a17a... b0f4c44... Author: Simon Peyton Jones <[email protected]> Date: Mon Sep 17 08:09:36 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/cmm/Bitmap.hs | 8 +- compiler/cmm/CmmBuildInfoTables.hs | 2 +- compiler/cmm/CmmCallConv.hs | 3 +- compiler/cmm/CmmInfo.hs | 16 ++-- compiler/cmm/CmmLayoutStack.hs | 84 ++++++++++--------- compiler/cmm/CmmLint.hs | 10 ++- compiler/cmm/CmmParse.y | 13 ++-- compiler/cmm/CmmPipeline.hs | 4 +- compiler/cmm/CmmType.hs | 25 +++--- compiler/cmm/CmmUtils.hs | 35 ++++---- compiler/cmm/OldCmmLint.hs | 10 ++- compiler/cmm/PprC.hs | 31 ++++---- compiler/cmm/SMRep.lhs | 11 +-- compiler/codeGen/CgBindery.lhs | 103 ++++++++++++----------- compiler/codeGen/CgCallConv.hs | 22 +++--- compiler/codeGen/CgClosure.lhs | 22 +++--- compiler/codeGen/CgCon.lhs | 27 +++--- compiler/codeGen/CgForeignCall.hs | 5 +- compiler/codeGen/CgHeapery.lhs | 14 ++-- compiler/codeGen/CgInfoTbls.hs | 34 ++++---- compiler/codeGen/CgLetNoEscape.lhs | 5 +- compiler/codeGen/CgPrimOp.hs | 25 +++--- compiler/codeGen/CgProf.hs | 13 ++-- compiler/codeGen/CgStackery.lhs | 38 +++++---- compiler/codeGen/CgUtils.hs | 17 ++-- compiler/codeGen/ClosureInfo.lhs | 42 +++++----- compiler/codeGen/StgCmm.hs | 7 +- compiler/codeGen/StgCmmBind.hs | 7 +- compiler/codeGen/StgCmmClosure.hs | 33 ++++---- compiler/codeGen/StgCmmCon.hs | 22 ++--- compiler/codeGen/StgCmmEnv.hs | 16 ++-- compiler/codeGen/StgCmmExpr.hs | 2 +- compiler/codeGen/StgCmmForeign.hs | 5 +- compiler/codeGen/StgCmmHeap.hs | 5 +- compiler/codeGen/StgCmmLayout.hs | 63 ++++++++------- compiler/codeGen/StgCmmPrim.hs | 25 +++--- compiler/codeGen/StgCmmProf.hs | 11 +-- compiler/codeGen/StgCmmUtils.hs | 3 +- compiler/deSugar/Coverage.lhs | 8 +- compiler/deSugar/DsCCall.lhs | 14 ++-- compiler/deSugar/DsForeign.lhs | 15 ++-- compiler/ghci/ByteCodeAsm.lhs | 27 +++--- compiler/ghci/ByteCodeGen.lhs | 103 ++++++++++++----------- compiler/ghci/ByteCodeItbls.lhs | 53 ++++--------- compiler/ghci/ByteCodeLink.lhs | 39 +++++---- compiler/ghci/DebuggerUtils.hs | 3 +- compiler/ghci/LibFFI.hsc | 21 +++-- compiler/ghci/Linker.lhs | 20 +++-- compiler/ghci/RtClosureInspect.hs | 27 ++++--- compiler/iface/BinIface.hs | 4 +- compiler/llvmGen/Llvm/Types.hs | 34 ++++---- compiler/llvmGen/LlvmCodeGen/Base.hs | 47 +++++------ compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 138 +++++++++++++++++------------- compiler/llvmGen/LlvmCodeGen/Data.hs | 12 ++- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 9 +- compiler/llvmGen/LlvmCodeGen/Regs.hs | 17 ++-- compiler/main/BreakArray.hs | 46 +++++----- compiler/main/DynFlags.hs | 13 +++- compiler/main/InteractiveEval.hs | 3 +- compiler/nativeGen/PPC/CodeGen.hs | 11 ++- compiler/nativeGen/PPC/Regs.hs | 7 +- compiler/nativeGen/X86/CodeGen.hs | 23 +++--- compiler/nativeGen/X86/Instr.hs | 12 ++-- compiler/nativeGen/X86/Regs.hs | 11 +-- compiler/typecheck/TcDeriv.lhs | 3 +- compiler/typecheck/TcGenDeriv.lhs | 9 +- compiler/types/TyCon.lhs | 21 +++-- ghc/InteractiveUI.hs | 14 ++-- includes/HaskellConstants.hs | 38 --------- includes/mkDerivedConstants.c | 17 ++++ 70 files changed, 826 insertions(+), 811 deletions(-)