Egui editor

examples/add.rs

@@ -40,8 +40,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/add_edit.rs

@@ -40,8 +40,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/add_mux.rs

@@ -107,8 +107,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/add_reg.rs

@@ -66,8 +66,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/add_reg_compound_wire.rs

@@ -48,8 +48,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/data_mem.rs

@@ -79,8 +79,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/mux_edit.rs

@@ -63,8 +63,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/probe_constant.rs

@@ -15,8 +15,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/probe_edit.rs

@@ -18,8 +18,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/probe_stim.rs

@@ -11,8 +11,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/probe_stim_assert.rs

@@ -23,8 +23,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

examples/sext.rs

@@ -29,8 +29,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

mips/examples/mips.rs

@@ -68,8 +68,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

mips/examples/reg_file.rs

@@ -92,8 +92,8 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }

mips/src/components/instr_mem.rs

@@ -1,9 +1,14 @@
 use serde::{Deserialize, Serialize};
 use std::rc::Rc;
 use syncrim::common::{
-    Component, Condition, Input, OutputType, Ports, SignalUnsigned, SignalValue, Simulator,
+    Component, Condition, Input, InputPort, OutputType, Ports, SignalUnsigned, SignalValue,
+    Simulator,
 };
 
+pub const INSTR_MEM_PC_ID: &str = "pc";
+
+pub const INSTR_MEM_OUT_ID: &str = "out";
+
 #[derive(Serialize, Deserialize)]
 pub struct InstrMem {
     pub(crate) id: String,
@@ -24,9 +29,12 @@ impl Component for InstrMem {
         (
             self.id.clone(),
             Ports {
-                inputs: vec![self.pc.clone()],
+                inputs: vec![InputPort {
+                    port_id: INSTR_MEM_PC_ID.to_string(),
+                    input: self.pc.clone(),
+                }],
                 out_type: OutputType::Combinatorial,
-                outputs: vec!["out".into()],
+                outputs: vec![INSTR_MEM_OUT_ID.to_string()],
             },
         )
     }
@@ -47,7 +55,7 @@ impl Component for InstrMem {
 
         // set output
         trace!("--- output {:?}", instr);
-        simulator.set_out_value(&self.id, "out", instr);
+        simulator.set_out_value(&self.id, INSTR_MEM_OUT_ID, instr);
         Ok(())
     }
 }

mips/src/components/reg_file.rs

@@ -3,7 +3,9 @@ use num_enum::TryFromPrimitive;
 use serde::{Deserialize, Serialize};
 use std::ops::{Deref, Range};
 use std::{cell::RefCell, rc::Rc};
-use syncrim::common::{Component, Condition, Input, OutputType, Ports, SignalUnsigned, Simulator};
+use syncrim::common::{
+    Component, Condition, Input, InputPort, OutputType, Ports, SignalUnsigned, Simulator,
+};
 
 #[allow(non_camel_case_types)]
 #[rustfmt::skip]
@@ -44,6 +46,15 @@ pub enum Reg {
     ra      = 31,   // Return address (used by function calls)
 }
 
+pub const REG_FILE_READ_ADDR1_ID: &str = "read_addr1";
+pub const REG_FILE_READ_ADDR2_ID: &str = "read_addr2";
+pub const REG_FILE_WRITE_DATA_ID: &str = "write_data";
+pub const REG_FILE_WRITE_ADDR_ID: &str = "write_addr";
+pub const REG_FILE_WRITE_ENABLE_ID: &str = "write_enable";
+
+pub const REG_FILE_REG_A_OUT: &str = "reg_a";
+pub const REG_FILE_REG_B_OUT: &str = "reg_b";
+
 #[derive(Serialize, Deserialize)]
 pub struct RegFile {
     pub(crate) id: String,
@@ -203,11 +214,26 @@ impl Component for RegFile {
             self.id.clone(),
             Ports {
                 inputs: vec![
-                    self.read_addr1.clone(),
-                    self.read_addr2.clone(),
-                    self.write_addr.clone(),
-                    self.write_data.clone(),
-                    self.write_enable.clone(),
+                    InputPort {
+                        port_id: REG_FILE_READ_ADDR1_ID.to_string(),
+                        input: self.read_addr1.clone(),
+                    },
+                    InputPort {
+                        port_id: REG_FILE_READ_ADDR2_ID.to_string(),
+                        input: self.read_addr2.clone(),
+                    },
+                    InputPort {
+                        port_id: REG_FILE_WRITE_DATA_ID.to_string(),
+                        input: self.write_data.clone(),
+                    },
+                    InputPort {
+                        port_id: REG_FILE_WRITE_ADDR_ID.to_string(),
+                        input: self.write_addr.clone(),
+                    },
+                    InputPort {
+                        port_id: REG_FILE_WRITE_ENABLE_ID.to_string(),
+                        input: self.write_enable.clone(),
+                    },
                 ],
                 out_type: OutputType::Combinatorial,
                 outputs: vec!["reg_a".into(), "reg_b".into()],
@@ -230,11 +256,11 @@ impl Component for RegFile {
         // read after write
         let reg_value_a = self.read_reg(simulator, &self.read_addr1);
         trace!("reg_value {}", reg_value_a);
-        simulator.set_out_value(&self.id, "reg_a", reg_value_a);
+        simulator.set_out_value(&self.id, REG_FILE_REG_A_OUT, reg_value_a);
 
         let reg_value_b = self.read_reg(simulator, &self.read_addr2);
         trace!("reg_value {}", reg_value_b);
-        simulator.set_out_value(&self.id, "reg_b", reg_value_b);
+        simulator.set_out_value(&self.id, REG_FILE_REG_B_OUT, reg_value_b);
         Ok(())
     }
 }
@@ -279,7 +305,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(&cs);
+        let mut simulator = Simulator::new(cs).unwrap();
 
         assert_eq!(simulator.cycle, 1);
 

mips/src/main.rs

@@ -6,8 +6,11 @@ fn main() {
     fern_setup();
 
     let path = PathBuf::from("mips.json");
-    let _cs = ComponentStore::load_file(&path);
+    let cs = ComponentStore::load_file(&path);
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&_cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
+
+    #[cfg(not(any(feature = "gui-vizia", feature = "gui-egui")))]
+    syncrim::common::Simulator::new(cs);
 }

riscv/examples/riscv.rs

@@ -237,10 +237,10 @@ fn main() {
     cs.save_file(&path);
 
     #[cfg(feature = "gui-egui")]
-    syncrim::gui_egui::gui(&cs, &path).ok();
+    syncrim::gui_egui::gui(cs, &path).ok();
 
     #[cfg(feature = "gui-vizia")]
-    syncrim::gui_vizia::gui(&cs, &path);
+    syncrim::gui_vizia::gui(cs, &path);
 }
 #[allow(unused_imports)]
 use log::LevelFilter;

riscv/src/components/alu.rs

@@ -1,10 +1,16 @@
 use log::trace;
 use serde::{Deserialize, Serialize};
 use syncrim::{
-    common::{Component, Condition, Input, OutputType, Ports, SignalValue, Simulator},
+    common::{Component, Condition, Input, InputPort, OutputType, Ports, SignalValue, Simulator},
     signal::SignalSigned,
 };
 
+pub const ALU_OPERATOR_I_ID: &str = "operator_i";
+pub const ALU_OPERAND_A_I_ID: &str = "operand_a_i";
+pub const ALU_OPERAND_B_I_ID: &str = "operand_b_i";
+
+pub const ALU_RESULT_O_ID: &str = "result_o";
+
 #[derive(Serialize, Deserialize)]
 pub struct ALU {
     pub id: String,
@@ -24,20 +30,30 @@ impl Component for ALU {
     fn get_id_ports(&self) -> (String, Ports) {
         (
             self.id.clone(),
-            Ports {
-                inputs: vec![
-                    self.operator_i.clone(),
-                    self.operand_a_i.clone(),
-                    self.operand_b_i.clone(),
+            Ports::new(
+                vec![
+                    &InputPort {
+                        port_id: ALU_OPERATOR_I_ID.to_string(),
+                        input: self.operator_i.clone(),
+                    },
+                    &InputPort {
+                        port_id: ALU_OPERAND_A_I_ID.to_string(),
+                        input: self.operand_a_i.clone(),
+                    },
+                    &InputPort {
+                        port_id: ALU_OPERAND_B_I_ID.to_string(),
+                        input: self.operand_b_i.clone(),
+                    },
                     //self.operand_c_i.clone(),
                 ],
-                out_type: OutputType::Combinatorial,
-                outputs: vec![
-                    "result_o".into(),
+                OutputType::Combinatorial,
+                vec![
+                    ALU_RESULT_O_ID,
+                    //"result_o".into(),
                     //"comparison_result_o".into(),
                     //"ready_o".into(),
                 ],
-            },
+            ),
         )
     }
     #[allow(non_snake_case)]
@@ -159,7 +175,7 @@ mod test {
             ],
         };
 
-        let mut simulator = Simulator::new(&cs);
+        let mut simulator = Simulator::new(cs).unwrap();
         assert_eq!(simulator.cycle, 1);
 
         // outputs