Add wasm worker base

package.json

@@ -32,6 +32,8 @@
     "tailwindcss": "^3.2.4",
     "typescript": "^4.6.4",
     "vite": "^5.1.1",
+    "vite-plugin-top-level-await": "^1.4.1",
+    "vite-plugin-wasm": "^3.3.0",
     "vue-tsc": "^1.0.0"
   }
 }

src-backend/src/build.rs

@@ -3,14 +3,15 @@ use std::collections::HashMap;
 use std::io::Cursor;
 use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
-use titan::assembler::binary::Binary;
+use titan::assembler::binary::{Binary, RegionFlags};
 use titan::assembler::line_details::LineDetails;
 use titan::assembler::string::{assemble_from, assemble_from_path, SourceError};
 use titan::cpu::memory::{Mountable, Region};
 use titan::cpu::memory::section::SectionMemory;
 use titan::cpu::{Memory, State};
 use titan::execution::elf::inspection::Inspection;
 use titan::elf::Elf;
+use titan::elf::program::ProgramHeaderFlags;
 use crate::keyboard::{KeyboardHandler, KeyboardState, KEYBOARD_SELECTOR};
 
 pub const TIME_TRAVEL_HISTORY_SIZE: usize = 1000;
@@ -40,6 +41,24 @@ pub enum AssemblerResult {
     },
 }
 
+pub fn get_elf_finished_pcs(elf: &Elf) -> Vec<u32> {
+    elf
+        .program_headers
+        .iter()
+        .filter(|header| header.flags.contains(ProgramHeaderFlags::EXECUTABLE))
+        .map(|header| header.virtual_address + header.data.len() as u32)
+        .collect()
+}
+
+pub fn get_binary_finished_pcs(binary: &Binary) -> Vec<u32> {
+    binary
+        .regions
+        .iter()
+        .filter(|region| region.flags.contains(RegionFlags::EXECUTABLE))
+        .map(|region| region.address + region.data.len() as u32)
+        .collect()
+}
+
 impl AssemblerResult {
     pub fn from_result_with_binary(
         result: Result<Binary, SourceError>,

src-backend/src/execution.rs

@@ -153,7 +153,7 @@ pub trait RewindableDevice: ExecutionDevice + ExecutionRewindable { }
 pub trait ExecutionDevice: Send + Sync {
     async fn resume(
         &self,
-        count: Option<u32>,
+        count: Option<usize>,
         breakpoints: Option<Vec<u32>>,
         display: Option<FlushDisplayBody>
     ) -> Result<ResumeResult, ()>;
@@ -177,7 +177,7 @@ pub trait ExecutionDevice: Send + Sync {
 impl<Mem: Memory + Send, Track: Tracker<Mem> + Send> ExecutionDevice for ExecutionState<Mem, Track> {
     async fn resume(
         &self,
-        count: Option<u32>,
+        count: Option<usize>,
         breakpoints: Option<Vec<u32>>,
         display: Option<FlushDisplayBody>
     ) -> Result<ResumeResult, ()> {
@@ -200,6 +200,7 @@ impl<Mem: Memory + Send, Track: Tracker<Mem> + Send> ExecutionDevice for Executi
 
         let (frame, result) = {
             if let Some(count) = count {
+                // Taylor: Why did I split the last iteration out?
                 for _ in 0..count - 1 {
                     delegate.cycle(&debugger).await;
                 }

src-backend/src/hex_format.rs

@@ -1,8 +1,8 @@
 use std::cmp::min;
 use byteorder::ByteOrder;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, Deserialize)]
+#[derive(Copy, Clone, Serialize, Deserialize)]
 #[serde(rename_all="snake_case")]
 pub enum HexEncoding {
     Byte,

src-backend/src/regions.rs

@@ -11,14 +11,14 @@ pub struct HexRegion {
     pub data: String // base64 encoded
 }
 
-#[derive(Copy, Clone, Deserialize)]
+#[derive(Copy, Clone, Serialize, Deserialize)]
 #[serde(rename_all="snake_case")]
 pub enum AssembleRegionsKind {
     Plain,
     HexV3
 }
 
-#[derive(Deserialize)]
+#[derive(Serialize, Deserialize)]
 pub struct AssembleRegionsOptions {
     pub kind: AssembleRegionsKind,
     pub continuous: bool,

src-tauri/src/build.rs

@@ -10,7 +10,7 @@ use titan::execution::Executor;
 use titan::execution::trackers::empty::EmptyTracker;
 use titan::execution::trackers::history::HistoryTracker;
 use titan::execution::trackers::Tracker;
-use saturn_backend::build::{assemble_text, AssemblerResult, configure_keyboard, create_elf_state, DisassembleResult, PrintPayload, TIME_TRAVEL_HISTORY_SIZE};
+use saturn_backend::build::{assemble_text, AssemblerResult, configure_keyboard, create_elf_state, DisassembleResult, get_binary_finished_pcs, get_elf_finished_pcs, PrintPayload, TIME_TRAVEL_HISTORY_SIZE};
 use saturn_backend::device::{ExecutionState, setup_state, state_from_binary};
 use saturn_backend::execution::RewindableDevice;
 use saturn_backend::keyboard::KeyboardState;
@@ -92,13 +92,8 @@ pub fn configure_elf(
 ) -> bool {
     let Ok(elf) = Elf::read(&mut Cursor::new(bytes)) else { return false };
 
-    let finished_pcs = elf
-        .program_headers
-        .iter()
-        .filter(|header| header.flags.contains(ProgramHeaderFlags::EXECUTABLE))
-        .map(|header| header.virtual_address + header.data.len() as u32)
-        .collect();
-
+    let finished_pcs = get_elf_finished_pcs(&elf);
+
     let console = forward_print(app_handle.clone());
     let midi = Box::new(ForwardMidi::new(app_handle));
     let history = HistoryTracker::new(TIME_TRAVEL_HISTORY_SIZE);
@@ -151,12 +146,7 @@ pub fn configure_asm(
 
     let Some(binary) = binary else { return result };
 
-    // No EXECUTABLE marked regions from assembler yet.
-    let finished_pcs = binary
-        .regions
-        .iter()
-        .map(|region| region.address + region.data.len() as u32)
-        .collect();
+    let finished_pcs = get_binary_finished_pcs(&binary);
 
     let console = forward_print(app_handle.clone());
     let midi = Box::new(ForwardMidi::new(app_handle));

src-tauri/src/state.rs

@@ -5,16 +5,16 @@ use saturn_backend::execution::{ResumeResult, RewindableDevice};
 pub type DebuggerBody = Mutex<Option<Arc<dyn RewindableDevice>>>;
 
 #[tauri::command]
-pub async fn last_pc(state: tauri::State<'_, DebuggerBody>) -> Result<Option<u32>, ()> {
-    Ok(state.lock().unwrap()
+pub fn last_pc(state: tauri::State<'_, DebuggerBody>) -> Option<u32> {
+    state.lock().unwrap()
         .as_ref()
         .map(|debugger| debugger.last_pc())
-        .and_then(|x| x))
+        .and_then(|x| x)
 }
 
 #[tauri::command]
 pub async fn resume(
-    count: Option<u32>,
+    count: Option<usize>,
     breakpoints: Option<Vec<u32>>,
     state: tauri::State<'_, DebuggerBody>,
     display: tauri::State<'_, FlushDisplayBody>,

src-wasm/Cargo.toml

@@ -10,7 +10,11 @@ crate-type = ["cdylib", "rlib"]
 default = ["console_error_panic_hook"]
 
 [dependencies]
+serde = "1.0.197"
+serde_json = "1.0.114"
 wasm-bindgen = "0.2.91"
+wasm-bindgen-futures = "0.4.41"
+serde-wasm-bindgen = "0.6.4"
 
 console_error_panic_hook = { version = "0.1.7", optional = true }
 

src-wasm/pack.sh

@@ -0,0 +1 @@
+wasm-pack build --out-dir ../src/utils/mips/wasm/

src-wasm/src/console.rs

@@ -0,0 +1,9 @@
+use saturn_backend::syscall::ConsoleHandler;
+
+pub struct WasmConsole { }
+
+impl ConsoleHandler for WasmConsole {
+    fn print(&mut self, _text: &str, _error: bool) {
+        todo!()
+    }
+}