[commit: ghc] simd: Merge remote-tracking branch 'origin/master' into simd (92b7e3d)
Geoffrey Mainland
gmainlan at microsoft.com
Wed Apr 18 20:10:24 CEST 2012
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : simd
http://hackage.haskell.org/trac/ghc/changeset/92b7e3d6271d8be007a7f71a197c8532a392c767
>---------------------------------------------------------------
commit 92b7e3d6271d8be007a7f71a197c8532a392c767
Merge: bf25557... 270b7ce...
Author: Geoffrey Mainland <gmainlan at microsoft.com>
Date: Mon Apr 2 13:07:50 2012 +0100
Merge remote-tracking branch 'origin/master' into simd
Conflicts:
compiler/prelude/PrelNames.lhs
compiler/prelude/TysPrim.lhs
compiler/types/TyCon.lhs
utils/genapply/GenApply.hs
.authorspellings | 29 -
.darcs-boring | 256 ---
README | 11 +-
aclocal.m4 | 45 +-
compiler/basicTypes/DataCon.lhs | 15 +-
compiler/basicTypes/MkId.lhs | 37 +-
compiler/basicTypes/Name.lhs | 5 +-
compiler/basicTypes/OccName.lhs | 8 +-
compiler/basicTypes/RdrName.lhs | 40 +-
compiler/basicTypes/Var.lhs | 37 +-
compiler/cmm/Cmm.hs | 10 +-
compiler/cmm/CmmBuildInfoTables.hs | 6 +-
compiler/cmm/CmmCvt.hs | 2 +-
compiler/cmm/CmmExpr.hs | 4 +
compiler/cmm/CmmLint.hs | 12 +-
compiler/cmm/CmmMachOp.hs | 6 +
compiler/cmm/CmmOpt.hs | 5 +-
compiler/cmm/CmmParse.y | 6 +-
compiler/cmm/CmmPipeline.hs | 4 +-
compiler/cmm/CmmStackLayout.hs | 6 +-
compiler/cmm/CmmType.hs | 6 +
compiler/cmm/MkGraph.hs | 2 +-
compiler/cmm/OldCmm.hs | 9 +-
compiler/cmm/OldCmmUtils.hs | 1 +
compiler/cmm/OldPprCmm.hs | 2 +-
compiler/cmm/PprC.hs | 32 +-
compiler/codeGen/CgClosure.lhs | 2 +-
compiler/codeGen/CgForeignCall.hs | 4 +-
compiler/codeGen/CgPrimOp.hs | 117 ++-
compiler/codeGen/CgUtils.hs | 3 +-
compiler/codeGen/ClosureInfo.lhs | 8 +
compiler/codeGen/StgCmmClosure.hs | 7 +
compiler/codeGen/StgCmmForeign.hs | 4 +-
compiler/coreSyn/CoreFVs.lhs | 16 +-
compiler/coreSyn/CoreLint.lhs | 493 ++---
compiler/coreSyn/CorePrep.lhs | 14 +-
compiler/coreSyn/CoreSyn.lhs | 4 +-
compiler/coreSyn/CoreUnfold.lhs | 83 +-
compiler/coreSyn/CoreUtils.lhs | 95 +-
compiler/coreSyn/MkCore.lhs | 20 +-
compiler/coreSyn/MkExternalCore.lhs | 15 +-
compiler/coreSyn/PprCore.lhs | 8 +-
compiler/coreSyn/TrieMap.lhs | 38 +-
compiler/deSugar/Desugar.lhs | 6 +-
compiler/deSugar/DsBinds.lhs | 124 +-
compiler/deSugar/DsCCall.lhs | 2 +-
compiler/deSugar/DsExpr.lhs | 8 +-
compiler/deSugar/DsForeign.lhs | 81 +-
compiler/deSugar/DsMeta.hs | 387 ++--
compiler/deSugar/DsMonad.lhs | 5 +-
compiler/deSugar/Match.lhs | 2 +-
compiler/deSugar/MatchCon.lhs | 15 +-
compiler/ghc.cabal.in | 38 +-
compiler/ghc.mk | 10 +-
compiler/ghci/ByteCodeGen.lhs | 4 +-
compiler/ghci/ByteCodeItbls.lhs | 7 +
compiler/ghci/Linker.lhs | 563 +++---
compiler/ghci/ObjLink.lhs | 39 +-
compiler/hsSyn/Convert.lhs | 150 +-
compiler/hsSyn/HsBinds.lhs | 8 +-
compiler/hsSyn/HsDecls.lhs | 403 ++--
compiler/hsSyn/HsExpr.lhs | 11 +-
compiler/hsSyn/HsImpExp.lhs | 19 +-
compiler/hsSyn/HsPat.lhs | 9 +-
compiler/hsSyn/HsSyn.lhs | 3 +-
compiler/hsSyn/HsTypes.lhs | 128 +-
compiler/hsSyn/HsUtils.lhs | 63 +-
compiler/iface/BinIface.hs | 117 +-
compiler/iface/BuildTyCl.lhs | 13 +-
compiler/iface/FlagChecker.hs | 46 +-
compiler/iface/IfaceSyn.lhs | 15 +-
compiler/iface/IfaceType.lhs | 139 +-
compiler/iface/LoadIface.lhs | 2 +-
compiler/iface/MkIface.lhs | 161 +-
compiler/iface/TcIface.lhs | 91 +-
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 31 +-
compiler/main/{Annotations.lhs => Annotations.hs} | 57 +-
compiler/main/CodeOutput.lhs | 3 +-
compiler/main/DriverPipeline.hs | 76 +-
compiler/main/DynFlags.hs | 74 +-
compiler/main/ErrUtils.lhs | 8 +-
compiler/main/GHC.hs | 72 +-
compiler/main/GhcMake.hs | 1257 ++++++------
compiler/main/HscMain.hs | 91 +-
compiler/main/HscStats.hs | 159 ++
compiler/main/HscStats.lhs | 12 +-
compiler/main/HscTypes.lhs | 13 +-
compiler/main/InteractiveEval.hs | 23 +-
compiler/main/PackageConfig.hs | 48 +-
compiler/main/Packages.lhs | 265 ++--
compiler/main/SysTools.lhs | 3 +-
compiler/main/TidyPgm.lhs | 66 +-
compiler/nativeGen/AsmCodeGen.lhs | 565 +++---
compiler/nativeGen/PPC/CodeGen.hs | 23 +-
compiler/nativeGen/PPC/Ppr.hs | 467 +++---
compiler/nativeGen/SPARC/CodeGen.hs | 478 ++++-
compiler/nativeGen/SPARC/CodeGen/CCall.hs | 343 ----
compiler/nativeGen/X86/CodeGen.hs | 386 +++-
compiler/nativeGen/X86/Instr.hs | 3 +
compiler/nativeGen/X86/Ppr.hs | 1 +
compiler/nativeGen/X86/Regs.hs | 38 +-
compiler/parser/Lexer.x | 18 +-
compiler/parser/Parser.y.pp | 127 +-
compiler/parser/ParserCore.y | 28 +-
compiler/parser/RdrHsSyn.lhs | 291 ++--
compiler/prelude/ForeignCall.lhs | 56 +-
compiler/prelude/PrelNames.lhs | 74 +-
compiler/prelude/TysPrim.lhs | 95 +-
compiler/prelude/TysWiredIn.lhs | 42 +-
compiler/prelude/primops.txt.pp | 17 +
compiler/rename/RnBinds.lhs | 42 +-
compiler/rename/RnEnv.lhs | 150 +-
compiler/rename/RnExpr.lhs | 9 +-
compiler/rename/RnHsSyn.lhs | 159 --
compiler/rename/RnNames.lhs | 93 +-
compiler/rename/RnPat.lhs | 29 +-
compiler/rename/RnSource.lhs | 482 +++---
compiler/rename/RnTypes.lhs | 448 +++--
compiler/simplCore/CoreMonad.lhs | 11 +-
compiler/simplCore/OccurAnal.lhs | 111 +-
compiler/simplCore/SetLevels.lhs | 41 +-
compiler/simplCore/SimplUtils.lhs | 102 +-
compiler/simplCore/Simplify.lhs | 22 +-
compiler/specialise/Specialise.lhs | 23 +-
compiler/stgSyn/CoreToStg.lhs | 2 +-
compiler/stgSyn/StgLint.lhs | 37 +-
compiler/typecheck/FamInst.lhs | 86 +-
compiler/typecheck/Inst.lhs | 5 +-
compiler/typecheck/TcArrows.lhs | 4 +-
compiler/typecheck/TcBinds.lhs | 386 ++---
compiler/typecheck/TcCanonical.lhs | 451 +++--
compiler/typecheck/TcClassDcl.lhs | 74 +-
compiler/typecheck/TcDeriv.lhs | 110 +-
compiler/typecheck/TcEnv.lhs | 138 +-
compiler/typecheck/TcErrors.lhs | 244 ++-
compiler/typecheck/TcEvidence.lhs | 54 +-
compiler/typecheck/TcExpr.lhs | 59 +-
compiler/typecheck/TcForeign.lhs | 75 +-
compiler/typecheck/TcGenDeriv.lhs | 4 +-
compiler/typecheck/TcGenGenerics.lhs | 2 +-
compiler/typecheck/TcHsSyn.lhs | 42 +-
compiler/typecheck/TcHsType.lhs | 1388 +++++++-------
compiler/typecheck/TcInstDcls.lhs | 204 +-
compiler/typecheck/TcInteract.lhs | 28 +-
compiler/typecheck/TcMType.lhs | 289 ++--
compiler/typecheck/TcPat.lhs | 39 +-
compiler/typecheck/TcRnDriver.lhs | 14 +-
compiler/typecheck/TcRnMonad.lhs | 25 +-
compiler/typecheck/TcRnTypes.lhs | 15 +-
compiler/typecheck/TcRules.lhs | 6 +-
compiler/typecheck/TcSMonad.lhs | 21 +-
compiler/typecheck/TcSimplify.lhs | 31 +-
compiler/typecheck/TcSplice.lhs | 47 +-
compiler/typecheck/TcSplice.lhs-boot | 7 +-
compiler/typecheck/TcTyClsDecls.lhs | 609 +++---
compiler/typecheck/TcTyDecls.lhs | 14 +-
compiler/typecheck/TcType.lhs | 60 +-
compiler/typecheck/TcUnify.lhs | 151 +--
compiler/types/Coercion.lhs | 5 +-
compiler/types/FamInstEnv.lhs | 68 +-
compiler/types/InstEnv.lhs | 18 +-
compiler/types/Kind.lhs | 228 +--
compiler/types/TyCon.lhs | 638 +++---
compiler/types/Type.lhs | 159 +-
compiler/types/TypeRep.lhs | 132 +-
compiler/types/Unify.lhs | 9 +-
compiler/utils/Digraph.lhs | 6 -
compiler/utils/GraphColor.hs | 575 +++---
compiler/utils/GraphOps.hs | 839 ++++----
compiler/utils/ListSetOps.lhs | 14 +-
compiler/utils/Outputable.lhs | 98 +-
compiler/utils/Platform.hs | 22 +-
compiler/utils/UniqFM.lhs | 4 +-
compiler/utils/Util.lhs | 16 +-
compiler/vectorise/Vectorise/Convert.hs | 9 +-
compiler/vectorise/Vectorise/Generic/PData.hs | 1 +
compiler/vectorise/Vectorise/Type/Classify.hs | 1 +
compiler/vectorise/Vectorise/Type/TyConDecl.hs | 1 +
compiler/vectorise/Vectorise/Type/Type.hs | 1 +
configure.ac | 126 +-
distrib/remilestoning.pl | 118 ++
docs/coding-style.html | 28 +-
docs/comm/rts-libs/threaded-rts.html | 2 +-
docs/ext-core/Makefile | 3 -
docs/ext-core/a4wide.sty | 39 -
docs/ext-core/code.sty | 83 -
docs/ext-core/core.bib | 124 --
docs/ext-core/core.tex | 779 --------
docs/ext-core/ghc.mk | 15 -
docs/index.html.in | 22 +-
docs/users_guide/external_core.xml | 1807 +++++++++++++++++
docs/users_guide/ffi-chap.xml | 52 +
docs/users_guide/flags.xml | 24 +-
docs/users_guide/ghci.xml | 98 +-
docs/users_guide/glasgow_exts.xml | 82 +-
docs/users_guide/phases.xml | 25 +-
docs/users_guide/runtime_control.xml | 43 +-
docs/users_guide/safe_haskell.xml | 2 +-
docs/users_guide/ug-book.xml.in | 1 +
docs/users_guide/ug-ent.xml.in | 2 +
docs/users_guide/using.xml | 2206 +++++++++++----------
docs/vh/vh.xml | 591 +++---
driver/ghci/ghc.mk | 4 +-
driver/utils/cwrapper.c | 6 +-
ghc.mk | 11 +-
ghc/GhciMonad.hs | 11 +-
ghc/GhciTags.hs | 17 +-
ghc/InteractiveUI.hs | 451 +++--
ghc/Main.hs | 9 +-
ghc/ghc-bin.cabal.in | 2 +-
ghc/ghc.mk | 11 +-
includes/Cmm.h | 2 +-
includes/HaskellConstants.hs | 10 +-
includes/MachDeps.h | 27 +-
includes/Rts.h | 25 +
includes/RtsAPI.h | 2 +-
includes/Stg.h | 10 +-
includes/ghc.mk | 31 +-
includes/mkDerivedConstants.c | 20 +-
includes/rts/Constants.h | 22 +-
includes/rts/Flags.h | 12 +-
includes/rts/storage/InfoTables.h | 22 +-
includes/stg/DLL.h | 4 +-
includes/stg/MachRegs.h | 173 +-
includes/stg/MiscClosures.h | 1 +
mk/config.mk.in | 8 +-
mk/tree.mk | 2 +-
mk/validate-settings.mk | 2 +-
packages | 1 -
rts/Adjustor.c | 441 +++--
rts/Capability.c | 11 +-
rts/Capability.h | 4 +-
rts/ClosureFlags.c | 18 +-
rts/HeapStackCheck.cmm | 12 +-
rts/Interpreter.c | 4 +-
rts/Linker.c | 382 ++++-
rts/LinkerInternals.h | 6 +-
rts/PosixSource.h | 2 +-
rts/PrimOps.cmm | 12 +-
rts/Printer.c | 2 +-
rts/RaiseAsync.c | 63 +-
rts/RtsFlags.c | 4 +-
rts/RtsMain.c | 7 +-
rts/RtsStartup.c | 2 +-
rts/Schedule.c | 4 +-
rts/Stats.c | 42 +-
rts/StgCRun.c | 87 +-
rts/StgMiscClosures.cmm | 6 +-
rts/StgStartup.cmm | 12 +-
rts/Task.c | 100 +-
rts/Task.h | 30 +-
rts/Threads.c | 38 +-
rts/Trace.c | 5 +-
rts/ghc.mk | 7 +-
rts/posix/Itimer.c | 2 +-
rts/posix/OSThreads.c | 1 -
rts/sm/Compact.c | 2 +-
rts/sm/GC.c | 42 +
rts/sm/Sanity.c | 1 +
rts/sm/Storage.c | 177 +-
rts/win32/AwaitEvent.c | 4 +-
rts/win32/ThrIOManager.c | 2 +-
rts/win32/seh_excn.c | 5 +-
rules/build-package-way.mk | 2 +-
rules/cmm-suffix-rules.mk | 8 +-
sync-all | 27 +
utils/fingerprint/fingerprint.py | 2 +-
utils/genapply/GenApply.hs | 650 +++---
utils/genprimopcode/Main.hs | 427 ++--
utils/genprimopcode/Parser.y | 1 -
utils/genprimopcode/ParserM.hs | 1 -
utils/genprimopcode/Syntax.hs | 20 +-
utils/ghc-pkg/Main.hs | 70 +-
utils/ghc-pkg/ghc.mk | 1 -
utils/ghctags/Main.hs | 4 +-
utils/hp2ps/Key.c | 22 +-
validate | 20 +-
277 files changed, 15937 insertions(+), 12816 deletions(-)
Diff suppressed because of size. To see it, use:
git show 92b7e3d6271d8be007a7f71a197c8532a392c767
More information about the Cvs-ghc
mailing list