diff options
| author | Sverker Eriksson <[email protected]> | 2017-04-25 19:12:04 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-04-25 19:12:04 +0200 |
| commit | 70074be307908d8913e042dcf564487028c53f84 (patch) | |
| tree | 04ce5c9513bf13bb9760b43b5576961812ae85d0 /erts/emulator/hipe/hipe_mode_switch.c | |
| parent | 504bb40f3530d5890849f1c51f7ce1aba6766784 (diff) | |
| parent | 56c4aee677f305f2ed9ca877a39e9c3c4f266f4b (diff) | |
| download | otp-70074be307908d8913e042dcf564487028c53f84.tar.gz otp-70074be307908d8913e042dcf564487028c53f84.tar.bz2 otp-70074be307908d8913e042dcf564487028c53f84.zip | |
Merge branch 'sverker/refactor'
* sverker/refactor:
erts: Introduce struct binary_internals
erts: Introduce erts_bin_release
erts: Init refc=1 in erts_bin_drv_alloc*
erts: Init refc=1 in erts_bin_nrml_alloc
erts: Remove deliberate leak of hipe fun entries
erts: Remove hipe_bifs:remove_refs_from/1
Refactor hipe specific code to use ErtsCodeInfo
erts: Refactor ErtsCodeInfo.native
Diffstat (limited to 'erts/emulator/hipe/hipe_mode_switch.c')
| -rw-r--r-- | erts/emulator/hipe/hipe_mode_switch.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/hipe/hipe_mode_switch.c b/erts/emulator/hipe/hipe_mode_switch.c index 712f65f629..1270a94986 100644 --- a/erts/emulator/hipe/hipe_mode_switch.c +++ b/erts/emulator/hipe/hipe_mode_switch.c @@ -176,14 +176,15 @@ void hipe_mode_switch_init(void) hipe_mfa_info_table_init(); } -void hipe_set_call_trap(Uint *bfun, void *nfun, int is_closure) +void hipe_set_call_trap(ErtsCodeInfo* ci, void *nfun, int is_closure) { - HIPE_ASSERT(bfun[-5] == BeamOpCode(op_i_func_info_IaaI)); + BeamInstr* bfun = erts_codeinfo_to_code(ci); + HIPE_ASSERT(ci->op == BeamOpCode(op_i_func_info_IaaI)); bfun[0] = is_closure ? BeamOpCode(op_hipe_trap_call_closure) : BeamOpCode(op_hipe_trap_call); - bfun[-4] = (Uint)nfun; + ci->u.ncallee = (void (*)(void)) nfun; } static __inline__ void |