RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-22 03:28:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

An option to selectively enable parts of ARM EHABI support.

Browse Source 
This change adds an new value to the --arm-enable-ehabi option that
disables emitting unwinding descriptors. This mode gives a working
backtrace() without the (currently broken) exception support.

llvm-svn: 148686
This commit is contained in:
Evgeniy Stepanov 2012-01-23 07:57:39 +00:00
parent 9a78ce373d
commit bffa428d01
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/llvm/MC/MCAsmInfo.h
View File

@ -30,6 +30,7 @@ namespace llvm {
namespace ExceptionHandling {
enum ExceptionsType { None, DwarfCFI, SjLj, ARM, Win64 };
enum ARMEHABIMode { ARMEHABIDisabled, ARMEHABIUnwind, ARMEHABIFull };
}
namespace LCOMM {

25
lib/CodeGen/AsmPrinter/ARMException.cpp
View File

@ -29,6 +29,7 @@
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetOptions.h"
#include "llvm/Target/TargetRegisterInfo.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Dwarf.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/ADT/SmallString.h"
@ -36,6 +37,18 @@
#include "llvm/ADT/Twine.h"
using namespace llvm;
cl::opt<ExceptionHandling::ARMEHABIMode>
EnableARMEHABI("arm-enable-ehabi", cl::Hidden,
cl::desc("Generate ARM EHABI tables:"),
cl::values(clEnumValN(ExceptionHandling::ARMEHABIDisabled, "no",
"Do not generate ARM EHABI tables"),
clEnumValN(ExceptionHandling::ARMEHABIUnwind, "unwind",
"Emit unwinding instructions, but not descriptors"),
clEnumValN(ExceptionHandling::ARMEHABIFull, "full",
"Generate full ARM EHABI tables"),
clEnumValEnd));
ARMException::ARMException(AsmPrinter *A)
: DwarfException(A),
shouldEmitTable(false), shouldEmitMoves(false), shouldEmitTableModule(false)
@ -72,13 +85,15 @@ void ARMException::EndFunction() {
Asm->OutStreamer.EmitPersonality(PerSym);
}
// Map all labels and get rid of any dead landing pads.
MMI->TidyLandingPads();
if (EnableARMEHABI == ExceptionHandling::ARMEHABIFull) {
// Map all labels and get rid of any dead landing pads.
MMI->TidyLandingPads();
Asm->OutStreamer.EmitHandlerData();
Asm->OutStreamer.EmitHandlerData();
// Emit actual exception table
EmitExceptionTable();
// Emit actual exception table
EmitExceptionTable();
}
}
Asm->OutStreamer.EmitFnEnd();

7
lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
View File

@ -16,10 +16,7 @@
using namespace llvm;
cl::opt<bool>
EnableARMEHABI("arm-enable-ehabi", cl::Hidden,
cl::desc("Generate ARM EHABI tables"),
cl::init(false));
extern cl::opt<ExceptionHandling::ARMEHABIMode> EnableARMEHABI;
static const char *const arm_asm_table[] = {
@ -82,6 +79,6 @@ ARMELFMCAsmInfo::ARMELFMCAsmInfo() {
SupportsDebugInformation = true;
// Exceptions handling
if (EnableARMEHABI)
if (EnableARMEHABI != ExceptionHandling::ARMEHABIDisabled)
ExceptionsType = ExceptionHandling::ARM;
}

5
test/CodeGen/ARM/ehabi-unwind.ll
View File

@ -1,7 +1,8 @@
; Test that the EHABI unwind instruction generator does not encounter any
; unfamiliar instructions.
; RUN: llc < %s -mtriple=thumbv7 -arm-enable-ehabi -disable-fp-elim
; RUN: llc < %s -mtriple=thumbv7 -arm-enable-ehabi
; RUN: llc < %s -mtriple=thumbv7 -arm-enable-ehabi=full -disable-fp-elim
; RUN: llc < %s -mtriple=thumbv7 -arm-enable-ehabi=full
; RUN: llc < %s -mtriple=thumbv7 -arm-enable-ehabi=unwind
define void @_Z1fv() nounwind {
entry: