Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions llvm/lib/Target/AVR/AsmParser/AVRAsmParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ class AVROperand : public MCParsedAsmOperand {
O << "Token: \"" << getToken() << "\"";
break;
case k_Register:
O << "Register: " << getReg();
O << "Register: " << getReg().id();
break;
case k_Immediate:
O << "Immediate: \"";
Expand All @@ -262,7 +262,7 @@ class AVROperand : public MCParsedAsmOperand {
case k_Memri: {
// only manually print the size for non-negative values,
// as the sign is inserted automatically.
O << "Memri: \"" << getReg() << '+';
O << "Memri: \"" << getReg().id() << '+';
MAI.printExpr(O, *getImm());
O << "\"";
break;
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Target/AVR/Disassembler/AVRDisassembler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static DecodeStatus DecodeGPR8RegisterClass(MCInst &Inst, unsigned RegNo,
if (RegNo > 31)
return MCDisassembler::Fail;

unsigned Register = GPRDecoderTable[RegNo];
MCRegister Register = GPRDecoderTable[RegNo];
Inst.addOperand(MCOperand::createReg(Register));
return MCDisassembler::Success;
}
Expand Down Expand Up @@ -174,7 +174,7 @@ static DecodeStatus decodeLoadStore(MCInst &Inst, unsigned Insn,
uint64_t Address,
const MCDisassembler *Decoder) {
// Get the register will be loaded or stored.
unsigned RegVal = GPRDecoderTable[(Insn >> 4) & 0x1f];
MCRegister RegVal = GPRDecoderTable[(Insn >> 4) & 0x1f];

// Decode LDD/STD with offset less than 8.
if ((Insn & 0xf000) == 0x8000) {
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/Target/AVR/MCTargetDesc/AVRMCCodeEmitter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ AVRMCCodeEmitter::loadStorePostEncoder(const MCInst &MI, unsigned EncodedValue,
EncodedValue |= (1 << 12);

// Encode the pointer register.
switch (MI.getOperand(Idx).getReg()) {
switch (MI.getOperand(Idx).getReg().id()) {
case AVR::R27R26:
EncodedValue |= 0xc;
break;
Expand Down
Loading