diff --git a/src/liboptimizer/pretty-printer.c b/src/liboptimizer/pretty-printer.c index ed8054ca8..f03e631e3 100644 --- a/src/liboptimizer/pretty-printer.c +++ b/src/liboptimizer/pretty-printer.c @@ -145,7 +145,7 @@ dump_variable (T_IDX id) __printf ("'%s'", deserialize_string_by_id (opcode.data.op.op2)); \ __printf (": STRING"); \ } else if (opcode.data.op.type_value_right == OPCODE_ARG_TYPE_NUMBER) {\ - __printf ("%d", deserialize_num_by_id (opcode.data.op.op2)); \ + __printf ("%d", (int) deserialize_num_by_id (opcode.data.op.op2)); \ __printf (": NUMBER"); \ } else if (opcode.data.op.type_value_right == OPCODE_ARG_TYPE_SMALLINT) {\ __printf ("%d", opcode.data.op.op2); \ diff --git a/tests/unit/test_addition_opcode_number_operands.c b/tests/unit/test_addition_opcode_number_operands.c index 747b78dc7..e40494530 100644 --- a/tests/unit/test_addition_opcode_number_operands.c +++ b/tests/unit/test_addition_opcode_number_operands.c @@ -40,7 +40,7 @@ main( int __unused argc, const char *strings[] = { "a", "b" }; - int nums [] = { 2 }; + ecma_number_t nums [] = { 2.0 }; uint16_t offset = serializer_dump_strings( strings, 2); serializer_dump_nums( nums, 1, offset, 2); diff --git a/tests/unit/test_assignment_opcode.c b/tests/unit/test_assignment_opcode.c index e96796a5c..f7030774e 100644 --- a/tests/unit/test_assignment_opcode.c +++ b/tests/unit/test_assignment_opcode.c @@ -45,7 +45,7 @@ main( int __unused argc, const char *strings[] = { "a", "b" }; - int nums [] = { 2 }; + ecma_number_t nums [] = { 2.0 }; uint16_t offset = serializer_dump_strings( strings, 2); serializer_dump_nums( nums, 1, offset, 2); diff --git a/tests/unit/test_division_opcode.c b/tests/unit/test_division_opcode.c index 2bedfe736..e8237b11a 100644 --- a/tests/unit/test_division_opcode.c +++ b/tests/unit/test_division_opcode.c @@ -40,7 +40,7 @@ main( int __unused argc, const char *strings[] = { "a", "b" }; - int nums [] = { 2 }; + ecma_number_t nums [] = { 2 }; uint16_t offset = serializer_dump_strings( strings, 2); serializer_dump_nums( nums, 1, offset, 2); diff --git a/tests/unit/test_multiplication_opcode.c b/tests/unit/test_multiplication_opcode.c index c95abb483..0052f60df 100644 --- a/tests/unit/test_multiplication_opcode.c +++ b/tests/unit/test_multiplication_opcode.c @@ -40,7 +40,7 @@ main( int __unused argc, const char *strings[] = { "a", "b" }; - int nums [] = { 2 }; + ecma_number_t nums [] = { 2 }; uint16_t offset = serializer_dump_strings( strings, 2); serializer_dump_nums( nums, 1, offset, 2); diff --git a/tests/unit/test_optimizer_adjust_jumps.c b/tests/unit/test_optimizer_adjust_jumps.c index 901713913..182ff8a88 100644 --- a/tests/unit/test_optimizer_adjust_jumps.c +++ b/tests/unit/test_optimizer_adjust_jumps.c @@ -48,7 +48,7 @@ main( int __unused argc, const char *strings[] = { "a", "b" }; - int nums [] = { 2 }; + ecma_number_t nums [] = { 2 }; serializer_init (true); uint16_t offset = serializer_dump_strings (strings, 2); serializer_dump_nums (nums, 1, offset, 2); diff --git a/tests/unit/test_optimizer_for_loops.c b/tests/unit/test_optimizer_for_loops.c index 05fc3080e..066ffe3e5 100644 --- a/tests/unit/test_optimizer_for_loops.c +++ b/tests/unit/test_optimizer_for_loops.c @@ -33,7 +33,7 @@ main( int __unused argc, char __unused **argv) { const char *strings[MAX_STRINGS]; - int32_t nums[MAX_NUMS]; + ecma_number_t nums[MAX_NUMS]; uint8_t strings_num, nums_count; uint16_t offset; const OPCODE *opcodes; @@ -62,32 +62,32 @@ main( int __unused argc, opcodes = deserialize_bytecode (); serializer_print_opcodes (); if (!opcodes_equal (opcodes, (OPCODE[]) { - [0] = getop_reg_var_decl (5, 8), // var tmp5 .. tmp8; + [0] = getop_reg_var_decl (2, 5), // var tmp2 .. tmp5; [1] = getop_var_decl (0), // var i; [2] = getop_var_decl (1), // var j; - [3] = getop_assignment (5, 2, 2), // tmp5 = 0; - [4] = getop_assignment (0, 4, 5), // i = tmp5; - [5] = getop_assignment (7, 2, 4), // tmp7 = 10; - [6] = getop_less_than (6, 0, 7), // tmp6 = i < tmp7; - [7] = getop_is_false_jmp (6, 14), // if (!tmp6) goto 14; + [3] = getop_assignment (2, 1, 0), // tmp2 = 0; + [4] = getop_assignment (0, 4, 2), // i = tmp2; + [5] = getop_assignment (4, 1, 10),// tmp4 = 10; + [6] = getop_less_than (3, 0, 4), // tmp3 = i < tmp4; + [7] = getop_is_false_jmp (3, 14), // if (!tmp3) goto 14; [8] = getop_jmp_down (3), // goto 11; - [9] = getop_post_incr (8, 0), // tmp8 = i ++; + [9] = getop_post_incr (5, 0), // tmp5 = i ++; [10] = getop_jmp_up (5), // goto 5; - [11] = getop_assignment (5, 2, 4), // tmp5 = 10; - [12] = getop_assignment (1, 4, 5), // j = tmp5; + [11] = getop_assignment (2, 1, 10),// tmp2 = 10; + [12] = getop_assignment (1, 4, 2), // j = tmp2; [13] = getop_jmp_up (5), // goto 8; [14] = getop_nop (), // ; - [15] = getop_assignment (5, 2, 2), // tmp5 = 0; - [16] = getop_assignment (0, 4, 5), // i = tmp5; - [17] = getop_assignment (7, 2, 4), // tmp7 = 10; - [18] = getop_less_than (6, 0, 7), // tmp6 = i < tmp7; - [19] = getop_is_false_jmp (6, 27), // if (!tmp6) goto 27; + [15] = getop_assignment (2, 1, 0), // tmp2 = 0; + [16] = getop_assignment (0, 4, 2), // i = tmp2; + [17] = getop_assignment (4, 1, 10),// tmp7 = 10; + [18] = getop_less_than (3, 0, 4), // tmp3 = i < tmp7; + [19] = getop_is_false_jmp (3, 27), // if (!tmp3) goto 27; [20] = getop_jmp_down (3), // goto 23; - [21] = getop_post_incr (8, 0), // tmp8 = i ++; + [21] = getop_post_incr (5, 0), // tmp5 = i ++; [22] = getop_jmp_up (5), // goto 17; [23] = getop_nop (), // ; - [24] = getop_assignment (5, 2, 4), // tmp5 = 10; - [25] = getop_assignment (1, 4, 5), // j = tmp5; + [24] = getop_assignment (2, 1, 10),// tmp2 = 10; + [25] = getop_assignment (1, 4, 5), // j = tmp2; [26] = getop_jmp_up (5), // goto 21; [27] = getop_exitval (0) // exit 0; }, 28)) diff --git a/tests/unit/test_optimizer_reorder_scope.c b/tests/unit/test_optimizer_reorder_scope.c index 32d6ccdc5..e78ee1a9a 100644 --- a/tests/unit/test_optimizer_reorder_scope.c +++ b/tests/unit/test_optimizer_reorder_scope.c @@ -46,7 +46,7 @@ main( int __unused argc, mem_init(); const char *strings[] = { "a", "b", "c", "use strict" }; - int nums [] = { 2 }; + ecma_number_t nums [] = { 2 }; serializer_init (true); uint16_t offset = serializer_dump_strings (strings, 4); serializer_dump_nums (nums, 1, offset, 4); diff --git a/tests/unit/test_remainder_opcode.c b/tests/unit/test_remainder_opcode.c index e82209ac9..f7f4fa2e7 100644 --- a/tests/unit/test_remainder_opcode.c +++ b/tests/unit/test_remainder_opcode.c @@ -40,7 +40,7 @@ main( int __unused argc, const char *strings[] = { "a", "b" }; - int nums [] = { 2 }; + ecma_number_t nums [] = { 2 }; uint16_t offset = serializer_dump_strings( strings, 2); serializer_dump_nums( nums, 1, offset, 2); diff --git a/tests/unit/test_substraction_opcode.c b/tests/unit/test_substraction_opcode.c index a81e0ebd4..61b8d28a1 100644 --- a/tests/unit/test_substraction_opcode.c +++ b/tests/unit/test_substraction_opcode.c @@ -40,7 +40,7 @@ main( int __unused argc, const char *strings[] = { "a", "b" }; - int nums [] = { 2 }; + ecma_number_t nums [] = { 2 }; uint16_t offset = serializer_dump_strings( strings, 2); serializer_dump_nums( nums, 1, offset, 2); diff --git a/tests/unit/test_var_decl_opcode_in_decl_lex_env.c b/tests/unit/test_var_decl_opcode_in_decl_lex_env.c index b4a25f091..1ca720f99 100644 --- a/tests/unit/test_var_decl_opcode_in_decl_lex_env.c +++ b/tests/unit/test_var_decl_opcode_in_decl_lex_env.c @@ -38,7 +38,7 @@ main( int __unused argc, const char *strings[] = { "a", "b" }; - int nums [] = { 2 }; + ecma_number_t nums [] = { 2 }; uint16_t offset = serializer_dump_strings( strings, 2); serializer_dump_nums( nums, 1, offset, 2);