Merge pull request #31 from FastVM/v0.0.4-pre

v0.0.4

Author: ShawSumma

.github/workflows/all.yml

@@ -7,13 +7,27 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - run: make -Bj CC=cc OPT='-Os -flto' GCCJIT=NO
+      - run: make linux TARGET=test
+      - run: cat build/test/diff.txt
       - uses: actions/upload-artifact@v4
         with:
           name: minivm-linux
-          path:  |
+          path: |
             build/bin/minivm
-  windows-minivm-gcc:
+  mac-minivm:
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - run: make mac TARGET=test
+      - run: cat build/test/diff.txt
+      - uses: actions/upload-artifact@v4
+        with:
+          name: minivm-mac
+          path: |
+            build/bin/minivm
+  windows-minivm:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
@@ -24,9 +38,10 @@ jobs:
         with:
           version: 12.2.0 
           platform: x64
-      - run: make -Bj EXE=.exe CC='gcc' OPT='-Os -flto' OS=WINDOWS GCCJIT=NO
+      - run: make windows TARGET=test OPT='-O2'
+      - run: cat build/test/diff.txt
       - uses: actions/upload-artifact@v4
         with:
           name: minivm-windows
-          path:  |
+          path: |
             build/bin/minivm.exe

.gitignore

@@ -29,3 +29,6 @@ minivm
 minivm.exe
 out.*
 package-lock.json
+web/minivm.js
+web-raw/minivm.js
+web-raw/minivm.wasm

.gitmodules

@@ -1,19 +1,12 @@
-[submodule "vendor/tcc"]
-	path = vendor/tcc
-	url = https://github.com/fastvm/minivm-tinycc
-[submodule "vendor/cuik"]
-	path = vendor/cuik
-	url = https://github.com/fastvm/minivm-cuik
-	branch = new-cg
-[submodule "vendor/xxhash"]
-	path = vendor/xxhash
-	url = https://github.com/fastvm/minivm-xxhash
 [submodule "vendor/tree-sitter"]
 	path = vendor/tree-sitter
 	url = https://github.com/fastvm/minivm-tree-sitter
 [submodule "vendor/isocline"]
 	path = vendor/isocline
 	url = https://github.com/fastvm/minivm-isocline
-[submodule "vendor/llvm-box"]
-	path = vendor/llvm-box
-	url = https://github.com/fastvm/llvm-box
+[submodule "vendor/raylib"]
+	path = vendor/raylib
+	url = https://github.com/FastVM/minivm-raylib
+[submodule "vendor/bdwgc"]
+	path = vendor/bdwgc
+	url = https://github.com/FastVM/minivm-bdwgc

core.mak

@@ -18,7 +18,17 @@ const readFileSync = (path) => {
 };
 
 const boxSpawn = (cmd, ...cmdArgs) => {
-    const args = [cmd, ...cmdArgs];
+    const args = [...cmdArgs];
+    switch (cmd) {
+        case 'wasm-ld':
+            args.unshift('lld', 'wasm-ld');
+            break;
+        case 'clang':
+            args.unshift('clang', 'clang');
+            break;
+        default: 
+            throw new Error(`command: ${cmd}`);
+    }
     const argc = args.length;
     const argv = box._malloc((argc + 1) * 4);
     let argv_ptr = argv;
@@ -127,19 +137,22 @@ mkdirSync(cache);
 
 timeEnd('llvm');
 
-export const run = (args) => {
+export const run = async (args) => {
     timeBegin('run');
     process.stdin.setRawMode(true);
 
     let last = 'mod';
 
     timeBegin(last);
 
-    const mod = MiniVM({
+    const mod = await MiniVM({
         noInitialRun: true,
         stdin: watch(stdinFunc),
         stdout: watch(stdoutFunc),
         stderr: watch(stderrFunc),
+
+        _vm_lang_lua_repl_sync() {},
+
         _vm_compile_c_to_wasm: (n) => {
             timeEnd(last);
             const cSrc = mod.FS.readFile(`/in${n}.c`);
@@ -149,17 +162,17 @@ export const run = (args) => {
             writeFileSync(inFile, cSrc);
             if (ld === 'none') {
                 timeBegin(cc);
-                execSync(`llvm-box ${cc} ${inFile} ${cFlags} -o ${outFile}`);
+                execSync(`${cc} ${inFile} ${cFlags} -o ${outFile}`);
                 timeEnd(cc);
                 unlinkSync(inFile);
             } else {
                 const midFile = `${cache}/mid${n}.o`;
                 timeBegin(cc);
-                execSync(`llvm-box ${cc} -c -w ${inFile} ${cFlagsBase} -o ${midFile}`);
+                execSync(`${cc} -c -w ${inFile} ${cFlagsBase} -o ${midFile}`);
                 timeEnd(cc);
                 unlinkSync(inFile);
                 timeBegin(ld);
-                execSync(`llvm-box ${ld} --no-entry --whole-archive ${midFile} ${ldFlagsBase} -o ${outFile}`);
+                execSync(`${ld} --no-entry --whole-archive ${midFile} ${ldFlagsBase} -o ${outFile}`);
                 timeEnd(ld);
                 unlinkSync(midFile);
             }
@@ -189,7 +202,7 @@ export const run = (args) => {
 };
 
 try {
-    run(process.argv.slice(2));
+    await run(process.argv.slice(2));
 } catch (e) {
     console.error(e);
 }