maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Convert more methods in static helpers. 

llvm-svn: 195826
This commit is contained in:
Rafael Espindola 2013-11-27 07:34:09 +00:00
parent 7caa135677
commit e370147b8c
2 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
llvm/lib/Target/X86/X86AsmPrinter.cpp
View File

@ -268,8 +268,9 @@ static void printOperand(X86AsmPrinter &P, const MachineInstr *MI,
} }
} }
void X86AsmPrinter::printLeaMemReference(const MachineInstr *MI, unsigned Op, static void printLeaMemReference(X86AsmPrinter &P, const MachineInstr *MI,
raw_ostream &O, const char *Modifier) { unsigned Op, raw_ostream &O,
const char *Modifier = NULL) {
const MachineOperand &BaseReg = MI->getOperand(Op); const MachineOperand &BaseReg = MI->getOperand(Op);
const MachineOperand &IndexReg = MI->getOperand(Op+2); const MachineOperand &IndexReg = MI->getOperand(Op+2);
const MachineOperand &DispSpec = MI->getOperand(Op+3); const MachineOperand &DispSpec = MI->getOperand(Op+3);
@ -290,7 +291,7 @@ void X86AsmPrinter::printLeaMemReference(const MachineInstr *MI, unsigned Op,
} else { } else {
assert(DispSpec.isGlobal() || DispSpec.isCPI() || assert(DispSpec.isGlobal() || DispSpec.isCPI() ||
DispSpec.isJTI() || DispSpec.isSymbol()); DispSpec.isJTI() || DispSpec.isSymbol());
printSymbolOperand(*this, MI->getOperand(Op+3), O); printSymbolOperand(P, MI->getOperand(Op+3), O);
} }
if (Modifier && strcmp(Modifier, "H") == 0) if (Modifier && strcmp(Modifier, "H") == 0)
@ -302,11 +303,11 @@ void X86AsmPrinter::printLeaMemReference(const MachineInstr *MI, unsigned Op,
O << '('; O << '(';
if (HasBaseReg) if (HasBaseReg)
printOperand(*this, MI, Op, O, Modifier); printOperand(P, MI, Op, O, Modifier);
if (IndexReg.getReg()) { if (IndexReg.getReg()) {
O << ','; O << ',';
printOperand(*this, MI, Op+2, O, Modifier); printOperand(P, MI, Op+2, O, Modifier);
unsigned ScaleVal = MI->getOperand(Op+1).getImm(); unsigned ScaleVal = MI->getOperand(Op+1).getImm();
if (ScaleVal != 1) if (ScaleVal != 1)
O << ',' << ScaleVal; O << ',' << ScaleVal;
@ -315,20 +316,22 @@ void X86AsmPrinter::printLeaMemReference(const MachineInstr *MI, unsigned Op,
} }
} }
void X86AsmPrinter::printMemReference(const MachineInstr *MI, unsigned Op, static void printMemReference(X86AsmPrinter &P, const MachineInstr *MI,
raw_ostream &O, const char *Modifier) { unsigned Op, raw_ostream &O,
const char *Modifier = NULL) {
assert(isMem(MI, Op) && "Invalid memory reference!"); assert(isMem(MI, Op) && "Invalid memory reference!");
const MachineOperand &Segment = MI->getOperand(Op+4); const MachineOperand &Segment = MI->getOperand(Op+4);
if (Segment.getReg()) { if (Segment.getReg()) {
printOperand(*this, MI, Op+4, O, Modifier); printOperand(P, MI, Op+4, O, Modifier);
O << ':'; O << ':';
} }
printLeaMemReference(MI, Op, O, Modifier); printLeaMemReference(P, MI, Op, O, Modifier);
} }
void X86AsmPrinter::printIntelMemReference(const MachineInstr *MI, unsigned Op, static void printIntelMemReference(X86AsmPrinter &P, const MachineInstr *MI,
raw_ostream &O, const char *Modifier, unsigned Op, raw_ostream &O,
unsigned AsmVariant){ const char *Modifier = NULL,
unsigned AsmVariant = 1) {
const MachineOperand &BaseReg = MI->getOperand(Op); const MachineOperand &BaseReg = MI->getOperand(Op);
unsigned ScaleVal = MI->getOperand(Op+1).getImm(); unsigned ScaleVal = MI->getOperand(Op+1).getImm();
const MachineOperand &IndexReg = MI->getOperand(Op+2); const MachineOperand &IndexReg = MI->getOperand(Op+2);
@ -337,7 +340,7 @@ void X86AsmPrinter::printIntelMemReference(const MachineInstr *MI, unsigned Op,
// If this has a segment register, print it. // If this has a segment register, print it.
if (SegReg.getReg()) { if (SegReg.getReg()) {
printOperand(*this, MI, Op+4, O, Modifier, AsmVariant); printOperand(P, MI, Op+4, O, Modifier, AsmVariant);
O << ':'; O << ':';
} }
@ -345,7 +348,7 @@ void X86AsmPrinter::printIntelMemReference(const MachineInstr *MI, unsigned Op,
bool NeedPlus = false; bool NeedPlus = false;
if (BaseReg.getReg()) { if (BaseReg.getReg()) {
printOperand(*this, MI, Op, O, Modifier, AsmVariant); printOperand(P, MI, Op, O, Modifier, AsmVariant);
NeedPlus = true; NeedPlus = true;
} }
@ -353,13 +356,13 @@ void X86AsmPrinter::printIntelMemReference(const MachineInstr *MI, unsigned Op,
if (NeedPlus) O << " + "; if (NeedPlus) O << " + ";
if (ScaleVal != 1) if (ScaleVal != 1)
O << ScaleVal << '*'; O << ScaleVal << '*';
printOperand(*this, MI, Op+2, O, Modifier, AsmVariant); printOperand(P, MI, Op+2, O, Modifier, AsmVariant);
NeedPlus = true; NeedPlus = true;
} }
if (!DispSpec.isImm()) { if (!DispSpec.isImm()) {
if (NeedPlus) O << " + "; if (NeedPlus) O << " + ";
printOperand(*this, MI, Op+3, O, Modifier, AsmVariant); printOperand(P, MI, Op+3, O, Modifier, AsmVariant);
} else { } else {
int64_t DispVal = DispSpec.getImm(); int64_t DispVal = DispSpec.getImm();
if (DispVal || (!IndexReg.getReg() && !BaseReg.getReg())) { if (DispVal || (!IndexReg.getReg() && !BaseReg.getReg())) {
@ -377,8 +380,8 @@ void X86AsmPrinter::printIntelMemReference(const MachineInstr *MI, unsigned Op,
O << ']'; O << ']';
} }
bool X86AsmPrinter::printAsmMRegister(const MachineOperand &MO, char Mode, static bool printAsmMRegister(X86AsmPrinter &P, const MachineOperand &MO,
raw_ostream &O) { char Mode, raw_ostream &O) {
unsigned Reg = MO.getReg(); unsigned Reg = MO.getReg();
switch (Mode) { switch (Mode) {
default: return true; // Unknown mode. default: return true; // Unknown mode.
@ -461,7 +464,7 @@ bool X86AsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
case 'k': // Print SImode register case 'k': // Print SImode register
case 'q': // Print DImode register case 'q': // Print DImode register
if (MO.isReg()) if (MO.isReg())
return printAsmMRegister(MO, ExtraCode[0], O); return printAsmMRegister(*this, MO, ExtraCode[0], O);
printOperand(*this, MI, OpNo, O); printOperand(*this, MI, OpNo, O);
return false; return false;
@ -489,7 +492,7 @@ bool X86AsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI,
const char *ExtraCode, const char *ExtraCode,
raw_ostream &O) { raw_ostream &O) {
if (AsmVariant) { if (AsmVariant) {
printIntelMemReference(MI, OpNo, O); printIntelMemReference(*this, MI, OpNo, O);
return false; return false;
} }
@ -506,14 +509,14 @@ bool X86AsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI,
// These only apply to registers, ignore on mem. // These only apply to registers, ignore on mem.
break; break;
case 'H': case 'H':
printMemReference(MI, OpNo, O, "H"); printMemReference(*this, MI, OpNo, O, "H");
return false; return false;
case 'P': // Don't print @PLT, but do print as memory. case 'P': // Don't print @PLT, but do print as memory.
printMemReference(MI, OpNo, O, "no-rip"); printMemReference(*this, MI, OpNo, O, "no-rip");
return false; return false;
} }
} }
printMemReference(MI, OpNo, O); printMemReference(*this, MI, OpNo, O);
return false; return false;
} }

10
llvm/lib/Target/X86/X86AsmPrinter.h
View File

@ -55,7 +55,6 @@ class LLVM_LIBRARY_VISIBILITY X86AsmPrinter : public AsmPrinter {
virtual void EmitInstruction(const MachineInstr *MI) LLVM_OVERRIDE; virtual void EmitInstruction(const MachineInstr *MI) LLVM_OVERRIDE;
bool printAsmMRegister(const MachineOperand &MO, char Mode, raw_ostream &O);
virtual bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo, virtual bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
unsigned AsmVariant, const char *ExtraCode, unsigned AsmVariant, const char *ExtraCode,
raw_ostream &OS) LLVM_OVERRIDE; raw_ostream &OS) LLVM_OVERRIDE;
@ -63,15 +62,6 @@ class LLVM_LIBRARY_VISIBILITY X86AsmPrinter : public AsmPrinter {
unsigned AsmVariant, const char *ExtraCode, unsigned AsmVariant, const char *ExtraCode,
raw_ostream &OS) LLVM_OVERRIDE; raw_ostream &OS) LLVM_OVERRIDE;
void printMemReference(const MachineInstr *MI, unsigned Op, raw_ostream &O,
const char *Modifier=NULL);
void printLeaMemReference(const MachineInstr *MI, unsigned Op, raw_ostream &O,
const char *Modifier=NULL);
void printIntelMemReference(const MachineInstr *MI, unsigned Op,
raw_ostream &O, const char *Modifier=NULL,
unsigned AsmVariant = 1);
virtual bool runOnMachineFunction(MachineFunction &F) LLVM_OVERRIDE; virtual bool runOnMachineFunction(MachineFunction &F) LLVM_OVERRIDE;
}; };