WIP

Author: saghul

amalgam.js

@@ -16,6 +16,8 @@ const quickjs_h = loadFile("quickjs.h")
 const quickjs_libc_c = loadFile("quickjs-libc.c")
 const quickjs_libc_h = loadFile("quickjs-libc.h")
 const quickjs_opcode_h = loadFile("quickjs-opcode.h")
+const xsum_c = loadFile("xsum.c")
+const xsum_h = loadFile("xsum.h")
 const gen_builtin_array_fromasync_h = loadFile("gen/builtin-array-fromasync.h")
 
 let source = "#if defined(QJS_BUILD_LIBC) && defined(__linux__) && !defined(_GNU_SOURCE)\n"
@@ -27,11 +29,13 @@ let source = "#if defined(QJS_BUILD_LIBC) && defined(__linux__) && !defined(_GNU
            + libunicode_h // exports lre_is_id_start, used by libregexp.h
            + libregexp_h
            + libunicode_table_h
+           + xsum_h
            + quickjs_h
            + quickjs_c
            + cutils_c
            + libregexp_c
            + libunicode_c
+           + xsum_c
            + "#ifdef QJS_BUILD_LIBC\n"
            + quickjs_libc_h
            + quickjs_libc_c

fuzz.c

@@ -4,6 +4,7 @@
 #include "cutils.c"
 #include "libregexp.c"
 #include "libunicode.c"
+#include "xsum.c"
 #include <stdlib.h>
 
 int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len)

meson.build

@@ -135,6 +135,7 @@ qjs_srcs = files(
   'libregexp.c',
   'libunicode.c',
   'quickjs.c',
+  'xsum.c'
 )
 qjs_hdrs = files(
   'quickjs.h',

quickjs.c

@@ -13781,7 +13781,7 @@ static no_inline __exception int js_unary_arith_slow(JSContext *ctx,
                 break;
             case OP_neg:
                 if (v64 == 0) {
-                    sp[-1] = __JS_NewFloat64(-0.0);
+                    sp[-1] = js_float64(-0.0);
                     return 0;
                 } else {
                     v64 = -v64;
@@ -13877,7 +13877,7 @@ static no_inline __exception int js_unary_arith_slow(JSContext *ctx,
             default:
                 abort();
             }
-            sp[-1] = __JS_NewFloat64(d);
+            sp[-1] = js_float64(d);
         }
         break;
     }
@@ -14019,28 +14019,28 @@ static no_inline __exception int js_binary_arith_slow(JSContext *ctx, JSValue *s
         case OP_mul:
             v = (int64_t)v1 * (int64_t)v2;
             if (v == 0 && (v1 | v2) < 0) {
-                sp[-2] = __JS_NewFloat64(-0.0);
+                sp[-2] = js_float64(-0.0);
                 return 0;
             }
             break;
         case OP_div:
-            sp[-2] = JS_NewFloat64(ctx, (double)v1 / (double)v2);
+            sp[-2] = js_number((double)v1 / (double)v2);
             return 0;
         case OP_mod:
             if (v1 < 0 || v2 <= 0) {
-                sp[-2] = JS_NewFloat64(ctx, fmod(v1, v2));
+                sp[-2] = js_number(fmod(v1, v2));
                 return 0;
             } else {
                 v = (int64_t)v1 % (int64_t)v2;
             }
             break;
         case OP_pow:
-            sp[-2] = JS_NewFloat64(ctx, js_math_pow(v1, v2));
+            sp[-2] = js_number(js_math_pow(v1, v2));
             return 0;
         default:
             abort();
         }
-        sp[-2] = JS_NewInt64(ctx, v);
+        sp[-2] = js_int64(v);
     } else if ((tag1 == JS_TAG_SHORT_BIG_INT || tag1 == JS_TAG_BIG_INT) &&
                (tag2 == JS_TAG_SHORT_BIG_INT || tag2 == JS_TAG_BIG_INT)) {
         JSBigInt *p1, *p2, *r;
@@ -14111,7 +14111,7 @@ static no_inline __exception int js_binary_arith_slow(JSContext *ctx, JSValue *s
         default:
             abort();
         }
-        sp[-2] = __JS_NewFloat64(dr);
+        sp[-2] = js_float64(dr);
     }
     return 0;
  exception:
@@ -14135,7 +14135,7 @@ static no_inline __exception int js_add_slow(JSContext *ctx, JSValue *sp)
         double d1, d2;
         d1 = JS_VALUE_GET_FLOAT64(op1);
         d2 = JS_VALUE_GET_FLOAT64(op2);
-        sp[-2] = __JS_NewFloat64(d1 + d2);
+        sp[-2] = js_float64(d1 + d2);
         return 0;
     }
     /* fast path for short bigint */
@@ -14227,7 +14227,7 @@ static no_inline __exception int js_add_slow(JSContext *ctx, JSValue *sp)
         }
         if (JS_ToFloat64Free(ctx, &d2, op2))
             goto exception;
-        sp[-2] = __JS_NewFloat64(d1 + d2);
+        sp[-2] = js_float64(d1 + d2);
     }
     return 0;
  exception:
@@ -14388,7 +14388,7 @@ static no_inline __exception int js_binary_logic_slow(JSContext *ctx,
         default:
             abort();
         }
-        sp[-2] = JS_NewInt32(ctx, r);
+        sp[-2] = js_int32(r);
     }
     return 0;
  exception: