6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-02 10:33:53 +00:00
Code Issues Projects Releases Wiki Activity

Revert: Emit personality function and Dwarf EH data for Win64 SEH.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185788 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kai Nacke 2013-07-08 04:43:23 +00:00
parent 04b84c2f92
commit 113d32cea8
2 changed files with 14 additions and 13 deletions

12
lib/CodeGen/AsmPrinter/Win64Exception.cpp

@ -78,9 +78,9 @@ void Win64Exception::BeginFunction(const MachineFunction *MF) {
if (!shouldEmitPersonality) if (!shouldEmitPersonality)
return; return;
const MCSymbol *PersHandlerSym = TLOF.getCFIPersonalitySymbol(Per, Asm->Mang, MCSymbol *GCCHandlerSym =
MMI); Asm->GetExternalSymbolSymbol("_GCC_specific_handler");
Asm->OutStreamer.EmitWin64EHHandler(PersHandlerSym, true, true); Asm->OutStreamer.EmitWin64EHHandler(GCCHandlerSym, true, true);
Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("eh_func_begin", Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("eh_func_begin",
Asm->getFunctionNumber())); Asm->getFunctionNumber()));
@ -99,8 +99,14 @@ 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();
} }

5
lib/MC/MCObjectFileInfo.cpp

@ -547,16 +547,11 @@ 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.
if (T.getOS() == Triple::Win32) {
// On Windows with SEH, the LSDA is emitted into the .xdata section
LSDASection = 0;
} else {
LSDASection = LSDASection =
Ctx->getCOFFSection(".gcc_except_table", Ctx->getCOFFSection(".gcc_except_table",
COFF::IMAGE_SCN_CNT_INITIALIZED_DATA | COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
COFF::IMAGE_SCN_MEM_READ, COFF::IMAGE_SCN_MEM_READ,
SectionKind::getReadOnly()); SectionKind::getReadOnly());
}
// Debug info. // Debug info.
DwarfAbbrevSection = DwarfAbbrevSection =