Support boxed numbers

Signed-off-by: Jakub Gonet <jakub.gonet@swmansion.com>

Author: jgonet

src/libAtomVM/bif.c

@@ -864,13 +864,10 @@ term bif_erlang_mul_2(Context *ctx, uint32_t fail_label, int live, term arg1, te
 term bif_erlang_fdiv_2(Context *ctx, uint32_t fail_label, int live, term arg1, term arg2)
 {
     UNUSED(live);
-    if (!term_is_integer(arg1) && !term_is_float(arg1)) {
-        TRACE("error: arg1: 0x%lx, arg2: 0x%lx\n", arg1, arg2);
+    if (UNLIKELY(!term_is_number(arg1))) {
         RAISE_ERROR_BIF(fail_label, BADARITH_ATOM);
     }
-
-    if (!term_is_integer(arg2) && !term_is_float(arg2)) {
-        TRACE("error: arg1: 0x%lx, arg2: 0x%lx\n", arg1, arg2);
+    if (UNLIKELY(!term_is_number(arg2))) {
         RAISE_ERROR_BIF(fail_label, BADARITH_ATOM);
     }
     avm_float_t farg1 = term_conv_to_float(arg1);

tests/erlang_tests/CMakeLists.txt

@@ -389,6 +389,7 @@ compile_erlang(floatabs)
 compile_erlang(floatdiv)
 compile_erlang(floatmath)
 compile_erlang(floatext)
+compile_erlang(bif_bin_arith_ops)
 
 compile_erlang(boxed_is_not_float)
 compile_erlang(float_is_float)
@@ -880,6 +881,7 @@ add_custom_target(erlang_test_modules DEPENDS
     floatdiv.beam
     floatmath.beam
     floatext.beam
+    bif_bin_arith_ops.beam
 
     boxed_is_not_float.beam
     float_is_float.beam

tests/libs/estdlib/test_bif_bin_arith_ops.erl renamed to tests/erlang_tests/bif_bin_arith_ops.erl

@@ -17,12 +17,12 @@
 %
 % SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later
 %
--module(test_bif_bin_arith_ops).
+-module(bif_bin_arith_ops).
 
 -define(ID(X), ?MODULE:id(X)).
--export([test/0, id/1]).
+-export([start/0, id/1]).
 
-test() ->
+start() ->
     Ops = ['+', '-', '*', '/'],
     ValidInputs = [[2, 3], [0, 2], [2.0, 3], [2, 3.0], [2.0, 3.0]],
     InvalidInputs = [[not_int, 1], [1, not_int]],
@@ -35,10 +35,12 @@ test() ->
     {error, badarith} = call_op('div', [2, 3.0]),
     {error, badarith} = call_op('rem', [2.0, 3]),
     {error, badarith} = call_op('rem', [2, 3.0]),
-    ok.
+    0.
 
-call_op(Name, Args) ->
-    try apply(erlang, ?ID(Name), ?ID(Args)) of
+call_op(RawName, [RawA, RawB]) ->
+    Name = ?ID(RawName),
+    [A, B] = ?ID([RawA, RawB]),
+    try erlang:Name(A, B) of
         V -> {ok, V}
     catch
         C:E -> {C, E}

tests/libs/estdlib/CMakeLists.txt

@@ -50,7 +50,6 @@ set(ERLANG_MODULES
     test_lists_subtraction
     test_tcp_socket
     test_udp_socket
-    test_bif_bin_arith_ops
     notify_init_server
     ping_pong_server
 )

tests/libs/estdlib/tests.erl

@@ -75,8 +75,7 @@ get_non_networking_tests(_OTPVersion) ->
         test_timer,
         test_spawn,
         test_supervisor,
-        test_lists_subtraction,
-        test_bif_bin_arith_ops
+        test_lists_subtraction
     ].
 
 get_networking_tests(OTPVersion) when

tests/test.c

@@ -458,6 +458,7 @@ struct Test tests[] = {
     TEST_CASE_EXPECTED(list2float, 511),
     TEST_CASE(floatmath),
     TEST_CASE(floatext),
+    TEST_CASE(bif_bin_arith_ops),
 
     TEST_CASE(test_fp_allocate_heap_zero),