aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2010-05-06 14:38:20 +0200
committerRaimo Niskanen <[email protected]>2010-06-03 14:54:20 +0200
commit19278f9eecb61ab652347097d1558b696c8eb066 (patch)
tree478b0bde340a292123436d62f2248b7210771b43 /erts/emulator/beam
parent5bd5aa849475b505a5b0798295511a6a0b4885a4 (diff)
downloadotp-19278f9eecb61ab652347097d1558b696c8eb066.tar.gz
otp-19278f9eecb61ab652347097d1558b696c8eb066.tar.bz2
otp-19278f9eecb61ab652347097d1558b696c8eb066.zip
Fix BeamInstr for call_time
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/beam_bp.h2
-rw-r--r--erts/emulator/beam/beam_emu.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/erts/emulator/beam/beam_bp.h b/erts/emulator/beam/beam_bp.h
index 249cb707fd..4a3d244d2f 100644
--- a/erts/emulator/beam/beam_bp.h
+++ b/erts/emulator/beam/beam_bp.h
@@ -91,7 +91,7 @@ typedef struct {
typedef struct bp_data_time { /* Call time */
struct bp_data *next;
struct bp_data *prev;
- Uint orig_instr;
+ BeamInstr orig_instr;
Uint pause;
Uint n;
bp_time_hash_t *hash;
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 8eb198fac3..29d0c0afde 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -4418,11 +4418,11 @@ apply_bif_or_nif_epilogue:
BpDataTime *bdt = (BpDataTime *) (I)[-4];
Uint tail_call = 0;
- ASSERT((I)[-5] == (Uint) BeamOp(op_i_func_info_IaaI));
+ ASSERT((I)[-5] == (BeamInstr) BeamOp(op_i_func_info_IaaI));
ASSERT(bdt);
bdt = (BpDataTime *) bdt->next;
ASSERT(bdt);
- (I)[-4] = (Uint) bdt;
+ (I)[-4] = (BeamInstr) bdt;
real_I = bdt->orig_instr;
ASSERT(VALID_INSTR(real_I));
@@ -4466,12 +4466,12 @@ apply_bif_or_nif_epilogue:
}
OpCase(i_return_time_trace): {
- Uint *pc = (Uint *) E[0];
+ BeamInstr *pc = (BeamInstr *) (UWord) E[0];
SWAPOUT;
erts_trace_time_break(c_p, pc, NULL, ERTS_BP_CALL_TIME_RETURN);
SWAPIN;
c_p->cp = NULL;
- SET_I((Eterm *) E[1]);
+ SET_I((BeamInstr *) cp_val(E[1]));
E += 2;
Goto(*I);
}
@@ -4485,7 +4485,7 @@ apply_bif_or_nif_epilogue:
}
/* Fall through to next case */
OpCase(i_mtrace_breakpoint): {
- Uint real_I;
+ BeamInstr real_I;
Uint32 flags;
Eterm tracer_pid;
Uint *cpp;