RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-02 00:37:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Roll out r126425 and r126450 to see if it fixes the failures on the buildbots.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126488 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Cameron Zwarich 2011-02-25 16:30:32 +00:00
parent 278be783b5
commit f754f50805
19 changed files with 6 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/MC/MCStreamer.h
View File

@ -239,11 +239,6 @@ namespace llvm {
/// EndCOFFSymbolDef - Marks the end of the symbol definition.
virtual void EndCOFFSymbolDef() = 0;
/// EmitCOFFSecRel32 - Emits a COFF section relative relocation.
///
/// @param Symbol - Symbol the section relative realocation should point to.
virtual void EmitCOFFSecRel32(MCSymbol const *Symbol) = 0;
/// EmitELFSize - Emit an ELF .size directive.
///
/// This corresponds to an assembler statement such as:

5
lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp
View File

@ -177,8 +177,9 @@ void AsmPrinter::EmitReference(const GlobalValue *GV, unsigned Encoding)const{
void AsmPrinter::EmitSectionOffset(const MCSymbol *Label,
const MCSymbol *SectionLabel) const {
// On COFF targets, we have to emit the special .secrel32 directive.
if (MAI->getDwarfSectionOffsetDirective()) {
OutStreamer.EmitCOFFSecRel32(Label);
if (const char *SecOffDir = MAI->getDwarfSectionOffsetDirective()) {
// FIXME: MCize.
OutStreamer.EmitRawText(SecOffDir + Twine(Label->getName()));
return;
}

23
lib/CodeGen/AsmPrinter/DIE.cpp
View File

@ -276,29 +276,6 @@ void DIELabel::print(raw_ostream &O) {
}
#endif
//===----------------------------------------------------------------------===//
// DIESectionOffset Implementation
//===----------------------------------------------------------------------===//
/// EmitValue - Emit label value.
///
void DIESectionOffset::EmitValue(AsmPrinter *AP, unsigned Form) const {
AP->EmitSectionOffset (Label, Label);
}
/// SizeOf - Determine size of label value in bytes.
///
unsigned DIESectionOffset::SizeOf(AsmPrinter *AP, unsigned Form) const {
if (Form == dwarf::DW_FORM_data4) return 4;
return AP->getTargetData().getPointerSize();
}
#ifndef NDEBUG
void DIESectionOffset::print(raw_ostream &O) {
O << "SecRelLbl: " << Label->getName();
}
#endif
//===----------------------------------------------------------------------===//
// DIEDelta Implementation
//===----------------------------------------------------------------------===//

30
lib/CodeGen/AsmPrinter/DIE.h
View File

@ -327,36 +327,6 @@ namespace llvm {
static bool classof(const DIELabel *) { return true; }
static bool classof(const DIEValue *L) { return L->getType() == isLabel; }
#ifndef NDEBUG
virtual void print(raw_ostream &O);
#endif
};
//===--------------------------------------------------------------------===//
/// DIESectionOffset - A section relative label expression DIE.
//
class DIESectionOffset : public DIEValue {
const MCSymbol *Label;
public:
explicit DIESectionOffset(const MCSymbol *L) : DIEValue(isSectionOffset),
Label(L) {}
/// EmitValue - Emit label value.
///
virtual void EmitValue(AsmPrinter *AP, unsigned Form) const;
/// getValue - Get MCSymbol.
///
const MCSymbol *getValue() const { return Label; }
/// SizeOf - Determine size of label value in bytes.
///
virtual unsigned SizeOf(AsmPrinter *AP, unsigned Form) const;
// Implement isa/cast/dyncast.
static bool classof(const DIELabel *) { return true; }
static bool classof(const DIEValue *L) { return L->getType() == isSectionOffset; }
#ifndef NDEBUG
virtual void print(raw_ostream &O);
#endif

13
lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -481,15 +481,6 @@ void DwarfDebug::addLabel(DIE *Die, unsigned Attribute, unsigned Form,
Die->addValue(Attribute, Form, Value);
}
/// addSectionOffset - Add a Dwarf section relative label attribute data and
/// value.
///
void DwarfDebug::addSectionOffset(DIE *Die, unsigned Attribute, unsigned Form,
const MCSymbol *Label) {
DIEValue *Value = new (DIEValueAllocator) DIESectionOffset(Label);
Die->addValue(Attribute, Form, Value);
}
/// addDelta - Add a label delta attribute data and value.
///
void DwarfDebug::addDelta(DIE *Die, unsigned Attribute, unsigned Form,
@ -1913,8 +1904,8 @@ void DwarfDebug::constructCompileUnit(const MDNode *N) {
// DW_AT_stmt_list is a offset of line number information for this
// compile unit in debug_line section.
if (Asm->MAI->doesDwarfUsesAbsoluteLabelForStmtList())
addSectionOffset(Die, dwarf::DW_AT_stmt_list, dwarf::DW_FORM_addr,
Asm->GetTempSymbol("section_line"));
addLabel(Die, dwarf::DW_AT_stmt_list, dwarf::DW_FORM_addr,
Asm->GetTempSymbol("section_line"));
else
addUInt(Die, dwarf::DW_AT_stmt_list, dwarf::DW_FORM_data4, 0);

6
lib/CodeGen/AsmPrinter/DwarfDebug.h
View File

@ -280,12 +280,6 @@ private:
void addLabel(DIE *Die, unsigned Attribute, unsigned Form,
const MCSymbol *Label);
/// addSectionOffset - Add a Dwarf section relative label attribute data and
/// value.
///
void addSectionOffset(DIE *Die, unsigned Attribute, unsigned Form,
const MCSymbol *Label);
/// addDelta - Add a label delta attribute data and value.
///
void addDelta(DIE *Die, unsigned Attribute, unsigned Form,

1
lib/MC/MCAsmInfoCOFF.cpp
View File

@ -33,6 +33,5 @@ MCAsmInfoCOFF::MCAsmInfoCOFF() {
HasLEB128 = true; // Target asm supports leb128 directives (little-endian)
SupportsDebugInformation = true;
DwarfSectionOffsetDirective = "\t.secrel32\t";
DwarfUsesAbsoluteLabelForStmtList = false;
HasMicrosoftFastStdCallMangling = true;
}

6
lib/MC/MCAsmStreamer.cpp
View File

@ -135,7 +135,6 @@ public:
virtual void EmitCOFFSymbolStorageClass(int StorageClass);
virtual void EmitCOFFSymbolType(int Type);
virtual void EndCOFFSymbolDef();
virtual void EmitCOFFSecRel32(MCSymbol const *Symbol);
virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value);
virtual void EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
unsigned ByteAlignment);
@ -385,11 +384,6 @@ void MCAsmStreamer::EndCOFFSymbolDef() {
EmitEOL();
}
void MCAsmStreamer::EmitCOFFSecRel32(MCSymbol const *Symbol) {
OS << "\t.secrel32\t" << *Symbol << '\n';
EmitEOL();
}
void MCAsmStreamer::EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {
assert(MAI.hasDotTypeDotSizeDirective());
OS << "\t.size\t" << *Symbol << ", " << *Value << '\n';

4
lib/MC/MCELFStreamer.cpp
View File

@ -108,10 +108,6 @@ public:
assert(0 && "ELF doesn't support this directive");
}
virtual void EmitCOFFSecRel32(MCSymbol const *Symbol) {
assert(0 && "ELF doesn't support this directive");
}
virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {
MCSymbolData &SD = getAssembler().getOrCreateSymbolData(*Symbol);
SD.setSize(Value);

5
lib/MC/MCLoggingStreamer.cpp
View File

@ -120,11 +120,6 @@ public:
return Child->EndCOFFSymbolDef();
}
virtual void EmitCOFFSecRel32(MCSymbol const *Symbol) {
LogCall("EndCOFFSymbolDef");
return Child->EmitCOFFSecRel32(Symbol);
}
virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {
LogCall("EmitELFSize");
return Child->EmitELFSize(Symbol, Value);

3
lib/MC/MCMachOStreamer.cpp
View File

@ -63,9 +63,6 @@ public:
virtual void EndCOFFSymbolDef() {
assert(0 && "macho doesn't support this directive");
}
virtual void EmitCOFFSecRel32(MCSymbol const *Symbol) {
assert(0 && "macho doesn't support this directive");
}
virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {
assert(0 && "macho doesn't support this directive");
}

1
lib/MC/MCNullStreamer.cpp
View File

@ -54,7 +54,6 @@ namespace {
virtual void EmitCOFFSymbolStorageClass(int StorageClass) {}
virtual void EmitCOFFSymbolType(int Type) {}
virtual void EndCOFFSymbolDef() {}
virtual void EmitCOFFSecRel32(MCSymbol const *Symbol) {}
virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {}
virtual void EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size,

3
lib/MC/MCPureStreamer.cpp
View File

@ -83,9 +83,6 @@ public:
virtual void EndCOFFSymbolDef() {
report_fatal_error("unsupported directive in pure streamer");
}
virtual void EmitCOFFSecRel32(MCSymbol const *Symbol) {
report_fatal_error("unsupported directive in pure streamer");
}
virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {
report_fatal_error("unsupported directive in pure streamer");
}

4
lib/MC/WinCOFFObjectWriter.cpp
View File

@ -705,10 +705,6 @@ void WinCOFFObjectWriter::RecordRelocation(const MCAssembler &Asm,
else
llvm_unreachable("unsupported relocation type");
break;
case X86::reloc_coff_secrel32:
Reloc.Data.Type = Is64Bit ? COFF::IMAGE_REL_AMD64_SREL32
: COFF::IMAGE_REL_I386_SECREL;
break;
default:
llvm_unreachable("unsupported relocation type");
}

18
lib/MC/WinCOFFStreamer.cpp
View File

@ -31,9 +31,6 @@
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
#include "../Target/X86/X86FixupKinds.h"
using namespace llvm;
namespace {
@ -62,7 +59,6 @@ public:
virtual void EmitCOFFSymbolStorageClass(int StorageClass);
virtual void EmitCOFFSymbolType(int Type);
virtual void EndCOFFSymbolDef();
virtual void EmitCOFFSecRel32(MCSymbol const *Symbol);
virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value);
virtual void EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
unsigned ByteAlignment);
@ -294,16 +290,6 @@ void WinCOFFStreamer::EndCOFFSymbolDef() {
CurSymbol = NULL;
}
void WinCOFFStreamer::EmitCOFFSecRel32(MCSymbol const *Symbol)
{
MCDataFragment *DF = getOrCreateDataFragment();
DF->addFixup(MCFixup::Create(DF->getContents().size(),
MCSymbolRefExpr::Create (Symbol, getContext ()),
(MCFixupKind)X86::reloc_coff_secrel32));
DF->getContents().resize(DF->getContents().size() + 4, 0);
}
void WinCOFFStreamer::EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {
llvm_unreachable("not implemented");
}
@ -382,10 +368,6 @@ void WinCOFFStreamer::EmitInstruction(const MCInst &Instruction) {
getCurrentSectionData()->setHasInstructions(true);
// Now that a machine instruction has been assembled into this section, make
// a line entry for any .loc directive that has been seen.
MCLineEntry::Make(this, getCurrentSection());
MCInstFragment *Fragment =
new MCInstFragment(Instruction, getCurrentSectionData());

3
lib/Target/PTX/PTXMCAsmStreamer.cpp
View File

@ -124,7 +124,6 @@ public:
virtual void EmitCOFFSymbolStorageClass(int StorageClass);
virtual void EmitCOFFSymbolType(int Type);
virtual void EndCOFFSymbolDef();
virtual void EmitCOFFSecRel32(MCSymbol const *Symbol);
virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value);
virtual void EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
unsigned ByteAlignment);
@ -278,8 +277,6 @@ void PTXMCAsmStreamer::EmitCOFFSymbolType (int Type) {}
void PTXMCAsmStreamer::EndCOFFSymbolDef() {}
void PTXMCAsmStreamer::EmitCOFFSecRel32(MCSymbol const *Symbol) {}
void PTXMCAsmStreamer::EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {}
void PTXMCAsmStreamer::EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size,

4
lib/Target/X86/X86AsmBackend.cpp
View File

@ -40,7 +40,6 @@ static unsigned getFixupKindLog2Size(unsigned Kind) {
case X86::reloc_riprel_4byte_movq_load:
case X86::reloc_signed_4byte:
case X86::reloc_global_offset_table:
case X86::reloc_coff_secrel32:
case FK_Data_4: return 2;
case FK_PCRel_8:
case FK_Data_8: return 3;
@ -70,8 +69,7 @@ public:
{ "reloc_riprel_4byte", 0, 4 * 8, MCFixupKindInfo::FKF_IsPCRel },
{ "reloc_riprel_4byte_movq_load", 0, 4 * 8, MCFixupKindInfo::FKF_IsPCRel},
{ "reloc_signed_4byte", 0, 4 * 8, 0},
{ "reloc_global_offset_table", 0, 4 * 8, 0},
{ "reloc_coff_secrel32", 0, 4 * 8, 0}
{ "reloc_global_offset_table", 0, 4 * 8, 0}
};
if (Kind < FirstTargetFixupKind)

2
lib/Target/X86/X86FixupKinds.h
View File

@ -23,8 +23,6 @@ enum Fixups {
reloc_global_offset_table, // 32-bit, relative to the start
// of the instruction. Used only
// for _GLOBAL_OFFSET_TABLE_.
reloc_coff_secrel32, // PE-COFF section relative 32
// (only valid for win32 COFF)
// Marker
LastTargetFixupKind,
NumTargetFixupKinds = LastTargetFixupKind - FirstTargetFixupKind

3
lib/Target/X86/X86MCAsmInfo.cpp
View File

@ -113,7 +113,4 @@ X86MCAsmInfoCOFF::X86MCAsmInfoCOFF(const Triple &Triple) {
AssemblerDialect = AsmWriterFlavor;
TextAlignFillValue = 0x90;
// Debug Information
SupportsDebugInformation = true;
}