Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/b0f1171fa871ea1baf1a8a0096dcb10ed198427f >--------------------------------------------------------------- commit b0f1171fa871ea1baf1a8a0096dcb10ed198427f Merge: 3d366a8... f26027e... Author: Iavor S. Diatchki <[email protected]> Date: Wed Aug 22 21:48:32 2012 -0700 Merge remote-tracking branch 'origin/master' into type-nats aclocal.m4 | 16 +- compiler/basicTypes/BasicTypes.lhs | 2 +- compiler/basicTypes/MkId.lhs | 4 +- compiler/cmm/Cmm.hs | 15 +- compiler/cmm/CmmBuildInfoTables.hs | 99 ++-- compiler/cmm/CmmCallConv.hs | 52 +- compiler/cmm/CmmContFlowOpt.hs | 95 +++- compiler/cmm/CmmCvt.hs | 2 +- compiler/cmm/CmmExpr.hs | 2 + compiler/cmm/CmmInfo.hs | 139 +++-- compiler/cmm/CmmLayoutStack.hs | 168 +++-- compiler/cmm/CmmLint.hs | 6 +- compiler/cmm/CmmMachOp.hs | 8 +- compiler/cmm/CmmNode.hs | 36 +- compiler/cmm/CmmOpt.hs | 22 +- compiler/cmm/CmmParse.y | 85 ++-- compiler/cmm/CmmPipeline.hs | 145 +++-- compiler/cmm/CmmProcPoint.hs | 26 +- compiler/cmm/CmmRewriteAssignments.hs | 29 +- compiler/cmm/CmmSink.hs | 580 ++++++++++++----- compiler/cmm/MkGraph.hs | 232 ++++--- compiler/cmm/OldCmm.hs | 20 +- compiler/cmm/PprC.hs | 4 +- compiler/cmm/PprCmm.hs | 2 +- compiler/cmm/PprCmmDecl.hs | 2 - compiler/cmm/SMRep.lhs | 119 ++-- compiler/codeGen/CgCallConv.hs | 87 ++-- compiler/codeGen/CgCase.lhs | 16 +- compiler/codeGen/CgClosure.lhs | 49 +- compiler/codeGen/CgCon.lhs | 50 +- compiler/codeGen/CgExpr.lhs | 23 +- compiler/codeGen/CgExtCode.hs | 5 + compiler/codeGen/CgForeignCall.hs | 53 +- compiler/codeGen/CgHeapery.lhs | 90 ++-- compiler/codeGen/CgInfoTbls.hs | 123 ++-- compiler/codeGen/CgMonad.lhs | 13 +- compiler/codeGen/CgPrimOp.hs | 98 ++-- compiler/codeGen/CgProf.hs | 55 +- compiler/codeGen/CgStackery.lhs | 12 +- compiler/codeGen/CgTailCall.lhs | 29 +- compiler/codeGen/CgTicky.hs | 2 +- compiler/codeGen/CgUtils.hs | 255 ++------ compiler/codeGen/ClosureInfo.lhs | 84 ++-- compiler/codeGen/CodeGen.lhs | 12 +- compiler/codeGen/CodeGen/Platform.hs | 67 ++ compiler/codeGen/CodeGen/Platform/ARM.hs | 9 + compiler/codeGen/CodeGen/Platform/NoRegs.hs | 8 + compiler/codeGen/CodeGen/Platform/PPC.hs | 9 + compiler/codeGen/CodeGen/Platform/PPC_Darwin.hs | 10 + compiler/codeGen/CodeGen/Platform/SPARC.hs | 9 + compiler/codeGen/CodeGen/Platform/X86.hs | 9 + compiler/codeGen/CodeGen/Platform/X86_64.hs | 9 + compiler/codeGen/StgCmm.hs | 134 ++-- compiler/codeGen/StgCmmBind.hs | 558 +++++++++-------- compiler/codeGen/StgCmmClosure.hs | 102 ++-- compiler/codeGen/StgCmmCon.hs | 88 ++-- compiler/codeGen/StgCmmEnv.hs | 29 +- compiler/codeGen/StgCmmExpr.hs | 431 ++++++------- compiler/codeGen/StgCmmForeign.hs | 100 ++-- compiler/codeGen/StgCmmHeap.hs | 209 ++++--- compiler/codeGen/StgCmmLayout.hs | 178 +++--- compiler/codeGen/StgCmmMonad.hs | 206 ++++--- compiler/codeGen/StgCmmPrim.hs | 96 ++-- compiler/codeGen/StgCmmProf.hs | 124 ++-- compiler/codeGen/StgCmmTicky.hs | 2 +- compiler/codeGen/StgCmmUtils.hs | 498 ++++++--------- compiler/coreSyn/CoreSyn.lhs | 13 + compiler/coreSyn/CoreUnfold.lhs | 81 ++- compiler/coreSyn/CoreUtils.lhs | 20 +- compiler/coreSyn/MkCore.lhs | 6 +- compiler/deSugar/Coverage.lhs | 106 ++-- compiler/deSugar/Desugar.lhs | 30 +- compiler/deSugar/DsMeta.hs | 253 +++++--- compiler/ghc.cabal.in | 8 + compiler/ghc.mk | 14 - compiler/ghci/ByteCodeAsm.lhs | 2 +- compiler/ghci/ByteCodeGen.lhs | 31 +- compiler/ghci/ByteCodeItbls.lhs | 27 +- compiler/ghci/DebuggerUtils.hs | 13 +- compiler/hsSyn/Convert.lhs | 92 ++- compiler/hsSyn/HsExpr.lhs | 2 +- compiler/hsSyn/HsSyn.lhs | 77 +-- compiler/iface/BinIface.hs | 5 +- compiler/iface/FlagChecker.hs | 3 +- compiler/iface/MkIface.lhs | 8 +- compiler/llvmGen/LlvmCodeGen.hs | 8 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 36 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 48 +- compiler/main/CmdLineParser.hs | 12 +- compiler/main/DriverPipeline.hs | 39 +- compiler/main/DynFlags.hs | 64 ++- compiler/main/HscMain.hs | 7 +- compiler/main/StaticFlagParser.hs | 28 +- compiler/main/StaticFlags.hs | 20 - compiler/main/SysTools.lhs | 300 +++++---- compiler/nativeGen/AsmCodeGen.lhs | 91 ++-- compiler/nativeGen/Instruction.hs | 7 +- compiler/nativeGen/PPC/CodeGen.hs | 2 +- compiler/nativeGen/PPC/Instr.hs | 4 +- compiler/nativeGen/PPC/Ppr.hs | 485 ++++++++------- compiler/nativeGen/PPC/Regs.hs | 253 ++++---- compiler/nativeGen/PprInstruction.hs | 2 - compiler/nativeGen/RegAlloc/Graph/Main.hs | 6 +- compiler/nativeGen/RegAlloc/Graph/Spill.hs | 31 +- compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 8 +- compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 12 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 14 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 110 ++-- compiler/nativeGen/RegAlloc/Linear/X86/FreeRegs.hs | 40 +- compiler/nativeGen/RegAlloc/Liveness.hs | 87 ++-- compiler/nativeGen/SPARC/Instr.hs | 4 +- compiler/nativeGen/SPARC/Ppr.hs | 77 ++-- compiler/nativeGen/SPARC/RegPlate.hs | 2 +- compiler/nativeGen/TargetReg.hs | 10 +- compiler/nativeGen/X86/CodeGen.hs | 16 +- compiler/nativeGen/X86/Instr.hs | 8 +- compiler/nativeGen/X86/Ppr.hs | 168 +++--- compiler/nativeGen/X86/Regs.hs | 183 +++--- compiler/parser/Lexer.x | 7 +- compiler/parser/Parser.y.pp | 15 +- compiler/prelude/PrelRules.lhs | 657 +++++++++++--------- compiler/profiling/ProfInit.hs | 9 +- compiler/rename/RnEnv.lhs | 8 +- compiler/rename/RnNames.lhs | 14 +- compiler/rename/RnTypes.lhs | 26 +- compiler/simplCore/FloatIn.lhs | 24 +- compiler/simplCore/FloatOut.lhs | 2 +- compiler/simplCore/Simplify.lhs | 374 ++++++------ compiler/stgSyn/StgSyn.lhs | 14 +- compiler/typecheck/TcErrors.lhs | 53 ++- compiler/typecheck/TcHsSyn.lhs | 52 +- compiler/typecheck/TcHsType.lhs | 12 +- compiler/typecheck/TcInstDcls.lhs | 4 +- compiler/typecheck/TcInteract.lhs | 192 ++---- compiler/typecheck/TcMType.lhs | 10 +- compiler/typecheck/TcPat.lhs | 10 +- compiler/typecheck/TcRnTypes.lhs | 42 +- compiler/typecheck/TcSMonad.lhs | 137 ++--- compiler/typecheck/TcSimplify.lhs | 126 +---- compiler/typecheck/TcTyClsDecls.lhs | 19 +- compiler/types/Type.lhs | 2 +- compiler/utils/Fingerprint.hsc | 7 - compiler/utils/Outputable.lhs | 32 +- compiler/utils/Platform.hs | 3 + compiler/utils/Pretty.lhs | 3 + compiler/utils/UniqFM.lhs | 175 +++--- compiler/vectorise/Vectorise/Generic/PADict.hs | 6 +- configure.ac | 33 +- distrib/configure.ac.in | 12 + docs/users_guide/ghci.xml | 14 +- docs/users_guide/glasgow_exts.xml | 148 ++++-- docs/users_guide/intro.xml | 14 +- docs/users_guide/using.xml | 2 +- ghc.mk | 8 +- ghc/InteractiveUI.hs | 4 +- ghc/Main.hs | 21 +- ghc/hschooks.c | 8 + includes/Cmm.h | 3 +- includes/CodeGen.Platform.hs | 152 +++++ includes/HaskellConstants.hs | 3 +- includes/Rts.h | 2 + includes/Stg.h | 2 +- includes/ghc.mk | 2 +- includes/mkDerivedConstants.c | 25 + includes/rts/prof/CCS.h | 9 + includes/stg/HaskellMachRegs.h | 47 ++ includes/stg/MachRegs.h | 64 +-- includes/stg/RtsMachRegs.h | 47 ++ mk/build.mk.sample | 27 - mk/config.mk.in | 22 +- mk/validate-settings.mk | 14 +- packages | 1 - rts/Capability.c | 4 +- rts/Linker.c | 72 ++- rts/Profiling.c | 3 +- rts/Proftimer.c | 8 +- rts/Proftimer.h | 5 - rts/Schedule.c | 52 +- rts/Task.c | 22 +- rts/Task.h | 2 +- rts/parallel/Pack.c | 4 +- rts/posix/Select.c | 17 +- rts/sm/BlockAlloc.c | 37 ++- rts/sm/BlockAlloc.h | 2 + rts/sm/GC.c | 62 +-- rts/sm/MarkWeak.c | 19 +- rts/sm/Storage.c | 47 ++- rts/sm/Storage.h | 4 +- rules/build-package-way.mk | 2 +- rules/distdir-way-opts.mk | 2 +- rules/haddock.mk | 3 +- settings.in | 5 + utils/genapply/GenApply.hs | 2 +- 194 files changed, 6649 insertions(+), 5270 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
