diff options
| author | Eli Bendersky <eliben@google.com> | 2013-01-30 16:30:19 +0000 |
|---|---|---|
| committer | Eli Bendersky <eliben@google.com> | 2013-01-30 16:30:19 +0000 |
| commit | 2e2ce49e59c8c43d81f6d4a2b336c11a18584776 (patch) | |
| tree | 6b60632e84099d695ddf018f30b5827062514b53 /llvm/lib/Target/ARM/ARMISelLowering.cpp | |
| parent | e07245cdfc4e5b202adc6e7757337d37beda4a4b (diff) | |
| download | bcm5719-llvm-2e2ce49e59c8c43d81f6d4a2b336c11a18584776.tar.gz bcm5719-llvm-2e2ce49e59c8c43d81f6d4a2b336c11a18584776.zip | |
Add a special ARM trap encoding for NaCl.
More details in this thread: http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20130128/163783.html
Patch by JF Bastien
llvm-svn: 173943
Diffstat (limited to 'llvm/lib/Target/ARM/ARMISelLowering.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMISelLowering.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp index 6beb1abd222..82b475a44f3 100644 --- a/llvm/lib/Target/ARM/ARMISelLowering.cpp +++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp @@ -6303,7 +6303,16 @@ EmitSjLjDispatchBlock(MachineInstr *MI, MachineBasicBlock *MBB) const { DispatchBB->setIsLandingPad(); MachineBasicBlock *TrapBB = MF->CreateMachineBasicBlock(); - BuildMI(TrapBB, dl, TII->get(Subtarget->isThumb() ? ARM::tTRAP : ARM::TRAP)); + unsigned trap_opcode; + if (Subtarget->isThumb()) { + trap_opcode = ARM::tTRAP; + } else { + if (Subtarget->useNaClTrap()) + trap_opcode = ARM::TRAPNaCl; + else + trap_opcode = ARM::TRAP; + } + BuildMI(TrapBB, dl, TII->get(trap_opcode)); DispatchBB->addSuccessor(TrapBB); MachineBasicBlock *DispContBB = MF->CreateMachineBasicBlock(); @@ -10317,4 +10326,3 @@ bool ARMTargetLowering::getTgtMemIntrinsic(IntrinsicInfo &Info, return false; } - |
