Skip to content

quickjs: support multiple quickjs versions #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ammarahm-ed merged 1 commit into from
Nov 26, 2025
Merged

quickjs: support multiple quickjs versions #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const { spawn } = require('child_process');
const path = require('path');
const readline = require('readline');

const VALID_ENGINES = ['V8-10',"V8-11","V8-13", 'QUICKJS', 'HERMES', 'JSC', 'SHERMES', 'PRIMJS'];
const HOST_OBJECTS_SUPPORTED = new Set(['V8-10','V8-11',"V8-13", 'QUICKJS', 'PRIMJS']);
const VALID_ENGINES = ['V8-10',"V8-11","V8-13", 'QUICKJS', "QUICKJS_NG", 'HERMES', 'JSC', 'SHERMES', 'PRIMJS'];
const HOST_OBJECTS_SUPPORTED = new Set(['V8-10','V8-11',"V8-13", 'QUICKJS',"QUICKJS_NG", 'PRIMJS']);

function parseArgs(argv) {
const opts = {};
Expand Down
28 changes: 19 additions & 9 deletions test-app/runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,25 +98,32 @@ file(GLOB_RECURSE MODULE_FILES

set(SOURCES ${RUNTIME_FILES} ${MODULE_FILES})

if (QUICKJS)
if (QUICKJS OR QUICKJS_NG)
add_subdirectory(${PROJECT_SOURCE_DIR}/src/main/cpp/napi/quickjs/mimalloc-dev mimalloc)

if (QUICKJS_NG)
set(QJS_SOURCE_DIR src/main/cpp/napi/quickjs/source_ng)
else()
set(QJS_SOURCE_DIR src/main/cpp/napi/quickjs/source)
endif()

set(SOURCES ${SOURCES}
# quickjs
src/main/cpp/napi/quickjs/source/cutils.c
src/main/cpp/napi/quickjs/source/libregexp.c
src/main/cpp/napi/quickjs/source/libunicode.c
src/main/cpp/napi/quickjs/source/quickjs.c
src/main/cpp/napi/quickjs/source/dtoa.c
${QJS_SOURCE_DIR}/cutils.c
${QJS_SOURCE_DIR}/libregexp.c
${QJS_SOURCE_DIR}/libunicode.c
${QJS_SOURCE_DIR}/quickjs.c
${QJS_SOURCE_DIR}/dtoa.c
# napi
src/main/cpp/napi/quickjs/quickjs-api.c
src/main/cpp/napi/quickjs/jsr.cpp


)

include_directories(
src/main/cpp/napi/quickjs
src/main/cpp/napi/quickjs/source
src/main/cpp/napi/quickjs/napi-new
${QJS_SOURCE_DIR}
src/main/cpp/napi/common
# mimalloc
src/main/cpp/napi/quickjs/mimalloc-dev/include
Expand Down Expand Up @@ -325,8 +332,11 @@ if (PRIMJS)
add_compile_definitions(NativeScript, PRIVATE __PRIMJS__)
endif ()

if (QUICKJS)
if (QUICKJS OR QUICKJS_NG)
add_compile_definitions(NativeScript, PRIVATE __QJS__)
if (QUICKJS_NG)
add_compile_definitions(NativeScript, PRIVATE __QJS_NG__)
endif ()
if (USE_MIMALLOC)
add_compile_definitions(NativeScript, PRIVATE USE_MIMALLOC)
endif ()
Expand Down
11 changes: 7 additions & 4 deletions test-app/runtime/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apply plugin: 'com.android.library'

// can be: "V8-11", "V8-10","V8-13", "JSC", "HERMES", "QUICKJS", "SHERMES", "PRIMJS"
// can be: "V8-11", "V8-10","V8-13", "JSC", "HERMES", "QUICKJS", "QUICKJS_NG", "SHERMES", "PRIMJS"

def jsEngine = "V8-10"
def jsEngine = "QUICKJS_NG"
def hasEngine = project.hasProperty("engine")
if (hasEngine) {
jsEngine = engine
Expand Down Expand Up @@ -133,9 +133,12 @@ android {
arguments.add("-DIS_NAPI_MODULE=true")
}

if (jsEngine == "QUICKJS") {
if (jsEngine == "QUICKJS" || jsEngine == "QUICKJS_NG") {
arguments.add("-DQUICKJS=1")
arguments.add("-DUSE_MIMALLOC=1")
if (jsEngine == "QUICKJS_NG") {
arguments.add("-DQUICKJS_NG=1")
}
} else if (jsEngine == "HERMES") {
arguments.add("-DHERMES=1")
} else if (jsEngine == "SHERMES") {
Expand Down Expand Up @@ -216,7 +219,7 @@ android {
exclude "**/libhermes.so"
exclude "**/libjsi.so"
}
} else if (jsEngine == "QUICKJS" || jsEngine == "PRIMJS") {
} else if (jsEngine == "QUICKJS" || jsEngine == "PRIMJS" || jsEngine == "QUICKJS_NG") {
packagingOptions {
exclude "**/libhermes.so"
exclude "**/libjsc.so"
Expand Down
147 changes: 137 additions & 10 deletions test-app/runtime/src/main/cpp/napi/quickjs/quickjs-api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
#include "js_native_api.h"
#include "quicks-runtime.h"

#ifndef __QJS_NG__
#include "cutils.h"
#endif

#ifdef __ANDROID__

#include <android/log.h>
Expand Down Expand Up @@ -35,6 +39,8 @@

#ifdef USE_MIMALLOC


#ifdef __QJS_NG__
static void *js_mi_calloc(void *opaque, size_t count, size_t size) {
return mi_calloc(count, size);
}
Expand All @@ -60,6 +66,85 @@ static const JSMallocFunctions mi_mf = {
js_mi_realloc,
mi_malloc_usable_size
};
#endif

#ifndef __QJS_NG__

#if defined(__APPLE__)
#define MALLOC_OVERHEAD 0
#else
#define MALLOC_OVERHEAD 8
#endif

static void *js_def_malloc(JSMallocState *s, size_t size)
{
void *ptr;

/* Do not allocate zero bytes: behavior is platform dependent */
assert(size != 0);

if (unlikely(s->malloc_size + size > s->malloc_limit))
return NULL;

ptr = mi_malloc(size);
if (!ptr)
return NULL;

s->malloc_count++;
s->malloc_size += mi_malloc_usable_size(ptr) + MALLOC_OVERHEAD;
return ptr;
}

static void js_def_free(JSMallocState *s, void *ptr)
{
if (!ptr)
return;

s->malloc_count--;
s->malloc_size -= mi_malloc_usable_size(ptr) + MALLOC_OVERHEAD;
mi_free(ptr);
}

static void *js_def_realloc(JSMallocState *s, void *ptr, size_t size)
{
size_t old_size;

if (!ptr) {
if (size == 0)
return NULL;
return js_def_malloc(s, size);
}
old_size = mi_malloc_usable_size(ptr);
if (size == 0) {
s->malloc_count--;
s->malloc_size -= old_size + MALLOC_OVERHEAD;
mi_free(ptr);
return NULL;
}
if (s->malloc_size + size - old_size > s->malloc_limit)
return NULL;

ptr = mi_realloc(ptr, size);
if (!ptr)
return NULL;

s->malloc_size += mi_malloc_usable_size(ptr) - old_size;
return ptr;
}

static const JSMallocFunctions mi_mf = {
js_def_malloc,
js_def_free,
js_def_realloc,
mi_malloc_usable_size,
};

#endif






#endif

Expand Down Expand Up @@ -1507,7 +1592,11 @@ napi_status napi_get_array_length(napi_env env,

JSValue jsValue = *((JSValue *) value);

#ifdef __QJS_NG__
if (!JS_IsArray(jsValue))
#else
if (!JS_IsArray(env->context,jsValue))
#endif
return napi_set_last_error(env, napi_array_expected, NULL, 0, NULL);

int64_t length = 0;
Expand Down Expand Up @@ -1822,7 +1911,11 @@ napi_status napi_get_value_bigint_int64(napi_env env,
CHECK_ARG(value)
CHECK_ARG(result)

if (!JS_IsBigInt(*(JSValue *) value)) {
if (!JS_IsBigInt(
#ifndef __QJS_NG__
env->context,
#endif
*(JSValue *) value)) {
return napi_set_last_error(env, napi_bigint_expected, NULL, 0, NULL);
}

Expand All @@ -1839,7 +1932,11 @@ napi_status napi_get_value_bigint_uint64(napi_env env,
CHECK_ARG(value)
CHECK_ARG(result)

if (!JS_IsBigInt(*(JSValue *) value)) {
if (!JS_IsBigInt(
#ifndef __QJS_NG__
env->context,
#endif
*(JSValue *) value)) {
return napi_set_last_error(env, napi_bigint_expected, NULL, 0, NULL);
}

Expand All @@ -1861,7 +1958,11 @@ napi_status napi_get_value_bigint_words(napi_env env,

JSValue jsValue = *(JSValue *) value;

if (!JS_IsBigInt(jsValue)) {
if (!JS_IsBigInt(
#ifndef __QJS_NG__
env->context,
#endif
jsValue)) {
return napi_set_last_error(env, napi_bigint_expected, NULL, 0, NULL);
}

Expand Down Expand Up @@ -2258,7 +2359,11 @@ napi_status napi_typeof(napi_env env, napi_value value, napi_valuetype *result)
*result = napi_string;
} else if (JS_IsSymbol(jsValue)) {
*result = napi_symbol;
} else if (JS_IsBigInt(jsValue)) {
} else if (JS_IsBigInt(
#ifndef __QJS_NG__
env->context,
#endif
jsValue)) {
*result = napi_bigint;
} else if (JS_IsFunction(env->context, jsValue)) {
*result = napi_function;
Expand Down Expand Up @@ -2306,7 +2411,11 @@ napi_status napi_is_array(napi_env env, napi_value value, bool *result) {
CHECK_ARG(result)

JSValue jsValue = *((JSValue *) value);
int status = JS_IsArray(jsValue);
int status = JS_IsArray(
#ifndef __QJS_NG__
env->context,
#endif,
jsValue);
RETURN_STATUS_IF_FALSE(status != -1, napi_pending_exception);
*result = status;

Expand Down Expand Up @@ -2375,7 +2484,11 @@ napi_status napi_is_error(napi_env env, napi_value value, bool *result) {
CHECK_ARG(value)
CHECK_ARG(result)

int status = JS_IsError(*((JSValue *) value));
int status = JS_IsError(
#ifndef __QJS_NG__
env->context,
#endif
*((JSValue *) value));
*result = status;
return napi_clear_last_error(env);
}
Expand Down Expand Up @@ -3957,8 +4070,10 @@ napi_status qjs_create_runtime(napi_runtime *runtime) {
(*runtime)->runtime = JS_NewRuntime();
#endif

#ifndef NDEBUG
#ifdef __QJS_NG__
#ifndef NDEBUG
JS_SetDumpFlags((*runtime)->runtime, JS_DUMP_LEAKS);
#endif
#endif

JS_SetMaxStackSize((*runtime)->runtime, 0);
Expand All @@ -3973,12 +4088,17 @@ napi_status qjs_create_runtime(napi_runtime *runtime) {
JSClassDef ConstructorClassDef = {"ConstructorInfo", function_finalizer, NULL, NULL, NULL};
JSClassDef NapiHostObjectClassDef = {"NapiHostObject", host_object_finalizer, NULL, NULL,
&NapiHostObjectExoticMethods};


#ifndef __QJS_NG__
JS_NewClassID( &(*runtime)->napiHostObjectClassId);
JS_NewClassID( &(*runtime)->constructorClassId);
JS_NewClassID(&(*runtime)->functionClassId);
JS_NewClassID(&(*runtime)->externalClassId);
#else
JS_NewClassID((*runtime)->runtime, &(*runtime)->napiHostObjectClassId);
JS_NewClassID((*runtime)->runtime, &(*runtime)->constructorClassId);
JS_NewClassID((*runtime)->runtime, &(*runtime)->functionClassId);
JS_NewClassID((*runtime)->runtime, &(*runtime)->externalClassId);
#endif

JS_NewClass((*runtime)->runtime, (*runtime)->napiHostObjectClassId, &NapiHostObjectClassDef);
JS_NewClass((*runtime)->runtime, (*runtime)->externalClassId, &ExternalClassDef);
Expand Down Expand Up @@ -4017,9 +4137,16 @@ JSEngineCallback(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *
return JS_UNDEFINED;
}

#ifndef __QJS_NG__
void JSR_PromiseRejectionTracker(JSContext *ctx, JSValueConst promise,
JSValueConst reason,
JS_BOOL is_handled, void *opaque)
#else
void JSR_PromiseRejectionTracker(JSContext *ctx, JSValue promise,
JSValue reason,
bool is_handled, void *opaque) {
bool is_handled, void *opaque)
#endif
{
JSValue global = JS_GetGlobalObject(ctx);
JSValue onUnhandledRejection = JS_GetPropertyStr(ctx, global, "onUnhandledPromiseRejectionTracker");
if (JS_IsFunction(ctx, onUnhandledRejection)) {
Expand Down
Loading