diff options
| author | Björn Gustavsson <[email protected]> | 2011-02-24 08:34:42 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-02-24 08:34:42 +0100 |
| commit | d4ea1aa8d1a206e7a143ac4bd9bd6c37c7fccdaa (patch) | |
| tree | f84ec3fa4c332f27dc997507d510c42e83f046f0 /erts/emulator/beam/beam_emu.c | |
| parent | 8592a7629a4afd1ea5b19f7473b3b06605169e66 (diff) | |
| parent | e1833ee82c7a07e000dbbea3af6c8fefc02582d6 (diff) | |
| download | otp-d4ea1aa8d1a206e7a143ac4bd9bd6c37c7fccdaa.tar.gz otp-d4ea1aa8d1a206e7a143ac4bd9bd6c37c7fccdaa.tar.bz2 otp-d4ea1aa8d1a206e7a143ac4bd9bd6c37c7fccdaa.zip | |
Merge branch 'bjorn/erts/minor-fixes' into dev
* bjorn/erts/minor-fixes:
BEAM loader: Add an assertion to check for overflowed code space
beam_emu: Eliminate redundant #ifdef
beam_emu: Remove unnecessary decrement of I in "case_end r"
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 16741aa2d7..12a8022861 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -3424,7 +3424,6 @@ void process_main(void) OpCase(case_end_r): case_end_val = r(0); - I--; do_case_end: c_p->fvalue = case_end_val; @@ -5865,9 +5864,6 @@ build_stacktrace(Process* c_p, Eterm exc) { Eterm args; int depth; BeamInstr* current; -#if HALFWORD_HEAP - BeamInstr current_buff[3]; -#endif Eterm Where = NIL; Eterm *next_p = &Where; @@ -5897,14 +5893,7 @@ build_stacktrace(Process* c_p, Eterm exc) { * (e.g. spawn_link(erlang, abs, [1])). */ if (current == NULL) { -#if HALFWORD_HEAP - current = current_buff; - current[0] = (BeamInstr) c_p->initial[0]; - current[1] = (BeamInstr) c_p->initial[1]; - current[2] = (BeamInstr) c_p->initial[2]; -#else current = c_p->initial; -#endif args = am_true; /* Just in case */ } else { args = get_args_from_exc(exc); |