aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/beam_bp.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/beam_bp.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/beam_bp.c')
-rw-r--r--erts/emulator/beam/beam_bp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c
index 2cdf66f441..62464f3864 100644
--- a/erts/emulator/beam/beam_bp.c
+++ b/erts/emulator/beam/beam_bp.c
@@ -238,7 +238,7 @@ erts_bp_match_export(BpFunctions* f, ErtsCodeMFA *mfa, int specified)
ASSERT(0);
}
- pc = ep->code;
+ pc = ep->beam;
if (ep->addressv[code_ix] == pc) {
if ((*pc == (BeamInstr) em_apply_bif ||
*pc == (BeamInstr) em_call_error_handler)) {
@@ -712,7 +712,7 @@ erts_bif_trace(int bif_index, Process* p, Eterm* args, BeamInstr* I)
Export* ep = bif_export[bif_index];
Uint32 flags = 0, flags_meta = 0;
ErtsTracer meta_tracer = erts_tracer_nil;
- int applying = (I == ep->code); /* Yup, the apply code for a bif
+ int applying = (I == ep->beam); /* Yup, the apply code for a bif
* is actually in the
* export entry */
BeamInstr *cp = p->cp;