Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for running OTP 24 code #8610

Merged
merged 1 commit into from
Jun 27, 2024
Merged

Remove support for running OTP 24 code #8610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions erts/emulator/beam/beam_debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,15 +690,6 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
print_byte_string(to, to_arg, str, bytes);
}
break;
case op_bs_put_string_WW:
if (ap - first_arg == 0) {
erts_print(to, to_arg, "%d", *ap);
} else {
Uint bytes = ap[-1];
byte* str = (byte *) ap[0];
print_byte_string(to, to_arg, str, bytes);
}
break;
default:
#ifdef ARCH_64
erts_print(to, to_arg, "%ld", *ap);
Expand Down
11 changes: 8 additions & 3 deletions erts/emulator/beam/beam_load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,13 @@ erts_prepare_loading(Binary* magic, Process *c_p, Eterm group_leader,
*
* We know that because OTP 23/24/25/26 artifically set the
* highest used op code to the op code for the `swap`
* instruction introduced in OTP 23. (OTP 27 artificially sets
* the highest op code to `make_fun3` introduced in OTP 24.)
* instruction introduced in OTP 23.
*
* OTP 27 artificially sets the highest op code to `make_fun3`
* introduced in OTP 24.
*
* OTP 28 artificially sets the highest op code to `bs_create_bin`
* introduced in OTP 25.
*
* Old BEAM files produced by OTP R12 and earlier may be
* incompatible with the current runtime system. We used to
Expand All @@ -207,7 +212,7 @@ erts_prepare_loading(Binary* magic, Process *c_p, Eterm group_leader,
"This BEAM file was compiled for an old version of "
"the runtime system.\n"
" To fix this, please re-compile this module with "
"Erlang/OTP 24 or later.\n");
"Erlang/OTP 25 or later.\n");
}

if (!load_code(stp)) {
Expand Down
3 changes: 0 additions & 3 deletions erts/emulator/beam/emu/beam_emu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,6 @@ void process_main(ErtsSchedulerData *esdp)

ERTS_MSACC_DECLARE_CACHE_X() /* a cached value of the tsd pointer for msacc */

ERL_BITS_DECLARE_STATEP; /* Has to be last declaration */

/*
* Note: In this function, we attempt to place rarely executed code towards
* the end of the function, in the hope that the cache hit rate will be better.
Expand Down Expand Up @@ -379,7 +377,6 @@ void process_main(ErtsSchedulerData *esdp)
start_time_i = c_p->i;
}

ERL_BITS_RELOAD_STATEP(c_p);
{
int reds;
BeamInstr next;
Expand Down
Loading
Loading