forked from OSchip/llvm-project
merge globaladdress symbol processing stuff into other stuff. Now
all global variable operand flag processing stuff is shared between different operand types. llvm-svn: 80886
This commit is contained in:
parent
155deabbcb
commit
954b9cd41f
|
@ -71,7 +71,7 @@ class VISIBILITY_HIDDEN X86ATTAsmPrinter : public AsmPrinter {
|
|||
// New MCInst printing stuff.
|
||||
void printInstruction(const MCInst *MI);
|
||||
MCSymbol *GetPICBaseSymbol();
|
||||
MCOperand LowerGlobalAddressOperand(const MachineOperand &MO);
|
||||
MCSymbol *GetGlobalAddressSymbol(const MachineOperand &MO);
|
||||
MCSymbol *GetExternalSymbolSymbol(const MachineOperand &MO);
|
||||
MCSymbol *GetJumpTableSymbol(const MachineOperand &MO);
|
||||
MCSymbol *GetConstantPoolIndexSymbol(const MachineOperand &MO);
|
||||
|
|
|
@ -54,7 +54,7 @@ static void lower_lea64_32mem(MCInst *MI, unsigned OpNo) {
|
|||
|
||||
/// LowerGlobalAddressOperand - Lower an MO_GlobalAddress operand to an
|
||||
/// MCOperand.
|
||||
MCOperand X86ATTAsmPrinter::LowerGlobalAddressOperand(const MachineOperand &MO){
|
||||
MCSymbol *X86ATTAsmPrinter::GetGlobalAddressSymbol(const MachineOperand &MO) {
|
||||
const GlobalValue *GV = MO.getGlobal();
|
||||
|
||||
const char *Suffix = "";
|
||||
|
@ -70,48 +70,27 @@ MCOperand X86ATTAsmPrinter::LowerGlobalAddressOperand(const MachineOperand &MO){
|
|||
if (Subtarget->isTargetCygMing())
|
||||
DecorateCygMingName(Name, GV);
|
||||
|
||||
// Handle dllimport linkage.
|
||||
if (MO.getTargetFlags() == X86II::MO_DLLIMPORT)
|
||||
Name = "__imp_" + Name;
|
||||
|
||||
if (MO.getTargetFlags() == X86II::MO_DARWIN_NONLAZY ||
|
||||
MO.getTargetFlags() == X86II::MO_DARWIN_NONLAZY_PIC_BASE)
|
||||
GVStubs[Name] = Mang->getMangledName(GV);
|
||||
else if (MO.getTargetFlags() == X86II::MO_DARWIN_HIDDEN_NONLAZY ||
|
||||
MO.getTargetFlags() == X86II::MO_DARWIN_HIDDEN_NONLAZY_PIC_BASE)
|
||||
HiddenGVStubs[Name] = Mang->getMangledName(GV);
|
||||
else if (MO.getTargetFlags() == X86II::MO_DARWIN_STUB)
|
||||
FnStubs[Name] = Mang->getMangledName(GV);
|
||||
|
||||
|
||||
// Handle target operand flags.
|
||||
// FIXME: This should be common between external symbols, constant pool etc.
|
||||
MCSymbol *NegatedSymbol = 0;
|
||||
|
||||
switch (MO.getTargetFlags()) {
|
||||
default:
|
||||
llvm_unreachable("Unknown target flag on GV operand");
|
||||
default: llvm_unreachable("Unknown target flag on GV operand");
|
||||
case X86II::MO_NO_FLAG: // No flag.
|
||||
case X86II::MO_GOT_ABSOLUTE_ADDRESS: // Doesn't modify symbol name.
|
||||
case X86II::MO_PIC_BASE_OFFSET: // Doesn't modify symbol name.
|
||||
break;
|
||||
case X86II::MO_DLLIMPORT:
|
||||
// Handle dllimport linkage.
|
||||
Name = "__imp_" + Name;
|
||||
break;
|
||||
case X86II::MO_DARWIN_NONLAZY:
|
||||
case X86II::MO_DARWIN_HIDDEN_NONLAZY:
|
||||
case X86II::MO_DLLIMPORT:
|
||||
case X86II::MO_DARWIN_STUB:
|
||||
// These affect the name of the symbol, not any suffix.
|
||||
break;
|
||||
case X86II::MO_GOT_ABSOLUTE_ADDRESS:
|
||||
assert(0 && "Reloc mode unimp!");
|
||||
//O << " + [.-";
|
||||
//PrintPICBaseSymbol();
|
||||
//O << ']';
|
||||
break;
|
||||
case X86II::MO_PIC_BASE_OFFSET:
|
||||
case X86II::MO_DARWIN_NONLAZY_PIC_BASE:
|
||||
case X86II::MO_DARWIN_HIDDEN_NONLAZY_PIC_BASE:
|
||||
// Subtract the pic base.
|
||||
NegatedSymbol = GetPICBaseSymbol();
|
||||
GVStubs[Name] = Mang->getMangledName(GV);
|
||||
break;
|
||||
case X86II::MO_DARWIN_HIDDEN_NONLAZY:
|
||||
case X86II::MO_DARWIN_HIDDEN_NONLAZY_PIC_BASE:
|
||||
HiddenGVStubs[Name] = Mang->getMangledName(GV);
|
||||
break;
|
||||
case X86II::MO_DARWIN_STUB:
|
||||
FnStubs[Name] = Mang->getMangledName(GV);
|
||||
break;
|
||||
|
||||
// FIXME: These probably should be a modifier on the symbol or something??
|
||||
case X86II::MO_TLSGD: Name += "@TLSGD"; break;
|
||||
case X86II::MO_GOTTPOFF: Name += "@GOTTPOFF"; break;
|
||||
|
@ -124,20 +103,7 @@ MCOperand X86ATTAsmPrinter::LowerGlobalAddressOperand(const MachineOperand &MO){
|
|||
case X86II::MO_PLT: Name += "@PLT"; break;
|
||||
}
|
||||
|
||||
// Create a symbol for the name.
|
||||
MCSymbol *Sym = OutContext.GetOrCreateSymbol(Name);
|
||||
// FIXME: We would like an efficient form for this, so we don't have to do a
|
||||
// lot of extra uniquing.
|
||||
const MCExpr *Expr = MCSymbolRefExpr::Create(Sym, OutContext);
|
||||
if (NegatedSymbol)
|
||||
Expr = MCBinaryExpr::CreateSub(Expr, MCSymbolRefExpr::Create(NegatedSymbol,
|
||||
OutContext),
|
||||
OutContext);
|
||||
if (MO.getOffset())
|
||||
Expr = MCBinaryExpr::CreateAdd(Expr, MCConstantExpr::Create(MO.getOffset(),
|
||||
OutContext),
|
||||
OutContext);
|
||||
return MCOperand::CreateExpr(Expr);
|
||||
return OutContext.GetOrCreateSymbol(Name);
|
||||
}
|
||||
|
||||
MCSymbol *X86ATTAsmPrinter::GetExternalSymbolSymbol(const MachineOperand &MO) {
|
||||
|
@ -198,9 +164,23 @@ MCOperand X86ATTAsmPrinter::LowerSymbolOperand(const MachineOperand &MO,
|
|||
MCSymbol *Sym) {
|
||||
MCSymbol *NegatedSymbol = 0;
|
||||
switch (MO.getTargetFlags()) {
|
||||
default:
|
||||
llvm_unreachable("Unknown target flag on GV operand");
|
||||
default: llvm_unreachable("Unknown target flag on GV operand");
|
||||
case X86II::MO_NO_FLAG: // No flag.
|
||||
|
||||
// These affect the name of the symbol, not any suffix.
|
||||
case X86II::MO_DARWIN_NONLAZY:
|
||||
case X86II::MO_DARWIN_HIDDEN_NONLAZY:
|
||||
case X86II::MO_DLLIMPORT:
|
||||
case X86II::MO_DARWIN_STUB:
|
||||
case X86II::MO_TLSGD:
|
||||
case X86II::MO_GOTTPOFF:
|
||||
case X86II::MO_INDNTPOFF:
|
||||
case X86II::MO_TPOFF:
|
||||
case X86II::MO_NTPOFF:
|
||||
case X86II::MO_GOTPCREL:
|
||||
case X86II::MO_GOT:
|
||||
case X86II::MO_GOTOFF:
|
||||
case X86II::MO_PLT:
|
||||
break;
|
||||
case X86II::MO_PIC_BASE_OFFSET:
|
||||
case X86II::MO_DARWIN_NONLAZY_PIC_BASE:
|
||||
|
@ -208,6 +188,12 @@ MCOperand X86ATTAsmPrinter::LowerSymbolOperand(const MachineOperand &MO,
|
|||
// Subtract the pic base.
|
||||
NegatedSymbol = GetPICBaseSymbol();
|
||||
break;
|
||||
case X86II::MO_GOT_ABSOLUTE_ADDRESS:
|
||||
assert(0 && "Reloc mode unimp!");
|
||||
//O << " + [.-";
|
||||
//PrintPICBaseSymbol();
|
||||
//O << ']';
|
||||
break;
|
||||
}
|
||||
|
||||
// FIXME: We would like an efficient form for this, so we don't have to do a
|
||||
|
@ -217,10 +203,13 @@ MCOperand X86ATTAsmPrinter::LowerSymbolOperand(const MachineOperand &MO,
|
|||
Expr = MCBinaryExpr::CreateSub(Expr, MCSymbolRefExpr::Create(NegatedSymbol,
|
||||
OutContext),
|
||||
OutContext);
|
||||
if (!MO.isSymbol() && MO.getOffset())
|
||||
Expr = MCBinaryExpr::CreateAdd(Expr, MCConstantExpr::Create(MO.getOffset(),
|
||||
OutContext),
|
||||
OutContext);
|
||||
return MCOperand::CreateExpr(Expr);
|
||||
}
|
||||
|
||||
|
||||
void X86ATTAsmPrinter::
|
||||
printInstructionThroughMCStreamer(const MachineInstr *MI) {
|
||||
|
||||
|
@ -288,7 +277,7 @@ printInstructionThroughMCStreamer(const MachineInstr *MI) {
|
|||
MO.getMBB()->getNumber());
|
||||
break;
|
||||
case MachineOperand::MO_GlobalAddress:
|
||||
MCOp = LowerGlobalAddressOperand(MO);
|
||||
MCOp = LowerSymbolOperand(MO, GetGlobalAddressSymbol(MO));
|
||||
break;
|
||||
case MachineOperand::MO_ExternalSymbol:
|
||||
MCOp = LowerSymbolOperand(MO, GetExternalSymbolSymbol(MO));
|
||||
|
|
Loading…
Reference in New Issue