Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/5c9dfadd979ca3ccb8dd7c21ddb9fb0fe9cdb3fe >--------------------------------------------------------------- commit 5c9dfadd979ca3ccb8dd7c21ddb9fb0fe9cdb3fe Merge: 72883e4... 8f4f29f... Author: Simon Peyton Jones <[email protected]> Date: Mon Jul 18 23:11:02 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/BasicTypes.lhs | 12 + compiler/basicTypes/DataCon.lhs | 5 +- compiler/basicTypes/MkId.lhs | 2 +- compiler/basicTypes/NameSet.lhs | 18 +- compiler/cmm/CLabel.hs | 49 +- compiler/cmm/Cmm.hs | 4 +- compiler/cmm/CmmBuildInfoTables.hs | 10 +- compiler/cmm/CmmCvt.hs | 17 +- compiler/cmm/CmmDecl.hs | 15 +- compiler/cmm/CmmInfo.hs | 12 +- compiler/cmm/CmmLint.hs | 24 +- compiler/cmm/CmmOpt.hs | 11 +- compiler/cmm/CmmParse.y | 41 +- compiler/cmm/CmmPipeline.hs | 35 +- compiler/cmm/CmmProcPoint.hs | 13 +- compiler/cmm/OldCmm.hs | 13 +- compiler/cmm/OldPprCmm.hs | 19 +- compiler/cmm/PprC.hs | 28 +- compiler/cmm/PprCmm.hs | 49 +- compiler/cmm/PprCmmDecl.hs | 54 +- compiler/codeGen/CgHpc.hs | 6 +- compiler/codeGen/CgInfoTbls.hs | 6 +- compiler/codeGen/CgMonad.lhs | 2 +- compiler/codeGen/CgUtils.hs | 14 +- compiler/codeGen/ClosureInfo.lhs | 22 +- compiler/codeGen/CodeGen.lhs | 4 +- compiler/codeGen/StgCmm.hs | 4 +- compiler/codeGen/StgCmmClosure.hs | 23 +- compiler/codeGen/StgCmmExpr.hs | 21 + compiler/codeGen/StgCmmHpc.hs | 11 +- compiler/codeGen/StgCmmLayout.hs | 2 +- compiler/codeGen/StgCmmMonad.hs | 2 +- compiler/codeGen/StgCmmPrim.hs | 12 + compiler/codeGen/StgCmmUtils.hs | 14 +- compiler/coreSyn/PprCore.lhs | 30 +- compiler/deSugar/Desugar.lhs | 4 +- compiler/deSugar/DsExpr.lhs | 6 +- compiler/deSugar/DsForeign.lhs | 53 +- compiler/deSugar/DsMeta.hs | 10 +- compiler/deSugar/DsMonad.lhs | 7 +- compiler/deSugar/Match.lhs | 14 +- compiler/deSugar/MatchLit.lhs | 4 + compiler/ghc.cabal.in | 2 +- compiler/ghci/Linker.lhs | 37 +- compiler/hsSyn/Convert.lhs | 3 +- compiler/hsSyn/HsExpr.lhs | 2 +- compiler/hsSyn/HsLit.lhs | 10 +- compiler/iface/MkIface.lhs | 29 +- compiler/llvmGen/Llvm/PpLlvm.hs | 29 +- compiler/llvmGen/Llvm/Types.hs | 59 +- compiler/llvmGen/LlvmCodeGen.hs | 44 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 2 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 21 +- compiler/llvmGen/LlvmCodeGen/Data.hs | 13 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 22 +- compiler/main/CodeOutput.lhs | 2 +- compiler/main/DriverPipeline.hs | 147 +- compiler/main/DynFlags.hs | 230 ++-- compiler/main/ErrUtils.lhs | 9 +- compiler/main/GHC.hs | 12 +- compiler/main/HscMain.lhs | 20 +- compiler/main/HscTypes.lhs | 41 +- compiler/main/InteractiveEval.hs | 2 +- compiler/main/StaticFlags.hs | 2 +- compiler/main/SysTools.lhs | 1 - compiler/nativeGen/AsmCodeGen.lhs | 118 +- compiler/nativeGen/Instruction.hs | 244 ++-- compiler/nativeGen/NCGMonad.hs | 16 +- compiler/nativeGen/PIC.hs | 11 +- compiler/nativeGen/PPC/CodeGen.hs | 30 +- compiler/nativeGen/PPC/Instr.hs | 49 +- compiler/nativeGen/PPC/Ppr.hs | 194 ++-- compiler/nativeGen/PPC/RegInfo.hs | 22 +- compiler/nativeGen/PprInstruction.hs | 2 + compiler/nativeGen/RegAlloc/Graph/Coalesce.hs | 6 +- compiler/nativeGen/RegAlloc/Graph/Main.hs | 43 +- compiler/nativeGen/RegAlloc/Graph/Spill.hs | 12 +- compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 101 +- compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 13 +- compiler/nativeGen/RegAlloc/Graph/Stats.hs | 70 +- compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 23 +- compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 9 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 96 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 190 ++- compiler/nativeGen/RegAlloc/Linear/StackMap.hs | 5 +- compiler/nativeGen/RegAlloc/Linear/State.hs | 17 +- compiler/nativeGen/RegAlloc/Linear/Stats.hs | 4 +- compiler/nativeGen/RegAlloc/Liveness.hs | 1163 +++++++------- compiler/nativeGen/SPARC/CodeGen.hs | 36 +- compiler/nativeGen/SPARC/CodeGen/CCall.hs | 19 +- compiler/nativeGen/SPARC/CodeGen/Expand.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 10 +- compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 9 +- compiler/nativeGen/SPARC/CodeGen/Sanity.hs | 14 +- compiler/nativeGen/SPARC/Instr.hs | 44 +- compiler/nativeGen/SPARC/Ppr.hs | 52 +- compiler/nativeGen/SPARC/ShortcutJump.hs | 23 +- compiler/nativeGen/TargetReg.hs | 46 +- compiler/nativeGen/X86/CodeGen.hs | 17 +- compiler/nativeGen/X86/Instr.hs | 60 +- compiler/nativeGen/X86/Ppr.hs | 648 ++++---- compiler/nativeGen/X86/RegInfo.hs | 21 +- compiler/parser/Lexer.x | 962 ++++++------ compiler/parser/Parser.y.pp | 18 +- compiler/parser/ParserCore.y | 2 +- compiler/prelude/ForeignCall.lhs | 17 +- compiler/prelude/PrelNames.lhs | 29 +- compiler/rename/RnEnv.lhs | 8 +- compiler/rename/RnNames.lhs | 26 +- compiler/rename/RnSource.lhs | 2 +- compiler/rename/RnTypes.lhs | 2 +- compiler/simplCore/Simplify.lhs | 16 +- compiler/stranal/WwLib.lhs | 2 +- compiler/typecheck/TcBinds.lhs | 2 +- compiler/typecheck/TcDeriv.lhs | 2 +- compiler/typecheck/TcErrors.lhs | 45 +- compiler/typecheck/TcExpr.lhs | 18 +- compiler/typecheck/TcForeign.lhs | 18 +- compiler/typecheck/TcGenDeriv.lhs | 43 +- compiler/typecheck/TcHsSyn.lhs | 8 +- compiler/typecheck/TcInstDcls.lhs | 10 +- compiler/typecheck/TcRnMonad.lhs | 23 +- compiler/types/Class.lhs | 5 +- compiler/types/Coercion.lhs | 18 +- compiler/types/OptCoercion.lhs | 98 +- compiler/types/TyCon.lhs | 9 +- compiler/utils/Binary.hs | 26 + compiler/utils/Digraph.lhs | 3 + compiler/utils/Fingerprint.hsc | 39 +- compiler/utils/Outputable.lhs | 18 + compiler/utils/Panic.lhs | 10 +- compiler/utils/UniqFM.lhs | 3 + compiler/utils/md5.c | 3 + configure.ac | 2 +- distrib/MacOS/mkinstaller | 2 +- docs/users_guide/6.10.1-notes.xml | 1255 -------------- docs/users_guide/6.12.1-notes.xml | 1304 --------------- docs/users_guide/6.6-notes.xml | 1718 -------------------- docs/users_guide/7.0.1-notes.xml | 1226 -------------- docs/users_guide/extending_ghc.xml | 284 ++++ docs/users_guide/ffi-chap.xml | 4 +- docs/users_guide/flags.xml | 47 +- docs/users_guide/glasgow_exts.xml | 80 - docs/users_guide/intro.xml | 2 +- docs/users_guide/runtime_control.xml | 61 +- docs/users_guide/safe_haskell.xml | 806 +++++----- docs/users_guide/ug-book.xml.in | 1 + docs/users_guide/ug-ent.xml.in | 3 +- ghc.mk | 16 +- ghc/InteractiveUI.hs | 77 +- ghc/Main.hs | 3 +- ghc/ghc-bin.cabal.in | 2 +- includes/rts/EventLogFormat.h | 21 +- includes/rts/Flags.h | 4 +- includes/rts/Globals.h | 1 - libraries/bin-package-db/bin-package-db.cabal | 2 +- mk/validate-settings.mk | 4 +- packages | 2 +- quickcheck/HeaderInfoTests.hs | 129 -- quickcheck/README | 9 - quickcheck/RunTests.hs | 62 - quickcheck/run.sh | 23 - rts/Capability.c | 76 +- rts/Capability.h | 10 +- rts/Globals.c | 8 - rts/Linker.c | 1 - rts/RtsFlags.c | 60 +- rts/RtsProbes.d | 14 +- rts/Schedule.c | 24 +- rts/Sparks.c | 75 +- rts/Sparks.h | 42 +- rts/Stats.c | 23 +- rts/StgCRun.c | 12 + rts/StgRun.h | 4 + rts/Trace.c | 174 ++- rts/Trace.h | 194 ++- rts/eventlog/EventLog.c | 111 ++- rts/eventlog/EventLog.h | 12 + rules/extra-packages.mk | 6 +- sync-all | 147 ++- utils/ghc-cabal/ghc-cabal.cabal | 2 +- utils/ghc-pkg/ghc-pkg.cabal | 2 +- utils/ghctags/Main.hs | 4 +- utils/runghc/runghc.cabal.in | 2 +- validate | 7 + 185 files changed, 4905 insertions(+), 9620 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
