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/beam_emu.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/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 2c47386925..8e88d6ccd5 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -119,7 +119,7 @@ do { \ #define GET_BIF_MODULE(p) (p->info.mfa.module) #define GET_BIF_FUNCTION(p) (p->info.mfa.function) #define GET_BIF_ARITY(p) (p->info.mfa.arity) -#define GET_BIF_ADDRESS(p) ((BifFunction) (p->code[1])) +#define GET_BIF_ADDRESS(p) ((BifFunction) (p->beam[1])) #define TermWords(t) (((t) / (sizeof(BeamInstr)/sizeof(Eterm))) + !!((t) % (sizeof(BeamInstr)/sizeof(Eterm)))) @@ -5147,8 +5147,8 @@ do { \ bif_table[i].name, bif_table[i].arity); bif_export[i] = ep; - ep->code[0] = (BeamInstr) OpCode(apply_bif); - ep->code[1] = (BeamInstr) bif_table[i].f; + ep->beam[0] = (BeamInstr) OpCode(apply_bif); + ep->beam[1] = (BeamInstr) bif_table[i].f; /* XXX: set func info for bifs */ ep->info.op = (BeamInstr) BeamOp(op_i_func_info_IaaI); } @@ -7219,8 +7219,8 @@ erts_is_builtin(Eterm Mod, Eterm Name, int arity) if ((ep = export_get(&e)) == NULL) { return 0; } - return ep->addressv[erts_active_code_ix()] == ep->code - && (ep->code[0] == (BeamInstr) em_apply_bif); + return ep->addressv[erts_active_code_ix()] == ep->beam + && (ep->beam[0] == (BeamInstr) em_apply_bif); } |