File 1281-Eliminate-the-Wterm-typedef.patch of Package erlang
From 302d053bec9671dd5ef092af7e7f757ba4135e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Fri, 13 Oct 2023 07:35:32 +0200
Subject: [PATCH 1/2] Eliminate the Wterm typedef
`Wterm` is remnant from the halfword runtime system.
---
erts/emulator/beam/big.c | 12 +++----
erts/emulator/beam/big.h | 10 +++---
erts/emulator/beam/erl_db.c | 4 +--
erts/emulator/beam/erl_db_util.c | 8 ++---
erts/emulator/beam/erl_db_util.h | 4 +--
erts/emulator/beam/erl_lock_check.c | 4 +--
erts/emulator/beam/erl_printf_term.c | 4 +--
erts/emulator/beam/erl_term.c | 38 +++++++++++-----------
erts/emulator/beam/erl_term.h | 48 +++++++++++++---------------
erts/emulator/beam/utils.c | 2 +-
10 files changed, 66 insertions(+), 68 deletions(-)
diff --git a/erts/emulator/beam/big.c b/erts/emulator/beam/big.c
index 0025fa7470..e3a12e324c 100644
--- a/erts/emulator/beam/big.c
+++ b/erts/emulator/beam/big.c
@@ -1934,7 +1934,7 @@ erts_uint64_array_to_big(Uint **hpp, int neg, int len, Uint64 *array)
** Convert a bignum to a double float
*/
int
-big_to_double(Wterm x, double* resp)
+big_to_double(Eterm x, double* resp)
{
double d = 0.0;
Eterm* xp = big_val(x);
@@ -2013,7 +2013,7 @@ double_to_big(double x, Eterm *heap, Uint hsz)
/*
** Estimate the number of digits in given base (include sign)
*/
-int big_integer_estimate(Wterm x, Uint base)
+int big_integer_estimate(Eterm x, Uint base)
{
Eterm* xp = big_val(x);
int lg = I_lg(BIG_V(xp), BIG_SIZE(xp));
@@ -2026,7 +2026,7 @@ int big_integer_estimate(Wterm x, Uint base)
/*
** Convert a bignum into a string of numbers in given base
*/
-static Uint write_big(Wterm x, int base, void (*write_func)(void *, char),
+static Uint write_big(Eterm x, int base, void (*write_func)(void *, char),
void *arg)
{
Eterm* xp = big_val(x);
@@ -2133,7 +2133,7 @@ write_string(void *arg, char c)
*(--(*((char **) arg))) = c;
}
-char *erts_big_to_string(Wterm x, int base, char *buf, Uint buf_sz)
+char *erts_big_to_string(Eterm x, int base, char *buf, Uint buf_sz)
{
char *big_str = buf + buf_sz - 1;
*big_str = '\0';
@@ -2191,7 +2191,7 @@ static Eterm big_norm(Eterm *x, dsize_t xl, short sign)
/*
** Compare bignums
*/
-int big_comp(Wterm x, Wterm y)
+int big_comp(Eterm x, Eterm y)
{
Eterm* xp = big_val(x);
Eterm* yp = big_val(y);
@@ -2582,7 +2582,7 @@ static Eterm B_plus_minus(ErtsDigit *x, dsize_t xl, short xsgn,
/*
** Add bignums
*/
-Eterm big_plus(Wterm x, Wterm y, Eterm *r)
+Eterm big_plus(Eterm x, Eterm y, Eterm *r)
{
Eterm* xp = big_val(x);
Eterm* yp = big_val(y);
diff --git a/erts/emulator/beam/big.h b/erts/emulator/beam/big.h
index b705421ca9..b30f42f0cf 100644
--- a/erts/emulator/beam/big.h
+++ b/erts/emulator/beam/big.h
@@ -125,14 +125,14 @@ typedef Uint dsize_t; /* Vector size type */
#endif
-int big_integer_estimate(Wterm, Uint base);
+int big_integer_estimate(Eterm, Uint base);
Eterm erts_big_to_list(Eterm, int base, Eterm**);
-char *erts_big_to_string(Wterm x, int base, char *buf, Uint buf_sz);
+char *erts_big_to_string(Eterm x, int base, char *buf, Uint buf_sz);
Uint erts_big_to_binary_bytes(Eterm x, int base, char *buf, Uint buf_sz);
Eterm small_times(Sint, Sint, Eterm*);
-Eterm big_plus(Wterm, Wterm, Eterm*);
+Eterm big_plus(Eterm, Eterm, Eterm*);
Eterm big_minus(Eterm, Eterm, Eterm*);
Eterm big_times(Eterm, Eterm, Eterm*);
Eterm big_mul_add(Eterm x, Eterm y, Eterm z, Eterm *r);
@@ -152,9 +152,9 @@ Eterm big_bxor(Eterm, Eterm, Eterm*);
Eterm big_bnot(Eterm, Eterm*);
Eterm big_lshift(Eterm, Sint, Eterm*);
-int big_comp (Wterm, Wterm);
+int big_comp (Eterm, Eterm);
int big_ucomp (Eterm, Eterm);
-int big_to_double(Wterm x, double* resp);
+int big_to_double(Eterm x, double* resp);
Eterm double_to_big(double, Eterm*, Uint hsz);
Eterm small_to_big(Sint, Eterm*);
Eterm uint_to_big(Uint, Eterm*);
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index 5bc28c74da..9f74666e48 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -1468,7 +1468,7 @@ do_update_counter(Process *p, DbTable* tb,
Eterm* tpl;
Sint position;
Eterm incr, warp;
- Wterm oldcnt;
+ Eterm oldcnt;
if (is_not_list(iter)) {
goto finalize;
@@ -1552,7 +1552,7 @@ do_update_counter(Process *p, DbTable* tb,
Eterm* tpl = tuple_val(CAR(list_val(iter)));
Sint position = signed_val(tpl[1]);
Eterm incr = tpl[2];
- Wterm oldcnt = db_do_read_element(&handle,position);
+ Eterm oldcnt = db_do_read_element(&handle,position);
Eterm newcnt = db_add_counter(&htop, oldcnt, incr);
if (newcnt == NIL) {
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index 048be25430..e6d3a03429 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -3147,13 +3147,13 @@ void db_free_dmc_err_info(DMCErrInfo *ei){
** Store bignum in *hpp and increase *hpp accordingly.
** *hpp is assumed to be large enough to hold the result.
*/
-Eterm db_add_counter(Eterm** hpp, Wterm counter, Eterm incr)
+Eterm db_add_counter(Eterm** hpp, Eterm counter, Eterm incr)
{
DeclareTmpHeapNoproc(big_tmp,2);
Eterm res;
Sint ires;
- Wterm arg1;
- Wterm arg2;
+ Eterm arg1;
+ Eterm arg2;
if (is_both_small(counter,incr)) {
ires = signed_val(counter) + signed_val(incr);
@@ -3197,7 +3197,7 @@ Eterm db_add_counter(Eterm** hpp, Wterm counter, Eterm incr)
/* Must be called to read elements after db_lookup_dbterm.
** Will decompress if needed.
*/
-Wterm db_do_read_element(DbUpdateHandle* handle, Sint position)
+Eterm db_do_read_element(DbUpdateHandle* handle, Sint position)
{
Eterm elem = handle->dbterm->tpl[position];
if (!is_header(elem)) {
diff --git a/erts/emulator/beam/erl_db_util.h b/erts/emulator/beam/erl_db_util.h
index c8f7b7f7b5..77463469cb 100644
--- a/erts/emulator/beam/erl_db_util.h
+++ b/erts/emulator/beam/erl_db_util.h
@@ -400,7 +400,7 @@ void db_free_tmp_uncompressed(DbTerm* obj);
ERTS_GLB_INLINE Eterm db_copy_object_from_ets(DbTableCommon* tb, DbTerm* bp,
Eterm** hpp, ErlOffHeap* off_heap);
ERTS_GLB_INLINE int db_eq(DbTableCommon* tb, Eterm a, DbTerm* b);
-Wterm db_do_read_element(DbUpdateHandle* handle, Sint position);
+Eterm db_do_read_element(DbUpdateHandle* handle, Sint position);
#if ERTS_GLB_INLINE_INCL_FUNC_DEF
@@ -478,7 +478,7 @@ void db_do_update_element(DbUpdateHandle* handle,
Sint position,
Eterm newval);
void db_finalize_resize(DbUpdateHandle* handle, Uint offset);
-Eterm db_add_counter(Eterm** hpp, Wterm counter, Eterm incr);
+Eterm db_add_counter(Eterm** hpp, Eterm counter, Eterm incr);
Binary *db_match_set_compile(Process *p, Eterm matchexpr,
Uint flags, Uint *freasonp);
int db_match_keeps_key(int keypos, Eterm match, Eterm guard, Eterm body);
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c
index baadec4866..45d3b531d0 100644
--- a/erts/emulator/beam/erl_lock_check.c
+++ b/erts/emulator/beam/erl_lock_check.c
@@ -426,7 +426,7 @@ new_locked_lock(lc_thread_t* thr,
}
static void
-raw_print_lock(char *prefix, Sint16 id, Wterm extra, erts_lock_flags_t flags,
+raw_print_lock(char *prefix, Sint16 id, Eterm extra, erts_lock_flags_t flags,
const char* file, unsigned int line, char *suffix)
{
char *lname = (1 <= id && id < ERTS_LOCK_ORDER_SIZE
@@ -447,7 +447,7 @@ raw_print_lock(char *prefix, Sint16 id, Wterm extra, erts_lock_flags_t flags,
}
static void
-print_lock2(char *prefix, Sint16 id, Wterm extra, erts_lock_flags_t flags, char *suffix)
+print_lock2(char *prefix, Sint16 id, Eterm extra, erts_lock_flags_t flags, char *suffix)
{
raw_print_lock(prefix, id, extra, flags, NULL, 0, suffix);
}
diff --git a/erts/emulator/beam/erl_printf_term.c b/erts/emulator/beam/erl_printf_term.c
index b4b1c0bceb..fecbbc593b 100644
--- a/erts/emulator/beam/erl_printf_term.c
+++ b/erts/emulator/beam/erl_printf_term.c
@@ -372,7 +372,7 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount) {
Eterm* ptr;
}popped;
Eterm* nobj;
- Wterm wobj;
+ Eterm wobj;
res = 0;
@@ -462,7 +462,7 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount) {
}
goto L_done;
}
- wobj = (Wterm)obj;
+ wobj = (Eterm)obj;
switch (tag_val_def(wobj)) {
case NIL_DEF:
PRINT_STRING(res, fn, arg, "[]");
diff --git a/erts/emulator/beam/erl_term.c b/erts/emulator/beam/erl_term.c
index 15d21d9c61..1e96d8abbe 100644
--- a/erts/emulator/beam/erl_term.c
+++ b/erts/emulator/beam/erl_term.c
@@ -166,10 +166,10 @@ FUNTY checked_##FUN(ARGTY x, const char *file, unsigned line) \
ET_DEFINE_CHECKED(Eterm,make_boxed,const Eterm*,_is_taggable_pointer);
ET_DEFINE_CHECKED(int,is_boxed,Eterm,!is_header);
-ET_DEFINE_CHECKED(Eterm*,boxed_val,Wterm,_boxed_precond);
+ET_DEFINE_CHECKED(Eterm*,boxed_val,Eterm,_boxed_precond);
ET_DEFINE_CHECKED(Eterm,make_list,const Eterm*,_is_taggable_pointer);
ET_DEFINE_CHECKED(int,is_not_list,Eterm,!is_header);
-ET_DEFINE_CHECKED(Eterm*,list_val,Wterm,_list_precond);
+ET_DEFINE_CHECKED(Eterm*,list_val,Eterm,_list_precond);
ET_DEFINE_CHECKED(Uint,unsigned_val,Eterm,is_small);
ET_DEFINE_CHECKED(Sint,signed_val,Eterm,is_small);
ET_DEFINE_CHECKED(Uint,atom_val,Eterm,is_atom);
@@ -177,29 +177,29 @@ ET_DEFINE_CHECKED(Uint,header_arity,Eterm,is_header);
ET_DEFINE_CHECKED(Uint,arityval,Eterm,is_sane_arity_value);
ET_DEFINE_CHECKED(Uint,thing_arityval,Eterm,is_thing);
ET_DEFINE_CHECKED(Uint,thing_subtag,Eterm,is_thing);
-ET_DEFINE_CHECKED(Eterm*,binary_val,Wterm,is_binary);
-ET_DEFINE_CHECKED(Eterm*,fun_val,Wterm,is_any_fun);
+ET_DEFINE_CHECKED(Eterm*,binary_val,Eterm,is_binary);
+ET_DEFINE_CHECKED(Eterm*,fun_val,Eterm,is_any_fun);
ET_DEFINE_CHECKED(int,bignum_header_is_neg,Eterm,_is_bignum_header);
ET_DEFINE_CHECKED(Eterm,bignum_header_neg,Eterm,_is_bignum_header);
ET_DEFINE_CHECKED(Uint,bignum_header_arity,Eterm,_is_bignum_header);
-ET_DEFINE_CHECKED(Eterm*,big_val,Wterm,is_big);
-ET_DEFINE_CHECKED(Eterm*,float_val,Wterm,is_float);
-ET_DEFINE_CHECKED(Eterm*,tuple_val,Wterm,is_tuple);
+ET_DEFINE_CHECKED(Eterm*,big_val,Eterm,is_big);
+ET_DEFINE_CHECKED(Eterm*,float_val,Eterm,is_float);
+ET_DEFINE_CHECKED(Eterm*,tuple_val,Eterm,is_tuple);
ET_DEFINE_CHECKED(struct erl_node_*,internal_pid_node,Eterm,is_internal_pid);
ET_DEFINE_CHECKED(struct erl_node_*,internal_port_node,Eterm,is_internal_port);
-ET_DEFINE_CHECKED(Eterm*,internal_ref_val,Wterm,is_internal_ref);
-ET_DEFINE_CHECKED(Uint32*,internal_magic_ref_numbers,Wterm,is_internal_magic_ref);
-ET_DEFINE_CHECKED(Uint32*,internal_non_magic_ref_numbers,Wterm,is_internal_non_magic_ref);
+ET_DEFINE_CHECKED(Eterm*,internal_ref_val,Eterm,is_internal_ref);
+ET_DEFINE_CHECKED(Uint32*,internal_magic_ref_numbers,Eterm,is_internal_magic_ref);
+ET_DEFINE_CHECKED(Uint32*,internal_non_magic_ref_numbers,Eterm,is_internal_non_magic_ref);
ET_DEFINE_CHECKED(struct erl_node_*,internal_ref_node,Eterm,is_internal_ref);
-ET_DEFINE_CHECKED(Eterm*,external_val,Wterm,is_external);
-ET_DEFINE_CHECKED(Uint,external_data_words,Wterm,is_external);
-ET_DEFINE_CHECKED(Uint,external_pid_data_words,Wterm,is_external_pid);
-ET_DEFINE_CHECKED(struct erl_node_*,external_pid_node,Wterm,is_external_pid);
-ET_DEFINE_CHECKED(Uint,external_port_data_words,Wterm,is_external_port);
-ET_DEFINE_CHECKED(Uint*,external_port_data,Wterm,is_external_port);
-ET_DEFINE_CHECKED(struct erl_node_*,external_port_node,Wterm,is_external_port);
-ET_DEFINE_CHECKED(Uint,external_ref_data_words,Wterm,is_external_ref);
-ET_DEFINE_CHECKED(Uint32*,external_ref_data,Wterm,is_external_ref);
+ET_DEFINE_CHECKED(Eterm*,external_val,Eterm,is_external);
+ET_DEFINE_CHECKED(Uint,external_data_words,Eterm,is_external);
+ET_DEFINE_CHECKED(Uint,external_pid_data_words,Eterm,is_external_pid);
+ET_DEFINE_CHECKED(struct erl_node_*,external_pid_node,Eterm,is_external_pid);
+ET_DEFINE_CHECKED(Uint,external_port_data_words,Eterm,is_external_port);
+ET_DEFINE_CHECKED(Uint*,external_port_data,Eterm,is_external_port);
+ET_DEFINE_CHECKED(struct erl_node_*,external_port_node,Eterm,is_external_port);
+ET_DEFINE_CHECKED(Uint,external_ref_data_words,Eterm,is_external_ref);
+ET_DEFINE_CHECKED(Uint32*,external_ref_data,Eterm,is_external_ref);
ET_DEFINE_CHECKED(struct erl_node_*,external_ref_node,Eterm,is_external_ref);
ET_DEFINE_CHECKED(Uint,external_thing_data_words,const ExternalThing*,is_thing_ptr);
diff --git a/erts/emulator/beam/erl_term.h b/erts/emulator/beam/erl_term.h
index 0e5416e658..1d9ef1607b 100644
--- a/erts/emulator/beam/erl_term.h
+++ b/erts/emulator/beam/erl_term.h
@@ -25,8 +25,6 @@
void erts_term_init(void);
-typedef UWord Wterm; /* Full word terms */
-
struct erl_node_; /* Declared in erl_node_tables.h */
/*
@@ -206,7 +204,7 @@ _ET_DECLARE_CHECKED(int,is_boxed,Eterm)
#else
#define _unchecked_boxed_val(x) ((Eterm*) ((x) - TAG_PRIMARY_BOXED))
#endif
-_ET_DECLARE_CHECKED(Eterm*,boxed_val,Wterm)
+_ET_DECLARE_CHECKED(Eterm*,boxed_val,Eterm)
#define boxed_val(x) _ET_APPLY(boxed_val,(x))
/* cons cell ("list") access methods */
@@ -228,7 +226,7 @@ _ET_DECLARE_CHECKED(int,is_not_list,Eterm)
#else
#define _unchecked_list_val(x) ((Eterm*) ((x) - TAG_PRIMARY_LIST))
#endif
-_ET_DECLARE_CHECKED(Eterm*,list_val,Wterm)
+_ET_DECLARE_CHECKED(Eterm*,list_val,Eterm)
#define list_val(x) _ET_APPLY(list_val,(x))
#define CONS(hp, car, cdr) \
@@ -384,7 +382,7 @@ _ET_DECLARE_CHECKED(Uint,thing_subtag,Eterm)
#define is_binary(x) (is_boxed((x)) && is_binary_header(*boxed_val((x))))
#define is_not_binary(x) (!is_binary((x)))
#define _unchecked_binary_val(x) _unchecked_boxed_val((x))
-_ET_DECLARE_CHECKED(Eterm*,binary_val,Wterm)
+_ET_DECLARE_CHECKED(Eterm*,binary_val,Eterm)
#define binary_val(x) _ET_APPLY(binary_val,(x))
/* process binaries stuff (special case of binaries) */
@@ -424,7 +422,7 @@ _ET_DECLARE_CHECKED(Eterm*,bitstring_val,Wterm)
#define is_any_fun(x) (is_boxed((x)) && is_fun_header(*boxed_val((x))))
#define is_not_any_fun(x) (!is_any_fun((x)))
#define _unchecked_fun_val(x) _unchecked_boxed_val((x))
-_ET_DECLARE_CHECKED(Eterm*,fun_val,Wterm)
+_ET_DECLARE_CHECKED(Eterm*,fun_val,Eterm)
#define fun_val(x) _ET_APPLY(fun_val,(x))
/* bignum access methods */
@@ -450,7 +448,7 @@ _ET_DECLARE_CHECKED(Uint,bignum_header_arity,Eterm)
#define is_big(x) (is_boxed((x)) && _is_bignum_header(*boxed_val((x))))
#define is_not_big(x) (!is_big((x)))
#define _unchecked_big_val(x) _unchecked_boxed_val((x))
-_ET_DECLARE_CHECKED(Eterm*,big_val,Wterm)
+_ET_DECLARE_CHECKED(Eterm*,big_val,Eterm)
#define big_val(x) _ET_APPLY(big_val,(x))
/* flonum ("float") access methods */
@@ -463,7 +461,7 @@ _ET_DECLARE_CHECKED(Eterm*,big_val,Wterm)
#define is_float(x) (is_boxed((x)) && *boxed_val((x)) == HEADER_FLONUM)
#define is_not_float(x) (!is_float(x))
#define _unchecked_float_val(x) _unchecked_boxed_val((x))
-_ET_DECLARE_CHECKED(Eterm*,float_val,Wterm)
+_ET_DECLARE_CHECKED(Eterm*,float_val,Eterm)
#define float_val(x) _ET_APPLY(float_val,(x))
/* Float definition for byte and word access */
@@ -512,7 +510,7 @@ typedef union float_def
(is_boxed((x)) && *boxed_val((x)) == make_arityval_unchecked((a)))
#define is_not_tuple_arity(x, a) (!is_tuple_arity((x),(a)))
#define _unchecked_tuple_val(x) _unchecked_boxed_val(x)
-_ET_DECLARE_CHECKED(Eterm*,tuple_val,Wterm)
+_ET_DECLARE_CHECKED(Eterm*,tuple_val,Eterm)
#define tuple_val(x) _ET_APPLY(tuple_val,(x))
/*
@@ -1045,12 +1043,12 @@ typedef union {
(!is_internal_ref((x)))
#define _unchecked_internal_ref_val(x) _unchecked_boxed_val((x))
-_ET_DECLARE_CHECKED(Eterm*,internal_ref_val,Wterm)
+_ET_DECLARE_CHECKED(Eterm*,internal_ref_val,Eterm)
#define internal_ref_val(x) _ET_APPLY(internal_ref_val,(x))
#define internal_non_magic_ref_thing_numbers(rt) (((ErtsORefThing *)(rt))->num)
#define _unchecked_internal_non_magic_ref_numbers(x) (internal_non_magic_ref_thing_numbers(_unchecked_ordinary_ref_thing_ptr(x)))
-_ET_DECLARE_CHECKED(Uint32*,internal_non_magic_ref_numbers,Wterm)
+_ET_DECLARE_CHECKED(Uint32*,internal_non_magic_ref_numbers,Eterm)
#define internal_non_magic_ref_numbers(x) _ET_APPLY(internal_non_magic_ref_numbers,(x))
#define internal_ordinary_ref_numbers(x) internal_non_magic_ref_numbers((x))
@@ -1063,7 +1061,7 @@ _ET_DECLARE_CHECKED(Uint32*,internal_non_magic_ref_numbers,Wterm)
#endif
#define _unchecked_internal_magic_ref_numbers(x) (internal_magic_thing_ref_numbers(_unchecked_magic_ref_thing_ptr(x)))
-_ET_DECLARE_CHECKED(Uint32*,internal_magic_ref_numbers,Wterm)
+_ET_DECLARE_CHECKED(Uint32*,internal_magic_ref_numbers,Eterm)
#define internal_magic_ref_numbers(x) _ET_APPLY(internal_magic_ref_numbers,(x))
@@ -1192,7 +1190,7 @@ typedef struct external_thing_ {
#define make_external_ref make_external
#define _unchecked_external_val(x) _unchecked_boxed_val((x))
-_ET_DECLARE_CHECKED(Eterm*,external_val,Wterm)
+_ET_DECLARE_CHECKED(Eterm*,external_val,Eterm)
#define external_val(x) _ET_APPLY(external_val,(x))
#define external_thing_ptr(x) ((ExternalThing *) external_val((x)))
@@ -1206,7 +1204,7 @@ _ET_DECLARE_CHECKED(Uint,external_thing_data_words,const ExternalThing*)
#define _unchecked_external_data_words(x) \
_unchecked_external_thing_data_words(_unchecked_external_thing_ptr((x)))
-_ET_DECLARE_CHECKED(Uint,external_data_words,Wterm)
+_ET_DECLARE_CHECKED(Uint,external_data_words,Eterm)
#define external_data_words(x) _ET_APPLY(external_data_words,(x))
#define _unchecked_external_data(x) (_unchecked_external_thing_ptr((x))->data.ui)
@@ -1217,11 +1215,11 @@ _ET_DECLARE_CHECKED(Uint,external_data_words,Wterm)
#define _unchecked_external_pid_data_words(x) \
_unchecked_external_data_words((x))
-_ET_DECLARE_CHECKED(Uint,external_pid_data_words,Wterm)
+_ET_DECLARE_CHECKED(Uint,external_pid_data_words,Eterm)
#define external_pid_data_words(x) _ET_APPLY(external_pid_data_words,(x))
#define _unchecked_external_pid_node(x) _unchecked_external_node((x))
-_ET_DECLARE_CHECKED(struct erl_node_*,external_pid_node,Wterm)
+_ET_DECLARE_CHECKED(struct erl_node_*,external_pid_node,Eterm)
#define external_pid_node(x) _ET_APPLY(external_pid_node,(x))
#define external_pid_number(x) (external_thing_ptr(x)->data.pid.num)
@@ -1229,15 +1227,15 @@ _ET_DECLARE_CHECKED(struct erl_node_*,external_pid_node,Wterm)
#define _unchecked_external_port_data_words(x) \
_unchecked_external_data_words((x))
-_ET_DECLARE_CHECKED(Uint,external_port_data_words,Wterm)
+_ET_DECLARE_CHECKED(Uint,external_port_data_words,Eterm)
#define external_port_data_words(x) _ET_APPLY(external_port_data_words,(x))
#define _unchecked_external_port_data(x) _unchecked_external_data((x))
-_ET_DECLARE_CHECKED(Uint*,external_port_data,Wterm)
+_ET_DECLARE_CHECKED(Uint*,external_port_data,Eterm)
#define external_port_data(x) _ET_APPLY(external_port_data,(x))
#define _unchecked_external_port_node(x) _unchecked_external_node((x))
-_ET_DECLARE_CHECKED(struct erl_node_*,external_port_node,Wterm)
+_ET_DECLARE_CHECKED(struct erl_node_*,external_port_node,Eterm)
#define external_port_node(x) _ET_APPLY(external_port_node,(x))
#ifdef ARCH_64
@@ -1250,12 +1248,12 @@ _ET_DECLARE_CHECKED(struct erl_node_*,external_port_node,Wterm)
#define _unchecked_external_ref_data_words(x) \
_unchecked_external_data_words((x))
-_ET_DECLARE_CHECKED(Uint,external_ref_data_words,Wterm)
+_ET_DECLARE_CHECKED(Uint,external_ref_data_words,Eterm)
#define external_ref_data_words(x) _ET_APPLY(external_ref_data_words,(x))
#define external_thing_ref_data_words(thing) external_thing_data_words(thing)
#define _unchecked_external_ref_data(x) (_unchecked_external_thing_ptr((x))->data.ui32)
-_ET_DECLARE_CHECKED(Uint32*,external_ref_data,Wterm)
+_ET_DECLARE_CHECKED(Uint32*,external_ref_data,Eterm)
#define external_ref_data(x) _ET_APPLY(external_ref_data,(x))
#define external_thing_ref_data(thing) ((thing)->data.ui32)
@@ -1432,9 +1430,9 @@ _ET_DECLARE_CHECKED(Uint,loader_y_reg_index,Uint)
#define FIRST_VACANT_TAG_DEF 0x12
#if ET_DEBUG
-ERTS_GLB_INLINE unsigned tag_val_def(Wterm, const char*, unsigned);
+ERTS_GLB_INLINE unsigned tag_val_def(Eterm, const char*, unsigned);
#else
-ERTS_GLB_INLINE unsigned tag_val_def(Wterm);
+ERTS_GLB_INLINE unsigned tag_val_def(Eterm);
#endif
#define not_eq_tags(X,Y) (tag_val_def((X)) ^ tag_val_def((Y)))
@@ -1468,9 +1466,9 @@ do { \
#if ERTS_GLB_INLINE_INCL_FUNC_DEF
#if ET_DEBUG
-ERTS_GLB_INLINE unsigned tag_val_def(Wterm x, const char *file, unsigned line)
+ERTS_GLB_INLINE unsigned tag_val_def(Eterm x, const char *file, unsigned line)
#else
-ERTS_GLB_INLINE unsigned tag_val_def(Wterm x)
+ERTS_GLB_INLINE unsigned tag_val_def(Eterm x)
#define file __FILE__
#define line __LINE__
#endif
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index e3bd8df1f8..3df6a4d3c1 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -2307,7 +2307,7 @@ tailrecur_ne:
case FLOAT_BIG:
if (exact) goto exact_fall_through;
{
- Wterm tmp = aw;
+ Eterm tmp = aw;
aw = bw;
bw = tmp;
}/* fall through */
--
2.35.3
