Skip to content

Fix ETP new fun arity format #10246

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

Merged
merged 1 commit into from
Oct 3, 2025
Merged

Fix ETP new fun arity format #10246

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
2 changes: 2 additions & 0 deletions erts/emulator/beam/erl_etp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ const Eterm etp_tag_header_map = _TAG_HEADER_MAP;
const Eterm etp_tag_header_mask = _TAG_HEADER_MASK;
const Eterm etp_header_subtag_mask = _HEADER_SUBTAG_MASK;
const Eterm etp_header_arity_offs = _HEADER_ARITY_OFFS;
const Eterm etp_header_fun_kind_offs = FUN_HEADER_KIND_OFFS;
const Eterm etp_header_fun_env_size_offs = FUN_HEADER_ENV_SIZE_OFFS;

const Eterm etp_tag_primary_size = _TAG_PRIMARY_SIZE;
const Eterm etp_tag_primary_mask = _TAG_PRIMARY_MASK;
Expand Down
13 changes: 10 additions & 3 deletions erts/etc/unix/etp-commands.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,17 @@ define etp-boxed-immediate-1
else
# Hexdump the rest
if ($etp_boxed_immediate_h == etp_fun_subtag)
printf "#Fun<"
set $etp_boxed_immediate_arity = \
((($etp_boxed_immediate_p[0] >> \
etp_header_fun_env_size_offs) & 0xff) + 1)
if ($etp_boxed_immediate_p[0] >> etp_header_fun_kind_offs)
printf "#FunX<"
else
printf "#FunL<"
end
else
set $etp_boxed_immediate_arity = \
($etp_boxed_immediate_p[0] >> etp_header_arity_offs)
if ($etp_boxed_immediate_h == etp_bin_ref_subtag)
printf "#BinRef<"
else
Expand All @@ -442,8 +451,6 @@ define etp-boxed-immediate-1
end
end
end
set $etp_boxed_immediate_arity = \
($etp_boxed_immediate_p[0] >> etp_header_arity_offs)
while $etp_boxed_immediate_arity > 0
set $etp_boxed_immediate_p++
if $etp_boxed_immediate_arity > 1
Expand Down
Loading