diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-03-10 15:11:09 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-03-10 15:11:09 +0000 |
| commit | 8b30f9854ed22cb39b4ac0e939f3bbaff7caad7e (patch) | |
| tree | 98e3e5765b5da20b495c16306cbc1e951174505f | |
| parent | 05e07836c833dc37816bee6857d099848a9c9a5a (diff) | |
| download | bcm5719-llvm-8b30f9854ed22cb39b4ac0e939f3bbaff7caad7e.tar.gz bcm5719-llvm-8b30f9854ed22cb39b4ac0e939f3bbaff7caad7e.zip | |
ARM: correct __builtin_longjmp on WoA
WoA uses r11 as the FP even though it is a pure thumb-2 environment in contrast
to AAPCS which states r7. This adjusts __builtin_longjmp to not clobber r7 and
to properly restore the frame pointer on execution.
llvm-svn: 263118
| -rw-r--r-- | llvm/lib/Target/ARM/ARMAsmPrinter.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/CodeGen/ARM/Windows/builtin_longjmp.ll | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/ARMAsmPrinter.cpp b/llvm/lib/Target/ARM/ARMAsmPrinter.cpp index aefc20d9e65..2629da9570f 100644 --- a/llvm/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/llvm/lib/Target/ARM/ARMAsmPrinter.cpp @@ -1858,8 +1858,10 @@ void ARMAsmPrinter::EmitInstruction(const MachineInstr *MI) { // ldr $scratch, [$src, #4] // ldr r7, [$src] // bx $scratch + const Triple &TT = TM.getTargetTriple(); unsigned SrcReg = MI->getOperand(0).getReg(); unsigned ScratchReg = MI->getOperand(1).getReg(); + EmitToStreamer(*OutStreamer, MCInstBuilder(ARM::tLDRi) .addReg(ScratchReg) .addReg(SrcReg) @@ -1886,7 +1888,7 @@ void ARMAsmPrinter::EmitInstruction(const MachineInstr *MI) { .addReg(0)); EmitToStreamer(*OutStreamer, MCInstBuilder(ARM::tLDRi) - .addReg(ARM::R7) + .addReg(TT.isOSWindows() ? ARM::R11 : ARM::R7) .addReg(SrcReg) .addImm(0) // Predicate. diff --git a/llvm/test/CodeGen/ARM/Windows/builtin_longjmp.ll b/llvm/test/CodeGen/ARM/Windows/builtin_longjmp.ll new file mode 100644 index 00000000000..d16b44f3d8a --- /dev/null +++ b/llvm/test/CodeGen/ARM/Windows/builtin_longjmp.ll @@ -0,0 +1,16 @@ +; RUN: llc -mtriple thumbv7--windows-itanium -filetype asm -o - %s | FileCheck %s + +declare void @llvm.eh.sjlj.longjmp(i8*) + +define arm_aapcs_vfpcc void @test___builtin_longjump(i8* %b) { +entry: + tail call void @llvm.eh.sjlj.longjmp(i8* %b) + unreachable +} + +; CHECK: ldr r[[SP:[0-9]+]], [r0, #8] +; CHECK: mov sp, r[[SP]] +; CHECK: ldr r[[PC:[0-9]+]], [r0, #4] +; CHECK: ldr r11, [r0] +; CHECK: bx r[[PC]] + |
