From 19bd0398962e93f6df51f40ab1a88892f73a7b4a Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 25 Jan 2010 21:10:10 +0000 Subject: [PATCH] rename MAI::PICJumpTableDirective to MAI::GPRel32Directive to make it clear what it is, instead of how it is used. llvm-svn: 94448 --- llvm/include/llvm/MC/MCAsmInfo.h | 16 ++++++---------- llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 16 +++++++--------- llvm/lib/MC/MCAsmInfo.cpp | 2 +- llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp | 2 +- llvm/lib/Target/Mips/MipsMCAsmInfo.cpp | 2 +- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/llvm/include/llvm/MC/MCAsmInfo.h b/llvm/include/llvm/MC/MCAsmInfo.h index 8a3ab738100d..c4f15a09e70e 100644 --- a/llvm/include/llvm/MC/MCAsmInfo.h +++ b/llvm/include/llvm/MC/MCAsmInfo.h @@ -134,6 +134,11 @@ namespace llvm { const char *Data32bitsDirective; // Defaults to "\t.long\t" const char *Data64bitsDirective; // Defaults to "\t.quad\t" + /// GPRel32Directive - if non-null, a directive that is used to emit a word + /// which should be relocated as a 32-bit GP-relative offset, e.g. .gpword + /// on Mips or .gprel32 on Alpha. + const char *GPRel32Directive; // Defaults to NULL. + /// getDataASDirective - Return the directive that should be used to emit /// data of the specified size to the specified numeric address space. virtual const char *getDataASDirective(unsigned Size, unsigned AS) const { @@ -168,13 +173,6 @@ namespace llvm { /// space created as the result of a alignment directive. unsigned TextAlignFillValue; // Defaults to 0 - //===--- Section Switching Directives ---------------------------------===// - - /// PICJumpTableDirective - if non-null, the directive to emit before jump - /// table entries. FIXME: REMOVE THIS. - const char *PICJumpTableDirective; // Defaults to NULL. - - //===--- Global Variable Emission Directives --------------------------===// /// GlobalDirective - This is the directive used to declare a global entity. @@ -300,6 +298,7 @@ namespace llvm { const char *getData64bitsDirective(unsigned AS = 0) const { return AS == 0 ? Data64bitsDirective : getDataASDirective(64, AS); } + const char *getGPRel32Directive() const { return GPRel32Directive; } /// getNonexecutableStackSection - Targets can implement this method to /// specify a section to switch to if the translation unit doesn't have any @@ -373,9 +372,6 @@ namespace llvm { const char *getAscizDirective() const { return AscizDirective; } - const char *getPICJumpTableDirective() const { - return PICJumpTableDirective; - } const char *getAlignDirective() const { return AlignDirective; } diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 3077ae371d6a..7a44a0165605 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -541,15 +541,14 @@ void AsmPrinter::EmitJumpTableInfo(MachineJumpTableInfo *MJTI, void AsmPrinter::printPICJumpTableEntry(const MachineJumpTableInfo *MJTI, const MachineBasicBlock *MBB, unsigned uid) const { - // Use JumpTableDirective otherwise honor the entry size from the jump table - // info. - const char *JTEntryDirective = MAI->getPICJumpTableDirective(); - bool HadJTEntryDirective = JTEntryDirective != NULL; - if (!HadJTEntryDirective) { - JTEntryDirective = MJTI->getEntrySize() == 4 ? - MAI->getData32bitsDirective() : MAI->getData64bitsDirective(); + // If the target supports GPRel, use it. + if (const char *GPRel32Dir = MAI->getGPRel32Directive()) { + O << GPRel32Dir << *GetMBBSymbol(MBB->getNumber()) << '\n'; + return; } + const char *JTEntryDirective = MJTI->getEntrySize() == 4 ? + MAI->getData32bitsDirective() : MAI->getData64bitsDirective(); O << JTEntryDirective << ' '; // If we have emitted set directives for the jump table entries, print @@ -564,8 +563,7 @@ void AsmPrinter::printPICJumpTableEntry(const MachineJumpTableInfo *MJTI, O << *GetMBBSymbol(MBB->getNumber()); // If the arch uses custom Jump Table directives, don't calc relative to // JT. - if (!HadJTEntryDirective) - O << '-' << *GetJTISymbol(uid); + O << '-' << *GetJTISymbol(uid); } O << '\n'; } diff --git a/llvm/lib/MC/MCAsmInfo.cpp b/llvm/lib/MC/MCAsmInfo.cpp index 0f3c46ba826d..796dcc4d330a 100644 --- a/llvm/lib/MC/MCAsmInfo.cpp +++ b/llvm/lib/MC/MCAsmInfo.cpp @@ -48,7 +48,7 @@ MCAsmInfo::MCAsmInfo() { AlignDirective = "\t.align\t"; AlignmentIsInBytes = true; TextAlignFillValue = 0; - PICJumpTableDirective = 0; + GPRel32Directive = 0; GlobalDirective = "\t.globl\t"; SetDirective = 0; HasLCOMMDirective = false; diff --git a/llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp b/llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp index b652a5305a01..0e63582facab 100644 --- a/llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp +++ b/llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp @@ -17,6 +17,6 @@ using namespace llvm; AlphaMCAsmInfo::AlphaMCAsmInfo(const Target &T, const StringRef &TT) { AlignmentIsInBytes = false; PrivateGlobalPrefix = "$"; - PICJumpTableDirective = ".gprel32"; + GPRel32Directive = ".gprel32"; WeakRefDirective = "\t.weak\t"; } diff --git a/llvm/lib/Target/Mips/MipsMCAsmInfo.cpp b/llvm/lib/Target/Mips/MipsMCAsmInfo.cpp index 2fa276298e57..c5356f0e23a8 100644 --- a/llvm/lib/Target/Mips/MipsMCAsmInfo.cpp +++ b/llvm/lib/Target/Mips/MipsMCAsmInfo.cpp @@ -22,5 +22,5 @@ MipsMCAsmInfo::MipsMCAsmInfo(const Target &T, const StringRef &TT) { PrivateGlobalPrefix = "$"; CommentString = "#"; ZeroDirective = "\t.space\t"; - PICJumpTableDirective = "\t.gpword\t"; + GPRel32Directive = "\t.gpword\t"; }