[commit: ghc] overlapping-tyfams: Revert ""Merged" master, in advance of implementing the new "Good"" (68db35e)

Richard Eisenberg eir at cis.upenn.edu
Fri Jun 21 15:15:56 CEST 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : overlapping-tyfams

https://github.com/ghc/ghc/commit/68db35e99447938248f4be5682d7824423246a86

>---------------------------------------------------------------

commit 68db35e99447938248f4be5682d7824423246a86
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri May 24 23:17:30 2013 +0100

    Revert ""Merged" master, in advance of implementing the new "Good""
    
    This reverts commit 8d890e0e2af839a8a8dc3b360727cffe76372830.

 .gitignore                                         |    1 +
 .gitmodules                                        |    3 -
 HACKING                                            |   63 +
 HACKING.md                                         |  149 -
 Makefile                                           |    1 +
 README                                             |  104 +
 README.md                                          |  134 -
 aclocal.m4                                         |  328 +-
 bindisttest/ghc.mk                                 |    2 +-
 boot                                               |    7 +-
 compiler/HsVersions.h                              |   10 +
 compiler/basicTypes/BasicTypes.lhs                 |   71 +-
 compiler/basicTypes/DataCon.lhs                    |  187 +-
 compiler/basicTypes/Demand.lhs                     | 1208 +-----
 compiler/basicTypes/Id.lhs                         |   57 +-
 compiler/basicTypes/IdInfo.lhs                     |   56 +-
 compiler/basicTypes/MkId.lhs                       |  303 +-
 compiler/basicTypes/Name.lhs                       |   24 +-
 compiler/basicTypes/OccName.lhs                    |    2 +-
 compiler/basicTypes/RdrName.lhs                    |    6 +-
 compiler/basicTypes/SrcLoc.lhs                     |    4 +-
 compiler/basicTypes/UniqSupply.lhs                 |    4 +-
 compiler/basicTypes/Var.lhs                        |    2 +-
 compiler/basicTypes/VarSet.lhs                     |    4 +-
 compiler/cbits/genSym.c                            |    9 -
 compiler/cmm/Bitmap.hs                             |   15 +-
 compiler/cmm/CLabel.hs                             |   62 +-
 compiler/cmm/Cmm.hs                                |    1 +
 compiler/cmm/CmmBuildInfoTables.hs                 |    8 +-
 compiler/cmm/CmmCallConv.hs                        |   17 +-
 compiler/cmm/CmmCommonBlockElim.hs                 |    6 +-
 compiler/cmm/CmmContFlowOpt.hs                     |    3 +-
 compiler/cmm/CmmExpr.hs                            |   17 -
 compiler/cmm/CmmInfo.hs                            |  155 +-
 compiler/cmm/CmmLayoutStack.hs                     |    6 +-
 compiler/cmm/CmmLex.x                              |    3 -
 compiler/cmm/CmmMachOp.hs                          |   69 -
 compiler/cmm/CmmNode.hs                            |   51 +-
 compiler/cmm/CmmParse.y                            |    8 +-
 compiler/cmm/CmmPipeline.hs                        |   16 +-
 compiler/cmm/CmmProcPoint.hs                       |    1 +
 compiler/cmm/CmmRewriteAssignments.hs              |    3 +
 compiler/cmm/CmmSink.hs                            |    2 +-
 compiler/cmm/CmmType.hs                            |   92 +-
 compiler/cmm/CmmUtils.hs                           |   80 +-
 compiler/cmm/PprC.hs                               |  109 +-
 compiler/cmm/PprCmmExpr.hs                         |    2 -
 compiler/codeGen/CgUtils.hs                        |    7 -
 compiler/codeGen/StgCmmArgRep.hs                   |  135 -
 compiler/codeGen/StgCmmBind.hs                     |   64 +-
 compiler/codeGen/StgCmmClosure.hs                  |    5 +-
 compiler/codeGen/StgCmmCon.hs                      |   26 +-
 compiler/codeGen/StgCmmEnv.hs                      |  139 +-
 compiler/codeGen/StgCmmExpr.hs                     |   18 +-
 compiler/codeGen/StgCmmExtCode.hs                  |   17 +-
 compiler/codeGen/StgCmmForeign.hs                  |   53 +-
 compiler/codeGen/StgCmmHeap.hs                     |  103 +-
 compiler/codeGen/StgCmmLayout.hs                   |  210 +-
 compiler/codeGen/StgCmmMonad.hs                    |  332 +-
 compiler/codeGen/StgCmmPrim.hs                     |  649 +--
 compiler/codeGen/StgCmmTicky.hs                    |  686 ++--
 compiler/codeGen/StgCmmUtils.hs                    |   20 +-
 compiler/coreSyn/CoreArity.lhs                     |   10 +-
 compiler/coreSyn/CoreFVs.lhs                       |   11 +-
 compiler/coreSyn/CoreLint.lhs                      |   66 +-
 compiler/coreSyn/CorePrep.lhs                      |  114 +-
 compiler/coreSyn/CoreSubst.lhs                     |   30 +-
 compiler/coreSyn/CoreSyn.lhs                       |   16 +-
 compiler/coreSyn/CoreTidy.lhs                      |    7 +-
 compiler/coreSyn/CoreUnfold.lhs                    |   57 +-
 compiler/coreSyn/CoreUtils.lhs                     |  143 +-
 compiler/coreSyn/ExternalCore.lhs                  |    7 +
 compiler/coreSyn/MkCore.lhs                        |   57 +-
 compiler/coreSyn/MkExternalCore.lhs                |   46 +-
 compiler/coreSyn/PprCore.lhs                       |   46 +-
 compiler/coreSyn/PprExternalCore.lhs               |   58 +-
 compiler/coreSyn/TrieMap.lhs                       |   38 +-
 compiler/deSugar/Check.lhs                         |   20 +-
 compiler/deSugar/Coverage.lhs                      |   33 +-
 compiler/deSugar/Desugar.lhs                       |    4 +-
 compiler/deSugar/DsArrows.lhs                      |  549 ++-
 compiler/deSugar/DsBinds.lhs                       |   40 +-
 compiler/deSugar/DsCCall.lhs                       |   45 +-
 compiler/deSugar/DsExpr.lhs                        |   67 +-
 compiler/deSugar/DsForeign.lhs                     |    2 +-
 compiler/deSugar/DsGRHSs.lhs                       |   14 +-
 compiler/deSugar/DsListComp.lhs                    |    7 +-
 compiler/deSugar/DsMeta.hs                         |   33 +-
 compiler/deSugar/DsUtils.lhs                       |    4 +-
 compiler/deSugar/Match.lhs                         |  128 +-
 compiler/deSugar/MatchCon.lhs                      |    3 +-
 compiler/deSugar/MatchLit.lhs                      |    4 +-
 compiler/ghc.cabal.in                              |   11 +-
 compiler/ghc.mk                                    |  246 +-
 compiler/ghci/ByteCodeAsm.lhs                      |   52 +-
 compiler/ghci/ByteCodeItbls.lhs                    |  384 +-
 compiler/ghci/ByteCodeLink.lhs                     |    2 +-
 compiler/ghci/Debugger.hs                          |    5 +-
 compiler/ghci/DebuggerUtils.hs                     |    2 +-
 compiler/ghci/LibFFI.hsc                           |    4 +-
 compiler/ghci/Linker.lhs                           |  152 +-
 compiler/ghci/RtClosureInspect.hs                  |    4 +-
 compiler/hsSyn/Convert.lhs                         |   18 +-
 compiler/hsSyn/HsBinds.lhs                         |   89 +-
 compiler/hsSyn/HsDecls.lhs                         |  134 +-
 compiler/hsSyn/HsExpr.lhs                          |   68 +-
 compiler/hsSyn/HsExpr.lhs-boot                     |   19 +-
 compiler/hsSyn/HsPat.lhs                           |   26 +-
 compiler/hsSyn/HsPat.lhs-boot                      |    8 +-
 compiler/hsSyn/HsTypes.lhs                         |   17 +-
 compiler/hsSyn/HsUtils.lhs                         |   15 +-
 compiler/iface/BinIface.hs                         |  135 +-
 compiler/iface/BuildTyCl.lhs                       |   28 +-
 compiler/iface/IfaceSyn.lhs                        |   95 +-
 compiler/iface/LoadIface.lhs                       |   25 +-
 compiler/iface/MkIface.lhs                         |   78 +-
 compiler/iface/TcIface.lhs                         |  118 +-
 compiler/llvmGen/Llvm.hs                           |    2 +-
 compiler/llvmGen/Llvm/AbsSyn.hs                    |   31 +-
 compiler/llvmGen/Llvm/PpLlvm.hs                    |   39 +-
 compiler/llvmGen/Llvm/Types.hs                     |  105 +-
 compiler/llvmGen/LlvmCodeGen.hs                    |    7 +-
 compiler/llvmGen/LlvmCodeGen/Base.hs               |   16 +-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs            |  332 +-
 compiler/llvmGen/LlvmCodeGen/Data.hs               |    8 -
 compiler/llvmGen/LlvmCodeGen/Ppr.hs                |    6 -
 compiler/llvmGen/LlvmCodeGen/Regs.hs               |    7 -
 compiler/main/CmdLineParser.hs                     |   10 -
 compiler/main/CodeOutput.lhs                       |   33 +-
 compiler/main/DriverMkDepend.hs                    |    6 +-
 compiler/main/DriverPhases.hs                      |   59 +-
 compiler/main/DriverPipeline.hs                    |  984 ++---
 compiler/main/DynFlags.hs                          |  317 +-
 compiler/main/DynFlags.hs-boot                     |    9 +-
 compiler/main/DynamicLoading.hs                    |    4 +-
 compiler/main/ErrUtils.lhs                         |    3 +-
 compiler/main/GHC.hs                               |   42 +-
 compiler/main/GhcMake.hs                           |   14 +-
 compiler/main/GhcMonad.hs                          |   10 +-
 compiler/main/HscMain.hs                           |  547 ++-
 compiler/main/HscStats.lhs                         |  187 +
 compiler/main/HscTypes.lhs                         |   63 +-
 compiler/main/InteractiveEval.hs                   |   87 +-
 compiler/main/InteractiveEval.hs-boot              |    3 +
 compiler/main/InteractiveEvalTypes.hs              |   65 -
 compiler/main/Packages.lhs                         |   42 +-
 compiler/main/PlatformConstants.hs                 |   12 -
 compiler/main/PprTyThing.hs                        |   19 +-
 compiler/main/StaticFlagParser.hs                  |  151 +
 compiler/main/StaticFlags.hs                       |  295 +-
 compiler/main/StaticFlags.hs-boot                  |    4 -
 compiler/main/SysTools.lhs                         |  151 +-
 compiler/main/TidyPgm.lhs                          |  138 +-
 compiler/nativeGen/AsmCodeGen.lhs                  |  192 +-
 compiler/nativeGen/NCGMonad.hs                     |   42 +-
 compiler/nativeGen/PIC.hs                          |  111 +-
 compiler/nativeGen/PPC/CodeGen.hs                  |    9 +-
 compiler/nativeGen/PPC/Instr.hs                    |  169 +-
 compiler/nativeGen/PprBase.hs                      |   15 +-
 compiler/nativeGen/RegAlloc/Linear/Base.hs         |    2 +-
 .../nativeGen/RegAlloc/Linear/JoinToTargets.hs     |    2 +-
 compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs |    2 +-
 .../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs    |    2 +-
 compiler/nativeGen/RegAlloc/Liveness.hs            |    6 +-
 compiler/nativeGen/SPARC/AddrMode.hs               |   17 +-
 compiler/nativeGen/SPARC/Base.hs                   |   51 +-
 compiler/nativeGen/SPARC/CodeGen.hs                |    7 +-
 compiler/nativeGen/SPARC/CodeGen/Gen64.hs          |  158 +-
 compiler/nativeGen/X86/CodeGen.hs                  |  106 +-
 compiler/nativeGen/X86/Instr.hs                    |  124 +-
 compiler/parser/Lexer.x                            |   11 +-
 compiler/parser/Parser.y.pp                        |   63 +-
 compiler/parser/RdrHsSyn.lhs                       |  129 +-
 compiler/prelude/PrelNames.lhs                     |  128 +-
 compiler/prelude/PrelNames.lhs-boot                |    3 +-
 compiler/prelude/PrelRules.lhs                     |   35 +-
 compiler/prelude/TysPrim.lhs                       |   51 +-
 compiler/prelude/TysWiredIn.lhs                    |  306 +-
 compiler/prelude/TysWiredIn.lhs-boot               |    2 +-
 compiler/prelude/primops.txt.pp                    |  515 +--
 compiler/profiling/SCCfinal.lhs                    |    2 +-
 compiler/rename/RnBinds.lhs                        |   22 +-
 compiler/rename/RnEnv.lhs                          |   65 +-
 compiler/rename/RnExpr.lhs                         |   57 +-
 compiler/rename/RnNames.lhs                        |   48 +-
 compiler/rename/RnPat.lhs                          |   34 +-
 compiler/rename/RnSource.lhs                       |   29 +-
 compiler/rename/RnTypes.lhs                        |   19 +-
 compiler/simplCore/CSE.lhs                         |   15 +-
 compiler/simplCore/CoreMonad.lhs                   |    4 +-
 compiler/simplCore/FloatIn.lhs                     |    2 +-
 compiler/simplCore/FloatOut.lhs                    |    8 +-
 compiler/simplCore/LiberateCase.lhs                |    2 +-
 compiler/simplCore/OccurAnal.lhs                   |  326 +-
 compiler/simplCore/SetLevels.lhs                   |   30 +-
 compiler/simplCore/SimplCore.lhs                   |   72 +-
 compiler/simplCore/SimplEnv.lhs                    |   16 +-
 compiler/simplCore/SimplMonad.lhs                  |   10 +-
 compiler/simplCore/SimplUtils.lhs                  |  133 +-
 compiler/simplCore/Simplify.lhs                    |  178 +-
 compiler/specialise/SpecConstr.lhs                 |  429 +-
 compiler/specialise/Specialise.lhs                 |  398 +-
 compiler/stgSyn/CoreToStg.lhs                      |   51 +-
 compiler/stgSyn/StgLint.lhs                        |    2 +-
 compiler/stgSyn/StgSyn.lhs                         |   14 +-
 compiler/stranal/DmdAnal.lhs                       | 1108 +++--
 compiler/stranal/WorkWrap.lhs                      |   58 +-
 compiler/stranal/WwLib.lhs                         |  352 +-
 compiler/typecheck/FamInst.lhs                     |  141 +-
 compiler/typecheck/Inst.lhs                        |  114 +-
 compiler/typecheck/TcArrows.lhs                    |  273 +-
 compiler/typecheck/TcBinds.lhs                     |   73 +-
 compiler/typecheck/TcCanonical.lhs                 |  255 +-
 compiler/typecheck/TcDeriv.lhs                     |  338 +-
 compiler/typecheck/TcEnv.lhs                       |    2 +-
 compiler/typecheck/TcErrors.lhs                    |  229 +-
 compiler/typecheck/TcEvidence.lhs                  |   33 +-
 compiler/typecheck/TcExpr.lhs                      |  182 +-
 compiler/typecheck/TcForeign.lhs                   |   23 +-
 compiler/typecheck/TcGenDeriv.lhs                  |  422 +-
 compiler/typecheck/TcGenGenerics.lhs               |   78 +-
 compiler/typecheck/TcHsSyn.lhs                     |  702 ++--
 compiler/typecheck/TcHsType.lhs                    |  119 +-
 compiler/typecheck/TcInstDcls.lhs                  |  297 +-
 compiler/typecheck/TcInteract.lhs                  |  124 +-
 compiler/typecheck/TcMType.lhs                     | 1463 +++++--
 compiler/typecheck/TcMatches.lhs                   |   14 +-
 compiler/typecheck/TcPat.lhs                       |  101 +-
 compiler/typecheck/TcRnDriver.lhs                  |  133 +-
 compiler/typecheck/TcRnMonad.lhs                   |   10 +-
 compiler/typecheck/TcRnTypes.lhs                   |   82 +-
 compiler/typecheck/TcRules.lhs                     |   18 +-
 compiler/typecheck/TcSMonad.lhs                    |   48 +-
 compiler/typecheck/TcSimplify.lhs                  |  361 +-
 compiler/typecheck/TcSplice.lhs                    |   86 +-
 compiler/typecheck/TcTyClsDecls.lhs                |  864 ++--
 compiler/typecheck/TcTyDecls.lhs                   |  106 +-
 compiler/typecheck/TcType.lhs                      |  188 +-
 compiler/typecheck/TcUnify.lhs                     |   13 +-
 compiler/typecheck/TcValidity.lhs                  | 1254 ------
 compiler/types/Class.lhs                           |   20 +-
 compiler/types/CoAxiom.lhs                         |  101 +-
 compiler/types/Coercion.lhs                        |  228 +-
 compiler/types/FamInstEnv.lhs                      |  510 ++-
 compiler/types/FunDeps.lhs                         |  157 +-
 compiler/types/InstEnv.lhs                         |  151 +-
 compiler/types/Kind.lhs                            |    9 +-
 compiler/types/OptCoercion.lhs                     |   92 +-
 compiler/types/TyCon.lhs                           |  127 +-
 compiler/types/Type.lhs                            |  488 ++-
 compiler/types/TypeRep.lhs                         |  167 +-
 compiler/types/Unify.lhs                           |   18 +-
 compiler/utils/Exception.hs                        |   29 +-
 compiler/utils/FastMutInt.lhs                      |   16 +-
 compiler/utils/FastString.lhs                      |    2 +
 compiler/utils/Fingerprint.hsc                     |    1 -
 compiler/utils/IOEnv.hs                            |   20 +
 compiler/utils/ListSetOps.lhs                      |   18 -
 compiler/utils/Maybes.lhs                          |   11 +-
 compiler/utils/MonadUtils.hs                       |   32 +-
 compiler/utils/OrdList.lhs                         |    9 +-
 compiler/utils/Outputable.lhs                      |   21 +-
 compiler/utils/Panic.lhs                           |    7 +-
 compiler/utils/Platform.hs                         |   29 +-
 compiler/utils/Stream.hs                           |    4 +-
 compiler/utils/UniqSet.lhs                         |   14 +-
 compiler/utils/Util.lhs                            |    9 +-
 compiler/vectorise/Vectorise.hs                    |  397 +-
 compiler/vectorise/Vectorise/Builtins/Base.hs      |    3 +-
 .../vectorise/Vectorise/Builtins/Initialise.hs     |    8 +-
 compiler/vectorise/Vectorise/Convert.hs            |   22 +-
 compiler/vectorise/Vectorise/Env.hs                |  121 +-
 compiler/vectorise/Vectorise/Exp.hs                | 1241 +++---
 compiler/vectorise/Vectorise/Generic/PAMethods.hs  |    4 +-
 compiler/vectorise/Vectorise/Generic/PData.hs      |   25 +-
 compiler/vectorise/Vectorise/Monad.hs              |   29 +-
 compiler/vectorise/Vectorise/Monad/Global.hs       |   73 +-
 compiler/vectorise/Vectorise/Monad/InstEnv.hs      |   13 +-
 compiler/vectorise/Vectorise/Monad/Local.hs        |  117 +-
 compiler/vectorise/Vectorise/Type/Classify.hs      |   51 +-
 compiler/vectorise/Vectorise/Type/Env.hs           |  220 +-
 compiler/vectorise/Vectorise/Type/TyConDecl.hs     |    5 +-
 compiler/vectorise/Vectorise/Type/Type.hs          |   13 +-
 compiler/vectorise/Vectorise/Utils.hs              |   25 +-
 configure.ac                                       |  198 +-
 distrib/compare/FilenameDescr.hs                   |   17 +-
 distrib/compare/Utils.hs                           |    6 +-
 distrib/compare/compare.hs                         |   66 +-
 distrib/configure.ac.in                            |   11 +-
 distrib/ghc.iss.in                                 |   97 +
 distrib/mkDocs/mkDocs                              |   27 +-
 distrib/windows-installer-licences.txt             |  704 ++++
 docs/comm/rts-libs/prelude.html                    |    4 +-
 docs/comm/the-beast/data-types.html                |    4 +-
 docs/core-spec/Makefile                            |    2 +-
 docs/storage-mgt/rp.tex                            |    2 +-
 docs/users_guide/7.6.1-notes.xml                   |  427 ++
 docs/users_guide/7.8.1-notes.xml                   |   33 -
 docs/users_guide/extending_ghc.xml                 |   30 +-
 docs/users_guide/external_core.xml                 |    5 +-
 docs/users_guide/flags.xml                         |   53 +-
 docs/users_guide/ghc.mk                            |    4 +-
 docs/users_guide/ghci.xml                          |   35 +-
 docs/users_guide/glasgow_exts.xml                  |  727 ++--
 docs/users_guide/intro.xml                         |   57 +-
 docs/users_guide/packages.xml                      |    4 +-
 docs/users_guide/parallel.xml                      |    2 +-
 docs/users_guide/phases.xml                        |   15 -
 docs/users_guide/profiling.xml                     |  172 +-
 docs/users_guide/safe_haskell.xml                  |    4 +-
 docs/users_guide/sooner.xml                        |   11 +-
 docs/users_guide/ug-book.xml.in                    |    2 +-
 docs/users_guide/ug-ent.xml.in                     |    2 +-
 docs/users_guide/using.xml                         |   76 +-
 driver/ghc/ghc.mk                                  |    4 +-
 driver/ghci/ghc.mk                                 |   12 +-
 driver/haddock/ghc.mk                              |    4 +-
 driver/split/ghc.mk                                |    5 +-
 driver/utils/dynwrapper.c                          |  197 -
 ghc.mk                                             |  568 +--
 ghc/GhciMonad.hs                                   |   27 +-
 ghc/InteractiveUI.hs                               |   30 +-
 ghc/Main.hs                                        |   68 +-
 ghc/ghc.mk                                         |   42 +-
 includes/Cmm.h                                     |   59 +-
 includes/CodeGen.Platform.hs                       |   27 -
 includes/HsFFI.h                                   |    4 -
 includes/Rts.h                                     |    3 +-
 includes/ghc.mk                                    |   12 +-
 includes/rts/GetTime.h                             |   19 -
 includes/rts/Globals.h                             |    2 -
 includes/rts/PrimFloat.h                           |    2 -
 includes/rts/Stable.h                              |   15 +-
 includes/rts/Ticky.h                               |    4 +-
 includes/rts/Utils.h                               |    6 +-
 includes/rts/prof/CCS.h                            |    2 +-
 includes/rts/storage/ClosureMacros.h               |    4 +
 includes/rts/storage/Closures.h                    |    2 +-
 includes/rts/storage/FunTypes.h                    |   35 +-
 includes/rts/storage/GC.h                          |    2 +-
 includes/rts/storage/SMPClosureOps.h               |    4 +-
 includes/rts/storage/TSO.h                         |    3 +-
 includes/stg/HaskellMachRegs.h                     |    2 +-
 includes/stg/MachRegs.h                            |   39 +-
 includes/stg/MiscClosures.h                        |    5 -
 includes/stg/Regs.h                                |   42 -
 includes/stg/RtsMachRegs.h                         |    2 +-
 includes/stg/Ticky.h                               |   51 +-
 includes/stg/Types.h                               |    2 -
 libffi/ghc.mk                                      |    8 +-
 libraries/Cabal                                    |    2 +-
 libraries/Win32                                    |    2 +-
 .../Distribution/InstalledPackageInfo/Binary.hs    |    8 +-
 libraries/bin-package-db/bin-package-db.cabal      |   11 +-
 libraries/binary                                   |    2 +-
 libraries/bytestring                               |    2 +-
 libraries/containers                               |    2 +-
 libraries/gen_contents_index                       |   24 +-
 libraries/haskeline                                |    2 +-
 libraries/pretty                                   |    2 +-
 libraries/random                                   |    1 -
 libraries/terminfo                                 |    2 +-
 libraries/time                                     |    2 +-
 libraries/vector                                   |    2 +-
 mk/build.mk.sample                                 |   61 +-
 mk/config.mk.in                                    |  279 +-
 mk/custom-settings.mk                              |    2 +-
 mk/project.mk.in                                   |   18 +-
 mk/tree.mk                                         |   19 +
 mk/validate-settings.mk                            |   17 +-
 mk/ways.mk                                         |    6 +-
 packages                                           |   89 +-
 rts/Adjustor.c                                     |    6 +-
 rts/AutoApply.h                                    |    6 +-
 rts/Capability.c                                   |    4 +-
 rts/Disassembler.c                                 |    4 +-
 rts/Exception.cmm                                  |   10 +-
 rts/FrontPanel.c                                   |  796 ++++
 rts/FrontPanel.h                                   |   39 +
 rts/GetTime.h                                      |    1 +
 rts/Globals.c                                      |   14 -
 rts/Hash.c                                         |    5 -
 rts/Hash.h                                         |    3 +-
 rts/HsFFI.c                                        |   18 -
 rts/Interpreter.c                                  |    4 +-
 rts/LdvProfile.c                                   |    2 +-
 rts/Linker.c                                       |  103 +-
 rts/Messages.c                                     |    6 +-
 rts/Prelude.h                                      |    2 -
 rts/PrimOps.cmm                                    |   20 +-
 rts/ProfHeap.c                                     |    5 +-
 rts/RaiseAsync.c                                   |    6 +-
 rts/RetainerProfile.c                              |    2 +-
 rts/RtsAPI.c                                       |   11 +-
 rts/RtsFlags.c                                     |   13 +
 rts/RtsStartup.c                                   |   21 +-
 rts/RtsUtils.c                                     |   22 +-
 rts/RtsUtils.h                                     |    3 +
 rts/STM.c                                          |   25 +-
 rts/Schedule.c                                     |   59 +-
 rts/Schedule.h                                     |   27 +-
 rts/Stable.c                                       |  624 ++-
 rts/Stable.h                                       |   29 +-
 rts/Stats.c                                        |   71 +-
 rts/Stats.h                                        |   12 +-
 rts/StgCRun.c                                      |   47 +-
 rts/StgMiscClosures.cmm                            |   12 -
 rts/StgPrimFloat.c                                 |   23 +
 rts/StgPrimFloat.h                                 |    5 +-
 rts/Task.c                                         |    9 +
 rts/Task.h                                         |    6 +
 rts/Threads.c                                      |    4 +-
 rts/Ticky.c                                        |  128 +-
 rts/Updates.h                                      |    4 +-
 rts/VisCallbacks.c                                 |   75 +
 rts/VisCallbacks.h                                 |   30 +
 rts/VisSupport.c                                   |  144 +
 rts/VisSupport.h                                   |   44 +
 rts/VisWindow.c                                    |  747 ++++
 rts/VisWindow.h                                    |    5 +
 rts/ghc.mk                                         |  121 +-
 rts/package.conf.in                                |   11 +-
 rts/{Hash.c => parallel/0Hash.c}                   |  151 +-
 rts/parallel/0Parallel.h                           |  414 ++
 rts/parallel/0Unpack.c                             |  440 ++
 rts/parallel/Dist.c                                |  117 +
 rts/parallel/Dist.h                                |   20 +
 rts/parallel/FetchMe.h                             |   24 +
 rts/parallel/FetchMe.hc                            |  180 +
 rts/parallel/Global.c                              | 1090 +++++
 rts/parallel/GranSim.c                             | 3015 ++++++++++++++
 rts/parallel/GranSimRts.h                          |  268 ++
 rts/parallel/HLC.h                                 |   63 +
 rts/parallel/HLComms.c                             | 1810 +++++++++
 rts/parallel/LLC.h                                 |  130 +
 rts/parallel/LLComms.c                             |  489 +++
 rts/parallel/PEOpCodes.h                           |   58 +
 rts/parallel/Pack.c                                | 4293 ++++++++++++++++++++
 rts/parallel/ParInit.c                             |  322 ++
 rts/parallel/ParInit.h                             |   19 +
 rts/parallel/ParTicky.c                            |  450 ++
 rts/parallel/ParTicky.h                            |   60 +
 rts/parallel/ParTypes.h                            |   38 +
 rts/parallel/Parallel.c                            | 1140 ++++++
 rts/parallel/ParallelDebug.c                       | 1955 +++++++++
 rts/parallel/ParallelDebug.h                       |   79 +
 rts/parallel/ParallelRts.h                         |  253 ++
 rts/parallel/RBH.c                                 |  337 ++
 rts/parallel/SysMan.c                              |  650 +++
 rts/posix/Itimer.c                                 |   73 +-
 rts/posix/OSMem.c                                  |    2 +-
 rts/posix/OSThreads.c                              |    4 +-
 rts/sm/Compact.c                                   |    2 +-
 rts/sm/Evac.c                                      |   17 +-
 rts/sm/GC.c                                        |   85 +-
 rts/sm/GCAux.c                                     |    8 -
 rts/sm/GCTDecl.h                                   |    2 +-
 rts/sm/GCThread.h                                  |    5 +-
 rts/sm/GCUtils.c                                   |   73 +-
 rts/sm/Scav.c                                      |    2 +-
 rts/sm/Storage.c                                   |   41 +-
 rts/sm/Storage.h                                   |    4 +-
 rts/win32/AsyncIO.c                                |    6 +-
 rts/win32/AsyncIO.h                                |    2 +-
 rts/win32/IOManager.c                              |   42 +-
 rts/win32/IOManager.h                              |    4 +-
 rts/win32/ThrIOManager.c                           |   10 +-
 rts/win32/libHSbase.def                            |    1 -
 rules/add-dependency.mk                            |   15 -
 rules/build-dependencies.mk                        |   33 +-
 rules/build-package-data.mk                        |   35 +-
 rules/build-package-way.mk                         |   75 +-
 rules/build-package.mk                             |   23 +-
 rules/build-perl.mk                                |   35 +-
 rules/build-prog.mk                                |  171 +-
 rules/c-sources.mk                                 |    5 +-
 rules/c-suffix-rules.mk                            |   15 +-
 rules/cmm-suffix-rules.mk                          |   16 +-
 rules/distdir-opts.mk                              |  114 -
 rules/distdir-way-opts.mk                          |  117 +-
 rules/extra-packages.mk                            |   48 +
 rules/foreachLibrary.mk                            |   43 -
 rules/haddock.mk                                   |    9 +-
 rules/hi-rule.mk                                   |   54 +-
 rules/hs-suffix-rules-srcdir.mk                    |   75 +-
 rules/hs-suffix-rules.mk                           |   35 +
 rules/hs-suffix-way-rules-srcdir.mk                |   88 -
 rules/hs-suffix-way-rules.mk                       |   54 -
 rules/library-path.mk                              |    6 +-
 rules/manual-package-config.mk                     |    4 +-
 rules/package-config.mk                            |    4 +-
 rules/pretty_commands.mk                           |    2 +-
 rules/shell-wrapper.mk                             |   10 +-
 settings.in                                        |    3 -
 sync-all                                           |  429 +-
 utils/Makefile                                     |  119 +
 utils/compare_sizes/ghc.mk                         |    2 +-
 utils/count_lines/ghc.mk                           |    2 +-
 utils/deriveConstants/DeriveConstants.hs           |   10 -
 utils/deriveConstants/ghc.mk                       |    2 +-
 utils/dll-split/Main.hs                            |   85 -
 utils/dll-split/dll-split.cabal                    |   21 -
 utils/dll-split/ghc.mk                             |   18 -
 utils/genapply/GenApply.hs                         |   68 +-
 utils/genapply/ghc.mk                              |    2 +-
 utils/genprimopcode/Main.hs                        |   35 +-
 utils/genprimopcode/ghc.mk                         |    2 +-
 utils/ghc-cabal/Main.hs                            |  122 +-
 utils/ghc-cabal/ghc.mk                             |   41 +-
 utils/ghc-pkg/Main.hs                              |   35 +-
 utils/ghc-pkg/ghc-pkg.cabal                        |    2 +-
 utils/ghc-pkg/ghc.mk                               |  119 +-
 utils/ghc-pwd/ghc.mk                               |    2 +-
 utils/ghctags/Main.hs                              |   11 +-
 utils/ghctags/ghc.mk                               |    2 +-
 utils/hp2ps/ghc.mk                                 |    2 +-
 utils/hpc/ghc.mk                                   |    2 +-
 utils/lndir/Makefile                               |   17 +
 utils/ltx/Makefile                                 |   12 +
 utils/ltx/ltx.prl                                  |  229 ++
 utils/mkUserGuidePart/ghc.mk                       |    2 +-
 utils/parallel/AVG.pl                              |  108 +
 utils/parallel/GrAnSim.el                          |  432 ++
 utils/parallel/Makefile                            |   53 +
 utils/parallel/RTS2gran.pl                         |  684 ++++
 utils/parallel/SN.pl                               |  280 ++
 utils/parallel/SPLIT.pl                            |  379 ++
 utils/parallel/avg-RTS.pl                          |   15 +
 utils/parallel/get_SN.pl                           |   40 +
 utils/parallel/ghc-fool-sort.pl                    |   23 +
 utils/parallel/ghc-unfool-sort.pl                  |   16 +
 utils/parallel/gp-ext-imp.pl                       |   86 +
 utils/parallel/gr2RTS.pl                           |  138 +
 utils/parallel/gr2ap.bash                          |  124 +
 utils/parallel/gr2gran.bash                        |  113 +
 utils/parallel/gr2java.pl                          |  322 ++
 utils/parallel/gr2jv.bash                          |  123 +
 utils/parallel/gr2pe.pl                            | 1434 +++++++
 utils/parallel/gr2ps.bash                          |  169 +
 utils/parallel/gr2qp.pl                            |  329 ++
 utils/parallel/gran-extr.pl                        | 2114 ++++++++++
 utils/parallel/grs2gr.pl                           |   48 +
 utils/parallel/par-aux.pl                          |   89 +
 utils/parallel/ps-scale-y.pl                       |  188 +
 utils/parallel/qp2ap.pl                            |  495 +++
 utils/parallel/qp2ps.pl                            |  988 +++++
 utils/parallel/sn_filter.pl                        |   92 +
 utils/parallel/stats.pl                            |  168 +
 utils/parallel/template.pl                         |  141 +
 utils/parallel/tf.pl                               |  148 +
 utils/runghc/ghc.mk                                |    6 +-
 utils/runghc/runghc.hs                             |    2 +-
 utils/stat2resid/Makefile                          |   41 +
 utils/stat2resid/parse-gcstats.prl                 |  232 ++
 utils/stat2resid/prefix.txt                        |   10 +
 utils/stat2resid/process-gcstats.prl               |   45 +
 utils/stat2resid/stat2resid.prl                    |   81 +
 utils/touchy/ghc.mk                                |    2 +-
 utils/unlit/ghc.mk                                 |    2 +-
 utils/verbatim/Makefile                            |   17 +
 utils/verbatim/verbatim.lex                        |   63 +
 validate                                           |    9 +-
 562 files changed, 47989 insertions(+), 22319 deletions(-)


Diff suppressed because of size. To see it, use:

    git show 68db35e99447938248f4be5682d7824423246a86



More information about the ghc-commits mailing list