Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/74d65116e7c047215f79deb410029ba727c6df5e >--------------------------------------------------------------- commit 74d65116e7c047215f79deb410029ba727c6df5e Merge: ad0139a... 2d96202... Author: Simon Peyton Jones <[email protected]> Date: Tue Oct 2 15:18:44 2012 +0100 Merge remote-tracking branch 'origin/master' compiler/basicTypes/Literal.lhs | 52 ++-- compiler/basicTypes/MkId.lhs | 11 +- compiler/cmm/Bitmap.hs | 14 +- compiler/cmm/CLabel.hs | 24 +- compiler/cmm/CmmBuildInfoTables.hs | 31 +- compiler/cmm/CmmInfo.hs | 34 ++- compiler/cmm/CmmLayoutStack.hs | 8 +- compiler/cmm/CmmOpt.hs | 269 ------------- compiler/cmm/CmmParse.y | 37 ++- compiler/cmm/CmmPipeline.hs | 5 +- compiler/cmm/CmmProcPoint.hs | 35 ++- compiler/cmm/CmmRewriteAssignments.hs | 3 +- compiler/cmm/CmmSink.hs | 25 +- compiler/cmm/CmmType.hs | 50 ++- compiler/cmm/CmmUtils.hs | 16 +- compiler/cmm/MkGraph.hs | 44 +-- compiler/cmm/OldCmmLint.hs | 4 +- compiler/cmm/PprC.hs | 12 +- compiler/cmm/PprCmmDecl.hs | 11 +- compiler/cmm/SMRep.lhs | 164 +++++--- compiler/codeGen/CgCallConv.hs | 71 ++-- compiler/codeGen/CgHeapery.lhs | 2 +- compiler/codeGen/CgInfoTbls.hs | 4 +- compiler/codeGen/CgParallel.hs | 6 +- compiler/codeGen/CgProf.hs | 45 +-- compiler/codeGen/CgTicky.hs | 16 +- compiler/codeGen/CgUtils.hs | 12 +- compiler/codeGen/ClosureInfo.lhs | 24 +- compiler/codeGen/CodeGen.lhs | 234 ------------ compiler/codeGen/StgCmm.hs | 8 +- compiler/codeGen/StgCmmBind.hs | 3 +- compiler/codeGen/StgCmmClosure.hs | 24 +- compiler/codeGen/StgCmmExpr.hs | 4 +- compiler/codeGen/StgCmmHeap.hs | 57 ++- compiler/codeGen/StgCmmLayout.hs | 20 +- compiler/codeGen/StgCmmProf.hs | 46 +-- compiler/codeGen/StgCmmTicky.hs | 11 +- compiler/codeGen/StgCmmUtils.hs | 7 +- compiler/coreSyn/CorePrep.lhs | 12 +- compiler/coreSyn/CoreSyn.lhs | 19 +- compiler/coreSyn/CoreUtils.lhs | 7 +- compiler/coreSyn/MkCore.lhs | 17 +- compiler/deSugar/DsCCall.lhs | 15 +- compiler/deSugar/DsForeign.lhs | 2 +- compiler/deSugar/DsMeta.hs | 19 +- compiler/deSugar/DsUtils.lhs | 7 +- compiler/deSugar/Match.lhs | 31 +- compiler/deSugar/MatchCon.lhs | 6 +- compiler/deSugar/MatchLit.lhs | 43 ++- compiler/ghc.cabal.in | 2 - compiler/ghc.mk | 6 +- compiler/ghci/ByteCodeAsm.lhs | 8 +- compiler/ghci/ByteCodeInstr.lhs | 2 +- compiler/ghci/DebuggerUtils.hs | 16 +- compiler/ghci/Linker.lhs | 2 +- compiler/main/Constants.lhs | 27 +- compiler/main/DynFlags.hs | 32 ++- compiler/main/HscMain.hs | 54 ++-- compiler/main/StaticFlagParser.hs | 3 +- compiler/main/TidyPgm.lhs | 40 +- compiler/nativeGen/AsmCodeGen.lhs | 85 +++-- compiler/nativeGen/Instruction.hs | 13 + compiler/nativeGen/PPC/Instr.hs | 2 + compiler/nativeGen/RegAlloc/Graph/Stats.hs | 386 ++++++++++---------- compiler/nativeGen/RegAlloc/Linear/Main.hs | 25 +- compiler/nativeGen/RegAlloc/Linear/StackMap.hs | 39 +-- compiler/nativeGen/RegAlloc/Liveness.hs | 7 +- compiler/nativeGen/SPARC/Instr.hs | 2 + compiler/nativeGen/X86/CodeGen.hs | 30 +- compiler/nativeGen/X86/Cond.hs | 69 ++-- compiler/nativeGen/X86/Instr.hs | 117 +++++-- compiler/nativeGen/X86/Regs.hs | 6 +- compiler/parser/Lexer.x | 5 - compiler/prelude/PrelRules.lhs | 409 ++++++++++++--------- compiler/rename/RnEnv.lhs | 21 +- compiler/rename/RnPat.lhs | 2 +- compiler/rename/RnSource.lhs | 479 ++++++++++++------------ compiler/simplCore/FloatIn.lhs | 105 +++--- compiler/simplCore/SimplCore.lhs | 4 +- compiler/simplCore/Simplify.lhs | 14 +- compiler/simplStg/SRT.lhs | 166 -------- compiler/simplStg/SimplStg.lhs | 13 +- compiler/specialise/Rules.lhs | 29 +- compiler/specialise/Specialise.lhs | 9 +- compiler/stgSyn/StgSyn.lhs | 12 +- compiler/typecheck/Inst.lhs | 19 +- compiler/typecheck/TcGenGenerics.lhs | 2 +- compiler/typecheck/TcHsSyn.lhs | 16 +- compiler/typecheck/TcRnMonad.lhs | 12 +- compiler/typecheck/TcTyClsDecls.lhs | 34 +- compiler/utils/Bag.lhs | 1 + compiler/utils/Serialized.hs | 10 + compiler/vectorise/Vectorise/Exp.hs | 8 +- compiler/vectorise/Vectorise/Type/Env.hs | 6 +- compiler/vectorise/Vectorise/Utils/Base.hs | 5 +- docs/users_guide/ffi-chap.xml | 2 +- docs/users_guide/glasgow_exts.xml | 5 +- docs/users_guide/using.xml | 18 + ghc.mk | 3 +- ghc/ghc.mk | 2 +- includes/HaskellConstants.hs | 58 --- includes/mkDerivedConstants.c | 467 ++++++++++++++---------- includes/rts/Flags.h | 1 + includes/rts/storage/ClosureMacros.h | 35 ++- includes/rts/storage/GC.h | 1 + mk/validate-settings.mk | 6 + rts/Interpreter.c | 2 +- rts/Printer.c | 6 +- rts/RtsFlags.c | 15 +- rts/Schedule.c | 16 +- rts/Schedule.h | 28 ++- rts/Timer.c | 27 +- rts/posix/Select.c | 15 +- rts/sm/BlockAlloc.c | 8 +- rts/sm/Evac.c | 14 +- rts/sm/GC.c | 21 +- rts/sm/GCAux.c | 2 +- rts/sm/Storage.c | 20 +- rules/build-prog.mk | 10 +- rules/shell-wrapper.mk | 19 +- utils/ghc-pkg/ghc.mk | 2 +- utils/runghc/ghc.mk | 2 +- 122 files changed, 2266 insertions(+), 2514 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
