Forward port changes from v0.6 release branch

Merge `binary_part/3` BIF (PR #1569), fix to `is_number` (#1624) and
migration to ubuntu-20.04 container (#1626) from release-0.6 branch.

Author: bettio

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

@@ -34,7 +34,8 @@ concurrency:
 
 jobs:
   build-and-test:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os || 'ubuntu-24.04' }}
+    container: ${{ matrix.container }}
     strategy:
 
       fail-fast: false
@@ -57,21 +58,21 @@ jobs:
         - cc: "gcc-7"
           cxx: "g++-7"
           compiler_pkgs: "gcc-7 g++-7"
-          os: "ubuntu-20.04"
+          container: "ubuntu:20.04"
           otp: "27"
           elixir_version: "1.17"
           rebar3_version: "3.24.0"
         - cc: "gcc-8"
           cxx: "g++-8"
           compiler_pkgs: "gcc-8 g++-8"
-          os: "ubuntu-20.04"
+          container: "ubuntu:20.04"
           otp: "27"
           elixir_version: "1.17"
           rebar3_version: "3.24.0"
         - cc: "gcc-9"
           cxx: "g++-9"
           compiler_pkgs: "gcc-9 g++-9"
-          os: "ubuntu-20.04"
+          container: "ubuntu:20.04"
           # otp: all
         - cc: "gcc-10"
           cxx: "g++-10"
@@ -119,13 +120,13 @@ jobs:
           cxx: "clang++-10"
           compiler_pkgs: "clang-10"
           cmake_opts_other: "-DAVM_WARNINGS_ARE_ERRORS=ON"
-          os: "ubuntu-20.04"
+          container: "ubuntu:20.04"
           # otp: all
         - cc: "clang-11"
           cxx: "clang++-11"
           compiler_pkgs: "clang-11"
           cmake_opts_other: "-DAVM_WARNINGS_ARE_ERRORS=ON"
-          os: "ubuntu-20.04"
+          container: "ubuntu:20.04"
           otp: "27"
           elixir_version: "1.17"
           rebar3_version: "3.24.0"
@@ -195,37 +196,41 @@ jobs:
           rebar3_version: "3.24.0"
 
         # Old versions of OTP/Elixir
-        - os: "ubuntu-20.04"
+        - container: "ubuntu:20.04"
           cc: "cc"
           cxx: "c++"
           cflags: ""
           otp: "21"
           elixir_version: "1.7"
           rebar3_version: "3.15.2"
+          compiler_pkgs: "g++"
 
-        - os: "ubuntu-20.04"
+        - container: "ubuntu:20.04"
           cc: "cc"
           cxx: "c++"
           cflags: ""
           otp: "22"
           elixir_version: "1.8"
           rebar3_version: "3.18.0"
+          compiler_pkgs: "g++"
 
-        - os: "ubuntu-20.04"
+        - container: "ubuntu:20.04"
           cc: "cc"
           cxx: "c++"
           cflags: ""
           otp: "23"
           elixir_version: "1.11"
           rebar3_version: "3.20.0"
+          compiler_pkgs: "g++"
 
-        - os: "ubuntu-22.04"
+        - container: "ubuntu:20.04"
           cc: "cc"
           cxx: "c++"
           cflags: ""
           otp: "24"
           elixir_version: "1.14"
           rebar3_version: "3.23.0"
+          compiler_pkgs: "g++"
 
         - os: "ubuntu-24.04"
           cc: "cc"
@@ -235,13 +240,14 @@ jobs:
           rebar3_version: "3.24.0"
 
         # Additional default compiler builds
-        - os: "ubuntu-20.04"
+        - container: "ubuntu:20.04"
           cc: "cc"
           cxx: "c++"
           cflags: ""
           otp: "27"
           elixir_version: "1.17"
           rebar3_version: "3.24.0"
+          compiler_pkgs: "g++"
 
         - os: "ubuntu-22.04"
           cc: "cc"
@@ -271,7 +277,7 @@ jobs:
           compiler_pkgs: "clang-18"
 
         # Additional 32 bits build
-        - os: "ubuntu-20.04"
+        - container: "ubuntu:20.04"
           cc: "gcc-10"
           cxx: "g++-10"
           cflags: "-m32 -O3"
@@ -285,13 +291,30 @@ jobs:
             libc6-dbg:i386 zlib1g-dev:i386 libmbedtls-dev:i386"
 
     env:
+      ImageOS: ${{ matrix.container == 'ubuntu:20.04' && 'ubuntu20' || matrix.os == 'ubuntu-20.04' && 'ubuntu20' || matrix.os == 'ubuntu-22.04' && 'ubuntu22' || matrix.os == 'ubuntu-24.04' && 'ubuntu24' || 'ubuntu24' }}
       CC: ${{ matrix.cc }}
       CXX: ${{ matrix.cxx }}
       CFLAGS: ${{ matrix.cflags }}
       CXXFLAGS: ${{ matrix.cflags }}
+      DEBIAN_FRONTEND: noninteractive
+      TZ: "Etc/UTC"
 
     steps:
     # Setup
+    - name: "Install deps for containers"
+      if: matrix.container != ''
+      run: apt-get update && apt-get install -y --no-install-recommends sudo unzip git tzdata
+
+    - name: "Add i386 architecture"
+      if: matrix.arch == 'i386'
+      run: sudo dpkg --add-architecture i386
+
+    - name: "APT update"
+      run: sudo apt update -y
+
+    - name: "Install deps"
+      run: sudo apt install -y ${{ matrix.compiler_pkgs}} cmake gperf zlib1g-dev doxygen valgrind libmbedtls-dev
+
     - name: "Checkout repo"
       uses: actions/checkout@v4
       with:
@@ -308,16 +331,6 @@ jobs:
           https://repo.hex.pm
           https://cdn.jsdelivr.net/hex
 
-    - name: "Add i386 architecture"
-      if: matrix.arch == 'i386'
-      run: sudo dpkg --add-architecture i386
-
-    - name: "APT update"
-      run: sudo apt update -y
-
-    - name: "Install deps"
-      run: sudo apt install -y ${{ matrix.compiler_pkgs}} cmake gperf zlib1g-dev doxygen valgrind libmbedtls-dev
-
     # Builder info
     - name: "System info"
       run: |
@@ -436,10 +449,12 @@ jobs:
       working-directory: build
       run: |
         ulimit -c unlimited
-        if command -v elixirc &> /dev/null
+        if command -v elixirc >/dev/null 2>&1 && command -v elixir >/dev/null 2>&1
         then
           valgrind --error-exitcode=1 ./src/AtomVM ./tests/libs/exavmlib/Tests.avm
           ./src/AtomVM ./tests/libs/exavmlib/Tests.avm
+        else
+          echo "Elixir not installed, skipping Elixir tests"
         fi
 
     - name: "Install and smoke test"

CHANGELOG.md

@@ -95,6 +95,7 @@ memory error
 - Fix `is_function/2` guard
 - Fixed segfault when calling `lists:reverse/1` (#1600)
 - Fixed nif_atomvm_posix_read GC bug
+- Fixed `erlang:is_number/1` function, now returns true also for floats
 
 ### Changed
 

src/libAtomVM/bif.c

@@ -112,6 +112,30 @@ term bif_erlang_bit_size_1(Context *ctx, uint32_t fail_label, int live, term arg
     return term_from_int32(len);
 }
 
+term bif_erlang_binary_part_3(Context *ctx, uint32_t fail_label, int live, term arg1, term arg2, term arg3)
+{
+    VALIDATE_VALUE_BIF(fail_label, arg1, term_is_binary);
+    VALIDATE_VALUE_BIF(fail_label, arg2, term_is_integer);
+    VALIDATE_VALUE_BIF(fail_label, arg3, term_is_integer);
+
+    avm_int_t pos = term_to_int(arg2);
+    avm_int_t len = term_to_int(arg3);
+    BinaryPosLen slice;
+    if (UNLIKELY(!term_normalize_binary_pos_len(arg1, pos, len, &slice))) {
+        RAISE_ERROR_BIF(fail_label, BADARG_ATOM);
+    }
+
+    TERM_DEBUG_ASSERT((sizeof(ctx->x) / sizeof(ctx->x[0])) >= MAX_REG + 1);
+    ctx->x[live] = arg1;
+    size_t heap_size = term_sub_binary_heap_size(arg1, len);
+    if (UNLIKELY(memory_ensure_free_with_roots(ctx, heap_size, live + 1, ctx->x, MEMORY_CAN_SHRINK) != MEMORY_GC_OK)) {
+        RAISE_ERROR_BIF(fail_label, OUT_OF_MEMORY_ATOM);
+    }
+    arg1 = ctx->x[live];
+
+    return term_maybe_create_sub_binary(arg1, slice.pos, slice.len, &ctx->heap, ctx->global);
+}
+
 term bif_erlang_is_atom_1(Context *ctx, uint32_t fail_label, term arg1)
 {
     UNUSED(ctx);
@@ -217,8 +241,7 @@ term bif_erlang_is_number_1(Context *ctx, uint32_t fail_label, term arg1)
     UNUSED(ctx);
     UNUSED(fail_label);
 
-    //TODO: change to term_is_number
-    return term_is_any_integer(arg1) ? TRUE_ATOM : FALSE_ATOM;
+    return term_is_number(arg1) ? TRUE_ATOM : FALSE_ATOM;
 }
 
 term bif_erlang_is_pid_1(Context *ctx, uint32_t fail_label, term arg1)

src/libAtomVM/bif.h

@@ -44,6 +44,7 @@ const struct ExportedFunction *bif_registry_get_handler(AtomString module, AtomS
 term bif_erlang_self_0(Context *ctx);
 term bif_erlang_byte_size_1(Context *ctx, uint32_t fail_label, int live, term arg1);
 term bif_erlang_bit_size_1(Context *ctx, uint32_t fail_label, int live, term arg1);
+term bif_erlang_binary_part_3(Context *ctx, uint32_t fail_label, int live, term arg1, term arg2, term arg3);
 term bif_erlang_length_1(Context *ctx, uint32_t fail_label, int live, term arg1);
 
 term bif_erlang_is_atom_1(Context *ctx, uint32_t fail_label, term arg1);

src/libAtomVM/bifs.gperf

@@ -39,6 +39,7 @@ erlang:self/0, {.bif.base.type = BIFFunctionType, .bif.bif0_ptr = bif_erlang_sel
 erlang:length/1, {.gcbif.base.type = GCBIFFunctionType, .gcbif.gcbif1_ptr = bif_erlang_length_1}
 erlang:byte_size/1, {.gcbif.base.type = GCBIFFunctionType, .gcbif.gcbif1_ptr = bif_erlang_byte_size_1}
 erlang:bit_size/1, {.gcbif.base.type = GCBIFFunctionType, .gcbif.gcbif1_ptr = bif_erlang_bit_size_1}
+erlang:binary_part/3, {.gcbif.base.type = GCBIFFunctionType, .gcbif.gcbif3_ptr = bif_erlang_binary_part_3}
 erlang:get/1, {.bif.base.type = BIFFunctionType, .bif.bif1_ptr = bif_erlang_get_1}
 erlang:is_atom/1, {.bif.base.type = BIFFunctionType, .bif.bif1_ptr = bif_erlang_is_atom_1}
 erlang:is_bitstring/1, {.bif.base.type = BIFFunctionType, .bif.bif1_ptr = bif_erlang_is_binary_1}

src/libAtomVM/nifs.c

@@ -3028,33 +3028,26 @@ static term nif_binary_last_1(Context *ctx, int argc, term argv[])
 static term nif_binary_part_3(Context *ctx, int argc, term argv[])
 {
     UNUSED(argc);
-
-    term bin_term = argv[0];
+    term pattern_term = argv[0];
     term pos_term = argv[1];
     term len_term = argv[2];
-
-    VALIDATE_VALUE(bin_term, term_is_binary);
+    VALIDATE_VALUE(pattern_term, term_is_binary);
     VALIDATE_VALUE(pos_term, term_is_integer);
     VALIDATE_VALUE(len_term, term_is_integer);
 
-    int bin_size = term_binary_size(bin_term);
     avm_int_t pos = term_to_int(pos_term);
     avm_int_t len = term_to_int(len_term);
-
-    if (len < 0) {
-        pos += len;
-        len = -len;
-    }
-
-    if (UNLIKELY((pos < 0) || (pos > bin_size) || (pos + len > bin_size))) {
+    BinaryPosLen slice;
+    if (UNLIKELY(!term_normalize_binary_pos_len(pattern_term, pos, len, &slice))) {
         RAISE_ERROR(BADARG_ATOM);
     }
 
-    size_t size = term_sub_binary_heap_size(bin_term, len);
-    if (UNLIKELY(memory_ensure_free_with_roots(ctx, size, 1, &bin_term, MEMORY_CAN_SHRINK) != MEMORY_GC_OK)) {
+    size_t heap_size = term_sub_binary_heap_size(pattern_term, len);
+    if (UNLIKELY(memory_ensure_free_with_roots(ctx, heap_size, 1, &pattern_term, MEMORY_CAN_SHRINK) != MEMORY_GC_OK)) {
         RAISE_ERROR(OUT_OF_MEMORY_ATOM);
     }
-    return term_maybe_create_sub_binary(bin_term, pos, len, &ctx->heap, ctx->global);
+
+    return term_maybe_create_sub_binary(pattern_term, slice.pos, slice.len, &ctx->heap, ctx->global);
 }
 
 static term nif_binary_split(Context *ctx, int argc, term argv[])

src/libAtomVM/term.h

@@ -136,6 +136,12 @@ struct PrinterFun
     printer_function_t print;
 };
 
+typedef struct BinaryPosLen
+{
+    avm_int_t pos;
+    avm_int_t len;
+} BinaryPosLen;
+
 enum RefcBinaryFlags
 {
     RefcNoFlags = 0,
@@ -1106,6 +1112,33 @@ static inline term term_create_empty_binary(size_t size, Heap *heap, GlobalConte
     return t;
 }
 
+static inline bool term_normalize_binary_pos_len(term binary, avm_int_t pos, avm_int_t len, BinaryPosLen *pos_len)
+{
+    avm_int_t size = (avm_int_t) term_binary_size(binary);
+    if (len < 0) {
+        pos += len;
+        len = -len;
+    }
+
+    if (UNLIKELY((pos < 0) || (pos > size) || (pos + len > size))) {
+        return false;
+    }
+
+    pos_len->pos = pos;
+    pos_len->len = len;
+    return true;
+}
+
+static inline bool term_is_invalid_binary_pos_len(BinaryPosLen pos_len)
+{
+    return pos_len.pos == -1 && pos_len.len == -1;
+}
+
+static inline BinaryPosLen term_invalid_binary_pos_len(void)
+{
+    return (BinaryPosLen) { .pos = -1, .len = -1 };
+}
+
 /**
 * @brief Insert an binary into a binary (using bit syntax).
 *

tests/erlang_tests/float_is_number.erl

@@ -23,10 +23,13 @@
 -export([start/0, pow/2, test/1, id/1]).
 
 start() ->
-    Res = (pow(-2, 63) + id(10.0)) * id(-1.0),
+    Res = ?MODULE:id((pow(-2, 63) + id(10.0)) * id(-1.0)),
+    true = ?MODULE:id(is_number(Res)),
     test(Res).
 
 id(I) when is_float(I) ->
+    I;
+id(I) when is_atom(I) ->
     I.
 
 pow(_N, 0) ->