Forward port changes from v0.6 release branch

Merge fixes and minor changes from release-0.6 branch, such as:
- CI: update macos version (gh deprecation) (#1837)
- opcodesswitch: fix OP_BS_CREATE_BIN that can have an allocator list
  (1832)
- Enable forgotten test bs_append_extra_words (#1831)

Author: bettio

.github/workflows/build-and-test-macos.yaml

@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["macos-13", "macos-14", "macos-15"]
+        os: ["macos-14", "macos-15", "macos-15-intel", "macos-26"]
         otp: ["24", "25", "26", "27", "28"]
         cmake_opts_other: [""]
 

src/libAtomVM/opcodesswitch.h

@@ -6731,7 +6731,7 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
                 uint32_t fail;
                 DECODE_LABEL(fail, pc);
                 uint32_t alloc;
-                DECODE_LITERAL(alloc, pc);
+                DECODE_ALLOCATOR_LIST(alloc, pc);
                 uint32_t live;
                 DECODE_LITERAL(live, pc);
                 uint32_t unit;

src/platforms/generic_unix/lib/sys.c

@@ -485,16 +485,14 @@ Context *sys_create_port(GlobalContext *glb, const char *driver_name, term opts)
 #ifdef DYNLOAD_PORT_DRIVERS
         void *handle;
         {
-            char port_driver_name[64 + strlen("avm_"
-                                              "_port_driver.so")
-                + 1];
+            char port_driver_name[64 + sizeof("avm_") - 1 + sizeof("_port_driver.so") - 1 + 1];
             snprintf(port_driver_name, sizeof(port_driver_name), "./avm_%s_port_driver.so", driver_name);
             handle = dlopen(port_driver_name, RTLD_NOW);
             if (!handle) {
                 return NULL;
             }
         }
-        char port_driver_func_name[64 + strlen("_create_port") + 1];
+        char port_driver_func_name[64 + sizeof("_create_port") - 1 + 1];
         snprintf(port_driver_func_name, sizeof(port_driver_func_name), "%s_create_port", driver_name);
         create_port_t create_port
             = (create_port_t) CAST_VOID_TO_FUNC_PTR(dlsym(handle, port_driver_func_name));

tests/erlang_tests/test_op_bs_create_bin.erl

@@ -38,7 +38,8 @@ start() ->
                 ok = test_bs_create_bin_utf16(),
                 ok = test_bs_create_bin_utf32(),
                 ok = test_bs_create_bin_integer(),
-                ok = test_bs_create_bin_binary();
+                ok = test_bs_create_bin_binary(),
+                ok = test_bs_create_bin_alloc_list();
             true ->
                 ok
         end,
@@ -266,3 +267,15 @@ test_bs_create_bin_binary() ->
             error:badarg -> unexpected
         end,
     ok.
+
+test_bs_create_bin_alloc_list() ->
+    %% Test that bs_create_bin with allocator list works correctly
+    %% Expected result: <<0,0,0,42>> (42 as 32-bit big-endian integer)
+    Expected = <<0, 0, 0, 42>>,
+    Result = test_op_bs_create_bin_asm:bs_create_bin_alloc_list(42),
+    case Result of
+        Expected ->
+            ok;
+        _ ->
+            error({unexpected_result, Result, expected, Expected})
+    end.

tests/erlang_tests/test_op_bs_create_bin_asm.S

@@ -31,12 +31,13 @@
     {bs_create_bin_integer_no_fail, 3},
     {bs_create_bin_integer_fail, 3},
     {bs_create_bin_binary_no_fail, 3},
-    {bs_create_bin_binary_fail, 3}
+    {bs_create_bin_binary_fail, 3},
+    {bs_create_bin_alloc_list, 1}
 ]}.
 
 {attributes, []}.
 
-{labels, 26}.
+{labels, 28}.
 
 {function, bs_create_bin_utf8_no_fail, 3, 2}.
 {label, 1}.
@@ -122,3 +123,12 @@ return.
 {label, 26}.
 {move, {atom, fail}, {x, 0}}.
 return.
+
+{function, bs_create_bin_alloc_list, 1, 28}.
+{label, 27}.
+{func_info, {atom, test_op_bs_create_bin_asm}, {atom, bs_create_bin_alloc_list}, 1}.
+{label, 28}.
+%% Test bs_create_bin with allocator list instead of simple literal
+{bs_create_bin, {f, 0}, {alloc, [{words, 2}, {floats, 1}, {funs, 1}]}, 1, 1, {x, 0},
+    {list, [{atom, integer}, 1, 1, nil, {x, 0}, {integer, 32}]}}.
+return.

tests/test.c

@@ -410,6 +410,7 @@ struct Test tests[] = {
     TEST_CASE(test_bs_int_unaligned),
     TEST_CASE(test_bs_start_match_live),
     TEST_CASE(test_bs_utf),
+    TEST_CASE_EXPECTED(bs_append_extra_words, 1),
     TEST_CASE(test_catch),
     TEST_CASE(test_gc),
     TEST_CASE_EXPECTED(test_raise, 7),