Remove the no longer used 'Modifier' optional operand to the ARM

printOperand() asm printer helper functions. rdar://8425198

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118140 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jim Grosbach 2010-11-03 01:11:15 +00:00
parent 496e2b2908
commit 0a2287b909
2 changed files with 8 additions and 17 deletions

View File

@ -116,16 +116,14 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O) {
} }
void ARMInstPrinter::printOperand(const MCInst *MI, unsigned OpNo, void ARMInstPrinter::printOperand(const MCInst *MI, unsigned OpNo,
raw_ostream &O, const char *Modifier) { raw_ostream &O) {
const MCOperand &Op = MI->getOperand(OpNo); const MCOperand &Op = MI->getOperand(OpNo);
if (Op.isReg()) { if (Op.isReg()) {
unsigned Reg = Op.getReg(); unsigned Reg = Op.getReg();
O << getRegisterName(Reg); O << getRegisterName(Reg);
} else if (Op.isImm()) { } else if (Op.isImm()) {
assert((Modifier == 0 || Modifier[0] == 0) && "No modifiers supported");
O << '#' << Op.getImm(); O << '#' << Op.getImm();
} else { } else {
assert((Modifier == 0 || Modifier[0] == 0) && "No modifiers supported");
assert(Op.isExpr() && "unknown operand kind in printOperand"); assert(Op.isExpr() && "unknown operand kind in printOperand");
O << *Op.getExpr(); O << *Op.getExpr();
} }
@ -291,16 +289,14 @@ void ARMInstPrinter::printAddrMode3OffsetOperand(const MCInst *MI,
} }
void ARMInstPrinter::printLdStmModeOperand(const MCInst *MI, unsigned OpNum, void ARMInstPrinter::printLdStmModeOperand(const MCInst *MI, unsigned OpNum,
raw_ostream &O, raw_ostream &O) {
const char *Modifier) {
ARM_AM::AMSubMode Mode = ARM_AM::getAM4SubMode(MI->getOperand(OpNum) ARM_AM::AMSubMode Mode = ARM_AM::getAM4SubMode(MI->getOperand(OpNum)
.getImm()); .getImm());
O << ARM_AM::getAMSubModeStr(Mode); O << ARM_AM::getAMSubModeStr(Mode);
} }
void ARMInstPrinter::printAddrMode5Operand(const MCInst *MI, unsigned OpNum, void ARMInstPrinter::printAddrMode5Operand(const MCInst *MI, unsigned OpNum,
raw_ostream &O, raw_ostream &O) {
const char *Modifier) {
const MCOperand &MO1 = MI->getOperand(OpNum); const MCOperand &MO1 = MI->getOperand(OpNum);
const MCOperand &MO2 = MI->getOperand(OpNum+1); const MCOperand &MO2 = MI->getOperand(OpNum+1);
@ -343,8 +339,7 @@ void ARMInstPrinter::printAddrMode6OffsetOperand(const MCInst *MI,
} }
void ARMInstPrinter::printAddrModePCOperand(const MCInst *MI, unsigned OpNum, void ARMInstPrinter::printAddrModePCOperand(const MCInst *MI, unsigned OpNum,
raw_ostream &O, raw_ostream &O) {
const char *Modifier) {
// All instructions using addrmodepc are pseudos and should have been // All instructions using addrmodepc are pseudos and should have been
// handled explicitly in printInstructionThroughMCStreamer(). If one got // handled explicitly in printInstructionThroughMCStreamer(). If one got
// here, it wasn't, so something's wrong. // here, it wasn't, so something's wrong.

View File

@ -33,8 +33,7 @@ public:
static const char *getRegisterName(unsigned RegNo); static const char *getRegisterName(unsigned RegNo);
void printOperand(const MCInst *MI, unsigned OpNo, raw_ostream &O, void printOperand(const MCInst *MI, unsigned OpNo, raw_ostream &O);
const char *Modifier = 0);
void printSOImmOperand(const MCInst *MI, unsigned OpNum, raw_ostream &O); void printSOImmOperand(const MCInst *MI, unsigned OpNum, raw_ostream &O);
void printSOImm2PartOperand(const MCInst *MI, unsigned OpNum, raw_ostream &O); void printSOImm2PartOperand(const MCInst *MI, unsigned OpNum, raw_ostream &O);
@ -46,15 +45,12 @@ public:
void printAddrMode3Operand(const MCInst *MI, unsigned OpNum, raw_ostream &O); void printAddrMode3Operand(const MCInst *MI, unsigned OpNum, raw_ostream &O);
void printAddrMode3OffsetOperand(const MCInst *MI, unsigned OpNum, void printAddrMode3OffsetOperand(const MCInst *MI, unsigned OpNum,
raw_ostream &O); raw_ostream &O);
void printLdStmModeOperand(const MCInst *MI, unsigned OpNum, raw_ostream &O, void printLdStmModeOperand(const MCInst *MI, unsigned OpNum, raw_ostream &O);
const char *Modifier = 0); void printAddrMode5Operand(const MCInst *MI, unsigned OpNum, raw_ostream &O);
void printAddrMode5Operand(const MCInst *MI, unsigned OpNum, raw_ostream &O,
const char *Modifier = 0);
void printAddrMode6Operand(const MCInst *MI, unsigned OpNum, raw_ostream &O); void printAddrMode6Operand(const MCInst *MI, unsigned OpNum, raw_ostream &O);
void printAddrMode6OffsetOperand(const MCInst *MI, unsigned OpNum, void printAddrMode6OffsetOperand(const MCInst *MI, unsigned OpNum,
raw_ostream &O); raw_ostream &O);
void printAddrModePCOperand(const MCInst *MI, unsigned OpNum, raw_ostream &O, void printAddrModePCOperand(const MCInst *MI, unsigned OpNum, raw_ostream &O);
const char *Modifier = 0);
void printBitfieldInvMaskImmOperand(const MCInst *MI, unsigned OpNum, void printBitfieldInvMaskImmOperand(const MCInst *MI, unsigned OpNum,
raw_ostream &O); raw_ostream &O);