merge cell

Makefile

@@ -24,7 +24,7 @@ $(BUILD_DBG)/build.ninja:
 install: all $(CELL_SHOP)
 	cp cell $(INSTALL_BIN)/cell
 	cp libcell_runtime.dylib $(INSTALL_LIB)/
-	cp source/cell.h source/quickjs.h source/wota.h $(INSTALL_INC)/
+	cp source/cell.h $(INSTALL_INC)/
 	rm -rf $(CELL_SHOP)/packages/core
 	ln -s $(CURDIR) $(CELL_SHOP)/packages/core
 	@echo "Installed cell to $(INSTALL_BIN) and $(INSTALL_LIB)"
@@ -32,7 +32,7 @@ install: all $(CELL_SHOP)
 install_debug: debug $(CELL_SHOP)
 	cp cell $(INSTALL_BIN)/cell
 	cp libcell_runtime.dylib $(INSTALL_LIB)/
-	cp source/cell.h source/quickjs.h source/wota.h $(INSTALL_INC)/
+	cp source/cell.h $(INSTALL_INC)/
 	rm -rf $(CELL_SHOP)/packages/core
 	ln -s $(CURDIR) $(CELL_SHOP)/packages/core
 	@echo "Installed cell (debug+asan) to $(INSTALL_BIN) and $(INSTALL_LIB)"

archive/miniz.c

@@ -1,6 +1,5 @@
-#include "quickjs.h"
-#include "miniz.h"
 #include "cell.h"
+#include "miniz.h"
 
 static JSClassID js_reader_class_id;
 static JSClassID js_writer_class_id;

debug/js.c

@@ -1,4 +1,5 @@
 #include "cell.h"
+#include "quickjs-internal.h"
 
 JSC_CCALL(os_mem_limit, JS_SetMemoryLimit(JS_GetRuntime(js), js2number(js,argv[0])))
 JSC_CCALL(os_max_stacksize, JS_SetMaxStackSize(js, js2number(js,argv[0])))

source/cell.c

@@ -8,8 +8,8 @@
 #include "stb_ds.h"
 
 #include "cell.h"
+#include "quickjs-internal.h"
 #include "cell_internal.h"
-#include "cJSON.h"
 
 #define BOOTSTRAP_MCODE      "boot/bootstrap.cm.mcode"
 #define ENGINE_SRC           "internal/engine.cm"

source/cell_internal.h

@@ -2,6 +2,12 @@
 #include <pthread.h>
 #include <stdatomic.h>
 
+/* Internal runtime accessors — not in public cell.h API */
+void *JS_GetContextOpaque (JSContext *ctx);
+void JS_SetContextOpaque (JSContext *ctx, void *opaque);
+void JS_SetPauseFlag(JSContext *ctx, int value);
+JSValue JS_GetStack (JSContext *ctx);
+
 /* Letter type for unified message queue */
 typedef enum {
   LETTER_BLOB,     /* Blob message */

source/quickjs-atom.h

@@ -1,265 +0,0 @@
-/*
- * QuickJS atom definitions
- *
- * Copyright (c) 2017-2018 Fabrice Bellard
- * Copyright (c) 2017-2018 Charlie Gordon
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifdef DEF
-
-/* Note: first atoms are considered as keywords in the parser */
-DEF(null, "null") /* must be first */
-DEF(false, "false")
-DEF(true, "true")
-DEF(if, "if")
-DEF(else, "else")
-DEF(return, "return")
-DEF(go, "go")
-DEF(var, "var")
-DEF(def, "def")
-DEF(this, "this")
-DEF(delete, "delete")
-DEF(void, "void")
-DEF(new, "new")
-DEF(in, "in")
-DEF(do, "do")
-DEF(while, "while")
-DEF(for, "for")
-DEF(break, "break")
-DEF(continue, "continue")
-DEF(switch, "switch")
-DEF(case, "case")
-DEF(default, "default")
-DEF(throw, "throw")
-DEF(try, "try")
-DEF(catch, "catch")
-DEF(finally, "finally")
-DEF(function, "function")
-DEF(debugger, "debugger")
-DEF(with, "with")
-/* FutureReservedWord */
-DEF(class, "class")
-DEF(const, "const")
-DEF(enum, "enum")
-DEF(export, "export")
-DEF(extends, "extends")
-DEF(import, "import")
-DEF(super, "super")
-/* FutureReservedWords when parsing strict mode code */
-DEF(implements, "implements")
-DEF(interface, "interface")
-DEF(let, "let")
-DEF(private, "private")
-DEF(protected, "protected")
-DEF(public, "public")
-DEF(static, "static")
-DEF(yield, "yield")
-DEF(await, "await")
-
-/* empty string */
-DEF(empty_string, "")
-/* identifiers */
-DEF(length, "length")
-DEF(fileName, "fileName")
-DEF(lineNumber, "lineNumber")
-DEF(columnNumber, "columnNumber")
-DEF(message, "message")
-DEF(cause, "cause")
-DEF(errors, "errors")
-DEF(stack, "stack")
-DEF(name, "name")
-DEF(toString, "toString")
-DEF(toLocaleString, "toLocaleString")
-DEF(valueOf, "valueOf")
-DEF(eval, "eval")
-DEF(prototype, "prototype")
-DEF(constructor, "constructor")
-DEF(configurable, "configurable")
-DEF(writable, "writable")
-DEF(enumerable, "enumerable")
-DEF(value, "value")
-DEF(get, "get")
-DEF(set, "set")
-DEF(of, "of")
-DEF(__proto__, "__proto__")
-DEF(undefined, "undefined")
-DEF(number, "number")
-DEF(boolean, "boolean")
-DEF(string, "string")
-DEF(object, "object")
-DEF(symbol, "symbol")
-DEF(integer, "integer")
-DEF(unknown, "unknown")
-DEF(callee, "callee")
-DEF(caller, "caller")
-DEF(_eval_, "<eval>")
-DEF(_ret_, "<ret>")
-DEF(_var_, "<var>")
-DEF(_arg_var_, "<arg_var>")
-DEF(_with_, "<with>")
-DEF(lastIndex, "lastIndex")
-DEF(target, "target")
-DEF(index, "index")
-DEF(input, "input")
-DEF(defineProperties, "defineProperties")
-DEF(apply, "apply")
-DEF(join, "join")
-DEF(concat, "concat")
-DEF(split, "split")
-DEF(construct, "construct")
-DEF(getPrototypeOf, "getPrototypeOf")
-DEF(setPrototypeOf, "setPrototypeOf")
-DEF(isExtensible, "isExtensible")
-DEF(preventExtensions, "preventExtensions")
-DEF(has, "has")
-DEF(deleteProperty, "deleteProperty")
-DEF(defineProperty, "defineProperty")
-DEF(getOwnPropertyDescriptor, "getOwnPropertyDescriptor")
-DEF(ownKeys, "ownKeys")
-DEF(add, "add")
-DEF(done, "done")
-DEF(next, "next")
-DEF(values, "values")
-DEF(source, "source")
-DEF(flags, "flags")
-DEF(global, "global")
-DEF(unicode, "unicode")
-DEF(raw, "raw")
-DEF(new_target, "new.target")
-DEF(this_active_func, "this.active_func")
-DEF(home_object, "<home_object>")
-DEF(computed_field, "<computed_field>")
-DEF(static_computed_field, "<static_computed_field>") /* must come after computed_fields */
-DEF(class_fields_init, "<class_fields_init>")
-DEF(brand, "<brand>")
-DEF(hash_constructor, "#constructor")
-DEF(as, "as")
-DEF(from, "from")
-DEF(meta, "meta")
-DEF(_default_, "*default*")
-DEF(_star_, "*")
-DEF(Module, "Module")
-DEF(then, "then")
-DEF(resolve, "resolve")
-DEF(reject, "reject")
-DEF(promise, "promise")
-DEF(proxy, "proxy")
-DEF(revoke, "revoke")
-DEF(async, "async")
-DEF(exec, "exec")
-DEF(groups, "groups")
-DEF(indices, "indices")
-DEF(status, "status")
-DEF(reason, "reason")
-DEF(globalThis, "globalThis")
-DEF(bigint, "bigint")
-DEF(minus_zero, "-0")
-DEF(Infinity, "Infinity")
-DEF(minus_Infinity, "-Infinity")
-DEF(NaN, "NaN")
-DEF(hasIndices, "hasIndices")
-DEF(ignoreCase, "ignoreCase")
-DEF(multiline, "multiline")
-DEF(dotAll, "dotAll")
-DEF(sticky, "sticky")
-DEF(unicodeSets, "unicodeSets")
-/* the following 3 atoms are only used with CONFIG_ATOMICS */
-DEF(not_equal, "not-equal")
-DEF(timed_out, "timed-out")
-DEF(ok, "ok")
-/* */
-DEF(toJSON, "toJSON")
-/* class names */
-DEF(Object, "Object")
-DEF(Array, "Array")
-DEF(Error, "Error")
-DEF(Number, "Number")
-DEF(String, "String")
-DEF(Boolean, "Boolean")
-DEF(Symbol, "Symbol")
-DEF(Math, "Math")
-DEF(JSON, "JSON")
-DEF(Date, "Date")
-DEF(Function, "Function")
-DEF(GeneratorFunction, "GeneratorFunction")
-DEF(ForInIterator, "ForInIterator")
-DEF(RegExp, "RegExp")
-DEF(ArrayBuffer, "ArrayBuffer")
-DEF(SharedArrayBuffer, "SharedArrayBuffer")
-/* must keep same order as class IDs for typed arrays */
-DEF(Uint8ClampedArray, "Uint8ClampedArray")
-DEF(Int8Array, "Int8Array")
-DEF(Uint8Array, "Uint8Array")
-DEF(Int16Array, "Int16Array")
-DEF(Uint16Array, "Uint16Array")
-DEF(Int32Array, "Int32Array")
-DEF(Uint32Array, "Uint32Array")
-DEF(BigInt64Array, "BigInt64Array")
-DEF(BigUint64Array, "BigUint64Array")
-DEF(Float16Array, "Float16Array")
-DEF(Float32Array, "Float32Array")
-DEF(Float64Array, "Float64Array")
-DEF(DataView, "DataView")
-DEF(BigInt, "BigInt")
-DEF(WeakRef, "WeakRef")
-DEF(FinalizationRegistry, "FinalizationRegistry")
-DEF(Map, "Map")
-DEF(Set, "Set") /* Map + 1 */
-DEF(WeakMap, "WeakMap") /* Map + 2 */
-DEF(WeakSet, "WeakSet") /* Map + 3 */
-DEF(Map_Iterator, "Map Iterator")
-DEF(Set_Iterator, "Set Iterator")
-DEF(Array_Iterator, "Array Iterator")
-DEF(String_Iterator, "String Iterator")
-DEF(RegExp_String_Iterator, "RegExp String Iterator")
-DEF(Generator, "Generator")
-DEF(Proxy, "Proxy")
-DEF(Promise, "Promise")
-DEF(PromiseResolveFunction, "PromiseResolveFunction")
-DEF(PromiseRejectFunction, "PromiseRejectFunction")
-DEF(AsyncFunction, "AsyncFunction")
-DEF(AsyncFunctionResolve, "AsyncFunctionResolve")
-DEF(AsyncFunctionReject, "AsyncFunctionReject")
-DEF(AsyncGeneratorFunction, "AsyncGeneratorFunction")
-DEF(AsyncGenerator, "AsyncGenerator")
-DEF(EvalError, "EvalError")
-DEF(RangeError, "RangeError")
-DEF(ReferenceError, "ReferenceError")
-DEF(SyntaxError, "SyntaxError")
-DEF(TypeError, "TypeError")
-DEF(URIError, "URIError")
-DEF(InternalError, "InternalError")
-/* symbols */
-DEF(Symbol_toPrimitive, "Symbol.toPrimitive")
-DEF(Symbol_iterator, "Symbol.iterator")
-DEF(Symbol_match, "Symbol.match")
-DEF(Symbol_matchAll, "Symbol.matchAll")
-DEF(Symbol_replace, "Symbol.replace")
-DEF(Symbol_search, "Symbol.search")
-DEF(Symbol_split, "Symbol.split")
-DEF(Symbol_toStringTag, "Symbol.toStringTag")
-DEF(Symbol_isConcatSpreadable, "Symbol.isConcatSpreadable")
-DEF(Symbol_hasInstance, "Symbol.hasInstance")
-DEF(Symbol_species, "Symbol.species")
-DEF(Symbol_unscopables, "Symbol.unscopables")
-DEF(Symbol_asyncIterator, "Symbol.asyncIterator")
-
-#endif /* DEF */

source/quickjs-internal.h

@@ -49,12 +49,173 @@
 #include "libregexp.h"
 #include "libunicode.h"
 #include "list.h"
-#include "quickjs.h"
+#include "cell.h"
 #include "cJSON.h"
 #include "blob.h"
 #include "nota.h"
 #include "wota.h"
 
+/* ============================================================
+   Internal API — not for C module authors
+   ============================================================ */
+
+/* Object header types */
+enum mist_obj_type {
+  OBJ_ARRAY = 0,
+  OBJ_BLOB = 1,
+  OBJ_TEXT = 2,
+  OBJ_RECORD = 3, // js style objects
+  OBJ_FUNCTION = 4,
+  OBJ_CODE = 5,
+  OBJ_FRAME = 6,
+  OBJ_FORWARD = 7
+};
+
+/* Object header bits */
+#define OBJHDR_S_BIT 3u
+#define OBJHDR_P_BIT 4u
+#define OBJHDR_A_BIT 5u
+#define OBJHDR_R_BIT 7u
+
+#define OBJHDR_FLAG(bit) ((objhdr_t)1ull << (bit))
+#define OBJHDR_S_MASK OBJHDR_FLAG (OBJHDR_S_BIT)
+#define OBJHDR_P_MASK OBJHDR_FLAG (OBJHDR_P_BIT)
+#define OBJHDR_A_MASK OBJHDR_FLAG (OBJHDR_A_BIT)
+#define OBJHDR_R_MASK OBJHDR_FLAG (OBJHDR_R_BIT)
+
+typedef uint64_t word_t;   // one actor-memory word
+typedef uint64_t objhdr_t; // header word
+typedef uint64_t objref_t; // 56-bit word address (0 = null)
+
+static inline uint8_t objhdr_type (objhdr_t h) { return (uint8_t)(h & 7u); }
+static inline int objhdr_s (objhdr_t h) { return (h & OBJHDR_S_MASK) != 0; }
+
+/* Word size constant */
+#define JSW 8
+
+/* Runtime / Context lifecycle */
+JSRuntime *JS_NewRuntime (void);
+void JS_FreeRuntime (JSRuntime *rt);
+void JS_SetMemoryLimit (JSRuntime *rt, size_t limit);
+void JS_SetPoolSize (JSRuntime *rt, size_t initial, size_t cap);
+
+JSContext *JS_NewContext (JSRuntime *rt);
+JSContext *JS_NewContextWithHeapSize (JSRuntime *rt, size_t heap_size);
+void JS_FreeContext (JSContext *s);
+void *JS_GetContextOpaque (JSContext *ctx);
+void JS_SetContextOpaque (JSContext *ctx, void *opaque);
+
+typedef void (*JS_GCScanFn)(JSContext *ctx,
+  uint8_t *from_base, uint8_t *from_end,
+  uint8_t *to_base, uint8_t **to_free, uint8_t *to_end);
+void JS_SetGCScanExternal(JSContext *ctx, JS_GCScanFn fn);
+
+void JS_SetActorSym (JSContext *ctx, JSValue sym);
+JSValue JS_GetActorSym (JSContext *ctx);
+JSRuntime *JS_GetRuntime (JSContext *ctx);
+void JS_SetMaxStackSize (JSContext *ctx, size_t stack_size);
+void JS_UpdateStackTop (JSContext *ctx);
+int JS_GetVMCallDepth(JSContext *ctx);
+void JS_SetHeapMemoryLimit(JSContext *ctx, size_t limit);
+void JS_SetPauseFlag(JSContext *ctx, int value);
+JS_BOOL JS_IsLiveObject (JSRuntime *rt, JSValue obj);
+
+/* Suspended state */
+#define JS_TAG_SUSPENDED 0x13     /* 10011 - distinct special tag */
+#define JS_SUSPENDED ((JSValue)JS_TAG_SUSPENDED)
+
+static inline JS_BOOL JS_IsSuspended(JSValue v) {
+  return JS_VALUE_GET_TAG(v) == JS_TAG_SUSPENDED;
+}
+
+#ifndef JS_DEFAULT_STACK_SIZE
+#define JS_DEFAULT_STACK_SIZE (1024 * 1024)
+#endif
+
+/* Internal compile flags */
+#define JS_EVAL_FLAG_COMPILE_ONLY (1 << 5)
+
+/* Compilation and MachCode */
+struct cJSON;
+typedef struct MachCode MachCode;
+
+void JS_FreeMachCode(MachCode *mc);
+uint8_t *JS_SerializeMachCode(MachCode *mc, size_t *out_size);
+MachCode *JS_DeserializeMachCode(const uint8_t *data, size_t size);
+struct JSCodeRegister *JS_LoadMachCode(JSContext *ctx, MachCode *mc, JSValue env);
+JSValue JS_RunMachBin(JSContext *ctx, const uint8_t *data, size_t size, JSValue env);
+JSValue JS_RunMachMcode(JSContext *ctx, const char *json_str, size_t len, JSValue env);
+void JS_DumpMachBin(JSContext *ctx, const uint8_t *data, size_t size, JSValue env);
+MachCode *mach_compile_mcode(struct cJSON *mcode_json);
+
+/* Debug / Dump utilities */
+typedef struct JSMemoryUsage {
+  int64_t malloc_size, malloc_limit, memory_used_size;
+  int64_t malloc_count;
+  int64_t memory_used_count;
+  int64_t str_count, str_size;
+  int64_t obj_count, obj_size;
+  int64_t prop_count, prop_size;
+  int64_t shape_count, shape_size;
+  int64_t js_func_count, js_func_size, js_func_code_size;
+  int64_t js_func_pc2line_count, js_func_pc2line_size;
+  int64_t c_func_count, array_count;
+  int64_t fast_array_count, fast_array_elements;
+  int64_t binary_object_count, binary_object_size;
+} JSMemoryUsage;
+
+void JS_ComputeMemoryUsage (JSRuntime *rt, JSMemoryUsage *s);
+void JS_DumpMemoryUsage (FILE *fp, const JSMemoryUsage *s, JSRuntime *rt);
+
+typedef struct {
+  JS_BOOL show_hidden : 8;
+  JS_BOOL raw_dump : 8;
+  uint32_t max_depth;
+  uint32_t max_string_length;
+  uint32_t max_item_count;
+} JSPrintValueOptions;
+
+typedef void JSPrintValueWrite (void *opaque, const char *buf, size_t len);
+
+void JS_PrintValueSetDefaultOptions (JSPrintValueOptions *options);
+void JS_PrintValueRT (JSRuntime *rt, JSPrintValueWrite *write_func,
+                      void *write_opaque, JSValue val,
+                      const JSPrintValueOptions *options);
+void JS_PrintValue (JSContext *ctx, JSPrintValueWrite *write_func,
+                    void *write_opaque, JSValue val,
+                    const JSPrintValueOptions *options);
+
+void js_debug_info (JSContext *js, JSValue fn, js_debug *dbg);
+
+uint32_t js_debugger_stack_depth (JSContext *ctx);
+JSValue js_debugger_backtrace_fns (JSContext *ctx);
+JSValue js_debugger_closure_variables (JSContext *ctx, JSValue fn);
+JSValue js_debugger_local_variables (JSContext *ctx, int stack_index);
+void js_debugger_set_closure_variable (JSContext *js, JSValue fn,
+                                       JSValue var_name, JSValue val);
+JSValue js_debugger_build_backtrace (JSContext *ctx);
+JSValue js_debugger_fn_info (JSContext *ctx, JSValue fn);
+JSValue js_debugger_fn_bytecode (JSContext *js, JSValue fn);
+void *js_debugger_val_address (JSContext *js, JSValue val);
+
+/* Stack trace */
+JSValue JS_GetStack (JSContext *ctx);
+void JS_CrashPrintStack(JSContext *ctx);
+
+/* Serialization (internal) */
+JSValue wota2value(JSContext *js, void *v);
+void *value2wota(JSContext *js, JSValue v, JSValue replacer, size_t *bytes);
+JSValue nota2value(JSContext *js, void *nota);
+void *value2nota(JSContext *js, JSValue v);
+
+/* Internal module init (called during context init) */
+JSValue js_core_blob_use(JSContext *js);
+JSValue js_core_json_use(JSContext *js);
+
+/* ============================================================
+   End internal API declarations
+   ============================================================ */
+
 void *js_malloc (JSContext *ctx, size_t size);
 void *js_mallocz (JSContext *ctx, size_t size);
 

source/suite.c

@@ -4,8 +4,8 @@
  * Bypasses parser/bytecode to verify low-level operations
  */
 
-#include "quickjs.h"
-#include "cJSON.h"
+#include "cell.h"
+#include "quickjs-internal.h"
 #include <stdio.h>
 #include <string.h>
 #include <math.h>