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/beam/beam_emu.c | |
| 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/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index f6524f36d2..9b251a6ad1 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -5034,7 +5034,10 @@ get_map_elements_fail: case HIPE_MODE_SWITCH_RES_RETURN: ASSERT(is_value(reg[0])); MoveReturn(reg[0], r(0)); - case HIPE_MODE_SWITCH_RES_CALL: + case HIPE_MODE_SWITCH_RES_CALL_EXPORTED: + c_p->i = c_p->hipe.u.callee_exp->addressv[erts_active_code_ix()]; + /*fall through*/ + case HIPE_MODE_SWITCH_RES_CALL_BEAM: SET_I(c_p->i); r(0) = reg[0]; Dispatch(); |