unifying interface

notnullgames · Oct 19, 2024 · f34dd37 · f34dd37
1 parent b26255b
commit f34dd37
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/cart/as/build.js b/cart/as/build.js
@@ -18,8 +18,14 @@ await writeFile('build/tmp.ts', (await readFile('null0.ts')) + '\n// user-code:\
 
 const { error, stdout, stderr, stats } = await asc.main([
   'build/tmp.ts',
-  '--debug',
+
+  // only minimal seems to work in WAMR
   '--runtime', 'minimal',
+  // '--runtime', 'incremental',
+  // '--runtime', 'stub',
+
+  // '--debug',
+  // '--exportRuntime',
   '--config', './node_modules/@assemblyscript/wasi-shim/asconfig.json',
   '--optimizeLevel', '3',
   '--shrinkLevel', '2',

diff --git a/cart/as/null0.ts b/cart/as/null0.ts
@@ -825,8 +825,10 @@ declare function _null0_file_read(filename: ArrayBuffer, byteSize:UsizePointer,
 function file_read(filename: string): ArrayBuffer {
   const i = file_info(filename)
   const ret = new ArrayBuffer(<i32>i.filesize)
+  console.log(`in AS: ${i.filesize.toString()} ${ret.byteLength.toString()}`)
   const b = new UsizePointer()
   _null0_file_read(String.UTF8.encode(filename, true), b, ret)
+  console.log(`in AS, from read: ${b.value.toString()}`)
   return ret
 }
 

diff --git a/cart/c/null0.h b/cart/c/null0.h
@@ -27,11 +27,6 @@ void* _null0_malloc(size_t size) {
   return malloc(size);
 }
 
-NULL0_EXPORT("alloca")
-void* _null0_alloca(size_t size) {
-  return __builtin_alloca(size);
-}
-
 NULL0_EXPORT("free")
 void _null0_free(void* ptr) {
   free(ptr);