aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/export.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-10-10 17:36:42 +0200
committerLukas Larsson <[email protected]>2016-10-12 15:40:19 +0200
commitab3ea86a2ad0015eb8a5a46e01a1ad4ad51da4e1 (patch)
treed0d51d5fb264cceec288152769040e488603f4c1 /erts/emulator/beam/export.c
parent2d32c9a84458818d438cf849b86be364affabf31 (diff)
downloadotp-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/export.c')
-rw-r--r--erts/emulator/beam/export.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/beam/export.c b/erts/emulator/beam/export.c
index 0a36175398..060fde074c 100644
--- a/erts/emulator/beam/export.c
+++ b/erts/emulator/beam/export.c
@@ -136,11 +136,11 @@ export_alloc(struct export_entry* tmpl_e)
obj->info.mfa.module = tmpl->info.mfa.module;
obj->info.mfa.function = tmpl->info.mfa.function;
obj->info.mfa.arity = tmpl->info.mfa.arity;
- obj->code[0] = (BeamInstr) em_call_error_handler;
- obj->code[1] = 0;
+ obj->beam[0] = (BeamInstr) em_call_error_handler;
+ obj->beam[1] = 0;
for (ix=0; ix<ERTS_NUM_CODE_IX; ix++) {
- obj->addressv[ix] = obj->code;
+ obj->addressv[ix] = obj->beam;
blob->entryv[ix].slot.index = -1;
blob->entryv[ix].ep = &blob->exp;
@@ -266,8 +266,8 @@ erts_find_function(Eterm m, Eterm f, unsigned int a, ErtsCodeIndex code_ix)
ee = hash_get(&export_tables[code_ix].htable, init_template(&templ, m, f, a));
if (ee == NULL ||
- (ee->ep->addressv[code_ix] == ee->ep->code &&
- ee->ep->code[0] != (BeamInstr) BeamOp(op_i_generic_breakpoint))) {
+ (ee->ep->addressv[code_ix] == ee->ep->beam &&
+ ee->ep->beam[0] != (BeamInstr) BeamOp(op_i_generic_breakpoint))) {
return NULL;
}
return ee->ep;