feat: bump emscripten to v4 (#404)

Author: mnixry

frontend/src/pages/AssemblerPage.tsx

@@ -121,8 +121,18 @@ export default function AssemblerPage(props: StackProps) {
       printErr: (str) =>
         output.push({ program: "gnu-as", line: str, fd: "stderr" }),
       arguments: [...asParams, "-o", "/tmp/a.out", "/tmp/a.s"],
-      preRun: [(m) => m.FS.writeFile("/tmp/a.s", inputData)],
-      postRun: [(m) => (elf = m.FS.readFile("/tmp/a.out"))],
+      preRun: [
+        (m) => {
+          m.FS.writeFile("/tmp/a.s", inputData);
+        },
+      ],
+      postRun: [
+        (m) => {
+          try {
+            elf = m.FS.readFile("/tmp/a.out");
+          } catch (e) {}
+        },
+      ],
     });
 
     if (!elf) {
@@ -145,7 +155,21 @@ export default function AssemblerPage(props: StackProps) {
   useEffect(() => {
     startLoading();
     assemble()
-      .catch((e) => setOutput([{ program: "internal", line: e, fd: "stderr" }]))
+      .catch((e) => {
+        console.error(e);
+        setOutput([
+          {
+            program: "internal",
+            line:
+              typeof e === "string"
+                ? e
+                : e instanceof Error
+                  ? String(e)
+                  : JSON.stringify(e),
+            fd: "stderr",
+          },
+        ]);
+      })
       .finally(stopLoading);
   }, [assemble, startLoading, stopLoading]);
 

frontend/src/pages/DisassemblerPage.tsx

@@ -79,7 +79,9 @@ export default function DisassemblerPage(props: StackProps) {
     if (formattedInput !== undefined) {
       setOutput([]);
       setInputBinary(
-        new Uint8Array(formattedInput.split(/\s/g).map((x) => parseInt(x, 16))),
+        new Uint8Array(
+          formattedInput.split(/\s/g).map((x) => Number.parseInt(x, 16)),
+        ),
       );
     } else {
       setOutput([
@@ -121,7 +123,7 @@ export default function DisassemblerPage(props: StackProps) {
       b: selectedProcessorBits,
     });
 
-    const objDumpArgs = ["-w", "-d", `--adjust-vma=0`, "-b", bfdName];
+    const objDumpArgs = ["-w", "-d", "--adjust-vma=0", "-b", bfdName];
     if (!showByte) objDumpArgs.push("--no-show-raw-insn");
     if (showIntelSyntax) objDumpArgs.push("-M", "intel");
     setObjDumpParamString(shlex.join(objDumpArgs));
@@ -166,13 +168,14 @@ export default function DisassemblerPage(props: StackProps) {
   const disassemble = useCallback(async () => {
     if (!objDumpParams || !objCopyParams || !inputBinary?.length) return;
 
-    const objdump = await loader("objdump"),
-      objcopy = await loader("objcopy");
+    const objdump = await loader("objdump");
+    const objcopy = await loader("objcopy");
 
     const output = [] as ExecutionOutput[];
-    const logErr = (line: string) => (
-      output.push({ fd: "stderr", program: "internal", line }), output
-    );
+    const logErr = (line: string) => {
+      output.push({ fd: "stderr", program: "internal", line });
+      return output;
+    };
 
     let copiedBinary = undefined as Uint8Array | undefined;
     await objcopy({
@@ -181,14 +184,24 @@ export default function DisassemblerPage(props: StackProps) {
       printErr: (line) =>
         output.push({ fd: "stderr", program: "objcopy", line }),
       preRun: [(m) => m.FS.writeFile("/tmp/a.out", inputBinary)],
-      postRun: [(m) => (copiedBinary = m.FS.readFile("/tmp/a.bin"))],
+      postRun: [
+        (m) => {
+          try {
+            copiedBinary = m.FS.readFile("/tmp/a.bin");
+          } catch (e) {
+            return logErr(
+              `objcopy failed to copy the binary: ${JSON.stringify(e)}`,
+            );
+          }
+        },
+      ],
     });
     if (!copiedBinary) return logErr("objcopy failed to copy the binary.");
 
     let dumpStdout = "";
     await objdump({
       arguments: [...objDumpParams, "/tmp/a.out"],
-      print: (line) => (dumpStdout += line + "\n"),
+      print: (line) => (dumpStdout += `${line}\n`),
       printErr: (line) =>
         output.push({ fd: "stderr", program: "objdump", line }),
       preRun: [(m) => m.FS.writeFile("/tmp/a.out", copiedBinary!)],

packages/binutils/build/Dockerfile

@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:3.1.74 AS builder
+FROM emscripten/emsdk:4.0.6 AS builder
 
 RUN apt-get update && \
     apt-get install -y git bison flex texinfo --no-install-recommends && \

packages/gas/build/Dockerfile

@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:3.1.74 AS builder
+FROM emscripten/emsdk:4.0.6 AS builder
 
 RUN apt-get update && \
     apt-get install -y git bison flex texinfo parallel --no-install-recommends && \