diff options
| author | Yiannis Tsiouris <[email protected]> | 2014-01-28 18:05:31 +0200 |
|---|---|---|
| committer | Yiannis Tsiouris <[email protected]> | 2014-03-07 18:35:02 +0200 |
| commit | a307b90ba474d2700289cd010d606b8c133fbacb (patch) | |
| tree | dba9c65b676cbe61f0f29b804cbd22886405f950 | |
| parent | f0d4ac85952e847ec3d846b2ab6bd8a508244521 (diff) | |
| download | otp-a307b90ba474d2700289cd010d606b8c133fbacb.tar.gz otp-a307b90ba474d2700289cd010d606b8c133fbacb.tar.bz2 otp-a307b90ba474d2700289cd010d606b8c133fbacb.zip | |
Add a BIF that only returns the atom ok
A call in llvm_fix_pinned_regs/0 is inserted in the beginning of LLVM unwind
blocks (i.e. code executed when an LLVM 'invoke' call triggers an exception)
in order to get the BP and SP registers right. This is needed because LLVM
exception handling doesn't provide the return value (that also contains the
values for these registers, as defined in the HiPE Calling Convention for
LLVM) on the 'landingpad's.
| -rw-r--r-- | erts/emulator/hipe/hipe_bif2.c | 7 | ||||
| -rw-r--r-- | erts/emulator/hipe/hipe_bif2.tab | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/erts/emulator/hipe/hipe_bif2.c b/erts/emulator/hipe/hipe_bif2.c index 7637049bc3..054911e822 100644 --- a/erts/emulator/hipe/hipe_bif2.c +++ b/erts/emulator/hipe/hipe_bif2.c @@ -182,3 +182,10 @@ BIF_RETTYPE hipe_bifs_debug_native_called_2(BIF_ALIST_2) BIF_RET(am_ok); } +/* Stub-BIF for LLVM: + * Reloads BP, SP (in llvm unwind label) */ + +BIF_RETTYPE hipe_bifs_llvm_fix_pinned_regs_0(BIF_ALIST_0) +{ + BIF_RET(am_ok); +} diff --git a/erts/emulator/hipe/hipe_bif2.tab b/erts/emulator/hipe/hipe_bif2.tab index 45a395bf57..1b659cfa90 100644 --- a/erts/emulator/hipe/hipe_bif2.tab +++ b/erts/emulator/hipe/hipe_bif2.tab @@ -30,3 +30,4 @@ bif hipe_bifs:in_native/0 bif hipe_bifs:modeswitch_debug_on/0 bif hipe_bifs:modeswitch_debug_off/0 bif hipe_bifs:debug_native_called/2 +bif hipe_bifs:llvm_fix_pinned_regs/0 |