6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-25 13:24:46 +00:00
Code Issues Projects Releases Wiki Activity

Clean up LSDA name generation and use for SJLJ exception handling. This

Browse Source 
makes an eggregious hack somewhat more palatable. Bringing the LSDA forward
and making it a GV available for reference would be even better, but is
beyond the scope of what I'm looking to solve at this point.

Objective C++ code could generate function names that broke the previous
scheme. This fixes that.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80649 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jim Grosbach
2009-09-01 01:57:56 +00:00
parent f98d8fee3c
commit 3fb2b1ede3
9 changed files with 163 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/CodeGen/AsmPrinter/DwarfException.cpp
View File

@@ -25,9 +25,11 @@
#include "llvm/Target/TargetOptions.h"
#include "llvm/Target/TargetRegisterInfo.h"
#include "llvm/Support/Dwarf.h"
#include "llvm/Support/Mangler.h"
#include "llvm/Support/Timer.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/ADT/StringExtras.h"
#include <sstream>
using namespace llvm;
static TimerGroup &getDwarfTimerGroup() {
@@ -599,9 +601,12 @@ void DwarfException::EmitExceptionTable() {
EmitLabel("exception", SubprogramCount);
if (MAI->getExceptionHandlingType() == ExceptionHandling::SjLj) {
std::string SjLjName = "_lsda_";
SjLjName += MF->getFunction()->getName().str();
EmitLabel(SjLjName.c_str(), 0);
std::stringstream out;
out << Asm->getFunctionNumber();
std::string LSDAName =
Asm->Mang->makeNameProper(std::string("LSDA_") + out.str(),
Mangler::Private);
EmitLabel(LSDAName.c_str(), 0, false);
}
// Emit the header.

18
lib/CodeGen/AsmPrinter/DwarfPrinter.cpp
View File

@@ -43,21 +43,27 @@ void Dwarf::PrintRelDirective(bool Force32Bit, bool isInSection) const {
/// PrintLabelName - Print label name in form used by Dwarf writer.
///
void Dwarf::PrintLabelName(const char *Tag, unsigned Number) const {
O << MAI->getPrivateGlobalPrefix() << Tag;
void Dwarf::PrintLabelName(const char *Tag, unsigned Number,
bool ForcePrivate) const {
if (ForcePrivate)
O << MAI->getPrivateGlobalPrefix();
O << Tag;
if (Number) O << Number;
}
void Dwarf::PrintLabelName(const char *Tag, unsigned Number,
const char *Suffix) const {
O << MAI->getPrivateGlobalPrefix() << Tag;
const char *Suffix, bool ForcePrivate) const {
if (ForcePrivate)
O << MAI->getPrivateGlobalPrefix();
O << Tag;
if (Number) O << Number;
O << Suffix;
}
/// EmitLabel - Emit location label for internal use by Dwarf.
///
void Dwarf::EmitLabel(const char *Tag, unsigned Number) const {
PrintLabelName(Tag, Number);
void Dwarf::EmitLabel(const char *Tag, unsigned Number,
bool ForcePrivate) const {
PrintLabelName(Tag, Number, ForcePrivate);
O << ":\n";
}

8
lib/CodeGen/AsmPrinter/DwarfPrinter.h
View File

@@ -100,16 +100,18 @@ namespace llvm {
void PrintLabelName(const DWLabel &Label) const {
PrintLabelName(Label.getTag(), Label.getNumber());
}
void PrintLabelName(const char *Tag, unsigned Number) const;
void PrintLabelName(const char *Tag, unsigned Number,
const char *Suffix) const;
bool ForcePrivate = true) const;
void PrintLabelName(const char *Tag, unsigned Number,
const char *Suffix, bool ForcePrivate = true) const;
/// EmitLabel - Emit location label for internal use by Dwarf.
///
void EmitLabel(const DWLabel &Label) const {
EmitLabel(Label.getTag(), Label.getNumber());
}
void EmitLabel(const char *Tag, unsigned Number) const;
void EmitLabel(const char *Tag, unsigned Number,
bool ForcePrivate = true) const;
/// EmitReference - Emit a reference to a label.
///