Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/8659b63495636fb2fbdcda740dfe8b4fe1111198 >--------------------------------------------------------------- commit 8659b63495636fb2fbdcda740dfe8b4fe1111198 Merge: 66f4f61... 1857071... Author: Iavor S. Diatchki <[email protected]> Date: Sun Sep 2 18:38:29 2012 -0700 Merge branch 'type-nats' of ssh://darcs.haskell.org/srv/darcs/ghc into type-nats compiler/basicTypes/RdrName.lhs | 21 +- compiler/cmm/CmmParse.y | 1058 ++++++++++---------- compiler/codeGen/CodeGen/Platform.hs | 46 +- compiler/codeGen/CodeGen/Platform/ARM.hs | 2 - compiler/codeGen/CodeGen/Platform/NoRegs.hs | 2 - compiler/codeGen/CodeGen/Platform/PPC.hs | 2 - compiler/codeGen/CodeGen/Platform/PPC_Darwin.hs | 2 - compiler/codeGen/CodeGen/Platform/SPARC.hs | 2 - compiler/codeGen/CodeGen/Platform/X86.hs | 2 - compiler/codeGen/CodeGen/Platform/X86_64.hs | 2 - compiler/coreSyn/CorePrep.lhs | 46 +- compiler/coreSyn/CoreSyn.lhs | 8 + compiler/coreSyn/CoreUtils.lhs | 10 +- compiler/coreSyn/TrieMap.lhs | 112 ++- compiler/deSugar/DsBinds.lhs | 11 +- compiler/ghc.cabal.in | 1 - compiler/ghci/Linker.lhs | 67 +- compiler/hsSyn/HsDecls.lhs | 5 +- compiler/iface/MkIface.lhs | 7 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 59 +- compiler/main/DriverPhases.hs | 41 +- compiler/main/DriverPipeline.hs | 20 +- compiler/main/GHC.hs | 6 + compiler/main/HscMain.hs | 38 +- compiler/main/HscTypes.lhs | 3 +- compiler/main/TidyPgm.lhs | 23 +- compiler/nativeGen/AsmCodeGen.lhs | 8 +- compiler/nativeGen/PPC/CodeGen.hs | 46 +- compiler/nativeGen/PPC/Instr.hs | 23 +- compiler/nativeGen/PPC/Regs.hs | 328 +------ compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 16 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 2 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 33 +- compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs | 5 +- .../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs | 25 +- compiler/nativeGen/SPARC/CodeGen.hs | 10 +- compiler/nativeGen/SPARC/CodeGen/Base.hs | 11 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 7 +- compiler/nativeGen/SPARC/Imm.hs | 4 +- compiler/nativeGen/SPARC/Instr.hs | 15 +- compiler/nativeGen/SPARC/RegPlate.hs | 318 ------ compiler/nativeGen/SPARC/Regs.hs | 130 +--- compiler/nativeGen/X86/CodeGen.hs | 157 ++-- compiler/nativeGen/X86/Instr.hs | 24 +- compiler/nativeGen/X86/Regs.hs | 216 +---- compiler/prelude/primops.txt.pp | 2 +- compiler/rename/RnEnv.lhs | 23 +- compiler/rename/RnNames.lhs | 196 +++-- compiler/specialise/Rules.lhs | 7 +- compiler/specialise/SpecConstr.lhs | 6 +- compiler/specialise/Specialise.lhs | 12 +- compiler/typecheck/TcBinds.lhs | 57 +- compiler/typecheck/TcCanonical.lhs | 12 +- compiler/typecheck/TcEvidence.lhs | 42 +- compiler/typecheck/TcMType.lhs | 34 +- compiler/typecheck/TcSimplify.lhs | 46 +- compiler/typecheck/TcTyClsDecls.lhs | 7 +- compiler/utils/Util.lhs | 17 +- docs/users_guide/using.xml | 17 +- ghc/InteractiveUI.hs | 54 +- includes/CodeGen.Platform.hs | 585 +++++++++++- includes/rts/storage/ClosureMacros.h | 60 +- mk/config.mk.in | 10 - rts/Interpreter.c | 2 +- rts/Printer.c | 2 +- rts/RaiseAsync.c | 2 +- rts/posix/OSThreads.c | 6 +- rts/sm/Compact.c | 6 +- rts/sm/Evac.c | 6 +- rts/sm/MarkWeak.c | 4 +- rts/sm/Sanity.c | 8 +- utils/ghc-cabal/Main.hs | 3 +- utils/ghc-cabal/ghc-cabal.cabal | 1 + 73 files changed, 2064 insertions(+), 2137 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
