Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/234fd081886a6d36ed62d577ad2796f6587b7632 >--------------------------------------------------------------- commit 234fd081886a6d36ed62d577ad2796f6587b7632 Merge: 3f99654... fb50847... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Thu Nov 15 09:13:12 2012 +0000 Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc aclocal.m4 | 172 +--- compiler/basicTypes/DataCon.lhs | 2 +- compiler/basicTypes/Id.lhs | 271 +++--- compiler/basicTypes/MkId.lhs | 2 +- compiler/basicTypes/Module.lhs | 8 + compiler/basicTypes/Name.lhs | 227 ++--- compiler/cmm/Cmm.hs | 39 +- compiler/cmm/CmmCallConv.hs | 6 +- compiler/cmm/CmmContFlowOpt.hs | 45 +- compiler/cmm/CmmCvt.hs | 117 --- compiler/cmm/CmmInfo.hs | 32 +- compiler/cmm/CmmNode.hs | 14 +- compiler/cmm/CmmOpt.hs | 8 +- compiler/cmm/CmmParse.y | 8 +- compiler/cmm/CmmPipeline.hs | 12 + compiler/cmm/CmmProcPoint.hs | 5 +- compiler/cmm/CmmUtils.hs | 14 +- compiler/cmm/MkGraph.hs | 40 +- compiler/cmm/OldCmm.hs | 279 ----- compiler/cmm/OldCmmLint.hs | 212 ---- compiler/cmm/OldCmmUtils.hs | 100 -- compiler/cmm/OldPprCmm.hs | 224 ---- compiler/cmm/PprC.hs | 137 ++-- compiler/cmm/PprCmmExpr.hs | 1 - compiler/codeGen/CgUtils.hs | 87 +-- compiler/codeGen/StgCmmBind.hs | 21 +- compiler/codeGen/StgCmmExpr.hs | 4 +- compiler/codeGen/StgCmmForeign.hs | 8 +- compiler/codeGen/StgCmmHeap.hs | 12 +- compiler/codeGen/StgCmmLayout.hs | 2 +- compiler/codeGen/StgCmmPrim.hs | 152 ++-- compiler/deSugar/DsExpr.lhs | 3 +- compiler/deSugar/DsForeign.lhs | 11 +- compiler/deSugar/DsGRHSs.lhs | 3 +- compiler/deSugar/DsMonad.lhs | 7 +- compiler/deSugar/DsUtils.lhs | 3 +- compiler/ghc.cabal.in | 5 - compiler/ghc.mk | 10 + compiler/ghci/RtClosureInspect.hs | 39 +- compiler/llvmGen/LlvmCodeGen.hs | 17 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 2 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 201 ++-- compiler/llvmGen/LlvmCodeGen/Data.hs | 2 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 2 +- compiler/main/CodeOutput.lhs | 4 +- compiler/main/DriverMkDepend.hs | 44 +- compiler/main/DynFlags.hs | 21 +- compiler/main/HscMain.hs | 16 +- compiler/main/InteractiveEval.hs | 10 +- compiler/nativeGen/AsmCodeGen.lhs | 73 +- compiler/nativeGen/Instruction.hs | 13 +- compiler/nativeGen/NCGMonad.hs | 105 +- compiler/nativeGen/PIC.hs | 2 +- compiler/nativeGen/PPC/CodeGen.hs | 72 +- compiler/nativeGen/PPC/Instr.hs | 2 +- compiler/nativeGen/PPC/Ppr.hs | 2 +- compiler/nativeGen/PPC/RegInfo.hs | 2 +- compiler/nativeGen/PPC/Regs.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/ArchBase.hs | 196 ++-- compiler/nativeGen/RegAlloc/Graph/ArchX86.hs | 188 ++-- compiler/nativeGen/RegAlloc/Graph/Coalesce.hs | 110 ++- compiler/nativeGen/RegAlloc/Graph/Main.hs | 236 +++-- compiler/nativeGen/RegAlloc/Graph/Spill.hs | 191 ++-- compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 802 ++++++++-------- compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 363 ++++---- compiler/nativeGen/RegAlloc/Graph/Stats.hs | 128 ++- compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 12 + compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 22 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 1 - compiler/nativeGen/RegAlloc/Linear/Main.hs | 18 +- compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs | 15 +- .../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs | 233 +++--- compiler/nativeGen/RegAlloc/Linear/StackMap.hs | 37 +- compiler/nativeGen/RegAlloc/Linear/Stats.hs | 111 +-- compiler/nativeGen/RegAlloc/Liveness.hs | 13 +- compiler/nativeGen/SPARC/CodeGen.hs | 73 +- compiler/nativeGen/SPARC/CodeGen/Amode.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Base.hs | 3 +- compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Expand.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Sanity.hs | 4 +- compiler/nativeGen/SPARC/Imm.hs | 2 +- compiler/nativeGen/SPARC/Instr.hs | 2 +- compiler/nativeGen/SPARC/Ppr.hs | 4 +- compiler/nativeGen/SPARC/ShortcutJump.hs | 2 +- compiler/nativeGen/Size.hs | 2 +- compiler/nativeGen/TargetReg.hs | 15 + compiler/nativeGen/X86/CodeGen.hs | 220 +++-- compiler/nativeGen/X86/Instr.hs | 2 +- compiler/nativeGen/X86/Ppr.hs | 2 +- compiler/nativeGen/X86/Regs.hs | 2 +- compiler/parser/Parser.y.pp | 1 + compiler/prelude/primops.txt.pp | 40 - compiler/rename/RnBinds.lhs | 1 + compiler/rename/RnEnv.lhs | 2 +- compiler/rename/RnExpr.lhs | 1 + compiler/simplCore/CoreMonad.lhs | 8 +- compiler/specialise/SpecConstr.lhs | 1065 ++++++++++---------- compiler/typecheck/TcBinds.lhs | 1 + compiler/typecheck/TcEnv.lhs | 38 +- compiler/typecheck/TcInteract.lhs | 67 +- compiler/typecheck/TcRnMonad.lhs | 3 - compiler/typecheck/TcRnTypes.lhs | 587 ++++++------ compiler/typecheck/TcSMonad.lhs | 66 +- compiler/typecheck/TcTyClsDecls.lhs | 1 + compiler/types/TyCon.lhs | 68 +- compiler/utils/IOEnv.hs | 5 + compiler/utils/Maybes.lhs | 9 - compiler/utils/Platform.hs | 3 + compiler/utils/UniqFM.lhs | 2 +- compiler/vectorise/Vectorise/Generic/PADict.hs | 4 +- compiler/vectorise/Vectorise/Monad/Naming.hs | 5 +- configure.ac | 32 +- distrib/configure.ac.in | 1 - docs/users_guide/flags.xml | 6 + docs/users_guide/ghci.xml | 15 +- docs/users_guide/glasgow_exts.xml | 13 +- docs/users_guide/safe_haskell.xml | 52 + ghc.mk | 9 +- ghc/ghc.mk | 2 +- includes/Rts.h | 6 + includes/ghc.mk | 83 +- includes/mkDerivedConstants.c | 814 --------------- includes/mkDerivedConstants.cross.awk | 350 ------- includes/mkSizeMacros.cross.awk | 82 -- includes/rts/storage/Block.h | 2 +- includes/rts/storage/Closures.h | 2 - mk/config.mk.in | 9 +- rts/Exception.cmm | 17 +- rts/HeapStackCheck.cmm | 6 +- rts/PrimOps.cmm | 21 +- rts/STM.c | 15 - rts/STM.h | 8 - rts/StgCRun.c | 2 +- rts/StgMiscClosures.cmm | 2 +- rts/StgStartup.cmm | 9 +- rts/Updates.cmm | 18 +- rts/ghc.mk | 2 +- rts/sm/GC.c | 8 +- rts/sm/Sanity.c | 13 +- rules/build-dependencies.mk | 12 +- rules/build-package-way.mk | 4 +- rules/build-prog.mk | 25 +- rules/distdir-way-opts.mk | 12 + utils/deriveConstants/DeriveConstants.hs | 870 ++++++++++++++++ {driver/split => utils/deriveConstants}/Makefile | 4 +- {driver/split => utils/deriveConstants}/ghc.mk | 12 +- utils/ghc-pkg/Main.hs | 2 +- 151 files changed, 4686 insertions(+), 5786 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
