From b7024fa5177617c08b521f27aca2994148a4c18b Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 23 Feb 2014 23:23:01 +0000 Subject: [PATCH] Pull in r201994 from upstream llvm trunk (by Benjamin Kramer): SPARC: Implement TRAP lowering. Matches what GCC emits. This lets clang emit "ta 5" for trap instructions on sparc64, instead of emitting a call to abort(), making it possible to link the kernel. --- contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp | 2 ++ contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td | 3 +++ 2 files changed, 5 insertions(+) diff --git a/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp b/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp index 283bff6bf6ed..995208675183 100644 --- a/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp +++ b/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp @@ -1566,6 +1566,8 @@ SparcTargetLowering::SparcTargetLowering(TargetMachine &TM) // VAARG needs to be lowered to not do unaligned accesses for doubles. setOperationAction(ISD::VAARG , MVT::Other, Custom); + setOperationAction(ISD::TRAP , MVT::Other, Legal); + // Use the default implementation. setOperationAction(ISD::VACOPY , MVT::Other, Expand); setOperationAction(ISD::VAEND , MVT::Other, Expand); diff --git a/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td b/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td index 94d2719d20ea..ae10ca0bd413 100644 --- a/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td +++ b/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td @@ -312,6 +312,9 @@ let hasSideEffects = 1, mayStore = 1 in { [(flushw)]>; } +let isBarrier = 1, isTerminator = 1, rd = 0b1000, rs1 = 0, simm13 = 5 in + def TA5 : F3_2<0b10, 0b111010, (outs), (ins), "ta 5", [(trap)]>; + let rd = 0 in def UNIMP : F2_1<0b000, (outs), (ins i32imm:$val), "unimp $val", []>;