The immediate portion of the operand is just a boolean (the 'U' bit indicating
add vs. subtract). Treat it as such.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136969
91177308-0d34-0410-b5e6-
96231b3b80d8
OS << ">";
break;
case PostIndexRegister:
- OS << "post-idx register "
- << getAddrOpcStr(ARM_AM::getAM3Op(PostIdxReg.Imm))
+ OS << "post-idx register " << (PostIdxReg.Imm ? "" : "-")
<< PostIdxReg.RegNum
<< ">";
break;
AsmToken Tok = Parser.getTok();
SMLoc S = Tok.getLoc();
bool haveEaten = false;
- unsigned Imm = ARM_AM::getAM3Opc(ARM_AM::add, 0);
+ bool isAdd = true;
int Reg = -1;
if (Tok.is(AsmToken::Plus)) {
Parser.Lex(); // Eat the '+' token.
haveEaten = true;
} else if (Tok.is(AsmToken::Minus)) {
Parser.Lex(); // Eat the '-' token.
- Imm = ARM_AM::getAM3Opc(ARM_AM::sub, 0);
+ isAdd = false;
haveEaten = true;
}
if (Parser.getTok().is(AsmToken::Identifier))
}
SMLoc E = Parser.getTok().getLoc();
- Operands.push_back(ARMOperand::CreatePostIdxReg(Reg, Imm, S, E));
+ Operands.push_back(ARMOperand::CreatePostIdxReg(Reg, isAdd, S, E));
return MatchOperand_Success;
}
++OpIdx;
} else {
// Disassemble the offset reg (Rm).
- unsigned Offset = ARM_AM::getAM3Opc(AddrOpcode, 0);
MI.addOperand(MCOperand::CreateReg(getRegisterEnum(B, ARM::GPRRegClassID,
decodeRm(insn))));
- MI.addOperand(MCOperand::CreateImm(Offset));
+ // FIXME: Remove the 'else' once done w/ addrmode3 refactor.
+ if (Opcode == ARM::STRHTr || Opcode == ARM::LDRSBTr ||
+ Opcode == ARM::LDRHTr || Opcode == ARM::LDRSHTr)
+ MI.addOperand(MCOperand::CreateImm(getUBit(insn)));
+ else {
+ unsigned Offset = ARM_AM::getAM3Opc(AddrOpcode, 0);
+ MI.addOperand(MCOperand::CreateImm(Offset));
+ }
OpIdx += 2;
}
const MCOperand &MO1 = MI->getOperand(OpNum);
const MCOperand &MO2 = MI->getOperand(OpNum+1);
- O << getAddrOpcStr(ARM_AM::getAM3Op(MO2.getImm()))
- << getRegisterName(MO1.getReg());
+ O << (MO2.getImm() ? "" : "-") << getRegisterName(MO1.getReg());
}
void ARMInstPrinter::printPostIdxImm8s4Operand(const MCInst *MI,
// {3-0} Rm
const MCOperand &MO = MI.getOperand(OpIdx);
const MCOperand &MO1 = MI.getOperand(OpIdx+1);
- unsigned Imm = MO1.getImm();
- bool isAdd = ARM_AM::getAM3Op(Imm) == ARM_AM::add;
+ bool isAdd = MO1.getImm() != 0;
return getARMRegisterNumbering(MO.getReg()) | (isAdd << 4);
}