diff options
| author | Sverker Eriksson <[email protected]> | 2017-04-04 18:13:22 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-04-04 19:26:58 +0200 |
| commit | 566ff495cb0f5f87306c81fc8d8ab2323b34d840 (patch) | |
| tree | 426c4125cc871562a466e74a0380236445e6ebf0 /erts/emulator/beam/beam_emu.c | |
| parent | 0b3416203c37eba5354e284b9040799158567133 (diff) | |
| download | otp-566ff495cb0f5f87306c81fc8d8ab2323b34d840.tar.gz otp-566ff495cb0f5f87306c81fc8d8ab2323b34d840.tar.bz2 otp-566ff495cb0f5f87306c81fc8d8ab2323b34d840.zip | |
erts: Refactor ErtsCodeInfo.native
into union with actual usage types.
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 9a91fdce08..3291f92b71 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -4948,14 +4948,14 @@ do { \ */ ErtsCodeInfo *ci = erts_code_to_codeinfo(I); ASSERT(ci->op == (Uint) OpCode(i_func_info_IaaI)); - c_p->hipe.u.ncallee = (void(*)(void)) ci->native; + c_p->hipe.u.ncallee = ci->u.ncallee; ++hipe_trap_count; HIPE_MODE_SWITCH(HIPE_MODE_SWITCH_CMD_CALL | (ci->mfa.arity << 8)); } OpCase(hipe_trap_call_closure): { ErtsCodeInfo *ci = erts_code_to_codeinfo(I); ASSERT(ci->op == (Uint) OpCode(i_func_info_IaaI)); - c_p->hipe.u.ncallee = (void(*)(void)) ci->native; + c_p->hipe.u.ncallee = ci->u.ncallee; ++hipe_trap_count; HIPE_MODE_SWITCH(HIPE_MODE_SWITCH_CMD_CALL_CLOSURE | (ci->mfa.arity << 8)); } @@ -5027,7 +5027,7 @@ do { \ * ... remainder of original BEAM code */ ErtsCodeInfo *ci = erts_code_to_codeinfo(I); - struct hipe_call_count *hcc = (struct hipe_call_count*)ci->native; + struct hipe_call_count *hcc = ci->u.hcc; ASSERT(ci->op == (Uint) OpCode(i_func_info_IaaI)); ASSERT(hcc != NULL); ASSERT(VALID_INSTR(hcc->opcode)); |