p2bin is working

Author: kirjavascript

app/components/file/file-object.js

@@ -126,10 +126,6 @@ export const FileObject = observer(({ obj }) => {
         ioWrap(obj.mappings.path, setMappingError, e, async (path) => {
             if (!obj.dplcs.enabled) environment.config.dplcsEnabled = false;
 
-            if (mappingsASM) {
-                await assemble(await fs.readFile(path, 'utf8'))
-            }
-
             const buffer = mappingsASM
                 ? parseASM(await fs.readFile(path, 'utf8'))
                 : await fs.readFile(path);

app/formats/asm/index.js

@@ -4,45 +4,48 @@ import asmsg from './messages/as.msg';
 import ioerrsmsg from './messages/ioerrs.msg';
 import cmdargmsg from './messages/cmdarg.msg';
 import p2binmsg from './messages/p2bin.msg';
+import toolsmsg from './messages/tools.msg';
 
-const messages = {
+const asMessages = {
     asmsg,
     ioerrsmsg,
     cmdargmsg,
 };
 
+const p2binMessages = {
+    p2binmsg,
+    ioerrsmsg,
+    cmdargmsg,
+    toolsmsg,
+};
+
 export async function assemble(
     code,
     { filename } = {
         filename: 'code.asm',
     },
 ) {
-    console.time('assemble');
-
     const aslWorker = new Worker('bundles/asl-worker.js');
     const asl = Comlink.wrap(aslWorker);
 
-    const pFile = await asl.assemble(prelude + code, { messages, filename });
+    const pFile = await asl.assemble(prelude + code, {
+        messages: asMessages,
+        filename,
+    });
     aslWorker.terminate();
 
-    console.log(pFile);
-
     const p2binWorker = new Worker('bundles/p2bin-worker.js');
     const p2bin = Comlink.wrap(p2binWorker);
     const bin = await p2bin.binary(pFile, {
-        messages: { p2binmsg },
+        messages: p2binMessages,
     });
     p2binWorker.terminate();
 
-    console.log(bin);
-
-    console.timeEnd('assemble');
-
     return bin;
 }
 
 const prelude = `SonicMappingsVer := 2
-
+SonicDplcVer = 2
 ; macro to declare a mappings table (taken from Sonic 2 Hg disassembly)
 mappingsTable macro {INTLABEL}
 __LABEL__ label *

app/formats/asm/messages/tools.msg

@@ -2,48 +2,34 @@ import * as Comlink from 'comlink';
 
 const endStr = '__flex2__done__';
 
-const errorList = [];
-
 function binary(pFile, { messages }) {
     return new Promise((resolve, reject) => {
         self.Module = {
             locateFile: url => `../wasm/${url}`,
-            arguments: ['data.p'],
+            arguments: ['-q', 'data.p'],
             print: (text) => {
-                console.log(1);
-                if (text === endStr) return handleResult(resolve, reject);
+                if (text === endStr) return resolve(FS.readFile('data.bin'));
                 console.log('p2bin: ' + text);
             },
             printErr: (text) => {
-                errorList.push(text);
+                reject({
+                    name: 'P2BinError',
+                    message: text,
+                });
             },
             onAbort: console.error,
             preInit: () => {
                 FS.writeFile('p2bin.msg', messages.p2binmsg);
+                FS.writeFile('ioerrs.msg', messages.ioerrsmsg);
+                FS.writeFile('cmdarg.msg', messages.cmdargmsg);
+                FS.writeFile('tools.msg', messages.toolsmsg);
                 FS.writeFile('data.p', pFile);
-                console.log(1);
             },
         };
-        console.log(1);
         importScripts('../wasm/p2bin.js');
     });
 }
 
-function handleResult(resolve, reject) {
-    if (errorList.length) return reject({
-        name: 'P2BinError',
-        message: '\n\n' + errorList.join('\n')
-    });
-
-    // const outputs = FS.readdir('/').filter(d => d.endsWith('.bin'));
-
-    // if (!outputs.length) return reject(new Error('cannot find .bin'));
-
-    // const [binPath] = outputs;
-
-    // resolve(FS.readFile(binPath));
-}
-
 Comlink.expose({
     binary,
 });