diff --git a/llvm/lib/Target/Hexagon/HexagonInstrFormats.td b/llvm/lib/Target/Hexagon/HexagonInstrFormats.td --- a/llvm/lib/Target/Hexagon/HexagonInstrFormats.td +++ b/llvm/lib/Target/Hexagon/HexagonInstrFormats.td @@ -268,8 +268,7 @@ let Inst{12-0} = ISubLo; } -class InstDuplex iClass, list pattern = [], - string cstr = ""> +class InstDuplex iClass, string cstr = ""> : Instruction, OpcodeDuplex { let Namespace = "Hexagon"; IType Type = TypeDUPLEX; // uses slot 0,1 diff --git a/llvm/lib/Target/Hexagon/HexagonPseudo.td b/llvm/lib/Target/Hexagon/HexagonPseudo.td --- a/llvm/lib/Target/Hexagon/HexagonPseudo.td +++ b/llvm/lib/Target/Hexagon/HexagonPseudo.td @@ -198,7 +198,7 @@ let isCall = 1, hasSideEffects = 1, isExtended = 0, isExtendable = 1, opExtendable = 0, isCodeGenOnly = 1, BaseOpcode = "PS_call_nr", isExtentSigned = 1, opExtentAlign = 2 in -class Call_nr nbits, bit isPred, bit isFalse, dag iops, +class Call_nr nbits, bit isFalse, dag iops, InstrItinClass itin> : Pseudo<(outs), iops, "">, PredRel { bits<2> Pu; @@ -210,7 +210,7 @@ let Itinerary = itin; } -def PS_call_nr : Call_nr<24, 0, 0, (ins s32_0Imm:$Ii), J2_call.Itinerary>; +def PS_call_nr : Call_nr<24, 0, (ins s32_0Imm:$Ii), J2_call.Itinerary>; //def PS_call_nrt: Call_nr<17, 1, 0, (ins PredRegs:$Pu, s32_0Imm:$dst), // J2_callt.Itinerary>; //def PS_call_nrf: Call_nr<17, 1, 1, (ins PredRegs:$Pu, s32_0Imm:$dst), @@ -267,7 +267,7 @@ class CondStr { string S = "if (" # !if(True,"","!") # CReg # !if(New,".new","") # ") "; } -class JumpOpcStr { +class JumpOpcStr { string S = Mnemonic # !if(Taken, ":t", ":nt"); } let isBranch = 1, isIndirectBranch = 1, Defs = [PC], isPredicated = 1, @@ -275,7 +275,7 @@ class T_JMPr_c : InstHexagon<(outs), (ins PredRegs:$src, IntRegs:$dst), CondStr<"$src", !if(PredNot,0,1), isPredNew>.S # - JumpOpcStr<"jumpr", isPredNew, isTak>.S # " $dst", + JumpOpcStr<"jumpr", isTak>.S # " $dst", [], "", rootInst.Itinerary, rootInst.Type>, OpcodeHexagon { let isTaken = isTak;