[hexagon] change AsmParser assertion to error

[bcain]

Summary

For immediates that can't be evaluated in assembler-mapped instructions, we
should return 'invalid operand' instead of assert.

[bcain]

Added context lines.

[bcain]

ping? any comments/concerns?

[kparzysz]

llvm/test/MC/Hexagon/inval_immed.s

4

Please add spaces around =.

llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp

int HexagonAsmParser::processInstruction(MCInst &Inst,
   case Hexagon::M2_mpysmi: {
     MCInst TmpInst;
     MCOperand &Rd = Inst.getOperand(0);
     MCOperand &Rs = Inst.getOperand(1);
     MCOperand &Imm = Inst.getOperand(2);
     int64_t Value;
     MCExpr const &Expr = *Imm.getExpr();
     bool Absolute = Expr.evaluateAsAbsolute(Value);
-    assert(Absolute);
-    (void)Absolute;
+    if (!Absolute)
+      return Match_InvalidOperand;
     if (!HexagonMCInstrInfo::mustExtend(Expr) &&
         ((Value <= -256) || Value >= 256))
       return Match_InvalidOperand;
     if (Value < 0 && Value > -256) {
       Imm.setExpr(HexagonMCExpr::create(
           MCConstantExpr::create(Value * -1, Context), Context));
       TmpInst.setOpcode(Hexagon::M2_mpysin);
     } else
       TmpInst.setOpcode(Hexagon::M2_mpysip);
     TmpInst.addOperand(Rd);
     TmpInst.addOperand(Rs);
     TmpInst.addOperand(Imm);
     Inst = TmpInst;
     break;
   }
 
   case Hexagon::S2_asr_i_r_rnd_goodsyntax: {
     MCOperand &Imm = Inst.getOperand(2);
     MCInst TmpInst;
     int64_t Value;
     bool Absolute = Imm.getExpr()->evaluateAsAbsolute(Value);
-    assert(Absolute);
-    (void)Absolute;
+    if (!Absolute)
+      return Match_InvalidOperand;
     if (Value == 0) { // convert to $Rd = $Rs
       TmpInst.setOpcode(Hexagon::A2_tfr);
       MCOperand &Rd = Inst.getOperand(0);
       MCOperand &Rs = Inst.getOperand(1);
       TmpInst.addOperand(Rd);
       TmpInst.addOperand(Rs);
     } else {
       Imm.setExpr(HexagonMCExpr::create(
int HexagonAsmParser::processInstruction(MCInst &Inst,
   }
 
   case Hexagon::S2_asr_i_p_rnd_goodsyntax: {
     MCOperand &Rdd = Inst.getOperand(0);
     MCOperand &Rss = Inst.getOperand(1);
     MCOperand &Imm = Inst.getOperand(2);
     int64_t Value;
     bool Absolute = Imm.getExpr()->evaluateAsAbsolute(Value);
-    assert(Absolute);
-    (void)Absolute;
+    if (!Absolute)
+      return Match_InvalidOperand;
     if (Value == 0) { // convert to $Rdd = combine ($Rs[0], $Rs[1])
       MCInst TmpInst;
       unsigned int RegPairNum = RI->getEncodingValue(Rss.getReg());
       std::string R1 = r + utostr(RegPairNum + 1);
       StringRef Reg1(R1);
       Rss.setReg(matchRegister(Reg1));
       // Add a new operand for the second register in the pair.
       std::string R2 = r + utostr(RegPairNum);
case Hexagon::M2_vrcmpys_s1rp: {
     }
     break;
   }
 
   case Hexagon::S5_asrhub_rnd_sat_goodsyntax: {
     MCOperand &Imm = Inst.getOperand(2);
     int64_t Value;
     bool Absolute = Imm.getExpr()->evaluateAsAbsolute(Value);
-    assert(Absolute);
-    (void)Absolute;
+    if (!Absolute)
+      return Match_InvalidOperand;
     if (Value == 0)
       Inst.setOpcode(Hexagon::S2_vsathub);
     else {
       Imm.setExpr(HexagonMCExpr::create(
           MCBinaryExpr::createSub(Imm.getExpr(),
                                   MCConstantExpr::create(1, Context), Context),
           Context));
       Inst.setOpcode(Hexagon::S5_asrhub_rnd_sat);
     }
     break;
   }
 
   case Hexagon::S5_vasrhrnd_goodsyntax: {
     MCOperand &Rdd = Inst.getOperand(0);
     MCOperand &Rss = Inst.getOperand(1);
     MCOperand &Imm = Inst.getOperand(2);
     int64_t Value;
     bool Absolute = Imm.getExpr()->evaluateAsAbsolute(Value);
-    assert(Absolute);
-    (void)Absolute;
+    if (!Absolute)
+      return Match_InvalidOperand;
     if (Value == 0) {
       MCInst TmpInst;
       unsigned int RegPairNum = RI->getEncodingValue(Rss.getReg());
       std::string R1 = r + utostr(RegPairNum + 1);
       StringRef Reg1(R1);
       Rss.setReg(matchRegister(Reg1));
       // Add a new operand for the second register in the pair.
       std::string R2 = r + utostr(RegPairNum);

llvm/test/MC/Hexagon/hex-immediates.s

+# RUN: llvm-mc -filetype=obj -arch=hexagon %s | llvm-objdump -d --print-imm-hex - | FileCheck %s
+
+# CHECK: r3 = ##0x70000240
+r3 = ##1879048768
+# CHECK: r3 = ##-0x70000240
+r3 = ##-1879048768

llvm/test/MC/Hexagon/inval_immed.s

+# RUN: not llvm-mc -filetype=asm -arch=hexagon %s 2>%t; FileCheck %s < %t
+
+    .text
+r0=mpyi(r0,#m9)
+
+# CHECK: error: invalid operand for instruction