Move the workaround to HexagonDisassembler::getSingleInstrcution

Author: s-barannikov

llvm/lib/Target/Hexagon/Disassembler/HexagonDisassembler.cpp

@@ -172,11 +172,6 @@ static DecodeStatus s32_0ImmDecoder(MCInst &MI, unsigned tmp,
                                     const MCDisassembler *Decoder);
 static DecodeStatus brtargetDecoder(MCInst &MI, unsigned tmp, uint64_t Address,
                                     const MCDisassembler *Decoder);
-
-static DecodeStatus decodeCRSWAP10(MCInst &Inst, unsigned Bits,
-                                   uint64_t Address,
-                                   const MCDisassembler *Decoder);
-
 #include "HexagonDepDecoders.inc"
 #include "HexagonGenDisassemblerTables.inc"
 
@@ -531,6 +526,9 @@ DecodeStatus HexagonDisassembler::getSingleInstruction(MCInst &MI, MCInst &MCB,
     MI.insert(MI.begin() + 1,
               MCOperand::createExpr(MCConstantExpr::create(-1, getContext())));
     break;
+  case Hexagon::Y4_crswap10:
+    MI.addOperand(MCOperand::createReg(Hexagon::SGP1_0));
+    break;
   default:
     break;
   }
@@ -846,16 +844,6 @@ static DecodeStatus brtargetDecoder(MCInst &MI, unsigned tmp, uint64_t Address,
   return MCDisassembler::Success;
 }
 
-static DecodeStatus decodeCRSWAP10(MCInst &Inst, unsigned int Bits,
-                                   uint64_t Address,
-                                   const MCDisassembler *Decoder) {
-  unsigned RegNo = fieldFromInstruction(Bits, 16, 5);
-  DecodeDoubleRegsRegisterClass(Inst, RegNo, Address, Decoder);
-  DecodeDoubleRegsRegisterClass(Inst, RegNo, Address, Decoder);
-  Inst.addOperand(MCOperand::createReg(Hexagon::SGP1_0));
-  return MCDisassembler::Success;
-}
-
 static const uint16_t SysRegDecoderTable[] = {
     Hexagon::SGP0,       Hexagon::SGP1,      Hexagon::STID,
     Hexagon::ELR,        Hexagon::BADVA0,    Hexagon::BADVA1,

llvm/lib/Target/Hexagon/HexagonDepInstrFormats.td

@@ -3049,6 +3049,7 @@ class Enc_cf1927 : OpcodeHexagon {
 class Enc_d0fe02 : OpcodeHexagon {
   bits <5> Rxx32;
   let Inst{20-16} = Rxx32{4-0};
+  bits <0> sgp10;
 }
 class Enc_d15d19 : OpcodeHexagon {
   bits <1> Mu2;

llvm/lib/Target/Hexagon/HexagonDepInstrInfo.td

@@ -41176,8 +41176,6 @@ let Inst{31-21} = 0b01101101100;
 let Uses = [SGP0, SGP1];
 let Defs = [SGP0, SGP1];
 let Constraints = "$Rxx32 = $Rxx32in";
-// $sgp10 operand has no encoding bits, we have to add the operand manually.
-let DecoderMethod = "decodeCRSWAP10";
 }
 def Y4_l2fetch : HInst<
 (outs),