Forward port changes from v0.6 release branch

Merge fixes for bnot support to boxed integers (#1743) and stacktrace
with OP_APPLY_LAST (#1758).

Author: bettio

CHANGELOG.md

@@ -80,6 +80,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fixed a bug where binary matching could fail due to a missing preservation of the matched binary.
 - Fixed a bug where `lists:seq/2` wouldn't return the empty list in valid cases.
+- bnot operator wasn't supporting boxed integers (integers bigger than 28-bit on 32-bit CPUs, and
+bigger than 60-bit on 64-bit CPUs).
 
 ### Changed
 

src/libAtomVM/bif.c

@@ -1473,6 +1473,34 @@ term bif_erlang_bsr_2(Context *ctx, uint32_t fail_label, int live, term arg1, te
     return bitshift_helper(ctx, fail_label, live, arg1, arg2, bsr);
 }
 
+static term bnot_boxed_helper(Context *ctx, uint32_t fail_label, uint32_t live, term arg1)
+{
+    if (term_is_boxed_integer(arg1)) {
+        switch (term_boxed_size(arg1)) {
+            case 0:
+                //BUG
+                AVM_ABORT();
+
+            case 1: {
+                avm_int_t val = term_unbox_int(arg1);
+                return make_boxed_int(ctx, fail_label, live, ~val);
+            }
+
+            #if BOXED_TERMS_REQUIRED_FOR_INT64 == 2
+            case 2: {
+                avm_int64_t val = term_unbox_int64(arg1);
+                return make_boxed_int64(ctx, fail_label, live, ~val);
+            }
+            #endif
+            default:
+                RAISE_ERROR_BIF(fail_label, OVERFLOW_ATOM);
+        }
+    } else {
+        TRACE("error: arg1: 0x%lx\n", arg1);
+        RAISE_ERROR_BIF(fail_label, BADARITH_ATOM);
+    }
+}
+
 term bif_erlang_bnot_1(Context *ctx, uint32_t fail_label, int live, term arg1)
 {
     UNUSED(live);
@@ -1481,7 +1509,7 @@ term bif_erlang_bnot_1(Context *ctx, uint32_t fail_label, int live, term arg1)
         return ~arg1 | TERM_INTEGER_TAG;
 
     } else {
-        RAISE_ERROR_BIF(fail_label, BADARITH_ATOM);
+        return bnot_boxed_helper(ctx, fail_label, live, arg1);
     }
 }
 

src/libAtomVM/opcodesswitch.h

@@ -5302,13 +5302,13 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
                 READ_ANY_XREG(function, arity + 1);
                 TRACE("apply_last/1, module=%lu, function=%lu arity=%i deallocate=%i\n", module, function, arity, n_words);
 
-                ctx->cp = ctx->e[n_words];
-                ctx->e += (n_words + 1);
-
                 if (UNLIKELY(!term_is_atom(module) || !term_is_atom(function))) {
                     RAISE_ERROR(BADARG_ATOM);
                 }
 
+                ctx->cp = ctx->e[n_words];
+                ctx->e += (n_words + 1);
+
                 atom_index_t module_name = term_to_atom_index(module);
                 atom_index_t function_name = term_to_atom_index(function);
 

tests/erlang_tests/CMakeLists.txt

@@ -345,6 +345,7 @@ compile_erlang(literal_test0)
 compile_erlang(literal_test1)
 compile_erlang(literal_test2)
 compile_erlang(test_extended_literal_large)
+compile_erlang(bnot64)
 
 compile_erlang(test_list_eq)
 compile_erlang(test_tuple_eq)
@@ -864,6 +865,8 @@ add_custom_target(erlang_test_modules DEPENDS
     literal_test2.beam
     test_extended_literal_large.beam
 
+    bnot64.beam
+
     test_list_eq.beam
     test_tuple_eq.beam
     test_tuple_list_eq.beam

tests/erlang_tests/bnot64.erl

@@ -0,0 +1,39 @@
+%
+% This file is part of AtomVM.
+%
+% Copyright 2025 Davide Bettio <davide@uninstall.it>
+%
+% Licensed under the Apache License, Version 2.0 (the "License");
+% you may not use this file except in compliance with the License.
+% You may obtain a copy of the License at
+%
+%    http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS,
+% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+% See the License for the specific language governing permissions and
+% limitations under the License.
+%
+% SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
+%
+
+-module(bnot64).
+-export([start/0, mybnot/1, id/1]).
+
+start() ->
+    -16#7AFECAFF = ?MODULE:mybnot(?MODULE:id(16#7AFECAFE)),
+    16#7AFECAFD = ?MODULE:mybnot(?MODULE:id(-16#7AFECAFE)),
+    -16#CAFECAFF = ?MODULE:mybnot(?MODULE:id(16#CAFECAFE)),
+    16#CAFECAFD = ?MODULE:mybnot(?MODULE:id(-16#CAFECAFE)),
+    -16#7AFECAFE12345679 = ?MODULE:mybnot(?MODULE:id(16#7AFECAFE12345678)),
+    16#7AFECAFE12345677 = ?MODULE:mybnot(?MODULE:id(-16#7AFECAFE12345678)),
+    0.
+
+mybnot(I) when is_integer(I) ->
+    bnot ?MODULE:id(I);
+mybnot(X) ->
+    {error, X}.
+
+id(X) ->
+    X.

tests/erlang_tests/fail_apply_last.erl

@@ -53,11 +53,25 @@ try_apply_last(M, F) ->
     try
         ?MODULE:do_apply0(M, F)
     catch
-        _Class:_Reason -> 1
+        _Class:_Reason:Stack ->
+            test_stacktrace(Stack, false, false, 1)
     end.
 
 pad_some_calls() ->
     X = 1,
     Y = 2,
     Z = X + Y,
     Z.
+
+% if try_apply_last/2 is in stacktrace, we also want do_apply0/2
+test_stacktrace([], _, _, R) ->
+    R;
+test_stacktrace([{?MODULE, try_apply_last, 2, _} | T], false, DoApply0, R) ->
+    test_stacktrace(T, true, DoApply0, R - 1);
+test_stacktrace([{?MODULE, do_apply0, 2, _} | T], TryApplyLast, false, R) ->
+    test_stacktrace(T, TryApplyLast, true, R + 1);
+test_stacktrace([_ | T], TryApplyLast, DoApply0, R) ->
+    test_stacktrace(T, TryApplyLast, DoApply0, R);
+test_stacktrace(undefined, _, _, R) ->
+    % AVM_CREATE_STACKTRACES=off
+    R.

tests/test.c

@@ -379,6 +379,8 @@ struct Test tests[] = {
     TEST_CASE(literal_test2),
     TEST_CASE(test_extended_literal_large),
 
+    TEST_CASE(bnot64),
+
     TEST_CASE_EXPECTED(test_list_eq, 1),
     TEST_CASE_EXPECTED(test_tuple_eq, 1),
     TEST_CASE_EXPECTED(test_tuple_list_eq, 1),