X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FMC%2FMCExpr.cpp;h=75bde8ed36be4be3736132628bdf3f16acc406ac;hb=20d5e1b247c63b8d6c7d74460875382c002994e7;hp=d601d4e94abb0dcb8c5e2753fc338c82db98370e;hpb=34a9d4b3b9b7858b729a1af67afa721c048fe5e7;p=oota-llvm.git diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp index d601d4e94ab..75bde8ed36b 100644 --- a/lib/MC/MCExpr.cpp +++ b/lib/MC/MCExpr.cpp @@ -11,6 +11,7 @@ #include "llvm/MC/MCExpr.h" #include "llvm/ADT/Statistic.h" #include "llvm/ADT/StringSwitch.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCAsmLayout.h" #include "llvm/MC/MCAssembler.h" #include "llvm/MC/MCContext.h" @@ -42,31 +43,17 @@ void MCExpr::print(raw_ostream &OS) const { // Parenthesize names that start with $ so that they don't look like // absolute names. bool UseParens = Sym.getName()[0] == '$'; - - if (SRE.getKind() == MCSymbolRefExpr::VK_PPC_DARWIN_HA16 || - SRE.getKind() == MCSymbolRefExpr::VK_PPC_DARWIN_LO16) { - OS << MCSymbolRefExpr::getVariantKindName(SRE.getKind()); - UseParens = true; - } - if (UseParens) OS << '(' << Sym << ')'; else OS << Sym; - if (SRE.getKind() == MCSymbolRefExpr::VK_ARM_PLT || - SRE.getKind() == MCSymbolRefExpr::VK_ARM_TLSGD || - SRE.getKind() == MCSymbolRefExpr::VK_ARM_GOT || - SRE.getKind() == MCSymbolRefExpr::VK_ARM_GOTOFF || - SRE.getKind() == MCSymbolRefExpr::VK_ARM_TPOFF || - SRE.getKind() == MCSymbolRefExpr::VK_ARM_GOTTPOFF || - SRE.getKind() == MCSymbolRefExpr::VK_ARM_TARGET1 || - SRE.getKind() == MCSymbolRefExpr::VK_ARM_TARGET2) - OS << MCSymbolRefExpr::getVariantKindName(SRE.getKind()); - else if (SRE.getKind() != MCSymbolRefExpr::VK_None && - SRE.getKind() != MCSymbolRefExpr::VK_PPC_DARWIN_HA16 && - SRE.getKind() != MCSymbolRefExpr::VK_PPC_DARWIN_LO16) - OS << '@' << MCSymbolRefExpr::getVariantKindName(SRE.getKind()); + if (SRE.getKind() != MCSymbolRefExpr::VK_None) { + if (SRE.getMCAsmInfo().useParensForSymbolVariant()) + OS << '(' << MCSymbolRefExpr::getVariantKindName(SRE.getKind()) << ')'; + else + OS << '@' << MCSymbolRefExpr::getVariantKindName(SRE.getKind()); + } return; } @@ -165,7 +152,7 @@ const MCConstantExpr *MCConstantExpr::Create(int64_t Value, MCContext &Ctx) { const MCSymbolRefExpr *MCSymbolRefExpr::Create(const MCSymbol *Sym, VariantKind Kind, MCContext &Ctx) { - return new (Ctx) MCSymbolRefExpr(Sym, Kind); + return new (Ctx) MCSymbolRefExpr(Sym, Kind, Ctx.getAsmInfo()); } const MCSymbolRefExpr *MCSymbolRefExpr::Create(StringRef Name, VariantKind Kind, @@ -192,25 +179,66 @@ StringRef MCSymbolRefExpr::getVariantKindName(VariantKind Kind) { case VK_TPOFF: return "TPOFF"; case VK_DTPOFF: return "DTPOFF"; case VK_TLVP: return "TLVP"; - case VK_SECREL: return "SECREL"; - case VK_ARM_PLT: return "(PLT)"; - case VK_ARM_GOT: return "(GOT)"; - case VK_ARM_GOTOFF: return "(GOTOFF)"; - case VK_ARM_TPOFF: return "(tpoff)"; - case VK_ARM_GOTTPOFF: return "(gottpoff)"; - case VK_ARM_TLSGD: return "(tlsgd)"; - case VK_ARM_TARGET1: return "(target1)"; - case VK_ARM_TARGET2: return "(target2)"; - case VK_PPC_TOC: return "tocbase"; - case VK_PPC_TOC_ENTRY: return "toc"; - case VK_PPC_DARWIN_HA16: return "ha16"; - case VK_PPC_DARWIN_LO16: return "lo16"; - case VK_PPC_GAS_HA16: return "ha"; - case VK_PPC_GAS_LO16: return "l"; - case VK_PPC_TPREL16_HA: return "tprel@ha"; - case VK_PPC_TPREL16_LO: return "tprel@l"; - case VK_PPC_TOC16_HA: return "toc@ha"; - case VK_PPC_TOC16_LO: return "toc@l"; + case VK_SECREL: return "SECREL32"; + case VK_ARM_NONE: return "none"; + case VK_ARM_TARGET1: return "target1"; + case VK_ARM_TARGET2: return "target2"; + case VK_ARM_PREL31: return "prel31"; + case VK_ARM_TLSLDO: return "tlsldo"; + case VK_ARM_TLSCALL: return "tlscall"; + case VK_ARM_TLSDESC: return "tlsdesc"; + case VK_ARM_TLSDESCSEQ: return "tlsdescseq"; + case VK_PPC_LO: return "l"; + case VK_PPC_HI: return "h"; + case VK_PPC_HA: return "ha"; + case VK_PPC_HIGHER: return "higher"; + case VK_PPC_HIGHERA: return "highera"; + case VK_PPC_HIGHEST: return "highest"; + case VK_PPC_HIGHESTA: return "highesta"; + case VK_PPC_GOT_LO: return "got@l"; + case VK_PPC_GOT_HI: return "got@h"; + case VK_PPC_GOT_HA: return "got@ha"; + case VK_PPC_TOCBASE: return "tocbase"; + case VK_PPC_TOC: return "toc"; + case VK_PPC_TOC_LO: return "toc@l"; + case VK_PPC_TOC_HI: return "toc@h"; + case VK_PPC_TOC_HA: return "toc@ha"; + case VK_PPC_DTPMOD: return "dtpmod"; + case VK_PPC_TPREL: return "tprel"; + case VK_PPC_TPREL_LO: return "tprel@l"; + case VK_PPC_TPREL_HI: return "tprel@h"; + case VK_PPC_TPREL_HA: return "tprel@ha"; + case VK_PPC_TPREL_HIGHER: return "tprel@higher"; + case VK_PPC_TPREL_HIGHERA: return "tprel@highera"; + case VK_PPC_TPREL_HIGHEST: return "tprel@highest"; + case VK_PPC_TPREL_HIGHESTA: return "tprel@highesta"; + case VK_PPC_DTPREL: return "dtprel"; + case VK_PPC_DTPREL_LO: return "dtprel@l"; + case VK_PPC_DTPREL_HI: return "dtprel@h"; + case VK_PPC_DTPREL_HA: return "dtprel@ha"; + case VK_PPC_DTPREL_HIGHER: return "dtprel@higher"; + case VK_PPC_DTPREL_HIGHERA: return "dtprel@highera"; + case VK_PPC_DTPREL_HIGHEST: return "dtprel@highest"; + case VK_PPC_DTPREL_HIGHESTA: return "dtprel@highesta"; + case VK_PPC_GOT_TPREL: return "got@tprel"; + case VK_PPC_GOT_TPREL_LO: return "got@tprel@l"; + case VK_PPC_GOT_TPREL_HI: return "got@tprel@h"; + case VK_PPC_GOT_TPREL_HA: return "got@tprel@ha"; + case VK_PPC_GOT_DTPREL: return "got@dtprel"; + case VK_PPC_GOT_DTPREL_LO: return "got@dtprel@l"; + case VK_PPC_GOT_DTPREL_HI: return "got@dtprel@h"; + case VK_PPC_GOT_DTPREL_HA: return "got@dtprel@ha"; + case VK_PPC_TLS: return "tls"; + case VK_PPC_GOT_TLSGD: return "got@tlsgd"; + case VK_PPC_GOT_TLSGD_LO: return "got@tlsgd@l"; + case VK_PPC_GOT_TLSGD_HI: return "got@tlsgd@h"; + case VK_PPC_GOT_TLSGD_HA: return "got@tlsgd@ha"; + case VK_PPC_TLSGD: return "tlsgd"; + case VK_PPC_GOT_TLSLD: return "got@tlsld"; + case VK_PPC_GOT_TLSLD_LO: return "got@tlsld@l"; + case VK_PPC_GOT_TLSLD_HI: return "got@tlsld@h"; + case VK_PPC_GOT_TLSLD_HA: return "got@tlsld@ha"; + case VK_PPC_TLSLD: return "tlsld"; case VK_Mips_GPREL: return "GPREL"; case VK_Mips_GOT_CALL: return "GOT_CALL"; case VK_Mips_GOT16: return "GOT16"; @@ -235,6 +263,7 @@ StringRef MCSymbolRefExpr::getVariantKindName(VariantKind Kind) { case VK_Mips_GOT_LO16: return "GOT_LO16"; case VK_Mips_CALL_HI16: return "CALL_HI16"; case VK_Mips_CALL_LO16: return "CALL_LO16"; + case VK_COFF_IMGREL32: return "IMGREL32"; } llvm_unreachable("Invalid variant kind"); } @@ -270,6 +299,122 @@ MCSymbolRefExpr::getVariantKindForName(StringRef Name) { .Case("dtpoff", VK_DTPOFF) .Case("TLVP", VK_TLVP) .Case("tlvp", VK_TLVP) + .Case("IMGREL", VK_COFF_IMGREL32) + .Case("imgrel", VK_COFF_IMGREL32) + .Case("SECREL32", VK_SECREL) + .Case("secrel32", VK_SECREL) + .Case("L", VK_PPC_LO) + .Case("l", VK_PPC_LO) + .Case("H", VK_PPC_HI) + .Case("h", VK_PPC_HI) + .Case("HA", VK_PPC_HA) + .Case("ha", VK_PPC_HA) + .Case("HIGHER", VK_PPC_HIGHER) + .Case("higher", VK_PPC_HIGHER) + .Case("HIGHERA", VK_PPC_HIGHERA) + .Case("highera", VK_PPC_HIGHERA) + .Case("HIGHEST", VK_PPC_HIGHEST) + .Case("highest", VK_PPC_HIGHEST) + .Case("HIGHESTA", VK_PPC_HIGHESTA) + .Case("highesta", VK_PPC_HIGHESTA) + .Case("GOT@L", VK_PPC_GOT_LO) + .Case("got@l", VK_PPC_GOT_LO) + .Case("GOT@H", VK_PPC_GOT_HI) + .Case("got@h", VK_PPC_GOT_HI) + .Case("GOT@HA", VK_PPC_GOT_HA) + .Case("got@ha", VK_PPC_GOT_HA) + .Case("TOCBASE", VK_PPC_TOCBASE) + .Case("tocbase", VK_PPC_TOCBASE) + .Case("TOC", VK_PPC_TOC) + .Case("toc", VK_PPC_TOC) + .Case("TOC@L", VK_PPC_TOC_LO) + .Case("toc@l", VK_PPC_TOC_LO) + .Case("TOC@H", VK_PPC_TOC_HI) + .Case("toc@h", VK_PPC_TOC_HI) + .Case("TOC@HA", VK_PPC_TOC_HA) + .Case("toc@ha", VK_PPC_TOC_HA) + .Case("TLS", VK_PPC_TLS) + .Case("tls", VK_PPC_TLS) + .Case("DTPMOD", VK_PPC_DTPMOD) + .Case("dtpmod", VK_PPC_DTPMOD) + .Case("TPREL", VK_PPC_TPREL) + .Case("tprel", VK_PPC_TPREL) + .Case("TPREL@L", VK_PPC_TPREL_LO) + .Case("tprel@l", VK_PPC_TPREL_LO) + .Case("TPREL@H", VK_PPC_TPREL_HI) + .Case("tprel@h", VK_PPC_TPREL_HI) + .Case("TPREL@HA", VK_PPC_TPREL_HA) + .Case("tprel@ha", VK_PPC_TPREL_HA) + .Case("TPREL@HIGHER", VK_PPC_TPREL_HIGHER) + .Case("tprel@higher", VK_PPC_TPREL_HIGHER) + .Case("TPREL@HIGHERA", VK_PPC_TPREL_HIGHERA) + .Case("tprel@highera", VK_PPC_TPREL_HIGHERA) + .Case("TPREL@HIGHEST", VK_PPC_TPREL_HIGHEST) + .Case("tprel@highest", VK_PPC_TPREL_HIGHEST) + .Case("TPREL@HIGHESTA", VK_PPC_TPREL_HIGHESTA) + .Case("tprel@highesta", VK_PPC_TPREL_HIGHESTA) + .Case("DTPREL", VK_PPC_DTPREL) + .Case("dtprel", VK_PPC_DTPREL) + .Case("DTPREL@L", VK_PPC_DTPREL_LO) + .Case("dtprel@l", VK_PPC_DTPREL_LO) + .Case("DTPREL@H", VK_PPC_DTPREL_HI) + .Case("dtprel@h", VK_PPC_DTPREL_HI) + .Case("DTPREL@HA", VK_PPC_DTPREL_HA) + .Case("dtprel@ha", VK_PPC_DTPREL_HA) + .Case("DTPREL@HIGHER", VK_PPC_DTPREL_HIGHER) + .Case("dtprel@higher", VK_PPC_DTPREL_HIGHER) + .Case("DTPREL@HIGHERA", VK_PPC_DTPREL_HIGHERA) + .Case("dtprel@highera", VK_PPC_DTPREL_HIGHERA) + .Case("DTPREL@HIGHEST", VK_PPC_DTPREL_HIGHEST) + .Case("dtprel@highest", VK_PPC_DTPREL_HIGHEST) + .Case("DTPREL@HIGHESTA", VK_PPC_DTPREL_HIGHESTA) + .Case("dtprel@highesta", VK_PPC_DTPREL_HIGHESTA) + .Case("GOT@TPREL", VK_PPC_GOT_TPREL) + .Case("got@tprel", VK_PPC_GOT_TPREL) + .Case("GOT@TPREL@L", VK_PPC_GOT_TPREL_LO) + .Case("got@tprel@l", VK_PPC_GOT_TPREL_LO) + .Case("GOT@TPREL@H", VK_PPC_GOT_TPREL_HI) + .Case("got@tprel@h", VK_PPC_GOT_TPREL_HI) + .Case("GOT@TPREL@HA", VK_PPC_GOT_TPREL_HA) + .Case("got@tprel@ha", VK_PPC_GOT_TPREL_HA) + .Case("GOT@DTPREL", VK_PPC_GOT_DTPREL) + .Case("got@dtprel", VK_PPC_GOT_DTPREL) + .Case("GOT@DTPREL@L", VK_PPC_GOT_DTPREL_LO) + .Case("got@dtprel@l", VK_PPC_GOT_DTPREL_LO) + .Case("GOT@DTPREL@H", VK_PPC_GOT_DTPREL_HI) + .Case("got@dtprel@h", VK_PPC_GOT_DTPREL_HI) + .Case("GOT@DTPREL@HA", VK_PPC_GOT_DTPREL_HA) + .Case("got@dtprel@ha", VK_PPC_GOT_DTPREL_HA) + .Case("GOT@TLSGD", VK_PPC_GOT_TLSGD) + .Case("got@tlsgd", VK_PPC_GOT_TLSGD) + .Case("GOT@TLSGD@L", VK_PPC_GOT_TLSGD_LO) + .Case("got@tlsgd@l", VK_PPC_GOT_TLSGD_LO) + .Case("GOT@TLSGD@H", VK_PPC_GOT_TLSGD_HI) + .Case("got@tlsgd@h", VK_PPC_GOT_TLSGD_HI) + .Case("GOT@TLSGD@HA", VK_PPC_GOT_TLSGD_HA) + .Case("got@tlsgd@ha", VK_PPC_GOT_TLSGD_HA) + .Case("GOT@TLSLD", VK_PPC_GOT_TLSLD) + .Case("got@tlsld", VK_PPC_GOT_TLSLD) + .Case("GOT@TLSLD@L", VK_PPC_GOT_TLSLD_LO) + .Case("got@tlsld@l", VK_PPC_GOT_TLSLD_LO) + .Case("GOT@TLSLD@H", VK_PPC_GOT_TLSLD_HI) + .Case("got@tlsld@h", VK_PPC_GOT_TLSLD_HI) + .Case("GOT@TLSLD@HA", VK_PPC_GOT_TLSLD_HA) + .Case("got@tlsld@ha", VK_PPC_GOT_TLSLD_HA) + .Case("NONE", VK_ARM_NONE) + .Case("none", VK_ARM_NONE) + .Case("TARGET1", VK_ARM_TARGET1) + .Case("target1", VK_ARM_TARGET1) + .Case("TARGET2", VK_ARM_TARGET2) + .Case("target2", VK_ARM_TARGET2) + .Case("PREL31", VK_ARM_PREL31) + .Case("prel31", VK_ARM_PREL31) + .Case("TLSLDO", VK_ARM_TLSLDO) + .Case("tlsldo", VK_ARM_TLSLDO) + .Case("TLSCALL", VK_ARM_TLSCALL) + .Case("tlscall", VK_ARM_TLSCALL) + .Case("TLSDESC", VK_ARM_TLSDESC) + .Case("tlsdesc", VK_ARM_TLSDESC) .Default(VK_Invalid); }