diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-10 17:36:42 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-10-12 15:40:19 +0200 |
| commit | ab3ea86a2ad0015eb8a5a46e01a1ad4ad51da4e1 (patch) | |
| tree | d0d51d5fb264cceec288152769040e488603f4c1 /erts/emulator/beam/erl_nif.c | |
| parent | 2d32c9a84458818d438cf849b86be364affabf31 (diff) | |
| download | otp-ab3ea86a2ad0015eb8a5a46e01a1ad4ad51da4e1.tar.gz otp-ab3ea86a2ad0015eb8a5a46e01a1ad4ad51da4e1.tar.bz2 otp-ab3ea86a2ad0015eb8a5a46e01a1ad4ad51da4e1.zip | |
erts: Refactor rename Export.code[] to Export.beam[]
to avoid scary merge errors.
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index 167cded28f..d2f18667bf 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -2328,9 +2328,9 @@ allocate_nif_sched_data(Process* proc, int argc) ep->rootset_extra = argc; ep->rootset[0] = NIL; for (i=0; i<ERTS_NUM_CODE_IX; i++) { - ep->exp.addressv[i] = &ep->exp.code[0]; + ep->exp.addressv[i] = &ep->exp.beam[0]; } - ep->exp.code[0] = (BeamInstr) em_call_nif; + ep->exp.beam[0] = (BeamInstr) em_call_nif; (void) ERTS_PROC_SET_NIF_TRAP_EXPORT(proc, ep); return ep; } @@ -2404,7 +2404,7 @@ init_nif_sched_data(ErlNifEnv* env, NativeFunPtr direct_fp, NativeFunPtr indirec ep->exp.info.mfa.module = proc->current->module; ep->exp.info.mfa.function = proc->current->function; ep->exp.info.mfa.arity = argc; - ep->exp.code[1] = (BeamInstr) direct_fp; + ep->exp.beam[1] = (BeamInstr) direct_fp; ep->m = env->mod_nif; ep->fp = indirect_fp; proc->freason = TRAP; |