6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-12 07:37:34 +00:00
Code Issues Projects Releases Wiki Activity

Retrying r91337:

Browse Source 
The CIE says that the LSDA point in the FDE section is an "sdata4". That's fine,
but we need it to actually be 4-bytes in the FDE for some platforms. Allow
individual platforms to decide for themselves.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@93616 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2010-01-16 01:40:55 +00:00
parent 9ab19f25aa
commit d58e9cb42d
4 changed files with 42 additions and 8 deletions
include/llvm/Target
TargetMachine.h
lib
CodeGen/AsmPrinter
DwarfException.cpp
Target/X86
X86TargetMachine.cppX86TargetMachine.h

14
include/llvm/Target/TargetMachine.h

@ -81,6 +81,14 @@ namespace CodeGenOpt {
};
}
// Specify if we should encode the LSDA pointer in the FDE as 4- or 8-bytes.
namespace DwarfLSDAEncoding {
enum Encoding {
Default,
FourByte,
EightByte
};
}
//===----------------------------------------------------------------------===//
///
@ -192,6 +200,12 @@ public:
/// is false.
static void setAsmVerbosityDefault(bool);
/// getLSDAEncoding - Returns the LSDA pointer encoding. The choices are
/// 4-byte, 8-byte, and target default.
virtual DwarfLSDAEncoding::Encoding getLSDAEncoding() const {
return DwarfLSDAEncoding::Default;
}
/// CodeGenFileType - These enums are meant to be passed into
/// addPassesToEmitFile to indicate what type of file to emit.
enum CodeGenFileType {

27
lib/CodeGen/AsmPrinter/DwarfException.cpp

@ -283,17 +283,28 @@ void DwarfException::EmitFDE(const FunctionEHFrameInfo &EHFrameInfo) {
if (MMI->getPersonalities()[0] != NULL) {
bool is4Byte = TD->getPointerSize() == sizeof(int32_t);
Asm->EmitULEB128Bytes(is4Byte ? 4 : 8);
Asm->EOL("Augmentation size");
if (Asm->TM.getLSDAEncoding() == DwarfLSDAEncoding::FourByte) {
Asm->EmitULEB128Bytes(4);
Asm->EOL("Augmentation size");
if (EHFrameInfo.hasLandingPads)
EmitReference("exception", EHFrameInfo.Number, true, false);
else {
if (is4Byte)
Asm->EmitInt32((int)0);
if (EHFrameInfo.hasLandingPads)
EmitReference("exception", EHFrameInfo.Number, true, true);
else
Asm->EmitInt64((int)0);
Asm->EmitInt32((int)0);
} else {
Asm->EmitULEB128Bytes(is4Byte ? 4 : 8);
Asm->EOL("Augmentation size");
if (EHFrameInfo.hasLandingPads) {
EmitReference("exception", EHFrameInfo.Number, true, false);
} else {
if (is4Byte)
Asm->EmitInt32((int)0);
else
Asm->EmitInt64((int)0);
}
}
Asm->EOL("Language Specific Data Area");
} else {
Asm->EmitULEB128Bytes(0);

7
lib/Target/X86/X86TargetMachine.cpp

@ -249,3 +249,10 @@ void X86TargetMachine::setCodeModelForJIT() {
else
setCodeModel(CodeModel::Small);
}
DwarfLSDAEncoding::Encoding X86TargetMachine::getLSDAEncoding() const {
if (Subtarget.isTargetDarwin() && Subtarget.getDarwinVers() > 10)
return DwarfLSDAEncoding::FourByte;
return DwarfLSDAEncoding::Default;
}

2
lib/Target/X86/X86TargetMachine.h

@ -62,6 +62,8 @@ public:
return Subtarget.isTargetELF() ? &ELFWriterInfo : 0;
}
virtual DwarfLSDAEncoding::Encoding getLSDAEncoding() const;
// Set up the pass pipeline.
virtual bool addInstSelector(PassManagerBase &PM, CodeGenOpt::Level OptLevel);
virtual bool addPreRegAlloc(PassManagerBase &PM, CodeGenOpt::Level OptLevel);