6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-15 22:28:18 +00:00
Code Issues Projects Releases Wiki Activity

Emit personality function and Dwarf EH data for Win64 SEH.

Browse Source 
Obviously the personality function should be emitted as language handler
instead of the hard coded _GCC_specific_handler. The language specific
data must be placed after the unwind information therefore it must not
be emitted into a separate section.

Reviewed by Charles Davis and Nico Rieck.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185761 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kai Nacke
2013-07-06 17:17:31 +00:00
parent 59c5c6c2b2
commit 28bb04453d
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/CodeGen/AsmPrinter/Win64Exception.cpp
View File

@@ -78,9 +78,9 @@ void Win64Exception::BeginFunction(const MachineFunction *MF) {
if (!shouldEmitPersonality) if (!shouldEmitPersonality)
return; return;
MCSymbol *GCCHandlerSym = const MCSymbol *PersHandlerSym = TLOF.getCFIPersonalitySymbol(Per, Asm->Mang,
Asm->GetExternalSymbolSymbol("_GCC_specific_handler"); MMI);
Asm->OutStreamer.EmitWin64EHHandler(GCCHandlerSym, true, true); Asm->OutStreamer.EmitWin64EHHandler(PersHandlerSym, true, true);
Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("eh_func_begin", Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("eh_func_begin",
Asm->getFunctionNumber())); Asm->getFunctionNumber()));
@@ -99,14 +99,8 @@ void Win64Exception::EndFunction() {
MMI->TidyLandingPads(); MMI->TidyLandingPads();
if (shouldEmitPersonality) { if (shouldEmitPersonality) {
const TargetLoweringObjectFile &TLOF = Asm->getObjFileLowering();
const Function *Per = MMI->getPersonalities()[MMI->getPersonalityIndex()];
const MCSymbol *Sym = TLOF.getCFIPersonalitySymbol(Per, Asm->Mang, MMI);
Asm->OutStreamer.PushSection(); Asm->OutStreamer.PushSection();
Asm->OutStreamer.EmitWin64EHHandlerData(); Asm->OutStreamer.EmitWin64EHHandlerData();
Asm->OutStreamer.EmitValue(MCSymbolRefExpr::Create(Sym, Asm->OutContext),
4);
EmitExceptionTable(); EmitExceptionTable();
Asm->OutStreamer.PopSection(); Asm->OutStreamer.PopSection();
} }

15
lib/MC/MCObjectFileInfo.cpp
View File

@@ -547,11 +547,16 @@ void MCObjectFileInfo::InitCOFFMCObjectFileInfo(Triple T) {
// though it contains relocatable pointers. In PIC mode, this is probably a // though it contains relocatable pointers. In PIC mode, this is probably a
// big runtime hit for C++ apps. Either the contents of the LSDA need to be // big runtime hit for C++ apps. Either the contents of the LSDA need to be
// adjusted or this should be a data section. // adjusted or this should be a data section.
LSDASection = if (T.getOS() == Triple::Win32) {
Ctx->getCOFFSection(".gcc_except_table", // On Windows with SEH, the LSDA is emitted into the .xdata section
COFF::IMAGE_SCN_CNT_INITIALIZED_DATA | LSDASection = 0;
COFF::IMAGE_SCN_MEM_READ, } else {
SectionKind::getReadOnly()); LSDASection =
Ctx->getCOFFSection(".gcc_except_table",
COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
COFF::IMAGE_SCN_MEM_READ,
SectionKind::getReadOnly());
}
// Debug info. // Debug info.
DwarfAbbrevSection = DwarfAbbrevSection =