Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/cf02909e1fc10597c3291817ab905d426307405b >--------------------------------------------------------------- commit cf02909e1fc10597c3291817ab905d426307405b Merge: 7d83fde... c3f4c6f... Author: Simon Peyton Jones <[email protected]> Date: Sat Sep 15 08:09:56 2012 +0100 Merge remote branch 'origin/master' aclocal.m4 | 5 +- compiler/cmm/Bitmap.hs | 35 +- compiler/cmm/CmmBuildInfoTables.hs | 48 +- compiler/cmm/CmmCallConv.hs | 83 +- compiler/cmm/CmmExpr.hs | 174 ++-- compiler/cmm/CmmInfo.hs | 40 +- compiler/cmm/CmmLayoutStack.hs | 85 +- compiler/cmm/CmmLint.hs | 66 +- compiler/cmm/CmmMachOp.hs | 152 ++-- compiler/cmm/CmmOpt.hs | 85 +- compiler/cmm/CmmParse.y | 35 +- compiler/cmm/CmmPipeline.hs | 4 +- compiler/cmm/CmmRewriteAssignments.hs | 46 +- compiler/cmm/CmmSink.hs | 40 +- compiler/cmm/CmmType.hs | 43 +- compiler/cmm/CmmUtils.hs | 292 ++++---- compiler/cmm/MkGraph.hs | 10 +- compiler/cmm/OldCmmLint.hs | 105 ++-- compiler/cmm/OldCmmUtils.hs | 17 +- compiler/cmm/OldPprCmm.hs | 7 +- compiler/cmm/PprC.hs | 178 +++-- compiler/cmm/PprCmm.hs | 3 +- compiler/cmm/PprCmmExpr.hs | 10 +- compiler/cmm/SMRep.lhs | 12 +- compiler/codeGen/CgBindery.lhs | 32 +- compiler/codeGen/CgCallConv.hs | 65 +- compiler/codeGen/CgCase.lhs | 13 +- compiler/codeGen/CgClosure.lhs | 27 +- compiler/codeGen/CgCon.lhs | 15 +- compiler/codeGen/CgExpr.lhs | 24 +- compiler/codeGen/CgForeignCall.hs | 92 ++- compiler/codeGen/CgHeapery.lhs | 118 ++-- compiler/codeGen/CgHpc.hs | 3 +- compiler/codeGen/CgInfoTbls.hs | 54 +- compiler/codeGen/CgPrimOp.hs | 831 ++++++++++---------- compiler/codeGen/CgProf.hs | 169 ++-- compiler/codeGen/CgStackery.lhs | 6 +- compiler/codeGen/CgTailCall.lhs | 15 +- compiler/codeGen/CgTicky.hs | 53 +- compiler/codeGen/CgUtils.hs | 316 ++++---- compiler/codeGen/ClosureInfo.lhs | 14 +- compiler/codeGen/StgCmm.hs | 2 +- compiler/codeGen/StgCmmBind.hs | 36 +- compiler/codeGen/StgCmmCon.hs | 32 +- compiler/codeGen/StgCmmEnv.hs | 45 +- compiler/codeGen/StgCmmExpr.hs | 63 +- compiler/codeGen/StgCmmForeign.hs | 108 ++-- compiler/codeGen/StgCmmHeap.hs | 88 +- compiler/codeGen/StgCmmHpc.hs | 6 +- compiler/codeGen/StgCmmLayout.hs | 35 +- compiler/codeGen/StgCmmMonad.hs | 18 +- compiler/codeGen/StgCmmPrim.hs | 853 ++++++++++---------- compiler/codeGen/StgCmmProf.hs | 150 ++-- compiler/codeGen/StgCmmTicky.hs | 48 +- compiler/codeGen/StgCmmUtils.hs | 181 +++-- compiler/deSugar/DsForeign.lhs | 27 +- compiler/ghc.cabal.in | 3 +- compiler/ghc.mk | 15 +- compiler/ghci/ByteCodeAsm.lhs | 40 +- compiler/ghci/ByteCodeGen.lhs | 33 +- compiler/ghci/ByteCodeItbls.lhs | 6 +- compiler/llvmGen/LlvmCodeGen.hs | 2 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 4 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 25 +- compiler/llvmGen/LlvmCodeGen/Data.hs | 10 +- compiler/main/CodeOutput.lhs | 2 +- compiler/main/DriverPipeline.hs | 263 ++++--- compiler/main/DynFlags.hs | 19 +- compiler/main/SysTools.lhs | 11 +- compiler/nativeGen/AsmCodeGen.lhs | 22 +- compiler/nativeGen/Instruction.hs | 5 +- compiler/nativeGen/PIC.hs | 11 +- compiler/nativeGen/PPC/CodeGen.hs | 51 +- compiler/nativeGen/PPC/Instr.hs | 29 +- compiler/nativeGen/PPC/Ppr.hs | 40 +- compiler/nativeGen/RegAlloc/Graph/Main.hs | 2 +- compiler/nativeGen/RegAlloc/Linear/Base.hs | 10 +- compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 28 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 434 +++++----- compiler/nativeGen/RegAlloc/Linear/Main.hs | 214 +++--- compiler/nativeGen/RegAlloc/Linear/StackMap.hs | 6 +- compiler/nativeGen/RegAlloc/Linear/State.hs | 121 ++-- compiler/nativeGen/RegAlloc/Linear/X86/FreeRegs.hs | 27 +- .../RegAlloc/Linear/{X86 => X86_64}/FreeRegs.hs | 30 +- compiler/nativeGen/RegAlloc/Liveness.hs | 15 +- compiler/nativeGen/SPARC/Base.hs | 6 +- compiler/nativeGen/SPARC/CodeGen.hs | 31 +- compiler/nativeGen/SPARC/CodeGen/Amode.hs | 3 +- compiler/nativeGen/SPARC/CodeGen/Base.hs | 9 +- compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 5 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 12 +- compiler/nativeGen/SPARC/Instr.hs | 17 +- compiler/nativeGen/SPARC/Ppr.hs | 40 +- compiler/nativeGen/SPARC/Stack.hs | 15 +- compiler/nativeGen/X86/CodeGen.hs | 168 ++-- compiler/nativeGen/X86/Instr.hs | 41 +- compiler/nativeGen/X86/Ppr.hs | 10 +- compiler/nativeGen/X86/Regs.hs | 6 +- compiler/simplStg/SRT.lhs | 101 ++-- compiler/simplStg/SimplStg.lhs | 2 +- compiler/utils/Platform.hs | 4 + ghc/ghc-bin.cabal.in | 2 +- ghc/ghc.mk | 13 +- ghc/hschooks.c | 2 +- includes/HaskellConstants.hs | 111 --- includes/ghc.mk | 59 +- includes/mkDerivedConstants.c | 409 ++++++++--- includes/rts/Hooks.h | 6 +- includes/rts/SpinLock.h | 2 +- includes/rts/Threads.h | 8 +- includes/rts/Types.h | 6 +- includes/rts/storage/Block.h | 4 +- includes/rts/storage/ClosureMacros.h | 8 +- includes/rts/storage/GC.h | 12 +- includes/rts/storage/MBlock.h | 6 +- includes/stg/Types.h | 18 +- rts/Arena.c | 2 +- rts/Capability.h | 2 +- rts/Disassembler.c | 2 +- rts/FrontPanel.c | 2 +- rts/FrontPanel.h | 2 +- rts/GetTime.h | 2 +- rts/Linker.c | 8 +- rts/Messages.c | 10 +- rts/Printer.c | 14 +- rts/ProfHeap.c | 2 +- rts/Profiling.c | 2 +- rts/RetainerProfile.c | 4 +- rts/RetainerProfile.h | 2 +- rts/RtsAPI.c | 6 +- rts/RtsFlags.c | 2 +- rts/RtsUtils.c | 2 +- rts/Schedule.c | 4 +- rts/Stats.c | 44 +- rts/Stats.h | 4 +- rts/Threads.c | 16 +- rts/Threads.h | 2 +- rts/Trace.c | 68 +- rts/Trace.h | 44 +- rts/eventlog/EventLog.c | 20 +- rts/eventlog/EventLog.h | 20 +- rts/hooks/MallocFail.c | 4 +- rts/hooks/OutOfHeap.c | 4 +- rts/hooks/StackOverflow.c | 4 +- rts/package.conf.in | 2 +- rts/parallel/ParTicky.c | 4 +- rts/posix/GetTime.c | 2 +- rts/posix/OSMem.c | 16 +- rts/sm/BlockAlloc.c | 80 ++- rts/sm/BlockAlloc.h | 12 +- rts/sm/Compact.c | 16 +- rts/sm/Evac.h | 2 +- rts/sm/GC.c | 38 +- rts/sm/GCThread.h | 18 +- rts/sm/GCUtils.c | 2 +- rts/sm/MBlock.c | 6 +- rts/sm/OSMem.h | 4 +- rts/sm/Sanity.c | 28 +- rts/sm/Scav.c | 8 +- rts/sm/Storage.c | 86 +- rts/sm/Storage.h | 30 +- rts/sm/Sweep.c | 2 +- rts/win32/GetTime.c | 2 +- rts/win32/OSMem.c | 30 +- sync-all | 7 +- utils/ghc-cabal/ghc-cabal.cabal | 2 +- utils/ghc-pkg/ghc-pkg.cabal | 2 +- utils/ghc-pwd/ghc-pwd.cabal | 2 +- utils/hpc/hpc-bin.cabal | 2 +- utils/runghc/runghc.cabal.in | 2 +- 170 files changed, 4407 insertions(+), 4024 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
