From db8f7a256554b5dd3eee0b398188a4e1a2eee258 Mon Sep 17 00:00:00 2001 From: Richard Davison Date: Tue, 17 Dec 2024 09:50:42 +0100 Subject: [PATCH 1/5] Add typed array utility functions --- quickjs.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ quickjs.h | 29 +++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/quickjs.c b/quickjs.c index cc630ab99..184f29c45 100644 --- a/quickjs.c +++ b/quickjs.c @@ -52448,6 +52448,16 @@ static JSValue js_typed_array_get_byteOffset(JSContext *ctx, JSValue this_val) return js_uint32(ta->offset); } +JSValue JS_NewTypedArray(JSContext *ctx, int argc, JSValueConst *argv, + JSTypedArrayEnum type) +{ + if (type < JS_TYPED_ARRAY_UINT8C || type > JS_TYPED_ARRAY_FLOAT64) + return JS_ThrowRangeError(ctx, "invalid typed array type"); + + return js_typed_array_constructor(ctx, JS_UNDEFINED, argc, argv, + JS_CLASS_UINT8C_ARRAY + type); +} + /* Return the buffer associated to the typed array or an exception if it is not a typed array or if the buffer is detached. pbyte_offset, pbyte_length or pbytes_per_element can be NULL. */ @@ -54755,10 +54765,59 @@ JSValue JS_NewUint8ArrayCopy(JSContext *ctx, const uint8_t *buf, size_t len) return js_new_uint8array(ctx, buffer); } +JS_BOOL JS_IsTypedArray(JSValue obj) { + JSClassID class_id = JS_GetClassID(obj); + return class_id >= JS_CLASS_INT8_ARRAY && class_id <= JS_CLASS_FLOAT64_ARRAY; +} + +JS_BOOL JS_isUint8ClampedArray(JSValue obj) { + return JS_GetClassID(obj) == JS_CLASS_UINT8C_ARRAY; +} + +JS_BOOL JS_IsInt8Array(JSValue obj) { + return JS_GetClassID(obj) == JS_CLASS_INT8_ARRAY; +} + JS_BOOL JS_IsUint8Array(JSValue obj) { return JS_GetClassID(obj) == JS_CLASS_UINT8_ARRAY; } +JS_BOOL JS_IsInt16Array(JSValue obj) { + return JS_GetClassID(obj) == JS_CLASS_INT16_ARRAY; +} + +JS_BOOL JS_IsUint16Array(JSValue obj) { + return JS_GetClassID(obj) == JS_CLASS_UINT16_ARRAY; +} + +JS_BOOL JS_IsInt32Array(JSValue obj) { + return JS_GetClassID(obj) == JS_CLASS_INT32_ARRAY; +} + +JS_BOOL JS_IsUint32Array(JSValue obj) { + return JS_GetClassID(obj) == JS_CLASS_UINT32_ARRAY; +} + +JS_BOOL JS_IsBigInt64Array(JSValue obj) { + return JS_GetClassID(obj) == JS_CLASS_BIG_INT64_ARRAY; +} + +JS_BOOL JS_IsBigUint64Array(JSValue obj) { + return JS_GetClassID(obj) == JS_CLASS_BIG_UINT64_ARRAY; +} + +JS_BOOL JS_IsFloat16Array(JSValue obj) { + return JS_GetClassID(obj) == JS_CLASS_FLOAT16_ARRAY; +} + +JS_BOOL JS_IsFloat32Array(JSValue obj) { + return JS_GetClassID(obj) == JS_CLASS_FLOAT32_ARRAY; +} + +JS_BOOL JS_IsFloat64Array(JSValue obj) { + return JS_GetClassID(obj) == JS_CLASS_FLOAT64_ARRAY; +} + /* Atomics */ #ifdef CONFIG_ATOMICS diff --git a/quickjs.h b/quickjs.h index 9e8b5113f..f429c34f2 100644 --- a/quickjs.h +++ b/quickjs.h @@ -777,6 +777,23 @@ JS_EXTERN void JS_DetachArrayBuffer(JSContext *ctx, JSValue obj); JS_EXTERN uint8_t *JS_GetArrayBuffer(JSContext *ctx, size_t *psize, JSValue obj); JS_EXTERN JS_BOOL JS_IsArrayBuffer(JSValue obj); JS_EXTERN uint8_t *JS_GetUint8Array(JSContext *ctx, size_t *psize, JSValue obj); + +typedef enum JSTypedArrayEnum { + JS_TYPED_ARRAY_UINT8C = 0, + JS_TYPED_ARRAY_INT8, + JS_TYPED_ARRAY_UINT8, + JS_TYPED_ARRAY_INT16, + JS_TYPED_ARRAY_UINT16, + JS_TYPED_ARRAY_INT32, + JS_TYPED_ARRAY_UINT32, + JS_TYPED_ARRAY_BIG_INT64, + JS_TYPED_ARRAY_BIG_UINT64, + JS_TYPED_ARRAY_FLOAT32, + JS_TYPED_ARRAY_FLOAT64, +} JSTypedArrayEnum; + +JSValue JS_NewTypedArray(JSContext *ctx, int argc, JSValueConst *argv, + JSTypedArrayEnum array_type); JS_EXTERN JSValue JS_GetTypedArrayBuffer(JSContext *ctx, JSValue obj, size_t *pbyte_offset, size_t *pbyte_length, @@ -784,7 +801,19 @@ JS_EXTERN JSValue JS_GetTypedArrayBuffer(JSContext *ctx, JSValue obj, JS_EXTERN JSValue JS_NewUint8Array(JSContext *ctx, uint8_t *buf, size_t len, JSFreeArrayBufferDataFunc *free_func, void *opaque, JS_BOOL is_shared); +JS_EXTERN JS_BOOL JS_IsTypedArray(JSValue obj); +JS_EXTERN JS_BOOL JS_IsUint8ClampedArray(JSValue obj); +JS_EXTERN JS_BOOL JS_IsInt8Array(JSValue obj); JS_EXTERN JS_BOOL JS_IsUint8Array(JSValue obj); +JS_EXTERN JS_BOOL JS_IsInt16Array(JSValue obj); +JS_EXTERN JS_BOOL JS_IsUint16Array(JSValue obj); +JS_EXTERN JS_BOOL JS_IsInt32Array(JSValue obj); +JS_EXTERN JS_BOOL JS_IsUint32Array(JSValue obj); +JS_EXTERN JS_BOOL JS_IsBigInt64Array(JSValue obj); +JS_EXTERN JS_BOOL JS_IsBigUint64Array(JSValue obj); +JS_EXTERN JS_BOOL JS_IsFloat16Array(JSValue obj); +JS_EXTERN JS_BOOL JS_IsFloat32Array(JSValue obj); +JS_EXTERN JS_BOOL JS_IsFloat64Array(JSValue obj); JS_EXTERN JSValue JS_NewUint8ArrayCopy(JSContext *ctx, const uint8_t *buf, size_t len); typedef struct { void *(*sab_alloc)(void *opaque, size_t size); From f584c0c6a2e545f874457135d13215c45c2df486 Mon Sep 17 00:00:00 2001 From: Richard Davison Date: Tue, 17 Dec 2024 09:52:19 +0100 Subject: [PATCH 2/5] Add JS_EXTERN --- quickjs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickjs.h b/quickjs.h index f429c34f2..6b65e9151 100644 --- a/quickjs.h +++ b/quickjs.h @@ -792,7 +792,7 @@ typedef enum JSTypedArrayEnum { JS_TYPED_ARRAY_FLOAT64, } JSTypedArrayEnum; -JSValue JS_NewTypedArray(JSContext *ctx, int argc, JSValueConst *argv, +JS_EXTERN JSValue JS_NewTypedArray(JSContext *ctx, int argc, JSValueConst *argv, JSTypedArrayEnum array_type); JS_EXTERN JSValue JS_GetTypedArrayBuffer(JSContext *ctx, JSValue obj, size_t *pbyte_offset, From 8fa4a89eae4149b9606c3d383cdedb648bdbb57e Mon Sep 17 00:00:00 2001 From: Richard Davison Date: Tue, 17 Dec 2024 12:49:34 +0100 Subject: [PATCH 3/5] Make typed array utils more generic --- quickjs.c | 55 +++++-------------------------------------------------- quickjs.h | 16 +++------------- 2 files changed, 8 insertions(+), 63 deletions(-) diff --git a/quickjs.c b/quickjs.c index 184f29c45..fa439ca25 100644 --- a/quickjs.c +++ b/quickjs.c @@ -54765,57 +54765,12 @@ JSValue JS_NewUint8ArrayCopy(JSContext *ctx, const uint8_t *buf, size_t len) return js_new_uint8array(ctx, buffer); } -JS_BOOL JS_IsTypedArray(JSValue obj) { +int JS_GetTypedArrayType(JSValue obj) +{ JSClassID class_id = JS_GetClassID(obj); - return class_id >= JS_CLASS_INT8_ARRAY && class_id <= JS_CLASS_FLOAT64_ARRAY; -} - -JS_BOOL JS_isUint8ClampedArray(JSValue obj) { - return JS_GetClassID(obj) == JS_CLASS_UINT8C_ARRAY; -} - -JS_BOOL JS_IsInt8Array(JSValue obj) { - return JS_GetClassID(obj) == JS_CLASS_INT8_ARRAY; -} - -JS_BOOL JS_IsUint8Array(JSValue obj) { - return JS_GetClassID(obj) == JS_CLASS_UINT8_ARRAY; -} - -JS_BOOL JS_IsInt16Array(JSValue obj) { - return JS_GetClassID(obj) == JS_CLASS_INT16_ARRAY; -} - -JS_BOOL JS_IsUint16Array(JSValue obj) { - return JS_GetClassID(obj) == JS_CLASS_UINT16_ARRAY; -} - -JS_BOOL JS_IsInt32Array(JSValue obj) { - return JS_GetClassID(obj) == JS_CLASS_INT32_ARRAY; -} - -JS_BOOL JS_IsUint32Array(JSValue obj) { - return JS_GetClassID(obj) == JS_CLASS_UINT32_ARRAY; -} - -JS_BOOL JS_IsBigInt64Array(JSValue obj) { - return JS_GetClassID(obj) == JS_CLASS_BIG_INT64_ARRAY; -} - -JS_BOOL JS_IsBigUint64Array(JSValue obj) { - return JS_GetClassID(obj) == JS_CLASS_BIG_UINT64_ARRAY; -} - -JS_BOOL JS_IsFloat16Array(JSValue obj) { - return JS_GetClassID(obj) == JS_CLASS_FLOAT16_ARRAY; -} - -JS_BOOL JS_IsFloat32Array(JSValue obj) { - return JS_GetClassID(obj) == JS_CLASS_FLOAT32_ARRAY; -} - -JS_BOOL JS_IsFloat64Array(JSValue obj) { - return JS_GetClassID(obj) == JS_CLASS_FLOAT64_ARRAY; + int mask = -((class_id >= JS_CLASS_UINT8C_ARRAY) & (class_id <= JS_CLASS_FLOAT64_ARRAY)); + int offset = (class_id - JS_CLASS_UINT8C_ARRAY) & mask; + return offset | (~mask & -1); } /* Atomics */ diff --git a/quickjs.h b/quickjs.h index 6b65e9151..60dd2f8c8 100644 --- a/quickjs.h +++ b/quickjs.h @@ -788,6 +788,7 @@ typedef enum JSTypedArrayEnum { JS_TYPED_ARRAY_UINT32, JS_TYPED_ARRAY_BIG_INT64, JS_TYPED_ARRAY_BIG_UINT64, + JS_TYPED_ARRAY_FLOAT16, JS_TYPED_ARRAY_FLOAT32, JS_TYPED_ARRAY_FLOAT64, } JSTypedArrayEnum; @@ -801,19 +802,8 @@ JS_EXTERN JSValue JS_GetTypedArrayBuffer(JSContext *ctx, JSValue obj, JS_EXTERN JSValue JS_NewUint8Array(JSContext *ctx, uint8_t *buf, size_t len, JSFreeArrayBufferDataFunc *free_func, void *opaque, JS_BOOL is_shared); -JS_EXTERN JS_BOOL JS_IsTypedArray(JSValue obj); -JS_EXTERN JS_BOOL JS_IsUint8ClampedArray(JSValue obj); -JS_EXTERN JS_BOOL JS_IsInt8Array(JSValue obj); -JS_EXTERN JS_BOOL JS_IsUint8Array(JSValue obj); -JS_EXTERN JS_BOOL JS_IsInt16Array(JSValue obj); -JS_EXTERN JS_BOOL JS_IsUint16Array(JSValue obj); -JS_EXTERN JS_BOOL JS_IsInt32Array(JSValue obj); -JS_EXTERN JS_BOOL JS_IsUint32Array(JSValue obj); -JS_EXTERN JS_BOOL JS_IsBigInt64Array(JSValue obj); -JS_EXTERN JS_BOOL JS_IsBigUint64Array(JSValue obj); -JS_EXTERN JS_BOOL JS_IsFloat16Array(JSValue obj); -JS_EXTERN JS_BOOL JS_IsFloat32Array(JSValue obj); -JS_EXTERN JS_BOOL JS_IsFloat64Array(JSValue obj); +/* returns -1 if not a typed array otherwise return a JSTypedArrayEnum value */ +JS_EXTERN int JS_GetTypedArrayType(JSValue obj); JS_EXTERN JSValue JS_NewUint8ArrayCopy(JSContext *ctx, const uint8_t *buf, size_t len); typedef struct { void *(*sab_alloc)(void *opaque, size_t size); From 5364adc0078363b169dc85aa910600eb62f58722 Mon Sep 17 00:00:00 2001 From: Richard Davison Date: Fri, 20 Dec 2024 12:29:38 +0100 Subject: [PATCH 4/5] JSValueConst -> JSValue --- quickjs.c | 2 +- quickjs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quickjs.c b/quickjs.c index fa439ca25..957d21f86 100644 --- a/quickjs.c +++ b/quickjs.c @@ -52448,7 +52448,7 @@ static JSValue js_typed_array_get_byteOffset(JSContext *ctx, JSValue this_val) return js_uint32(ta->offset); } -JSValue JS_NewTypedArray(JSContext *ctx, int argc, JSValueConst *argv, +JSValue JS_NewTypedArray(JSContext *ctx, int argc, JSValue *argv, JSTypedArrayEnum type) { if (type < JS_TYPED_ARRAY_UINT8C || type > JS_TYPED_ARRAY_FLOAT64) diff --git a/quickjs.h b/quickjs.h index 60dd2f8c8..418e8673a 100644 --- a/quickjs.h +++ b/quickjs.h @@ -793,7 +793,7 @@ typedef enum JSTypedArrayEnum { JS_TYPED_ARRAY_FLOAT64, } JSTypedArrayEnum; -JS_EXTERN JSValue JS_NewTypedArray(JSContext *ctx, int argc, JSValueConst *argv, +JS_EXTERN JSValue JS_NewTypedArray(JSContext *ctx, int argc, JSValue *argv, JSTypedArrayEnum array_type); JS_EXTERN JSValue JS_GetTypedArrayBuffer(JSContext *ctx, JSValue obj, size_t *pbyte_offset, From 50277e32e94164a590361ae4617d57f2627700d2 Mon Sep 17 00:00:00 2001 From: Richard Davison Date: Sun, 22 Dec 2024 13:30:56 +0100 Subject: [PATCH 5/5] stop trying to be smarter than you are --- quickjs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/quickjs.c b/quickjs.c index 957d21f86..d519c5189 100644 --- a/quickjs.c +++ b/quickjs.c @@ -54768,9 +54768,10 @@ JSValue JS_NewUint8ArrayCopy(JSContext *ctx, const uint8_t *buf, size_t len) int JS_GetTypedArrayType(JSValue obj) { JSClassID class_id = JS_GetClassID(obj); - int mask = -((class_id >= JS_CLASS_UINT8C_ARRAY) & (class_id <= JS_CLASS_FLOAT64_ARRAY)); - int offset = (class_id - JS_CLASS_UINT8C_ARRAY) & mask; - return offset | (~mask & -1); + if (class_id >= JS_CLASS_UINT8C_ARRAY && class_id <= JS_CLASS_FLOAT64_ARRAY) + return class_id - JS_CLASS_UINT8C_ARRAY; + else + return -1; } /* Atomics */