diff options
| author | Zandra Hird <[email protected]> | 2015-04-29 14:52:53 +0200 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-04-29 14:52:53 +0200 |
| commit | 5758f481ea259d78004a0a770cea2cc23dbf282e (patch) | |
| tree | 5aa6cac60caab2d1e46f7a13c074b5514fdbd41a /erts/emulator/hipe/hipe_amd64_bifs.m4 | |
| parent | de6ef63b143557558436b5c0213030a27d78da0d (diff) | |
| parent | 086af2a9f8fffefd8fb8330cc45bdf1e698809df (diff) | |
| download | otp-5758f481ea259d78004a0a770cea2cc23dbf282e.tar.gz otp-5758f481ea259d78004a0a770cea2cc23dbf282e.tar.bz2 otp-5758f481ea259d78004a0a770cea2cc23dbf282e.zip | |
Merge branch 'mikpe/hipe-unbreak-arity-4-bifs'
* mikpe/hipe-unbreak-arity-4-bifs:
erts/hipe: unbreak arity 4 BIFs
Diffstat (limited to 'erts/emulator/hipe/hipe_amd64_bifs.m4')
| -rw-r--r-- | erts/emulator/hipe/hipe_amd64_bifs.m4 | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/erts/emulator/hipe/hipe_amd64_bifs.m4 b/erts/emulator/hipe/hipe_amd64_bifs.m4 index 7d94aa05b3..74cb9112ce 100644 --- a/erts/emulator/hipe/hipe_amd64_bifs.m4 +++ b/erts/emulator/hipe/hipe_amd64_bifs.m4 @@ -159,37 +159,36 @@ define(standard_bif_interface_4, ` #ifndef HAVE_$1 #`define' HAVE_$1 - TEXT - .align 4 - GLOBAL(ASYM($1)) + TEXT + .align 4 + GLOBAL(ASYM($1)) ASYM($1): - /* set up the parameters */ - movq P, %rdi - NBIF_ARG(%rsi,4,0) - NBIF_ARG(%rdx,4,1) - NBIF_ARG(%rcx,4,2) - NBIF_ARG(%r8,4,3) - - /* make the call on the C stack */ - SWITCH_ERLANG_TO_C - pushq %r8 - pushq %rcx - pushq %rdx - pushq %rsi - movq %rsp, %rsi /* Eterm* BIF__ARGS */ - sub $(8), %rsp /* stack frame 16-byte alignment */ - CALL_BIF($2) - add $(4*8 + 8), %rsp - TEST_GOT_MBUF - SWITCH_C_TO_ERLANG - - /* throw exception if failure, otherwise return */ - TEST_GOT_EXN - jz nbif_4_simple_exception - NBIF_RET(4) - HANDLE_GOT_MBUF(4) - SET_SIZE(ASYM($1)) - TYPE_FUNCTION(ASYM($1)) + /* set up the parameters */ + movq P, %rdi + NBIF_ARG(%rsi,4,0) + NBIF_ARG(%rdx,4,1) + NBIF_ARG(%rcx,4,2) + NBIF_ARG(%r8,4,3) + + /* make the call on the C stack */ + SWITCH_ERLANG_TO_C + pushq %r8 + pushq %rcx + pushq %rdx + pushq %rsi + movq %rsp, %rsi /* Eterm* BIF__ARGS */ + CALL_BIF($2) + add $(4*8), %rsp + TEST_GOT_MBUF + SWITCH_C_TO_ERLANG + + /* throw exception if failure, otherwise return */ + TEST_GOT_EXN + jz nbif_4_simple_exception + NBIF_RET(4) + HANDLE_GOT_MBUF(4) + SET_SIZE(ASYM($1)) + TYPE_FUNCTION(ASYM($1)) #endif') define(standard_bif_interface_0, |