diff options
Diffstat (limited to 'erts/emulator/beam/erl_vm.h')
| -rw-r--r-- | erts/emulator/beam/erl_vm.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_vm.h b/erts/emulator/beam/erl_vm.h index 54df471cda..6d5b7c6e1b 100644 --- a/erts/emulator/beam/erl_vm.h +++ b/erts/emulator/beam/erl_vm.h @@ -298,8 +298,8 @@ extern void** beam_ops; #ifndef BEAMASM -#define BeamIsReturnTimeTrace(w) \ - BeamIsOpCode(*(const BeamInstr*)(w), op_i_return_time_trace) +#define BeamIsReturnCallAccTrace(w) \ + BeamIsOpCode(*(const BeamInstr*)(w), op_i_call_trace_return) #define BeamIsReturnToTrace(w) \ BeamIsOpCode(*(const BeamInstr*)(w), op_i_return_to_trace) #define BeamIsReturnTrace(w) \ @@ -307,8 +307,8 @@ extern void** beam_ops; #else /* BEAMASM */ -#define BeamIsReturnTimeTrace(w) \ - ((w) == beam_return_time_trace) +#define BeamIsReturnCallAccTrace(w) \ + ((w) == beam_call_trace_return) #define BeamIsReturnToTrace(w) \ ((w) == beam_return_to_trace) #define BeamIsReturnTrace(w) \ @@ -316,9 +316,14 @@ extern void** beam_ops; #endif /* BEAMASM */ +/* Stack frame sizes (not including CP_SIZE) */ +#define BEAM_RETURN_CALL_ACC_TRACE_FRAME_SZ 2 +#define BEAM_RETURN_TO_TRACE_FRAME_SZ 0 +#define BEAM_RETURN_TRACE_FRAME_SZ 2 + #if ERTS_GLB_INLINE_INCL_FUNC_DEF ERTS_GLB_INLINE -int erts_cp_size() +int erts_cp_size(void) { if (erts_frame_layout == ERTS_FRAME_LAYOUT_RA) { return 1; |