[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (b92c76e)
Ian Lynagh <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/b92c76ec5703a216b0d5553e037da6f66932a82e >--------------------------------------------------------------- commit b92c76ec5703a216b0d5553e037da6f66932a82e Merge: 85a8f79... a910970... Author: Ian Lynagh <[email protected]> Date: Thu Sep 20 18:05:01 2012 +0100 Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc compiler/cmm/CmmLayoutStack.hs | 4 +- compiler/cmm/CmmPipeline.hs | 3 +- compiler/cmm/CmmProcPoint.hs | 35 +++++-- compiler/cmm/MkGraph.hs | 44 ++++----- compiler/codeGen/StgCmmLayout.hs | 4 +- compiler/nativeGen/AsmCodeGen.lhs | 70 ++++++++++---- compiler/nativeGen/Instruction.hs | 13 +++ compiler/nativeGen/PPC/Instr.hs | 2 + compiler/nativeGen/RegAlloc/Linear/Main.hs | 25 ++++- compiler/nativeGen/RegAlloc/Linear/StackMap.hs | 39 +++----- compiler/nativeGen/RegAlloc/Liveness.hs | 5 + compiler/nativeGen/SPARC/Instr.hs | 2 + compiler/nativeGen/X86/Instr.hs | 117 ++++++++++++++++++------ compiler/nativeGen/X86/Regs.hs | 6 +- 14 files changed, 247 insertions(+), 122 deletions(-)