diff options
| author | Sverker Eriksson <[email protected]> | 2014-04-25 23:02:26 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-04-29 16:17:56 +0200 |
| commit | c4cdb1847e09d1153a6044d7a6aac05db4fad515 (patch) | |
| tree | 6bbb66be7b53e2532caee29ee0ff455416e9b2af /erts/emulator/hipe/hipe_amd64_glue.S | |
| parent | 23246d73bbd3188e2c0a45408b9bd29fd034ccaf (diff) | |
| download | otp-c4cdb1847e09d1153a6044d7a6aac05db4fad515.tar.gz otp-c4cdb1847e09d1153a6044d7a6aac05db4fad515.tar.bz2 otp-c4cdb1847e09d1153a6044d7a6aac05db4fad515.zip | |
erts: Fix global tracing of beam function when called from hipe code
Make hipe to beam calls use export entry.
Makes it a lot easier to handle global tracing correctly
(breakpoints in export entry). A beam function should now be traced
correctly regardless how it is called.
This will also fix a SEGV crash when a hipe stub is made pointing into
a traced export entry and tracing is then stopped which clears the export
entry causing the hipe stub to execute beam instruction NULL.
This commit assumes that hipe code never calls local beam functions, which
should be the case nowadays as we only hipe compile entire modules.
Diffstat (limited to 'erts/emulator/hipe/hipe_amd64_glue.S')
| -rw-r--r-- | erts/emulator/hipe/hipe_amd64_glue.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/hipe/hipe_amd64_glue.S b/erts/emulator/hipe/hipe_amd64_glue.S index 8816906870..bebe0a8fd1 100644 --- a/erts/emulator/hipe/hipe_amd64_glue.S +++ b/erts/emulator/hipe/hipe_amd64_glue.S @@ -109,7 +109,7 @@ ASYM(nbif_return): * stub (hipe_x86_loader.erl) which should look as follows: * * stub for f/N: - * movq $<f's BEAM code address>, P_BEAM_IP(P) + * movq $<f's export entry address>, P_CALLEE_EXP(P) * movb $<N>, P_ARITY(P) * jmp nbif_callemu * @@ -119,7 +119,7 @@ ASYM(nbif_return): GLOBAL(ASYM(nbif_callemu)) ASYM(nbif_callemu): STORE_ARG_REGS - movl $HIPE_MODE_SWITCH_RES_CALL, %eax + movl $HIPE_MODE_SWITCH_RES_CALL_EXPORTED, %eax jmp .suspend_exit /* |