6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-10-07 05:55:44 +00:00
Code Issues Projects Releases Wiki Activity

remove the MAI argument to MCExpr::print and switch overthing to use << when printing them.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@93699 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2010-01-18 00:37:40 +00:00
parent 950558aa23
commit 8cb9a3b13f
9 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/MC/MCExpr.h
View File

@ -51,7 +51,7 @@ public:
/// @name Utility Methods
/// @{
void print(raw_ostream &OS, const MCAsmInfo *MAI) const;
void print(raw_ostream &OS) const;
void dump() const;
/// @}
@ -75,6 +75,11 @@ public:
static bool classof(const MCExpr *) { return true; }
};
inline raw_ostream &operator<<(raw_ostream &OS, const MCExpr &E) {
E.print(OS);
return OS;
}
//// MCConstantExpr - Represent a constant integer expression.
class MCConstantExpr : public MCExpr {

3
lib/CodeGen/AsmPrinter/DwarfException.cpp
View File

@ -194,8 +194,7 @@ void DwarfException::EmitCIE(const Function *PersonalityFn, unsigned Index) {
PersonalityRef = CreateLabelDiff(PersonalityRef, "personalityref_addr",
Index);
O << MAI->getData32bitsDirective();
PersonalityRef->print(O, MAI);
O << MAI->getData32bitsDirective() << *PersonalityRef;
Asm->EOL("Personality");
Asm->EmitInt8(LSDAEncoding);

12
lib/MC/MCAsmStreamer.cpp
View File

@ -118,9 +118,7 @@ void MCAsmStreamer::EmitAssignment(MCSymbol *Symbol, const MCExpr *Value) {
assert((Symbol->isUndefined() || Symbol->isAbsolute()) &&
"Cannot define a symbol twice!");
OS << *Symbol << " = ";
Value->print(OS, &MAI);
OS << '\n';
OS << *Symbol << " = " << *Value << '\n';
// FIXME: Lift context changes into super class.
// FIXME: Set associated section.
@ -194,9 +192,7 @@ void MCAsmStreamer::EmitValue(const MCExpr *Value, unsigned Size) {
case 8: OS << ".quad"; break;
}
OS << ' ';
truncateToSize(Value, Size)->print(OS, &MAI);
OS << '\n';
OS << ' ' << *truncateToSize(Value, Size) << '\n';
}
void MCAsmStreamer::EmitValueToAlignment(unsigned ByteAlignment, int64_t Value,
@ -250,9 +246,7 @@ void MCAsmStreamer::EmitValueToAlignment(unsigned ByteAlignment, int64_t Value,
void MCAsmStreamer::EmitValueToOffset(const MCExpr *Offset,
unsigned char Value) {
// FIXME: Verify that Offset is associated with the current section.
OS << ".org ";
Offset->print(OS, &MAI);
OS << ", " << (unsigned) Value << '\n';
OS << ".org " << *Offset << ", " << (unsigned) Value << '\n';
}
void MCAsmStreamer::EmitInstruction(const MCInst &Inst) {

18
lib/MC/MCExpr.cpp
View File

@ -15,7 +15,7 @@
#include "llvm/Support/raw_ostream.h"
using namespace llvm;
void MCExpr::print(raw_ostream &OS, const MCAsmInfo *MAI) const {
void MCExpr::print(raw_ostream &OS) const {
switch (getKind()) {
case MCExpr::Constant:
OS << cast<MCConstantExpr>(*this).getValue();
@ -42,7 +42,7 @@ void MCExpr::print(raw_ostream &OS, const MCAsmInfo *MAI) const {
case MCUnaryExpr::Not: OS << '~'; break;
case MCUnaryExpr::Plus: OS << '+'; break;
}
UE.getSubExpr()->print(OS, MAI);
OS << *UE.getSubExpr();
return;
}
@ -51,11 +51,9 @@ void MCExpr::print(raw_ostream &OS, const MCAsmInfo *MAI) const {
// Only print parens around the LHS if it is non-trivial.
if (isa<MCConstantExpr>(BE.getLHS()) || isa<MCSymbolRefExpr>(BE.getLHS())) {
BE.getLHS()->print(OS, MAI);
OS << *BE.getLHS();
} else {
OS << '(';
BE.getLHS()->print(OS, MAI);
OS << ')';
OS << '(' << *BE.getLHS() << ')';
}
switch (BE.getOpcode()) {
@ -92,11 +90,9 @@ void MCExpr::print(raw_ostream &OS, const MCAsmInfo *MAI) const {
// Only print parens around the LHS if it is non-trivial.
if (isa<MCConstantExpr>(BE.getRHS()) || isa<MCSymbolRefExpr>(BE.getRHS())) {
BE.getRHS()->print(OS, MAI);
OS << *BE.getRHS();
} else {
OS << '(';
BE.getRHS()->print(OS, MAI);
OS << ')';
OS << '(' << *BE.getRHS() << ')';
}
return;
}
@ -106,7 +102,7 @@ void MCExpr::print(raw_ostream &OS, const MCAsmInfo *MAI) const {
}
void MCExpr::dump() const {
print(dbgs(), 0);
print(dbgs());
dbgs() << '\n';
}

4
lib/MC/MCInst.cpp
View File

@ -23,9 +23,7 @@ void MCOperand::print(raw_ostream &OS, const MCAsmInfo *MAI) const {
else if (isImm())
OS << "Imm:" << getImm();
else if (isExpr()) {
OS << "Expr:(";
getExpr()->print(OS, MAI);
OS << ")";
OS << "Expr:(" << *getExpr() << ")";
} else
OS << "UNDEFINED";
OS << ">";

2
lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp
View File

@ -62,7 +62,7 @@ void ARMInstPrinter::printOperand(const MCInst *MI, unsigned OpNo,
} else {
assert((Modifier == 0 || Modifier[0] == 0) && "No modifiers supported");
assert(Op.isExpr() && "unknown operand kind in printOperand");
Op.getExpr()->print(O, &MAI);
O << *Op.getExpr();
}
}

8
lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.cpp
View File

@ -39,7 +39,7 @@ void MSP430InstPrinter::printPCRelImmOperand(const MCInst *MI, unsigned OpNo) {
O << Op.getImm();
else {
assert(Op.isExpr() && "unknown pcrel immediate operand");
Op.getExpr()->print(O, &MAI);
O << *Op.getExpr();
}
}
@ -53,8 +53,7 @@ void MSP430InstPrinter::printOperand(const MCInst *MI, unsigned OpNo,
O << '#' << Op.getImm();
} else {
assert(Op.isExpr() && "unknown operand kind in printOperand");
O << '#';
Op.getExpr()->print(O, &MAI);
O << '#' << *Op.getExpr();
}
}
@ -65,8 +64,7 @@ void MSP430InstPrinter::printSrcMemOperand(const MCInst *MI, unsigned OpNo,
// Print displacement first
if (Disp.isExpr()) {
O << '&';
Disp.getExpr()->print(O, &MAI);
O << '&' << *Disp.getExpr();
} else {
assert(Disp.isImm() && "Expected immediate in displacement field");
if (!Base.getReg())

7
lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp
View File

@ -55,7 +55,7 @@ void X86ATTInstPrinter::print_pcrel_imm(const MCInst *MI, unsigned OpNo) {
O << (int)Op.getImm();
else {
assert(Op.isExpr() && "unknown pcrel immediate operand");
Op.getExpr()->print(O, &MAI);
O << *Op.getExpr();
}
}
@ -68,8 +68,7 @@ void X86ATTInstPrinter::printOperand(const MCInst *MI, unsigned OpNo) {
O << '$' << Op.getImm();
} else {
assert(Op.isExpr() && "unknown operand kind in printOperand");
O << '$';
Op.getExpr()->print(O, &MAI);
O << '$' << *Op.getExpr();
}
}
@ -84,7 +83,7 @@ void X86ATTInstPrinter::printLeaMemReference(const MCInst *MI, unsigned Op) {
O << DispVal;
} else {
assert(DispSpec.isExpr() && "non-immediate displacement for LEA?");
DispSpec.getExpr()->print(O, &MAI);
O << *DispSpec.getExpr();
}
if (IndexReg.getReg() || BaseReg.getReg()) {

6
lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp
View File

@ -52,7 +52,7 @@ void X86IntelInstPrinter::print_pcrel_imm(const MCInst *MI, unsigned OpNo) {
O << Op.getImm();
else {
assert(Op.isExpr() && "unknown pcrel immediate operand");
Op.getExpr()->print(O, &MAI);
O << *Op.getExpr();
}
}
@ -72,7 +72,7 @@ void X86IntelInstPrinter::printOperand(const MCInst *MI, unsigned OpNo,
O << Op.getImm();
} else {
assert(Op.isExpr() && "unknown operand kind in printOperand");
Op.getExpr()->print(O, &MAI);
O << *Op.getExpr();
}
}
@ -102,7 +102,7 @@ void X86IntelInstPrinter::printLeaMemReference(const MCInst *MI, unsigned Op) {
if (!DispSpec.isImm()) {
if (NeedPlus) O << " + ";
assert(DispSpec.isExpr() && "non-immediate displacement for LEA?");
DispSpec.getExpr()->print(O, &MAI);
O << *DispSpec.getExpr();
} else {
int64_t DispVal = DispSpec.getImm();
if (DispVal || (!IndexReg.getReg() && !BaseReg.getReg())) {