Added Mips related compoennts, change wire ui, new UI helpers, new misc compoents

.vscode/settings.json

@@ -1,9 +1,8 @@
 {
   "json.schemaDownload.enable": true,
   "rust-analyzer.linkedProjects": [
-    "./mips/Cargo.toml",
-    "./Cargo.toml",
-    ".\\mips\\Cargo.toml"
+    "./mips-lib/Cargo.toml",
+    // "./Cargo.toml",
   ],
   "cSpell.ignoreWords": [
     "Clippy",
@@ -63,12 +62,47 @@
     "usize",
     "vizia",
     "winit",
-    "xffff"
+    "xffff",
+    "ADDU",
+    "autowire",
+    "BGEZ",
+    "BGEZAL",
+    "BGTZ",
+    "BLEZ",
+    "BLTZAL",
+    "cntr",
+    "funct",
+    "hline",
+    "instrs",
+    "memref",
+    "MIPSCLK",
+    "muxes",
+    "NOTYPE",
+    "shamt",
+    "signzero",
+    "SIGNZEROEXTEND",
+    "SLLV",
+    "SLTI",
+    "SLTIU",
+    "SLTU",
+    "SRAV",
+    "SRLV",
+    "strtab",
+    "SUBU",
+    "symtype",
+    "syncsim",
+    "SYSCALL",
+    "vline",
+    "winapi",
+    "winuser",
+    "XORI",
+    "ZEROEXTEND"
   ],
   "[rust]": {
     "editor.defaultFormatter": "rust-lang.rust-analyzer",
     "editor.formatOnSave": true
-  }
+  },
+
   //,
   // "rust-analyzer.cargo.unsetTest": [
   //   "syncrim"

Cargo.toml

@@ -6,11 +6,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [workspace]
-members = ["mips", "riscv"]
+members = [ "mips-lib", "riscv"]
 
 [dependencies]
+MIPS_disassembly = "0.1.2"
 anyhow = "1.0.72"
 clap = { version = "4.3.15", features = ["derive"] }
+elf = "0.7.4"
 fern = "0.6.2"
 log = "0.4.19"
 num_enum = "0.6.1"

examples/and.rs

@@ -0,0 +1,33 @@
+use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
+use syncrim::{
+    common::{ComponentStore, Input},
+    components::*,
+    fern::fern_setup,
+};
+fn main() {
+    fern_setup();
+    let cs = ComponentStore {
+        store: vec![
+            ProbeEdit::rc_new("A", (100.0, 100.0)),
+            ProbeEdit::rc_new("B", (100.0, 140.0)),
+            And::rc_new(
+                "and",
+                (150.0, 120.0),
+                Input::new("A", PROBE_EDIT_OUT_ID),
+                Input::new("B", PROBE_EDIT_OUT_ID),
+            ),
+            Probe::rc_new("probe", (250.0, 100.0), Input::new("and", AND_OUT_ID)),
+        ],
+    };
+
+    let path = PathBuf::from("and.json");
+    cs.save_file(&path);
+
+    #[cfg(feature = "gui-egui")]
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
+
+    #[cfg(feature = "gui-vizia")]
+    syncrim::gui_vizia::gui(cs, &path);
+}

examples/mips_mux.rs

@@ -0,0 +1,39 @@
+use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
+use syncrim::{
+    common::{ComponentStore, Input},
+    components::*,
+    fern::fern_setup,
+};
+fn main() {
+    fern_setup();
+    let cs = ComponentStore {
+        store: vec![
+            Mux::rc_new(
+                "mux",
+                (200.0, 200.0),
+                Input::new("ctrl", "out"),
+                vec![Input::new("c0", "out"), Input::new("c1", "out")],
+            ),
+            ProbeEdit::rc_new("ctrl", (190.0, 100.0)),
+            Wire::rc_new(
+                "w0",
+                vec![(190.0, 110.0), (190.0, 150.0)],
+                Input::new("ctrl", "out"),
+            ),
+            Constant::rc_new("c0", (140.0, 170.0), 0),
+            Constant::rc_new("c1", (140.0, 190.0), 1),
+            Probe::rc_new("p_mux", (260.0, 200.0), Input::new("mux", "out")),
+        ],
+    };
+
+    let path = PathBuf::from("mux_edit.json");
+    cs.save_file(&path);
+
+    #[cfg(feature = "gui-egui")]
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
+
+    #[cfg(feature = "gui-vizia")]
+    syncrim::gui_vizia::gui(cs, &path);
+}

mips-lib/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+name = "mips-lib"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+MIPS_disassembly = "0.1.2"
+anyhow = "1.0.72"
+clap = { version = "4.3.15", features = ["derive"] }
+elf = "0.7.4"
+fern = "0.6.2"
+log = "0.4.19"
+num_enum = "0.6.1"
+petgraph = "0.6.3"
+rfd = "0.11.4"
+serde = { version = "1.0.171", features = ["rc"] }
+serde_derive = "1.0.171"
+serde_json = "1.0.103"
+typetag = "0.2.10"
+egui = {version = "0.28.0"}
+[dependencies.syncrim]
+path = "../"
+default-features = false
+
+[features]
+default = ["gui-egui"]
+
+components = ["syncrim/components"]
+gui-vizia = ["syncrim/gui-vizia"]
+gui-egui = ["syncrim/gui-egui"]

mips-lib/examples/mips_alu.rs

@@ -0,0 +1,46 @@
+use mips_lib::components::*;
+use std::path::PathBuf;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
+use syncrim::{
+    common::{ComponentStore, Input},
+    components::*,
+    fern::fern_setup,
+};
+
+fn main() {
+    fern_setup();
+    let cs = ComponentStore {
+        store: vec![
+            ALU::rc_new(
+                "full_adder",
+                (200.0, 120.0),
+                Input::new("c0", "out"),
+                Input::new("c1", "out"),
+                Input::new("c2", "out"),
+            ),
+            ProbeEdit::rc_new("c0", (60.0, 100.0)),
+            ProbeEdit::rc_new("c1", (60.0, 140.0)),
+            ProbeEdit::rc_new("c2", (60.0, 180.0)),
+            Probe::rc_new(
+                "p1",
+                (270.0, 120.0),
+                Input::new("full_adder", FULL_ADD_OUT_ID),
+            ),
+        ],
+    };
+
+    let path = PathBuf::from("alu.json");
+    cs.save_file(&path);
+
+    #[cfg(feature = "gui-egui")]
+    {
+        use syncrim::autowire::autowire;
+        let cs = autowire(cs);
+        cs.save_file(&path);
+        syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
+    }
+
+    #[cfg(feature = "gui-vizia")]
+    syncrim::gui_vizia::gui(cs, &path);
+}

mips-lib/examples/mips_controll_unit.rs

@@ -0,0 +1,78 @@
+use mips_lib::components::*;
+use std::path::PathBuf;
+use std::rc::Rc;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
+use syncrim::{
+    common::{ComponentStore, Input},
+    components::*,
+    fern::fern_setup,
+};
+
+fn main() {
+    fern_setup();
+    let cs = ComponentStore {
+        store: vec![
+            Rc::new(ProbeEdit::new("instr", (100.0, 10.0))),
+            ControlUnit::rc_new("cntr", (200.0, 10.0), Input::new("instr", "out")),
+            Probe::rc_new(
+                "reg_dest",
+                (300.0, 10.0),
+                Input::new("cntr", cntr_field::REG_DEST_OUT),
+            ),
+            Probe::rc_new(
+                "reg_write",
+                (300.0, 30.0),
+                Input::new("cntr", cntr_field::REG_WRITE_ENABLE_OUT),
+            ),
+            Probe::rc_new(
+                "reg_write_src",
+                (300.0, 50.0),
+                Input::new("cntr", cntr_field::REG_WRITE_SRC_OUT),
+            ),
+            Probe::rc_new(
+                "alu_op",
+                (300.0, 70.0),
+                Input::new("cntr", cntr_field::ALU_OP_OUT),
+            ),
+            Probe::rc_new(
+                "alu_src_a",
+                (300.0, 90.0),
+                Input::new("cntr", cntr_field::ALU_SRC_A_OUT),
+            ),
+            Probe::rc_new(
+                "alu_src_b",
+                (300.0, 110.0),
+                Input::new("cntr", cntr_field::ALU_SRC_B_OUT),
+            ),
+            Probe::rc_new(
+                "extend_select",
+                (300.0, 130.0),
+                Input::new("cntr", cntr_field::EXTEND_SELECT_OUT),
+            ),
+            Probe::rc_new(
+                "mem_write",
+                (300.0, 150.0),
+                Input::new("cntr", cntr_field::MEM_WRITE_ENABLE_OUT),
+            ),
+            Probe::rc_new(
+                "branch_interrupt",
+                (300.0, 170.0),
+                Input::new("cntr", cntr_field::BRANCH_INTERRUPT_OUT),
+            ),
+        ],
+    };
+    let path = PathBuf::from("cntr_unit.json");
+    cs.save_file(&path);
+
+    #[cfg(feature = "gui-egui")]
+    {
+        use syncrim::autowire::autowire;
+        let cs = autowire(cs);
+        cs.save_file(&path);
+        syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
+    }
+
+    #[cfg(feature = "gui-vizia")]
+    syncrim::gui_vizia::gui(cs, &path);
+}

mips-lib/examples/mips_im_dm_regfile.rs

@@ -0,0 +1,75 @@
+use mips_lib::components::*;
+use std::path::PathBuf;
+use std::rc::Rc;
+#[cfg(feature = "gui-egui")]
+use syncrim::gui_egui::editor::Library;
+use syncrim::{
+    common::{ComponentStore, Input},
+    components::*,
+    fern::fern_setup,
+};
+
+fn main() {
+    fern_setup();
+
+    let cs = ComponentStore {
+        store: vec![
+            Rc::new(PhysicalMem::new("phys_mem", (0.0, 0.0))),
+            ProbeEdit::rc_new("rs_addr", (60.0, 100.0)),
+            ProbeEdit::rc_new("rt_addr", (60.0, 140.0)),
+            ProbeEdit::rc_new("write_addr", (60.0, 180.0)),
+            ProbeEdit::rc_new("write_data", (60.0, 220.0)),
+            ProbeEdit::rc_new("write_enable", (60.0, 260.0)),
+            Probe::rc_new(
+                "rs",
+                (300.0, 120.0),
+                Input::new("reg_file", reg_file_fields::RS_VALUE_OUT_ID),
+            ),
+            Probe::rc_new(
+                "rt",
+                (60.0, 400.0),
+                Input::new("reg_file", reg_file_fields::RT_VALUE_OUT_ID),
+            ),
+            ProbeEdit::rc_new("pc", (60.0, 500.0)),
+            Rc::new(InstrMem::new(
+                "instr_mem".into(),
+                (200.0, 500.0),
+                Input::new("pc", "out"),
+                "phys_mem".into(),
+                "reg_file".into(),
+            )),
+            ProbeEdit::rc_new("data_adrs", (60.0, 660.0)),
+            ProbeEdit::rc_new("data_write_enable", (60.0, 700.0)),
+            ProbeEdit::rc_new("data_mem_op", (60.0, 740.0)),
+            ProbeEdit::rc_new("data_write_data", (60.0, 780.0)),
+            Rc::new(DataMem::new(
+                "data_mem".into(),
+                (200.0, 700.0),
+                Input::new("data_adrs", "out"),
+                Input::new("data_write_data", "out"),
+                Input::new("data_mem_op", "out"),
+                Input::new("data_write_enable", "out"),
+                "phys_mem".into(),
+                "reg_file".into(),
+            )),
+            RegFile::rc_new(
+                "reg_file",
+                (200.0, 200.0),
+                Input::new("rs_addr", "out"),
+                Input::new("rt_addr", "out"),
+                Input::new("write_addr", "out"),
+                Input::new("write_data", "out"),
+                Input::new("write_enable", "out"),
+            ),
+        ],
+    };
+
+    let path = PathBuf::from("add.json");
+    cs.save_file(&path);
+
+    #[cfg(feature = "gui-egui")]
+    syncrim::gui_egui::gui(cs, &path, Library::default()).ok();
+
+    #[cfg(feature = "gui-vizia")]
+    syncrim::gui_vizia::gui(cs, &path);
+}