Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : local-gc
http://hackage.haskell.org/trac/ghc/changeset/dcbfbb1232cf4a96802f6d6aa0735c336ef0674a >--------------------------------------------------------------- commit dcbfbb1232cf4a96802f6d6aa0735c336ef0674a Merge: b044b6f... 927df64... Author: Simon Marlow <[email protected]> Date: Sun Jun 5 16:15:50 2011 +0100 merge .gitignore | 22 +- MAKEHELP | 6 - Makefile | 8 +- aclocal.m4 | 116 +- boot | 233 +++- boot-pkgs | 114 -- compiler/Makefile.local | 75 - compiler/basicTypes/BasicTypes.lhs | 38 +- compiler/basicTypes/DataCon.lhs | 88 +- compiler/basicTypes/Id.lhs | 39 +- compiler/basicTypes/IdInfo.lhs | 5 +- compiler/basicTypes/IdInfo.lhs-boot | 2 + compiler/basicTypes/MkId.lhs | 128 +- compiler/basicTypes/Module.lhs | 17 +- compiler/basicTypes/Name.lhs | 3 +- compiler/basicTypes/NameSet.lhs | 12 +- compiler/basicTypes/OccName.lhs | 29 +- compiler/basicTypes/SrcLoc.lhs | 8 +- compiler/basicTypes/Var.lhs | 89 +- compiler/basicTypes/VarEnv.lhs | 3 +- compiler/basicTypes/VarSet.lhs | 6 +- compiler/cmm/CLabel.hs | 21 +- compiler/cmm/Cmm.hs | 26 +- compiler/cmm/CmmCPS.hs | 95 +- compiler/cmm/CmmExpr.hs | 5 +- compiler/cmm/CmmLint.hs | 16 +- compiler/cmm/CmmNode.hs | 58 +- compiler/cmm/CmmOpt.hs | 60 + compiler/cmm/CmmParse.y | 53 +- compiler/cmm/CmmProcPoint.hs | 2 + compiler/cmm/CmmSpillReload.hs | 562 ++++++-- compiler/cmm/CmmStackLayout.hs | 152 ++- compiler/cmm/MkGraph.hs | 2 +- compiler/cmm/OldCmm.hs | 4 +- compiler/cmm/PprC.hs | 15 - compiler/cmm/cmm-notes | 33 +- compiler/codeGen/CgPrimOp.hs | 212 +++ compiler/codeGen/CgUtils.hs | 19 +- compiler/codeGen/StgCmmUtils.hs | 62 + compiler/coreSyn/CoreArity.lhs | 42 +- compiler/coreSyn/CoreFVs.lhs | 24 +- compiler/coreSyn/CoreLint.lhs | 451 +++--- compiler/coreSyn/CorePrep.lhs | 37 +- compiler/coreSyn/CoreSubst.lhs | 255 ++-- compiler/coreSyn/CoreSyn.lhs | 64 +- compiler/coreSyn/CoreTidy.lhs | 9 +- compiler/coreSyn/CoreUnfold.lhs | 157 ++- compiler/coreSyn/CoreUtils.lhs | 247 ++-- compiler/coreSyn/ExternalCore.lhs | 13 +- compiler/coreSyn/MkCore.lhs | 10 +- compiler/coreSyn/MkExternalCore.lhs | 54 +- compiler/coreSyn/PprCore.lhs | 16 +- compiler/coreSyn/PprExternalCore.lhs | 6 +- compiler/deSugar/Check.lhs | 33 +- compiler/deSugar/Coverage.lhs | 108 +- compiler/deSugar/Desugar.lhs | 2 + compiler/deSugar/DsArrows.lhs | 16 +- compiler/deSugar/DsBinds.lhs | 26 +- compiler/deSugar/DsCCall.lhs | 4 +- compiler/deSugar/DsExpr.lhs | 241 +--- compiler/deSugar/DsForeign.lhs | 13 +- compiler/deSugar/DsGRHSs.lhs | 4 +- compiler/deSugar/DsListComp.lhs | 535 +++++--- compiler/deSugar/DsMeta.hs | 23 +- compiler/deSugar/DsUtils.lhs | 20 +- compiler/deSugar/Match.lhs | 16 +- compiler/deSugar/MatchCon.lhs | 1 - compiler/deSugar/MatchLit.lhs | 39 +- compiler/ghc.cabal.in | 20 +- compiler/ghc.mk | 56 +- compiler/ghci/ByteCodeAsm.lhs | 28 +- compiler/ghci/ByteCodeFFI.lhs | 28 - compiler/ghci/ByteCodeGen.lhs | 485 +++--- compiler/ghci/ByteCodeInstr.lhs | 2 +- compiler/ghci/ObjLink.lhs | 20 +- compiler/ghci/RtClosureInspect.hs | 289 ++-- compiler/hsSyn/Convert.lhs | 24 +- compiler/hsSyn/HsBinds.lhs | 58 +- compiler/hsSyn/HsDecls.lhs | 32 +- compiler/hsSyn/HsExpr.lhs | 344 +++-- compiler/hsSyn/HsImpExp.lhs | 23 +- compiler/hsSyn/HsLit.lhs | 37 +- compiler/hsSyn/HsPat.lhs | 17 +- compiler/hsSyn/HsTypes.lhs | 3 - compiler/hsSyn/HsUtils.lhs | 117 +- compiler/iface/BinIface.hs | 105 +- compiler/iface/BuildTyCl.lhs | 38 +- compiler/iface/IfaceSyn.lhs | 459 +++--- compiler/iface/IfaceType.lhs | 111 +- compiler/iface/MkIface.lhs | 78 +- compiler/iface/TcIface.lhs | 80 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 31 +- compiler/llvmGen/LlvmCodeGen/Regs.hs | 2 + compiler/llvmGen/LlvmMangler.hs | 78 +- compiler/main/CmdLineParser.hs | 2 +- compiler/main/CodeOutput.lhs | 22 +- compiler/main/DriverMkDepend.hs | 2 - compiler/main/DriverPhases.hs | 4 - compiler/main/DriverPipeline.hs | 215 ++-- compiler/main/DynFlags.hs | 535 ++++--- compiler/main/ErrUtils.lhs | 39 +- compiler/main/GHC.hs | 15 +- compiler/main/GhcMake.hs | 9 +- compiler/main/GhcMonad.hs | 4 +- compiler/main/HscMain.lhs | 11 +- compiler/main/HscStats.lhs | 22 +- compiler/main/HscTypes.lhs | 112 +- compiler/main/InteractiveEval.hs | 44 +- compiler/main/Packages.lhs | 75 +- compiler/main/PprTyThing.hs | 10 +- compiler/main/StaticFlagParser.hs | 1 - compiler/main/StaticFlags.hs | 28 +- compiler/main/SysTools.lhs | 144 ++- compiler/main/TidyPgm.lhs | 1 + compiler/nativeGen/Alpha/CodeGen.hs | 789 ---------- compiler/nativeGen/Alpha/Instr.hs | 142 -- compiler/nativeGen/Alpha/Ppr.hs-old | 562 ------- compiler/nativeGen/Alpha/RegInfo.hs | 218 --- compiler/nativeGen/Alpha/Regs.hs | 323 ---- compiler/nativeGen/AsmCodeGen.lhs | 87 +- compiler/nativeGen/PPC/CodeGen.hs | 37 +- compiler/nativeGen/PPC/Instr.hs | 10 +- compiler/nativeGen/PPC/Ppr.hs | 6 +- compiler/nativeGen/PPC/Regs.hs | 1 - .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 2 +- compiler/nativeGen/SPARC/CodeGen.hs | 16 +- compiler/nativeGen/SPARC/Instr.hs | 10 +- compiler/nativeGen/SPARC/Ppr.hs | 9 +- compiler/nativeGen/X86/CodeGen.hs | 40 +- compiler/nativeGen/X86/Instr.hs | 17 +- compiler/nativeGen/X86/Ppr.hs | 35 +- compiler/nativeGen/X86/Regs.hs | 23 +- compiler/parser/Lexer.x | 72 +- compiler/parser/Parser.y.pp | 38 +- compiler/parser/ParserCore.y | 2 +- compiler/parser/RdrHsSyn.lhs | 65 +- compiler/prelude/ForeignCall.lhs | 5 +- compiler/prelude/PrelNames.lhs | 222 +++- compiler/prelude/PrelRules.lhs | 6 +- compiler/prelude/PrimOp.lhs | 35 +- compiler/prelude/TysPrim.lhs | 332 +++-- compiler/prelude/TysWiredIn.lhs | 34 +- compiler/prelude/primops.txt.pp | 169 ++- compiler/rename/RnBinds.lhs | 71 +- compiler/rename/RnEnv.lhs | 13 +- compiler/rename/RnExpr.lhs | 453 ++++-- compiler/rename/RnHsSyn.lhs | 35 +- compiler/rename/RnNames.lhs | 2 +- compiler/rename/RnPat.lhs | 4 - compiler/rename/RnSource.lhs | 27 +- compiler/rename/RnTypes.lhs | 9 +- compiler/simplCore/CSE.lhs | 2 + compiler/simplCore/CoreMonad.lhs | 14 +- compiler/simplCore/FloatIn.lhs | 19 +- compiler/simplCore/FloatOut.lhs | 1 + compiler/simplCore/LiberateCase.lhs | 1 + compiler/simplCore/OccurAnal.lhs | 96 +- compiler/simplCore/SAT.lhs | 23 +- compiler/simplCore/SetLevels.lhs | 19 +- compiler/simplCore/SimplEnv.lhs | 92 +- compiler/simplCore/SimplUtils.lhs | 42 +- compiler/simplCore/Simplify.lhs | 203 ++-- compiler/specialise/Rules.lhs | 30 +- compiler/specialise/SpecConstr.lhs | 40 +- compiler/specialise/Specialise.lhs | 7 +- compiler/stgSyn/CoreToStg.lhs | 15 +- compiler/stgSyn/StgSyn.lhs | 24 +- compiler/stranal/DmdAnal.lhs | 33 +- compiler/stranal/WorkWrap.lhs | 1 + compiler/stranal/WwLib.lhs | 27 +- compiler/typecheck/FamInst.lhs | 49 +- compiler/typecheck/Inst.lhs | 16 +- compiler/typecheck/TcArrows.lhs | 109 +- compiler/typecheck/TcBinds.lhs | 24 +- compiler/typecheck/TcCanonical.lhs | 287 ++--- compiler/typecheck/TcClassDcl.lhs | 369 ++---- compiler/typecheck/TcDeriv.lhs | 392 ++++- compiler/typecheck/TcEnv.lhs | 10 +- compiler/typecheck/TcErrors.lhs | 176 ++- compiler/typecheck/TcExpr.lhs | 98 +- compiler/typecheck/TcForeign.lhs | 137 +- compiler/typecheck/TcGenDeriv.lhs | 49 +- compiler/typecheck/TcHsSyn.lhs | 92 +- compiler/typecheck/TcHsType.lhs | 26 +- compiler/typecheck/TcInstDcls.lhs | 297 ++++- compiler/typecheck/TcInteract.lhs | 330 +++-- compiler/typecheck/TcMType.lhs | 98 +- compiler/typecheck/TcMatches.lhs | 605 ++++++--- compiler/typecheck/TcPat.lhs | 74 +- compiler/typecheck/TcRnDriver.lhs | 137 +-- compiler/typecheck/TcRnMonad.lhs | 13 +- compiler/typecheck/TcRnTypes.lhs | 63 +- compiler/typecheck/TcRules.lhs | 1 - compiler/typecheck/TcSMonad.lhs | 193 ++- compiler/typecheck/TcSimplify.lhs | 100 +- compiler/typecheck/TcSplice.lhs | 23 +- compiler/typecheck/TcTyClsDecls.lhs | 330 +---- compiler/typecheck/TcTyDecls.lhs | 17 +- compiler/typecheck/TcType.lhs | 343 ++--- compiler/typecheck/TcUnify.lhs | 107 +- compiler/typecheck/TcUnify.lhs-boot | 4 +- compiler/types/Class.lhs | 10 +- compiler/types/Coercion.lhs | 1553 ++++++++++++-------- compiler/types/FamInstEnv.lhs | 88 +- compiler/types/FunDeps.lhs | 6 +- compiler/types/Generics.lhs | 842 +++++------- compiler/types/InstEnv.lhs | 4 +- compiler/types/Kind.lhs | 235 +++ compiler/types/OptCoercion.lhs | 538 +++---- compiler/types/TyCon.lhs | 269 ++-- compiler/types/Type.lhs | 683 ++++----- compiler/types/TypeRep.lhs | 563 ++++--- compiler/types/TypeRep.lhs-boot | 3 +- compiler/types/Unify.lhs | 70 +- compiler/utils/Bag.lhs | 3 +- compiler/utils/Outputable.lhs | 286 +++-- compiler/utils/Pair.lhs | 47 + compiler/{nativeGen => utils}/Platform.hs | 7 +- compiler/utils/Pretty.lhs | 7 +- compiler/utils/Util.lhs | 14 + compiler/vectorise/Vectorise.hs | 3 +- compiler/vectorise/Vectorise/Builtins/Base.hs | 3 +- .../vectorise/Vectorise/Builtins/Initialise.hs | 106 +- compiler/vectorise/Vectorise/Builtins/Modules.hs | 88 +- compiler/vectorise/Vectorise/Builtins/Prelude.hs | 34 +- compiler/vectorise/Vectorise/Exp.hs | 3 +- compiler/vectorise/Vectorise/Type/Env.hs | 1 - compiler/vectorise/Vectorise/Type/PData.hs | 1 - compiler/vectorise/Vectorise/Type/PRepr.hs | 11 +- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 1 - compiler/vectorise/Vectorise/Type/Type.hs | 1 - compiler/vectorise/Vectorise/Utils.hs | 3 +- compiler/vectorise/Vectorise/Utils/Base.hs | 2 +- compiler/vectorise/Vectorise/Utils/Closure.hs | 1 - compiler/vectorise/Vectorise/Utils/Hoisting.hs | 1 - compiler/vectorise/Vectorise/Utils/PADict.hs | 7 +- compiler/vectorise/Vectorise/Utils/Poly.hs | 1 - compiler/vectorise/Vectorise/Var.hs | 1 - configure.ac | 28 +- distrib/Makefile | 2 +- distrib/configure.ac.in | 4 +- docs/users_guide/debugging.xml | 137 ++- docs/users_guide/flags.xml | 95 +- docs/users_guide/glasgow_exts.xml | 625 ++++++--- docs/users_guide/shared_libs.xml | 63 +- docs/users_guide/using.xml | 26 +- docs/users_guide/win32-dlls.xml | 36 +- extra-gcc-opts.in | 1 - ghc.mk | 21 +- ghc.spec.in | 1 - ghc/GhciMonad.hs | 6 +- ghc/GhciTags.hs | 7 +- ghc/InteractiveUI.hs | 131 +- ghc/Main.hs | 42 +- ghc/ghc-bin.cabal.in | 2 +- ghc/ghc.mk | 28 +- ghc/ghc.wrapper | 2 +- includes/Cmm.h | 6 +- includes/Rts.h | 9 +- includes/rts/EventLogFormat.h | 40 +- includes/rts/Flags.h | 4 +- includes/rts/storage/GC.h | 30 +- includes/stg/MachRegs.h | 5 + includes/stg/SMP.h | 2 + libffi/ghc.mk | 11 +- libraries/Makefile.common | 118 -- libraries/Makefile.inc | 8 - libraries/Makefile.local | 38 - libraries/tarballs/time-1.2.0.3.tar.gz | Bin 85069 -> 0 bytes libraries/tarballs/time-1.2.0.4.tar.gz | Bin 0 -> 85693 bytes mk/build.mk.sample | 11 +- mk/config.mk.in | 51 +- mk/validate-settings.mk | 3 +- rts/Capability.c | 68 +- rts/Capability.h | 14 +- rts/GetEnv.h | 23 + rts/Hash.c | 67 +- rts/Linker.c | 173 ++- rts/PrimOps.cmm | 1 + rts/ProfHeap.c | 13 +- rts/RetainerSet.c | 75 +- rts/RetainerSet.h | 2 +- rts/RtsFlags.c | 196 ++- rts/RtsFlags.h | 1 + rts/RtsProbes.d | 6 + rts/RtsStartup.c | 12 +- rts/Schedule.c | 23 +- rts/Stats.c | 95 +- rts/Trace.c | 88 ++ rts/Trace.h | 86 +- rts/eventlog/EventLog.c | 170 +++- rts/eventlog/EventLog.h | 24 + rts/ghc.mk | 10 +- rts/posix/GetEnv.c | 44 + rts/sm/GC.c | 12 +- rts/win32/GetEnv.c | 61 + rules/build-package-data.mk | 7 +- rules/build-package-way.mk | 14 +- rules/build-package.mk | 16 +- rules/build-prog.mk | 18 +- rules/c-suffix-rules.mk | 10 +- rules/dependencies.mk | 38 + rules/distdir-way-opts.mk | 8 +- rules/hs-suffix-rules-srcdir.mk | 4 +- rules/package-config.mk | 6 + rules/shell-wrapper.mk | 1 - settings.in | 8 + sync-all | 270 ++-- utils/Makefile | 2 +- utils/compare_sizes/ghc.mk | 4 +- utils/fingerprint/fingerprint.py | 248 ++++ utils/genprimopcode/Lexer.x | 1 + utils/genprimopcode/Main.hs | 13 +- utils/genprimopcode/Parser.y | 2 + utils/genprimopcode/ParserM.hs | 1 + utils/genprimopcode/Syntax.hs | 2 + utils/ghc-cabal/Main.hs | 5 +- utils/ghc-pkg/Main.hs | 343 +++-- utils/ghc-pwd/ghc.mk | 4 +- utils/ghctags/Main.hs | 4 +- utils/ghctags/ghc.mk | 10 +- utils/hpc/ghc.mk | 10 +- utils/runghc/ghc.mk | 14 +- utils/runghc/runghc.hs | 20 +- validate | 17 +- 325 files changed, 14818 insertions(+), 12578 deletions(-) Diff suppressed because of size. To see it, use: git show dcbfbb1232cf4a96802f6d6aa0735c336ef0674a _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
