6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-09-30 19:55:11 +00:00
Code Issues Projects Releases Wiki Activity

GCC uses a different encoding of pointers in the FDE when using

Browse Source 
-fno-dwarf2-cfi-asm. Implement the same behavior.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@130637 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2011-05-01 04:49:54 +00:00
parent c35280647b
commit 5426a9ee37
13 changed files with 76 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
View File

@ -188,7 +188,7 @@ public:
virtual unsigned getPersonalityEncoding() const;
virtual unsigned getLSDAEncoding() const;
virtual unsigned getFDEEncoding() const;
virtual unsigned getFDEEncoding(bool CFI) const;
virtual unsigned getTTypeEncoding() const;
};

4
include/llvm/MC/MCDwarf.h
View File

@ -281,8 +281,8 @@ namespace llvm {
//
// This emits the frame info section.
//
static void Emit(MCStreamer &streamer);
static void EmitDarwin(MCStreamer &streamer);
static void Emit(MCStreamer &streamer, bool usingCFI);
static void EmitDarwin(MCStreamer &streamer, bool usingCFI);
static void EmitAdvanceLoc(MCStreamer &Streamer, uint64_t AddrDelta);
static void EncodeAdvanceLoc(uint64_t AddrDelta, raw_ostream &OS,
const TargetAsmInfo &AsmInfo);

4
include/llvm/Target/TargetAsmInfo.h
View File

@ -58,8 +58,8 @@ public:
return TLOF->getEHFrameSection();
}
unsigned getFDEEncoding() const {
return TLOF->getFDEEncoding();
unsigned getFDEEncoding(bool CFI) const {
return TLOF->getFDEEncoding(CFI);
}
bool isFunctionEHFrameSymbolPrivate() const {

2
include/llvm/Target/TargetLoweringObjectFile.h
View File

@ -233,7 +233,7 @@ public:
virtual unsigned getPersonalityEncoding() const;
virtual unsigned getLSDAEncoding() const;
virtual unsigned getFDEEncoding() const;
virtual unsigned getFDEEncoding(bool CFI) const;
virtual unsigned getTTypeEncoding() const;
protected:

4
lib/CodeGen/AsmPrinter/DwarfTableException.cpp
View File

@ -92,7 +92,7 @@ void DwarfTableException::EmitCIE(const Function *PersonalityFn, unsigned Index)
// personality function reference:
unsigned LSDAEncoding = TLOF.getLSDAEncoding();
unsigned FDEEncoding = TLOF.getFDEEncoding();
unsigned FDEEncoding = TLOF.getFDEEncoding(false);
unsigned PerEncoding = TLOF.getPersonalityEncoding();
char Augmentation[6] = { 0 };
@ -168,7 +168,7 @@ void DwarfTableException::EmitFDE(const FunctionEHFrameInfo &EHFrameInfo) {
const TargetLoweringObjectFile &TLOF = Asm->getObjFileLowering();
unsigned LSDAEncoding = TLOF.getLSDAEncoding();
unsigned FDEEncoding = TLOF.getFDEEncoding();
unsigned FDEEncoding = TLOF.getFDEEncoding(false);
Asm->OutStreamer.SwitchSection(TLOF.getEHFrameSection());

2
lib/CodeGen/TargetLoweringObjectFileImpl.cpp
View File

@ -879,7 +879,7 @@ unsigned TargetLoweringObjectFileMachO::getLSDAEncoding() const {
return DW_EH_PE_pcrel;
}
unsigned TargetLoweringObjectFileMachO::getFDEEncoding() const {
unsigned TargetLoweringObjectFileMachO::getFDEEncoding(bool CFI) const {
return DW_EH_PE_pcrel;
}

3
lib/MC/MCAsmStreamer.cpp
View File

@ -1069,6 +1069,9 @@ void MCAsmStreamer::Finish() {
// Dump out the dwarf file & directory tables and line tables.
if (getContext().hasDwarfFiles() && !UseLoc)
MCDwarfFileTable::Emit(this);
if (getNumFrameInfos() && !UseCFI)
MCDwarfFrameEmitter::Emit(*this, false);
}
MCStreamer *llvm::createAsmStreamer(MCContext &Context,

20
lib/MC/MCDwarf.cpp
View File

@ -500,9 +500,11 @@ namespace {
class FrameEmitterImpl {
int CFAOffset;
int CIENum;
bool UsingCFI;
public:
FrameEmitterImpl() : CFAOffset(0), CIENum(0) {
FrameEmitterImpl(bool usingCFI) : CFAOffset(0), CIENum(0),
UsingCFI(usingCFI) {
}
const MCSymbol &EmitCIE(MCStreamer &streamer,
@ -702,7 +704,7 @@ const MCSymbol &FrameEmitterImpl::EmitCIE(MCStreamer &streamer,
streamer.EmitIntValue(lsdaEncoding, 1);
}
// Encoding of the FDE pointers
streamer.EmitIntValue(asmInfo.getFDEEncoding(), 1);
streamer.EmitIntValue(asmInfo.getFDEEncoding(UsingCFI), 1);
// Initial Instructions
@ -753,7 +755,7 @@ MCSymbol *FrameEmitterImpl::EmitFDE(MCStreamer &streamer,
const MCExpr *offset = MakeStartMinusEndExpr(streamer, cieStart, *fdeStart,
0);
streamer.EmitAbsValue(offset, 4);
unsigned fdeEncoding = asmInfo.getFDEEncoding();
unsigned fdeEncoding = asmInfo.getFDEEncoding(UsingCFI);
unsigned size = getSizeForEncoding(streamer, fdeEncoding);
// PC Begin
@ -837,8 +839,9 @@ namespace llvm {
// compatible with the one in CodeGen. It is useful during the transition
// to make it easy to compare the outputs, but should probably be removed
// afterwards.
void MCDwarfFrameEmitter::EmitDarwin(MCStreamer &streamer) {
FrameEmitterImpl Emitter;
void MCDwarfFrameEmitter::EmitDarwin(MCStreamer &streamer,
bool usingCFI) {
FrameEmitterImpl Emitter(usingCFI);
DenseMap<const MCSymbol*, const MCSymbol*> Personalities;
const MCSymbol *aCIE = NULL;
const MCDwarfFrameInfo *aFrame = NULL;
@ -892,17 +895,18 @@ void MCDwarfFrameEmitter::EmitDarwin(MCStreamer &streamer) {
streamer.EmitLabel(fdeEnd);
}
void MCDwarfFrameEmitter::Emit(MCStreamer &streamer) {
void MCDwarfFrameEmitter::Emit(MCStreamer &streamer,
bool usingCFI) {
const MCContext &context = streamer.getContext();
const TargetAsmInfo &asmInfo = context.getTargetAsmInfo();
if (!asmInfo.isFunctionEHFrameSymbolPrivate()) {
EmitDarwin(streamer);
EmitDarwin(streamer, usingCFI);
return;
}
MCSymbol *fdeEnd = NULL;
DenseMap<CIEKey, const MCSymbol*> CIEStarts;
FrameEmitterImpl Emitter;
FrameEmitterImpl Emitter(usingCFI);
for (unsigned i = 0, n = streamer.getNumFrameInfos(); i < n; ++i) {
const MCDwarfFrameInfo &frame = streamer.getFrameInfo(i);

2
lib/MC/MCELFStreamer.cpp
View File

@ -346,7 +346,7 @@ void MCELFStreamer::EmitInstToData(const MCInst &Inst) {
void MCELFStreamer::Finish() {
if (getNumFrameInfos())
MCDwarfFrameEmitter::Emit(*this);
MCDwarfFrameEmitter::Emit(*this, true);
for (std::vector<LocalCommon>::const_iterator i = LocalCommons.begin(),
e = LocalCommons.end();

2
lib/Target/TargetLoweringObjectFile.cpp
View File

@ -350,7 +350,7 @@ unsigned TargetLoweringObjectFile::getLSDAEncoding() const {
return dwarf::DW_EH_PE_absptr;
}
unsigned TargetLoweringObjectFile::getFDEEncoding() const {
unsigned TargetLoweringObjectFile::getFDEEncoding(bool CFI) const {
return dwarf::DW_EH_PE_absptr;
}

13
lib/Target/X86/X86TargetObjectFile.cpp
View File

@ -58,7 +58,7 @@ unsigned X8632_ELFTargetObjectFile::getLSDAEncoding() const {
return DW_EH_PE_absptr;
}
unsigned X8632_ELFTargetObjectFile::getFDEEncoding() const {
unsigned X8632_ELFTargetObjectFile::getFDEEncoding(bool FDE) const {
if (TM.getRelocationModel() == Reloc::PIC_)
return DW_EH_PE_pcrel | DW_EH_PE_sdata4;
else
@ -97,8 +97,15 @@ unsigned X8664_ELFTargetObjectFile::getLSDAEncoding() const {
return DW_EH_PE_absptr;
}
unsigned X8664_ELFTargetObjectFile::getFDEEncoding() const {
return DW_EH_PE_pcrel | DW_EH_PE_sdata4;
unsigned X8664_ELFTargetObjectFile::getFDEEncoding(bool CFI) const {
if (CFI)
return DW_EH_PE_pcrel | DW_EH_PE_sdata4;
CodeModel::Model Model = TM.getCodeModel();
if (TM.getRelocationModel() == Reloc::PIC_)
return DW_EH_PE_pcrel | DW_EH_PE_sdata4;
return DW_EH_PE_udata4;
}
unsigned X8664_ELFTargetObjectFile::getTTypeEncoding() const {

4
lib/Target/X86/X86TargetObjectFile.h
View File

@ -40,7 +40,7 @@ namespace llvm {
:TM(tm) { }
virtual unsigned getPersonalityEncoding() const;
virtual unsigned getLSDAEncoding() const;
virtual unsigned getFDEEncoding() const;
virtual unsigned getFDEEncoding(bool CFI) const;
virtual unsigned getTTypeEncoding() const;
};
@ -51,7 +51,7 @@ namespace llvm {
:TM(tm) { }
virtual unsigned getPersonalityEncoding() const;
virtual unsigned getLSDAEncoding() const;
virtual unsigned getFDEEncoding() const;
virtual unsigned getFDEEncoding(bool CFI) const;
virtual unsigned getTTypeEncoding() const;
};

38
test/CodeGen/X86/no-cfi.ll Normal file
View File

@ -0,0 +1,38 @@
; RUN: llc < %s -mtriple=x86_64-unknown-linux-gnu -disable-cfi | FileCheck --check-prefix=STATIC %s
; RUN: llc < %s -mtriple=x86_64-unknown-linux-gnu -disable-cfi -relocation-model=pic | FileCheck --check-prefix=PIC %s
; STATIC: .ascii "zPLR"
; STATIC: .byte 3
; STATIC-NEXT: .long __gxx_personality_v0
; STATIC-NEXT: .byte 3
; STATIC-NEXT: .byte 3
; PIC: .ascii "zPLR"
; PIC: .byte 155
; PIC-NEXT: .L
; PIC-NEXT: .long DW.ref.__gxx_personality_v0-.L
; PIC-NEXT: .byte 27
; PIC-NEXT: .byte 27
define void @bar() {
entry:
%call = invoke i32 @foo()
to label %invoke.cont unwind label %lpad
invoke.cont:
ret void
lpad:
%exn = call i8* @llvm.eh.exception() nounwind
%eh.selector = call i32 (i8*, i8*, ...)* @llvm.eh.selector(i8* %exn, i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*), i8* null) nounwind
ret void
}
declare i32 @foo()
declare i8* @llvm.eh.exception() nounwind readonly
declare i32 @__gxx_personality_v0(...)
declare i32 @llvm.eh.selector(i8*, i8*, ...) nounwind