Skip to content

Commit 63b4351

Browse files
authored
[AVR] Remove LPM/ELPM custom decoder (NFC) (#156928)
Follow-up to #156361.
1 parent 2b73dad commit 63b4351

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

llvm/lib/Target/AVR/AVRInstrFormats.td

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,20 +201,14 @@ class FSTLD<bit type, bits<2> mode, dag outs, dag ins, string asmstr,
201201
//===---------------------------------------------------------------------===//
202202
class FLPMX<bit e, bit p, dag outs, dag ins, string asmstr, list<dag> pattern>
203203
: AVRInst16<outs, ins, asmstr, pattern> {
204+
bits<0> z;
204205
bits<5> rd;
205206

206-
let Inst{15 - 12} = 0b1001;
207-
208-
let Inst{11 - 9} = 0b000;
209-
let Inst{8} = rd{4};
210-
211-
let Inst{7 - 4} = rd{3 - 0};
212-
207+
let Inst{15 - 9} = 0b1001000;
208+
let Inst{8 - 4} = rd;
213209
let Inst{3 - 2} = 0b01;
214210
let Inst{1} = e;
215211
let Inst{0} = p;
216-
217-
let DecoderMethod = "decodeFLPMX";
218212
}
219213

220214
//===----------------------------------------------------------------------===//

llvm/lib/Target/AVR/Disassembler/AVRDisassembler.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,6 @@ static DecodeStatus decodeFRd(MCInst &Inst, unsigned Insn, uint64_t Address,
150150
return MCDisassembler::Success;
151151
}
152152

153-
static DecodeStatus decodeFLPMX(MCInst &Inst, unsigned Insn, uint64_t Address,
154-
const MCDisassembler *Decoder) {
155-
if (decodeFRd(Inst, Insn, Address, Decoder) == MCDisassembler::Fail)
156-
return MCDisassembler::Fail;
157-
Inst.addOperand(MCOperand::createReg(AVR::R31R30));
158-
return MCDisassembler::Success;
159-
}
160-
161153
static DecodeStatus decodeFFMULRdRr(MCInst &Inst, unsigned Insn,
162154
uint64_t Address,
163155
const MCDisassembler *Decoder) {

0 commit comments

Comments
 (0)