Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/cae17466c7882f068817a25e8a76700021378ec9 >--------------------------------------------------------------- commit cae17466c7882f068817a25e8a76700021378ec9 Author: David Terei <[email protected]> Date: Tue Nov 22 12:05:52 2011 -0800 Explicitly handle unsupported Cmm prim ops. >--------------------------------------------------------------- compiler/nativeGen/PPC/CodeGen.hs | 7 ++++--- compiler/nativeGen/SPARC/CodeGen/CCall.hs | 7 +++++-- compiler/nativeGen/X86/CodeGen.hs | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs index 4bde8ef..607e05d 100644 --- a/compiler/nativeGen/PPC/CodeGen.hs +++ b/compiler/nativeGen/PPC/CodeGen.hs @@ -1146,9 +1146,10 @@ genCCall' gcp target dest_regs argsAndHints MO_PopCnt w -> (fsLit $ popCntLabel w, False) - other -> pprPanic "genCCall(ppc): unknown callish op" - (pprCallishMachOp other) - + MO_WriteBarrier -> + panic $ "outOfLineCmmOp: MO_WriteBarrier not supported" + MO_Touch -> + panic $ "outOfLineCmmOp: MO_Touch not supported" -- ----------------------------------------------------------------------------- -- Generating a table-branch diff --git a/compiler/nativeGen/SPARC/CodeGen/CCall.hs b/compiler/nativeGen/SPARC/CodeGen/CCall.hs index 5b26667..d4f1506 100644 --- a/compiler/nativeGen/SPARC/CodeGen/CCall.hs +++ b/compiler/nativeGen/SPARC/CodeGen/CCall.hs @@ -342,5 +342,8 @@ outOfLineMachOp_table mop MO_PopCnt w -> fsLit $ popCntLabel w - _ -> pprPanic "outOfLineMachOp(sparc): Unknown callish mach op " - (pprCallishMachOp mop) + MO_WriteBarrier -> + panic $ "outOfLineCmmOp: MO_WriteBarrier not supported here" + MO_Touch -> + panic $ "outOfLineCmmOp: MO_Touch not supported here" + diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs index adf199c..97baeec 100644 --- a/compiler/nativeGen/X86/CodeGen.hs +++ b/compiler/nativeGen/X86/CodeGen.hs @@ -2048,8 +2048,10 @@ outOfLineCmmOp mop res args MO_PopCnt _ -> fsLit "popcnt" - other -> panic $ "outOfLineCmmOp: unmatched op! (" ++ show other ++ ")" - + MO_WriteBarrier -> + panic $ "outOfLineCmmOp: MO_WriteBarrier not supported here" + MO_Touch -> + panic $ "outOfLineCmmOp: MO_Touch not supported here" -- ----------------------------------------------------------------------------- -- Generating a table-branch _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
