From df0b107a4ab2a6120b2e829790b35110be972d13 Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Fri, 15 Mar 2024 13:33:23 -0400
Subject: [PATCH 01/21] Add Stack Segment view

---
 src/bin/main.rs                    | 19 +++----
 src/emulation_core/mips/memory.rs  | 45 ++++++----------
 src/ui/assembled_view/component.rs | 85 ++++++++++++++++++++++++++----
 src/ui/footer/component.rs         | 49 +++++++----------
 src/ui/hex_editor/component.rs     |  7 ++-
 src/ui/swim_editor/component.rs    | 45 +++++++---------
 src/ui/swim_editor/tab.rs          | 31 +++++++++++
 7 files changed, 174 insertions(+), 107 deletions(-)

diff --git a/src/bin/main.rs b/src/bin/main.rs
index d624e7975..b9b80d666 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -18,11 +18,13 @@ use swim::ui::footer::component::Footer;
 use swim::ui::regview::component::Regview;
 use swim::ui::swim_editor::component::SwimEditor;
 use swim::{
-    emulation_core::{architectures::AvailableDatapaths, mips::instruction::get_string_version},
+    emulation_core::{
+        architectures::AvailableDatapaths, mips::gp_registers::GpRegisterType,
+        mips::instruction::get_string_version,
+    },
     ui::{
-        footer::component::FooterTabState,
         hex_editor::component::{parse_hexdump, UpdatedLine},
-        swim_editor::component::EditorTabState,
+        swim_editor::tab::TabState,
     },
 };
 use wasm_bindgen::{JsCast, JsValue};
@@ -81,8 +83,8 @@ fn app(props: &AppProps) -> Html {
     let command = use_state_eq(|| String::from("(Test) Enter a string"));
 
     // Store the currently selected tabs in windows
-    let console_active_tab = use_state_eq(FooterTabState::default);
-    let editor_active_tab = use_state_eq(|| EditorTabState::Editor);
+    let console_active_tab = use_state_eq(|| TabState::Console);
+    let editor_active_tab = use_state_eq(|| TabState::Editor);
 
     let datapath_state = use_reducer(DatapathReducer::default);
 
@@ -91,7 +93,7 @@ fn app(props: &AppProps) -> Html {
     {
         let dispatcher = datapath_state.dispatcher();
         use_effect_with_deps(
-            move |communicator| {
+            move |communicator: &&DatapathCommunicator| {
                 spawn_local(communicator.listen_for_updates(dispatcher));
             },
             props.communicator,
@@ -463,7 +465,6 @@ fn app(props: &AppProps) -> Html {
         )
     };
 
-    log::debug!("{:?}", datapath_state.executing);
     html! {
         <>
             // button tied to the input file element, which is hidden to be more clean
@@ -522,11 +523,11 @@ fn app(props: &AppProps) -> Html {
 
                     // Editor
                     <div class="flex flex-col grow min-h-16 mt-2">
-                        <SwimEditor text_model={text_model} lines_content={lines_content} program_info={program_info_ref.borrow().clone()} pc_limit={*pc_limit} binary={binary_ref.borrow().clone()} memory_curr_instr={memory_curr_instr.clone()} editor_curr_line={editor_curr_line.clone()} editor_active_tab={editor_active_tab.clone()} console_active_tab={console_active_tab.clone()} pc={datapath_state.mips.registers.pc} communicator={props.communicator} current_architecture={datapath_state.current_architecture.clone()} speed={datapath_state.speed}/>
+                        <SwimEditor text_model={text_model} lines_content={lines_content} program_info={program_info_ref.borrow().clone()} pc_limit={*pc_limit} binary={binary_ref.borrow().clone()} memory_curr_instr={memory_curr_instr.clone()} editor_curr_line={editor_curr_line.clone()} editor_active_tab={editor_active_tab.clone()} console_active_tab={console_active_tab.clone()} pc={datapath_state.mips.registers.pc} communicator={props.communicator} current_architecture={datapath_state.current_architecture.clone()} speed={datapath_state.speed} sp={datapath_state.mips.registers[GpRegisterType::Sp]} memory={datapath_state.mips.memory.clone()}/>
                     </div>
 
                     // Console
-                    <Footer parsermsg={(*parser_text_output).clone()} datapath_state={datapath_state.clone()} memory_text_model={memory_text_model} memory_curr_instr={memory_curr_instr.clone()} active_tab={console_active_tab.clone()} communicator={props.communicator} show_input={show_input.clone()} command={command.clone()} on_memory_clicked={on_memory_clicked.clone()}/>
+                    <Footer parsermsg={(*parser_text_output).clone()} datapath_state={datapath_state.clone()} memory_text_model={memory_text_model} memory_curr_instr={memory_curr_instr.clone()} active_tab={console_active_tab.clone()} communicator={props.communicator} show_input={show_input.clone()} command={command.clone()} on_memory_clicked={on_memory_clicked.clone()} pc_limit={pc_limit.clone()}/>
                 </div>
 
                 // Right column
diff --git a/src/emulation_core/mips/memory.rs b/src/emulation_core/mips/memory.rs
index ad2513e32..ed772335c 100644
--- a/src/emulation_core/mips/memory.rs
+++ b/src/emulation_core/mips/memory.rs
@@ -159,33 +159,11 @@ impl Memory {
         Ok(result)
     }
 
-    // // Returns instructions that were updated with their string versions and line numbers
-    // pub fn store_hexdump(&mut self, instructions: Vec<u32>) -> Result<Vec<UpdatedLine>, String> {
-    //     let mut changed_lines: Vec<UpdatedLine> = vec![];
-    //     for (i, data) in instructions.iter().enumerate() {
-    //         let address = i as u64;
-    //         let line = match get_string_version(*data) {
-    //             Ok(string) => string,
-    //             Err(string) => string,
-    //         };
-    //         let curr_word = match self.load_word(address * 4) {
-    //             Ok(data) => data,
-    //             Err(e) => {
-    //                 debug!("{:?}", e);
-    //                 0
-    //             }
-    //         };
-    //         if curr_word != *data {
-    //             changed_lines.push(UpdatedLine::new(line, i));
-    //             self.store_word(address * 4, *data)?
-    //         }
-    //     }
-
-    //     Ok(changed_lines)
-    // }
-
-    pub fn generate_formatted_hex(&self) -> String {
-        let iterator = MemoryIter::new(self);
+    pub fn generate_formatted_hex(&self, end_address: usize) -> String {
+        if end_address == 0 {
+            return "".to_string();
+        }
+        let iterator = MemoryIter::new(self, 0, end_address);
 
         let mut string: String = "".to_string();
 
@@ -221,13 +199,19 @@ impl Memory {
 pub struct MemoryIter<'a> {
     memory: &'a Memory,
     current_address: usize,
+    end_address: usize,
 }
 
 impl<'a> MemoryIter<'a> {
-    pub fn new(memory: &'a Memory) -> MemoryIter<'a> {
+    pub fn new(
+        memory: &'a Memory,
+        current_address: usize,
+        end_address: usize,
+    ) -> MemoryIter<'a> {
         MemoryIter {
             memory,
-            current_address: 0,
+            current_address,
+            end_address,
         }
     }
 }
@@ -237,7 +221,8 @@ impl<'a> Iterator for MemoryIter<'a> {
     type Item = (usize, Vec<u32>);
     fn next(&mut self) -> Option<Self::Item> {
         self.current_address = (self.current_address + 3) & !3;
-        if self.current_address + 16 <= self.memory.memory.len() {
+        if self.current_address + 16 <= self.end_address
+        {
             let address = self.current_address;
             let words = (0..4)
                 .map(|i| self.memory.load_word(address as u64 + (i * 4)).unwrap())
diff --git a/src/ui/assembled_view/component.rs b/src/ui/assembled_view/component.rs
index 359748b4c..dca702f27 100644
--- a/src/ui/assembled_view/component.rs
+++ b/src/ui/assembled_view/component.rs
@@ -2,10 +2,10 @@ use std::cell::RefCell;
 use std::rc::Rc;
 
 use crate::agent::datapath_communicator::DatapathCommunicator;
+use crate::emulation_core::mips::memory::{Memory, MemoryIter, CAPACITY_BYTES};
 // use monaco::api::TextModel;
 use crate::parser::parser_structs_and_enums::ProgramInfo;
-use crate::ui::footer::component::FooterTabState;
-use crate::ui::swim_editor::component::EditorTabState;
+use crate::ui::swim_editor::tab::TabState;
 use log::debug;
 use wasm_bindgen::JsCast;
 use web_sys::{HtmlElement, HtmlInputElement};
@@ -21,8 +21,8 @@ pub struct TextSegmentProps {
     pub memory_curr_instr: UseStateHandle<u64>,
     pub editor_curr_line: UseStateHandle<f64>,
     pub pc: u64,
-    pub editor_active_tab: UseStateHandle<EditorTabState>,
-    pub console_active_tab: UseStateHandle<FooterTabState>,
+    pub editor_active_tab: UseStateHandle<TabState>,
+    pub console_active_tab: UseStateHandle<TabState>,
     pub communicator: &'static DatapathCommunicator,
 }
 #[derive(PartialEq, Properties)]
@@ -32,8 +32,8 @@ pub struct DataSegmentProps {
     pub lines_content: Rc<RefCell<Vec<String>>>,
     pub memory_curr_instr: UseStateHandle<u64>,
     pub editor_curr_line: UseStateHandle<f64>,
-    pub editor_active_tab: UseStateHandle<EditorTabState>,
-    pub console_active_tab: UseStateHandle<FooterTabState>,
+    pub editor_active_tab: UseStateHandle<TabState>,
+    pub console_active_tab: UseStateHandle<TabState>,
     pub pc_limit: usize,
 }
 
@@ -77,7 +77,7 @@ pub fn TextSegment(props: &TextSegmentProps) -> Html {
             move |args: (MouseEvent, usize), memory_curr_instr| {
                 let (_e, address) = args;
                 memory_curr_instr.set(address as u64);
-                console_active_tab.set(FooterTabState::HexEditor);
+                console_active_tab.set(TabState::HexEditor);
             },
             memory_curr_instr,
         )
@@ -91,7 +91,7 @@ pub fn TextSegment(props: &TextSegmentProps) -> Html {
             move |args: (MouseEvent, usize), _| {
                 let (_e, line_number) = args;
                 editor_curr_line.set(line_number as f64 + 1.0);
-                editor_active_tab.set(EditorTabState::Editor);
+                editor_active_tab.set(TabState::Editor);
             },
             (),
         )
@@ -196,7 +196,7 @@ pub fn DataSegment(props: &DataSegmentProps) -> Html {
             move |args: (MouseEvent, usize), memory_curr_instr| {
                 let (_e, address) = args;
                 memory_curr_instr.set(address as u64);
-                console_active_tab.set(FooterTabState::HexEditor);
+                console_active_tab.set(TabState::HexEditor);
             },
             memory_curr_instr,
         )
@@ -210,7 +210,7 @@ pub fn DataSegment(props: &DataSegmentProps) -> Html {
             move |args: (MouseEvent, usize), _| {
                 let (_e, line_number) = args;
                 editor_curr_line.set(line_number as f64);
-                editor_active_tab.set(EditorTabState::Editor);
+                editor_active_tab.set(TabState::Editor);
             },
             (),
         )
@@ -261,3 +261,68 @@ pub fn DataSegment(props: &DataSegmentProps) -> Html {
         </table>
     }
 }
+
+#[derive(PartialEq, Properties)]
+pub struct StackSegmentProps {
+    pub memory: Memory,
+    pub sp: u64,
+    pub memory_curr_instr: UseStateHandle<u64>,
+    pub console_active_tab: UseStateHandle<TabState>,
+}
+
+#[function_component]
+pub fn StackSegment(props: &StackSegmentProps) -> Html {
+    let memory = &props.memory;
+    let sp = props.sp;
+    let console_active_tab = &props.console_active_tab;
+    let memory_curr_instr = &props.memory_curr_instr;
+
+    // Go to the memory address in hex editor
+    let on_address_click = {
+        let memory_curr_instr = memory_curr_instr.clone();
+        let console_active_tab = console_active_tab.clone();
+        use_callback(
+            move |args: (MouseEvent, usize), memory_curr_instr| {
+                let (_e, address) = args;
+                memory_curr_instr.set(address as u64);
+                console_active_tab.set(TabState::HexEditor);
+            },
+            memory_curr_instr,
+        )
+    };
+
+    html! {
+        <table class="h-[96%] bg-primary-900">
+        // | address | data in hex
+            <tr>
+                <th>{"Address"}</th>
+                <th>{"Hex"}</th>
+            </tr>
+            {
+                if !memory.memory.is_empty() && sp != 0 {
+                    let memory_iter = MemoryIter::new(memory, sp as usize, memory.memory.len());
+                    memory_iter.map(|(address, words)| {
+                        let on_address_click = Callback::clone(&on_address_click);
+                        html! {
+                            <tr>
+                                <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", address)} onclick={move |e: MouseEvent| {on_address_click.emit((e, address))}}>
+                                    {format!("0x{:08x}", address as u64)}
+                                </td>
+                                <td>
+                                    {
+                                        words.iter().map(|word| {
+                                            format!("0x{:08x} ", word)
+                                        }).collect::<String>()
+                                    }
+                                </td>
+                            </tr>
+                        }
+                    }).collect::<Html>()
+                }
+                else {
+                    html! {<></>}
+                }
+            }
+        </table>
+    }
+}
diff --git a/src/ui/footer/component.rs b/src/ui/footer/component.rs
index e50908973..16153ab1c 100644
--- a/src/ui/footer/component.rs
+++ b/src/ui/footer/component.rs
@@ -2,8 +2,10 @@ use crate::agent::datapath_communicator::DatapathCommunicator;
 use crate::agent::datapath_reducer::DatapathReducer;
 use crate::ui::console::component::Console;
 use crate::ui::hex_editor::component::HexEditor;
+use crate::ui::swim_editor::tab::TabState;
 use crate::ui::visual_datapath::VisualDatapath;
 use monaco::api::TextModel;
+use std::str::FromStr;
 use wasm_bindgen::JsCast;
 use web_sys::HtmlElement;
 use yew::prelude::*;
@@ -18,16 +20,9 @@ pub struct Footerprops {
     pub command: UseStateHandle<String>,
     pub memory_text_model: UseStateHandle<TextModel>,
     pub memory_curr_instr: UseStateHandle<u64>,
-    pub active_tab: UseStateHandle<FooterTabState>,
+    pub active_tab: UseStateHandle<TabState>,
     pub on_memory_clicked: Callback<MouseEvent>,
-}
-
-#[derive(Default, PartialEq)]
-pub enum FooterTabState {
-    #[default]
-    Console,
-    Datapath,
-    HexEditor,
+    pub pc_limit: UseStateHandle<usize>,
 }
 
 #[function_component(Footer)]
@@ -42,13 +37,7 @@ pub fn footer(props: &Footerprops) -> Html {
                 .get_attribute("label")
                 .unwrap_or(String::from("console"));
 
-            let new_tab = match tab_name.as_str() {
-                "console" => FooterTabState::Console,
-                "datapath" => FooterTabState::Datapath,
-                "hex_editor" => FooterTabState::HexEditor,
-                _ => FooterTabState::default(),
-            };
-
+            let new_tab = TabState::from_str(&tab_name).unwrap();
             active_tab.set(new_tab);
         })
     };
@@ -74,51 +63,51 @@ pub fn footer(props: &Footerprops) -> Html {
     html! {
     <>
             // Console buttons
-            if **active_tab == FooterTabState::Console {
+            if **active_tab == TabState::Console {
                 <div class="min-h-48 border-primary-200 border-groove border-2 p-4 max-h-[50%] bg-accent-blue-300 text-primary-200 overflow-y-auto overflow-wrap z-10">
                     <Console communicator={props.communicator} parsermsg={props.parsermsg.clone()} show_input={props.show_input.clone()} command={props.command.clone()}/>
                 </div>
-            } else if **active_tab == FooterTabState::Datapath {
+            } else if **active_tab == TabState::Datapath {
                 <VisualDatapath datapath_state={props.datapath_state.clone()} svg_path={svg_path} />
-            } else if **active_tab == FooterTabState::HexEditor {
+            } else if **active_tab == TabState::HexEditor {
                 <div class="min-h-[200px] max-h-[50%] border-primary-200 border-groove border-2 z-10">
-                    <HexEditor memory_text_model={props.memory_text_model.clone()} memory_curr_instr={props.memory_curr_instr.clone()} datapath_state={props.datapath_state.clone()}/>
+                    <HexEditor memory_text_model={props.memory_text_model.clone()} memory_curr_instr={props.memory_curr_instr.clone()} datapath_state={props.datapath_state.clone()} pc_limit={props.pc_limit.clone()}/>
                 </div>
             }
             <div class="flex flex-row justify-between w-full">
                 <div class="flex flex-row min-w-0">
                     <FooterTab
-                        label="console"
+                        label={TabState::Console.to_string()}
                         on_click={change_tab.clone()}
                         disabled={false}
                         active_tab={active_tab.clone()}
-                        tab_name={FooterTabState::Console}
+                        tab_name={TabState::Console}
                         text="Console"
                     />
                     <FooterTab
-                        label="datapath"
+                        label={TabState::Datapath.to_string()}
                         on_click={change_tab.clone()}
                         disabled={false}
                         active_tab={active_tab.clone()}
-                        tab_name={FooterTabState::Datapath}
+                        tab_name={TabState::Datapath}
                         text="Datapath"
                     />
                     <FooterTab
-                        label="hex_editor"
+                        label={TabState::HexEditor.to_string()}
                         on_click={change_tab.clone()}
                         disabled={false}
                         active_tab={active_tab.clone()}
-                        tab_name={FooterTabState::HexEditor}
+                        tab_name={TabState::HexEditor}
                         text="Hex Editor"
                     />
                 </div>
 
-                if **active_tab == FooterTabState::Datapath {
+                if **active_tab == TabState::Datapath {
                     <div class="min-w-0">
                         <button class="hover:text-primary-100 duration-300 pointer pt-4 min-w-0 text-ellipsis text-nowrap overflow-hidden" onclick={switch_datapath_type}>{switch_datapath_button_label}</button>
                     </div>
                 }
-                else if **active_tab == FooterTabState::HexEditor {
+                else if **active_tab == TabState::HexEditor {
                     <div class="min-w-0">
                         <button class="disabled:hidden hover:text-primary-100 duration-300 pointer pt-4 min-w-0 text-ellipsis text-nowrap overflow-hidden" onclick={props.on_memory_clicked.clone()} disabled={!props.datapath_state.initialized}>{"Update Memory"}</button>
                     </div>
@@ -134,8 +123,8 @@ pub struct FooterTabProps {
     pub text: String,
     pub on_click: Callback<MouseEvent>,
     pub disabled: bool,
-    pub active_tab: UseStateHandle<FooterTabState>,
-    pub tab_name: FooterTabState,
+    pub active_tab: UseStateHandle<TabState>,
+    pub tab_name: TabState,
 }
 
 #[function_component(FooterTab)]
diff --git a/src/ui/hex_editor/component.rs b/src/ui/hex_editor/component.rs
index b056f2d43..48786196f 100644
--- a/src/ui/hex_editor/component.rs
+++ b/src/ui/hex_editor/component.rs
@@ -20,6 +20,7 @@ use monaco::{
 };
 
 use crate::agent::datapath_reducer::DatapathReducer;
+use crate::emulation_core::mips::memory::CAPACITY_BYTES;
 
 #[derive(PartialEq, Properties)]
 pub struct HexCoord {
@@ -34,6 +35,7 @@ pub struct HexEditorProps {
     pub datapath_state: UseReducerHandle<DatapathReducer>,
     // The instruction to highlight
     pub memory_curr_instr: UseStateHandle<u64>,
+    pub pc_limit: UseStateHandle<usize>,
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -144,9 +146,9 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
     let on_editor_created = {
         use_callback(
             move |editor_link: CodeEditorLink,
-                  (datapath_state, memory_text_model, memory_curr_instr)| {
+                  (datapath_state, memory_text_model, _pc_limit, memory_curr_instr)| {
                 match editor_link.with_editor(|editor| {
-                    let hexdump = &datapath_state.mips.memory.generate_formatted_hex();
+                    let hexdump = &datapath_state.mips.memory.generate_formatted_hex(CAPACITY_BYTES);
                     memory_text_model.set_value(hexdump);
 
                     let raw_editor = editor.as_ref();
@@ -191,6 +193,7 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
             (
                 props.datapath_state.clone(),
                 props.memory_text_model.clone(),
+                props.pc_limit.clone(),
                 memory_curr_instr,
             ),
         )
diff --git a/src/ui/swim_editor/component.rs b/src/ui/swim_editor/component.rs
index 91aedb520..b322e276e 100644
--- a/src/ui/swim_editor/component.rs
+++ b/src/ui/swim_editor/component.rs
@@ -1,3 +1,4 @@
+use std::str::FromStr;
 use std::{cell::RefCell, rc::Rc};
 
 use monaco::{
@@ -18,14 +19,15 @@ use yew::prelude::*;
 use yew::{html, Callback, Properties};
 use yew_hooks::prelude::*;
 
+use crate::emulation_core::mips::memory::Memory;
+use crate::ui::assembled_view::component::StackSegment;
 use crate::{
     agent::datapath_communicator::DatapathCommunicator,
     emulation_core::architectures::AvailableDatapaths,
     parser::parser_structs_and_enums::ProgramInfo,
     ui::{
         assembled_view::component::{DataSegment, TextSegment},
-        footer::component::FooterTabState,
-        swim_editor::tab::Tab,
+        swim_editor::tab::{Tab, TabState},
     },
 };
 use strum::IntoEnumIterator;
@@ -40,19 +42,13 @@ pub struct SwimEditorProps {
     pub pc_limit: usize,
     pub memory_curr_instr: UseStateHandle<u64>,
     pub editor_curr_line: UseStateHandle<f64>,
-    pub editor_active_tab: UseStateHandle<EditorTabState>,
-    pub console_active_tab: UseStateHandle<FooterTabState>,
+    pub editor_active_tab: UseStateHandle<TabState>,
+    pub console_active_tab: UseStateHandle<TabState>,
     pub current_architecture: AvailableDatapaths,
     pub speed: u32,
     pub communicator: &'static DatapathCommunicator,
-}
-
-#[derive(Default, PartialEq)]
-pub enum EditorTabState {
-    #[default]
-    Editor,
-    TextSegment,
-    DataSegment,
+    pub sp: u64,
+    pub memory: Memory,
 }
 
 fn get_options() -> IStandaloneEditorConstructionOptions {
@@ -154,13 +150,7 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
                 .get_attribute("label")
                 .unwrap_or(String::from("editor"));
 
-            let new_tab: EditorTabState = match tab_name.as_str() {
-                "editor" => EditorTabState::Editor,
-                "text" => EditorTabState::TextSegment,
-                "data" => EditorTabState::DataSegment,
-                _ => EditorTabState::default(),
-            };
-
+            let new_tab: TabState = TabState::from_str(&tab_name).unwrap();
             editor_active_tab.set(new_tab);
         })
     };
@@ -263,7 +253,7 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
         });
     };
 
-    let conditional_class = if **editor_active_tab == EditorTabState::Editor {
+    let conditional_class = if **editor_active_tab == TabState::Editor {
         ""
     } else {
         "hidden"
@@ -282,9 +272,10 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
             // Editor buttons
             <div class="flex flex-row justify-between items-center border-b-2 border-b-solid border-b-primary-200">
                 <div class="flex flex-row flex-nowrap min-w-0 items-end h-full">
-                    <Tab<EditorTabState> label={"editor".to_string()} text={"Editor".to_string()} on_click={change_tab.clone()} disabled={false} active_tab={editor_active_tab.clone()} tab_name={EditorTabState::Editor}/>
-                    <Tab<EditorTabState> label={"text".to_string()} text={"Text Segment".to_string()} on_click={change_tab.clone()} disabled={false} active_tab={editor_active_tab.clone()} tab_name={EditorTabState::TextSegment}/>
-                    <Tab<EditorTabState> label={"data".to_string()} text={"Data Segment".to_string()} on_click={change_tab.clone()} disabled={false} active_tab={editor_active_tab.clone()} tab_name={EditorTabState::DataSegment}/>
+                    <Tab<TabState> label={TabState::Editor.to_string()} text={"Editor".to_string()} on_click={change_tab.clone()} disabled={false} active_tab={editor_active_tab.clone()} tab_name={TabState::Editor}/>
+                    <Tab<TabState> label={TabState::TextSegment.to_string()} text={"Text Segment".to_string()} on_click={change_tab.clone()} disabled={false} active_tab={editor_active_tab.clone()} tab_name={TabState::TextSegment}/>
+                    <Tab<TabState> label={TabState::DataSegment.to_string()} text={"Data Segment".to_string()} on_click={change_tab.clone()} disabled={false} active_tab={editor_active_tab.clone()} tab_name={TabState::DataSegment}/>
+                    <Tab<TabState> label={TabState::StackSegment.to_string()} text={"Stack Segment".to_string()} on_click={change_tab.clone()} disabled={false} active_tab={editor_active_tab.clone()} tab_name={TabState::StackSegment}/>
                 </div>
                 <div class="flex flex-row flex-wrap justify-end items-center gap-2 cursor-default">
                     <button class={classes!("copy-button", conditional_class)} title="Copy to Clipboard" onclick={on_clipboard_clicked}>{"Copy to Clipboard "}<i class={classes!("fa-regular", "fa-copy")}></i></button>
@@ -295,12 +286,14 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
                     </select>
                 </div>
             </div>
-            if **editor_active_tab == EditorTabState::Editor {
+            if **editor_active_tab == TabState::Editor {
                 <CodeEditor classes={"editor"} link={link} options={get_options()} model={text_model.clone()} on_editor_created={on_editor_created}/>
-            } else if **editor_active_tab == EditorTabState::TextSegment {
+            } else if **editor_active_tab == TabState::TextSegment {
                 <TextSegment lines_content={props.lines_content.clone()} program_info={props.program_info.clone()} pc={props.pc} editor_active_tab={editor_active_tab.clone()} console_active_tab={console_active_tab.clone()} memory_curr_instr={props.memory_curr_instr.clone()} editor_curr_line={props.editor_curr_line.clone()} communicator={props.communicator}/>
-            } else if **editor_active_tab == EditorTabState::DataSegment {
+            } else if **editor_active_tab == TabState::DataSegment {
                 <DataSegment lines_content={props.lines_content.clone()} program_info={props.program_info.clone()} binary={props.binary.clone()} editor_active_tab={editor_active_tab.clone()} console_active_tab={console_active_tab.clone()} memory_curr_instr={props.memory_curr_instr.clone()} editor_curr_line={props.editor_curr_line.clone()} pc_limit={props.pc_limit}/>
+            } else if **editor_active_tab == TabState::StackSegment {
+                <StackSegment memory_curr_instr={props.memory_curr_instr.clone()} console_active_tab={console_active_tab.clone()} sp={props.sp} memory={props.memory.clone()}/>
             }
         </>
     }
diff --git a/src/ui/swim_editor/tab.rs b/src/ui/swim_editor/tab.rs
index 505d2877c..3d6c50de4 100644
--- a/src/ui/swim_editor/tab.rs
+++ b/src/ui/swim_editor/tab.rs
@@ -1,5 +1,36 @@
+use std::str::FromStr;
+use strum_macros::Display;
 use yew::prelude::*;
 
+#[derive(PartialEq, Clone, Copy, Default, Display)]
+pub enum TabState {
+    #[default]
+    Console,
+    Datapath,
+    HexEditor,
+    Editor,
+    TextSegment,
+    DataSegment,
+    StackSegment,
+}
+
+impl FromStr for TabState {
+    type Err = ();
+
+    fn from_str(tab_name: &str) -> Result<TabState, Self::Err> {
+        match tab_name {
+            "Console" => Ok(TabState::Console),
+            "Datapath" => Ok(TabState::Datapath),
+            "HexEditor" => Ok(TabState::HexEditor),
+            "Editor" => Ok(TabState::Editor),
+            "TextSegment" => Ok(TabState::TextSegment),
+            "DataSegment" => Ok(TabState::DataSegment),
+            "StackSegment" => Ok(TabState::StackSegment),
+            _ => Err(()),
+        }
+    }
+}
+
 #[derive(Clone, PartialEq, Properties)]
 pub struct TabProps<T: std::cmp::PartialEq> {
     pub label: String,

From 6d5daec99a9282b85efa30bcd6faa5496d4147b9 Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Thu, 21 Mar 2024 12:19:39 -0400
Subject: [PATCH 02/21] Re-adds parsing at every step-type execution or memory
 update, starts stack in datapath with branch tracking

---
 src/agent.rs                         |  5 +++++
 src/agent/datapath_reducer.rs        |  5 +++++
 src/agent/messages.rs                |  1 +
 src/bin/main.rs                      | 31 ++++++++++++----------------
 src/emulation_core/datapath.rs       |  3 +++
 src/emulation_core/mips/datapath.rs  | 19 +++++++++++++++++
 src/emulation_core/riscv/datapath.rs | 16 +++++++-------
 src/parser/parser_assembler_main.rs  |  2 ++
 8 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/src/agent.rs b/src/agent.rs
index 7fe063624..be49ac9d9 100644
--- a/src/agent.rs
+++ b/src/agent.rs
@@ -108,6 +108,11 @@ pub async fn emulation_core_agent(scope: ReactorScope<Command, DatapathUpdate>)
                     state.updates.changed_memory,
                     UpdateMemory(datapath.memory.clone())
                 );
+                send_update_mips!(
+                    state.scope,
+                    state.updates.hit_branch,
+                    UpdateStack(datapath.stack.clone())
+                )
             }
         }
         // Part 5: Sending Non-Syscall System Updates to UI
diff --git a/src/agent/datapath_reducer.rs b/src/agent/datapath_reducer.rs
index fc79342e6..481e7d37c 100644
--- a/src/agent/datapath_reducer.rs
+++ b/src/agent/datapath_reducer.rs
@@ -28,6 +28,7 @@ pub struct MipsCoreState {
     pub coprocessor_registers: FpRegisters,
     pub memory: Memory,
     pub current_stage: Stage,
+    pub stack: Vec<u32>,
 }
 
 impl Default for DatapathReducer {
@@ -82,6 +83,10 @@ impl Reducible for DatapathReducer {
                         current_stage: stage,
                         ..self.mips.clone()
                     },
+                    MipsStateUpdate::UpdateStack(stack) => MipsCoreState {
+                        stack,
+                        ..self.mips.clone()
+                    },
                 },
                 messages: self.messages.clone(),
                 speed: self.speed,
diff --git a/src/agent/messages.rs b/src/agent/messages.rs
index 9cfff820c..d55a69d1d 100644
--- a/src/agent/messages.rs
+++ b/src/agent/messages.rs
@@ -33,6 +33,7 @@ pub enum MipsStateUpdate {
     UpdateCoprocessorRegisters(FpRegisters),
     UpdateMemory(Memory),
     UpdateStage(Stage),
+    UpdateStack(Vec<u32>),
 }
 
 /// Information about the effects of system calls sent from the worker thread to the UI thread.
diff --git a/src/bin/main.rs b/src/bin/main.rs
index b9b80d666..b285a7eab 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -163,6 +163,7 @@ fn app(props: &AppProps) -> Html {
                     // Send the binary over to the emulation core thread
                     communicator.initialize(program_info.pc_starting_point, assembled);
                     memory_curr_instr.set(datapath_state.mips.registers.pc);
+
                     text_model.set_value(&program_info.updated_monaco_string); // Expands pseudo-instructions to their hardware counterpart.
                 }
 
@@ -185,7 +186,7 @@ fn app(props: &AppProps) -> Html {
     // code, the previously executed line is highlighted.
     let on_execute_clicked = {
         let datapath_state = datapath_state.clone();
-        let program_info_ref = Rc::clone(&program_info_ref);
+        let text_model = text_model.clone();
 
         // Code editor
         let editor_curr_line = editor_curr_line.clone();
@@ -195,12 +196,12 @@ fn app(props: &AppProps) -> Html {
         let communicator = props.communicator;
 
         use_callback(
-            move |_, (editor_curr_line, memory_curr_instr, datapath_state)| {
+            move |_, (editor_curr_line, memory_curr_instr, text_model, datapath_state)| {
                 // Get the current line and convert it to f64
-                let programinfo = Rc::clone(&program_info_ref);
-                let programinfo = programinfo.borrow().clone();
-                let list_of_line_numbers = programinfo.address_to_line_number;
+                let (program_info, _assembled) = parser(text_model.get_value(), ARCH);
+                let list_of_line_numbers = program_info.address_to_line_number;
                 let index = datapath_state.mips.registers.pc as usize / 4;
+                log::debug!("Line numbers: {:?}", list_of_line_numbers);
                 editor_curr_line.set(*list_of_line_numbers.get(index).unwrap_or(&0) as f64 + 1.0); // add one to account for the editor's line numbers
                 memory_curr_instr.set(datapath_state.mips.registers.pc);
 
@@ -209,13 +210,13 @@ fn app(props: &AppProps) -> Html {
 
                 trigger.force_update();
             },
-            (editor_curr_line, memory_curr_instr, datapath_state),
+            (editor_curr_line, memory_curr_instr, text_model, datapath_state),
         )
     };
 
     let on_execute_stage_clicked = {
         let datapath_state = datapath_state.clone();
-        let program_info_ref = Rc::clone(&program_info_ref);
+        let text_model = text_model.clone();
         let communicator = props.communicator;
 
         // Code editor
@@ -227,12 +228,11 @@ fn app(props: &AppProps) -> Html {
         let trigger = use_force_update();
 
         use_callback(
-            move |_, (editor_curr_line, memory_curr_instr, datapath_state)| {
+            move |_, (editor_curr_line, memory_curr_instr, text_model, datapath_state)| {
                 if datapath_state.mips.current_stage == Stage::InstructionDecode {
                     // highlight on InstructionDecode since syscall stops at that stage.
-                    let programinfo = Rc::clone(&program_info_ref);
-                    let programinfo = programinfo.borrow().clone();
-                    let list_of_line_numbers = programinfo.address_to_line_number;
+                    let (program_info, _assembled) = parser(text_model.get_value(), ARCH);
+                    let list_of_line_numbers = program_info.address_to_line_number;
                     let index = datapath_state.mips.registers.pc as usize / 4;
                     editor_curr_line
                         .set(*list_of_line_numbers.get(index).unwrap_or(&0) as f64 + 1.0);
@@ -244,7 +244,7 @@ fn app(props: &AppProps) -> Html {
 
                 trigger.force_update();
             },
-            (editor_curr_line, memory_curr_instr, datapath_state),
+            (editor_curr_line, memory_curr_instr, text_model, datapath_state),
         )
     };
 
@@ -269,8 +269,6 @@ fn app(props: &AppProps) -> Html {
     };
 
     let on_memory_clicked = {
-        let program_info_ref = Rc::clone(&program_info_ref);
-
         // Code editor
         let text_model = text_model.clone();
 
@@ -285,8 +283,6 @@ fn app(props: &AppProps) -> Html {
             move |_, datapath_state| {
                 let text_model = text_model.clone();
 
-                let program_info_ref = Rc::clone(&program_info_ref);
-
                 // Update memory
                 let memory_text_model = memory_text_model.clone();
 
@@ -321,7 +317,7 @@ fn app(props: &AppProps) -> Html {
                             }
                         }
                         // Memory updated successfully
-                        let program_info = program_info_ref.borrow().clone();
+                        let (program_info, _assembled) = parser(text_model.get_value(), ARCH);
                         let mut lines_beyond_counter = program_info.address_to_line_number.len();
                         let mut curr_value = text_model.get_value();
                         let mut add_new_lines = false;
@@ -395,7 +391,6 @@ fn app(props: &AppProps) -> Html {
 
                 // Update the parsed info for text and data segment views
                 let (program_info, _) = parser(text_model.get_value(), ARCH);
-                *program_info_ref.borrow_mut() = program_info;
 
                 trigger.force_update();
             },
diff --git a/src/emulation_core/datapath.rs b/src/emulation_core/datapath.rs
index a33751fae..5b8483c10 100644
--- a/src/emulation_core/datapath.rs
+++ b/src/emulation_core/datapath.rs
@@ -170,6 +170,7 @@ pub struct DatapathUpdateSignal {
     pub changed_memory: bool,
     pub hit_syscall: bool,
     pub hit_breakpoint: bool,
+    pub hit_branch: bool,
 }
 
 /// Constant used to easily trigger an update for everything but to avoid triggering any other
@@ -182,6 +183,7 @@ pub const UPDATE_EVERYTHING: DatapathUpdateSignal = DatapathUpdateSignal {
     changed_memory: true,
     hit_syscall: false,
     hit_breakpoint: false,
+    hit_branch: false,
 };
 
 impl BitOrAssign for DatapathUpdateSignal {
@@ -193,5 +195,6 @@ impl BitOrAssign for DatapathUpdateSignal {
         self.changed_memory |= rhs.changed_memory;
         self.hit_syscall |= rhs.hit_syscall;
         self.hit_breakpoint |= rhs.hit_breakpoint;
+        self.hit_branch |= rhs.hit_branch;
     }
 }
diff --git a/src/emulation_core/mips/datapath.rs b/src/emulation_core/mips/datapath.rs
index 4fd7ad162..1169238b7 100644
--- a/src/emulation_core/mips/datapath.rs
+++ b/src/emulation_core/mips/datapath.rs
@@ -73,6 +73,9 @@ pub struct MipsDatapath {
     /// The currently-active stage in the datapath.
     pub current_stage: Stage,
 
+    /// The stack of instructions that have been executed
+    pub stack: Vec<u32>,
+
     /// Boolean value that states whether the datapath has halted.
     ///
     /// This is set in the event of any `syscall` instruction. To unset this,
@@ -213,6 +216,7 @@ impl Default for MipsDatapath {
             datapath_signals: DatapathSignals::default(),
             state: DatapathState::default(),
             current_stage: Stage::default(),
+            stack: Vec::new(),
             is_halted: true,
         };
 
@@ -238,6 +242,8 @@ impl Datapath for MipsDatapath {
 
             result_signals |= self.execute_stage();
 
+
+
             // This instruction is finished when the datapath has returned
             // to the IF stage.
             if self.current_stage == Stage::InstructionFetch {
@@ -407,12 +413,25 @@ impl MipsDatapath {
             _ => (false, false),
         };
 
+        // Check if we hit a branch and signal it to the caller
+        let hit_branch = match self.signals.branch {
+            Branch::YesBranch => true,
+            _ => false
+        };
+
+        let hit_jump = match self.signals.jump {
+            Jump::YesJump => true,
+            Jump::YesJumpJalr => true,
+            _ => false
+        };
+
         // Instruction decode always involves a state update
         DatapathUpdateSignal {
             changed_state: true,
             changed_coprocessor_state: true,
             hit_syscall,
             hit_breakpoint,
+            hit_branch: hit_branch || hit_jump,
             ..Default::default()
         }
     }
diff --git a/src/emulation_core/riscv/datapath.rs b/src/emulation_core/riscv/datapath.rs
index 8bcd4a40a..dc24aff8a 100644
--- a/src/emulation_core/riscv/datapath.rs
+++ b/src/emulation_core/riscv/datapath.rs
@@ -270,7 +270,7 @@ impl Datapath for RiscDatapath {
         &self.memory
     }
 
-    fn set_memory(&mut self, ptr: usize, data: Vec<u8>) {
+    fn set_memory(&mut self, ptr: u64, data: u32) {
         todo!();
     }
 
@@ -281,7 +281,7 @@ impl Datapath for RiscDatapath {
     fn reset(&mut self) {
         std::mem::take(self);
     }
-    
+
     fn as_datapath_ref(&self) -> DatapathRef {
         todo!();
     }
@@ -535,7 +535,7 @@ impl RiscDatapath {
         if r.op == OPCODE_OP_32 {
             self.datapath_signals.reg_width = RegisterWidth::HalfWidth;
         }
-        
+
         match r.funct3 {
             0 => match r.funct7 {
                 0b0000000 => self.signals.alu_op = AluOp::Addition,
@@ -569,7 +569,7 @@ impl RiscDatapath {
                 self.error(&format!("Unsupported Instruction!"));
             }
         }
-        
+
         match i.op {
             OPCODE_IMM | OPCODE_IMM_32 => match i.funct3 {
                 0 => self.signals.alu_op = AluOp::Addition,
@@ -578,7 +578,7 @@ impl RiscDatapath {
                 2 => self.signals.alu_op = AluOp::SetOnLessThanSigned,
                 3 => self.signals.alu_op = AluOp::SetOnLessThanUnsigned,
                 4 => self.signals.alu_op = AluOp::Xor,
-                5 => { 
+                5 => {
                     match i.imm >> 6 {
                         0b000000 => self.signals.alu_op = AluOp::ShiftRightLogical(self.state.shamt),
                         0b010000 => self.signals.alu_op = AluOp::ShiftRightArithmetic(self.state.shamt),
@@ -615,7 +615,7 @@ impl RiscDatapath {
             reg_write_en: RegWriteEn::NoWrite,
             ..Default::default()
         };
-        
+
         match s.funct3 {
             0 => self.signals.read_write = ReadWrite::StoreByte,
             1 => self.signals.read_write = ReadWrite::StoreHalf,
@@ -632,7 +632,7 @@ impl RiscDatapath {
             reg_write_en: RegWriteEn::NoWrite,
             ..Default::default()
         };
-        
+
         match b.funct3 {
             0 => self.signals.branch_jump = BranchJump::Beq,
             1 => self.signals.branch_jump = BranchJump::Bne,
@@ -654,7 +654,7 @@ impl RiscDatapath {
             reg_write_en: RegWriteEn::YesWrite,
             ..Default::default()
         };
-        
+
         match u.op {
             OPCODE_AUIPC => self.signals.wb_sel = WBSel::UseAlu,
             OPCODE_LUI => self.signals.wb_sel = WBSel::UseImmediate,
diff --git a/src/parser/parser_assembler_main.rs b/src/parser/parser_assembler_main.rs
index aab92cea1..222f6d261 100644
--- a/src/parser/parser_assembler_main.rs
+++ b/src/parser/parser_assembler_main.rs
@@ -35,6 +35,8 @@ pub fn parser(file_string: String, arch: AvailableDatapaths) -> (ProgramInfo, Ve
             let labels: HashMap<String, usize> =
                 create_label_map(&mut program_info.instructions, &mut program_info.data);
 
+            log::debug!("Labels: {:?}", labels);
+
             complete_lw_sw_pseudo_instructions(
                 &mut program_info.instructions,
                 &labels,

From 48a7df8e3052230c1d3551250e2ae7a06a1e4dc2 Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Fri, 22 Mar 2024 16:47:54 -0400
Subject: [PATCH 03/21] Track jump instructions

---
 src/agent/datapath_reducer.rs       |  3 +-
 src/agent/messages.rs               |  3 +-
 src/bin/main.rs                     |  2 +-
 src/emulation_core/mips.rs          |  1 +
 src/emulation_core/mips/datapath.rs | 14 ++++-
 src/emulation_core/mips/stack.rs    | 84 +++++++++++++++++++++++++++++
 src/ui/assembled_view/component.rs  | 79 ++++++++++++++++++++++++++-
 src/ui/swim_editor/component.rs     |  7 ++-
 src/ui/swim_editor/tab.rs           |  2 +
 9 files changed, 188 insertions(+), 7 deletions(-)
 create mode 100644 src/emulation_core/mips/stack.rs

diff --git a/src/agent/datapath_reducer.rs b/src/agent/datapath_reducer.rs
index 481e7d37c..f035acf41 100644
--- a/src/agent/datapath_reducer.rs
+++ b/src/agent/datapath_reducer.rs
@@ -6,6 +6,7 @@ use crate::emulation_core::mips::datapath::{DatapathState, Stage};
 use crate::emulation_core::mips::fp_registers::FpRegisters;
 use crate::emulation_core::mips::gp_registers::GpRegisters;
 use crate::emulation_core::mips::memory::Memory;
+use crate::emulation_core::mips::stack::Stack;
 use gloo_console::log;
 use std::rc::Rc;
 use yew::Reducible;
@@ -28,7 +29,7 @@ pub struct MipsCoreState {
     pub coprocessor_registers: FpRegisters,
     pub memory: Memory,
     pub current_stage: Stage,
-    pub stack: Vec<u32>,
+    pub stack: Stack,
 }
 
 impl Default for DatapathReducer {
diff --git a/src/agent/messages.rs b/src/agent/messages.rs
index d55a69d1d..efcca90e9 100644
--- a/src/agent/messages.rs
+++ b/src/agent/messages.rs
@@ -3,6 +3,7 @@ use crate::emulation_core::mips::datapath::DatapathState;
 use crate::emulation_core::mips::fp_registers::FpRegisters;
 use crate::emulation_core::mips::gp_registers::GpRegisters;
 use crate::emulation_core::mips::memory::Memory;
+use crate::emulation_core::mips::stack::Stack;
 use crate::emulation_core::{architectures::AvailableDatapaths, mips::datapath::Stage};
 use serde::{Deserialize, Serialize};
 
@@ -33,7 +34,7 @@ pub enum MipsStateUpdate {
     UpdateCoprocessorRegisters(FpRegisters),
     UpdateMemory(Memory),
     UpdateStage(Stage),
-    UpdateStack(Vec<u32>),
+    UpdateStack(Stack),
 }
 
 /// Information about the effects of system calls sent from the worker thread to the UI thread.
diff --git a/src/bin/main.rs b/src/bin/main.rs
index b285a7eab..6497eb756 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -518,7 +518,7 @@ fn app(props: &AppProps) -> Html {
 
                     // Editor
                     <div class="flex flex-col grow min-h-16 mt-2">
-                        <SwimEditor text_model={text_model} lines_content={lines_content} program_info={program_info_ref.borrow().clone()} pc_limit={*pc_limit} binary={binary_ref.borrow().clone()} memory_curr_instr={memory_curr_instr.clone()} editor_curr_line={editor_curr_line.clone()} editor_active_tab={editor_active_tab.clone()} console_active_tab={console_active_tab.clone()} pc={datapath_state.mips.registers.pc} communicator={props.communicator} current_architecture={datapath_state.current_architecture.clone()} speed={datapath_state.speed} sp={datapath_state.mips.registers[GpRegisterType::Sp]} memory={datapath_state.mips.memory.clone()}/>
+                        <SwimEditor text_model={text_model} lines_content={lines_content} program_info={program_info_ref.borrow().clone()} pc_limit={*pc_limit} binary={binary_ref.borrow().clone()} memory_curr_instr={memory_curr_instr.clone()} editor_curr_line={editor_curr_line.clone()} editor_active_tab={editor_active_tab.clone()} console_active_tab={console_active_tab.clone()} pc={datapath_state.mips.registers.pc} communicator={props.communicator} current_architecture={datapath_state.current_architecture.clone()} speed={datapath_state.speed} sp={datapath_state.mips.registers[GpRegisterType::Sp]} memory={datapath_state.mips.memory.clone()} stack={datapath_state.mips.stack.clone()}/>
                     </div>
 
                     // Console
diff --git a/src/emulation_core/mips.rs b/src/emulation_core/mips.rs
index 739e7731b..bf26cd90d 100644
--- a/src/emulation_core/mips.rs
+++ b/src/emulation_core/mips.rs
@@ -10,3 +10,4 @@ pub mod fp_registers;
 pub mod gp_registers;
 pub mod instruction;
 pub mod memory;
+pub mod stack;
diff --git a/src/emulation_core/mips/datapath.rs b/src/emulation_core/mips/datapath.rs
index 1169238b7..0cb5e0b37 100644
--- a/src/emulation_core/mips/datapath.rs
+++ b/src/emulation_core/mips/datapath.rs
@@ -56,6 +56,7 @@ use crate::emulation_core::architectures::DatapathRef;
 use crate::emulation_core::datapath::{DatapathUpdateSignal, Syscall};
 use crate::emulation_core::mips::fp_registers::FpRegisterType;
 use crate::emulation_core::mips::gp_registers::GpRegisterType::{A0, A1};
+use crate::emulation_core::mips::stack::{Stack, StackFrame};
 use serde::{Deserialize, Serialize};
 
 /// An implementation of a datapath for the MIPS64 ISA.
@@ -74,7 +75,7 @@ pub struct MipsDatapath {
     pub current_stage: Stage,
 
     /// The stack of instructions that have been executed
-    pub stack: Vec<u32>,
+    pub stack: Stack,
 
     /// Boolean value that states whether the datapath has halted.
     ///
@@ -216,7 +217,7 @@ impl Default for MipsDatapath {
             datapath_signals: DatapathSignals::default(),
             state: DatapathState::default(),
             current_stage: Stage::default(),
-            stack: Vec::new(),
+            stack: Stack::default(),
             is_halted: true,
         };
 
@@ -425,6 +426,15 @@ impl MipsDatapath {
             _ => false
         };
 
+        if hit_branch || hit_jump {
+            // Add current line to stack if branch is taken
+            let frame = StackFrame::new(
+                self.state.instruction,
+                self.registers.pc as u32,
+            );
+            self.stack.push(frame);
+        }
+
         // Instruction decode always involves a state update
         DatapathUpdateSignal {
             changed_state: true,
diff --git a/src/emulation_core/mips/stack.rs b/src/emulation_core/mips/stack.rs
new file mode 100644
index 000000000..3300649be
--- /dev/null
+++ b/src/emulation_core/mips/stack.rs
@@ -0,0 +1,84 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Stack {
+    pub stack: Vec<StackFrame>,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct StackFrame {
+    pub instruction: u32,
+    pub address: u32,
+}
+
+impl Default for Stack {
+    fn default() -> Self {
+        Self {
+            stack: Vec::new(),
+        }
+    }
+}
+
+impl ToString for Stack {
+    fn to_string(&self) -> String {
+        let mut output = String::new();
+
+        for frame in &self.stack {
+            output.push_str(&format!("{:08x}  {}\n", frame.address, frame.instruction));
+        }
+
+        output
+    }
+}
+
+impl Stack {
+    pub fn push(&mut self, frame: StackFrame) {
+        self.stack.push(frame);
+    }
+
+    pub fn pop(&mut self) -> Option<StackFrame> {
+        self.stack.pop()
+    }
+
+    pub fn peek(&self) -> Option<&StackFrame> {
+        self.stack.last()
+    }
+}
+
+impl StackFrame {
+    pub fn new(instruction: u32, address: u32) -> Self {
+        Self {
+            instruction,
+            address,
+        }
+    }
+}
+
+pub struct StackIter<'a> {
+    stack: &'a Stack,
+    current_address: u32,
+}
+
+impl<'a> StackIter<'a> {
+    pub fn new(
+        stack: &'a Stack,
+        current_address: u32,
+    ) -> StackIter<'a> {
+        StackIter {
+            stack,
+            current_address,
+        }
+    }
+}
+
+impl<'a> Iterator for StackIter<'a> {
+    type Item = &'a StackFrame;
+    fn next(&mut self) -> Option<Self::Item> {
+        self.current_address = (self.current_address + 3) & !3;
+        if self.current_address < self.stack.stack.len() as u32 {
+            Some(&self.stack.stack[self.current_address as usize])
+        } else {
+            None
+        }
+    }
+}
diff --git a/src/ui/assembled_view/component.rs b/src/ui/assembled_view/component.rs
index dca702f27..d1e710ba1 100644
--- a/src/ui/assembled_view/component.rs
+++ b/src/ui/assembled_view/component.rs
@@ -2,7 +2,8 @@ use std::cell::RefCell;
 use std::rc::Rc;
 
 use crate::agent::datapath_communicator::DatapathCommunicator;
-use crate::emulation_core::mips::memory::{Memory, MemoryIter, CAPACITY_BYTES};
+use crate::emulation_core::mips::memory::{Memory, MemoryIter};
+use crate::emulation_core::mips::stack::{Stack, StackFrame, StackIter};
 // use monaco::api::TextModel;
 use crate::parser::parser_structs_and_enums::ProgramInfo;
 use crate::ui::swim_editor::tab::TabState;
@@ -326,3 +327,79 @@ pub fn StackSegment(props: &StackSegmentProps) -> Html {
         </table>
     }
 }
+
+
+#[derive(PartialEq, Properties)]
+pub struct StackFrameProps {
+    pub stack: Stack,
+    pub memory_curr_instr: UseStateHandle<u64>,
+    pub console_active_tab: UseStateHandle<TabState>,
+}
+
+#[function_component]
+pub fn StackFrameView(props: &StackFrameProps) -> Html {
+    let console_active_tab = &props.console_active_tab;
+    let memory_curr_instr = &props.memory_curr_instr;
+    let stack = &props.stack;
+    log::debug!("Stack: {:?}", stack.stack);
+
+    // Go to the memory address in hex editor
+    let on_address_click = {
+        let memory_curr_instr = memory_curr_instr.clone();
+        let console_active_tab = console_active_tab.clone();
+        use_callback(
+            move |args: (MouseEvent, usize), memory_curr_instr| {
+                let (_e, address) = args;
+                memory_curr_instr.set(address as u64);
+                console_active_tab.set(TabState::HexEditor);
+            },
+            memory_curr_instr,
+        )
+    };
+
+    html! {
+        <table class="h-[96%] bg-primary-900">
+        // | address | data in hex
+            <tr>
+                <th>{"Address"}</th>
+                <th>{"Hex"}</th>
+            </tr>
+            {
+                if !stack.stack.is_empty() {
+                    let stack = stack.stack.clone();
+                    stack.into_iter().enumerate().map(|(address, frame)| {
+                        let on_address_click = Callback::clone(&on_address_click);
+                        log::debug!("Frame: {:?}", frame);
+                        html! {
+                            <tr>
+                                <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.address)} onclick={move |e: MouseEvent| {on_address_click.emit((e, frame.address as usize))}}>
+                                    {format!("0x{:08x}", frame.address as u64)}
+                                </td>
+                                <td>
+                                    {format!("0x{:08x}", frame.instruction)}
+                                </td>
+                            </tr>
+                        }
+                    }).collect::<Html>()
+                    // let stack_iter = StackIter::new(&stack, 0);
+                    // stack_iter.map(|frame| {
+                    //     let on_address_click = Callback::clone(&on_address_click);
+                    //     html! {
+                    //         <tr>
+                    //             <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.address)} onclick={move |e: MouseEvent| {on_address_click.emit((e, frame.address as usize))}}>
+                    //                 {format!("0x{:08x}", frame.address as u64)}
+                    //             </td>
+                    //             <td>
+                    //                 {format!("0x{:08x}", frame.instruction)}
+                    //             </td>
+                    //         </tr>
+                    //     }
+                    // }).collect::<Html>()
+                }
+                else {
+                    html! {<></>}
+                }
+            }
+        </table>
+    }
+}
diff --git a/src/ui/swim_editor/component.rs b/src/ui/swim_editor/component.rs
index b322e276e..88aae6bac 100644
--- a/src/ui/swim_editor/component.rs
+++ b/src/ui/swim_editor/component.rs
@@ -20,7 +20,8 @@ use yew::{html, Callback, Properties};
 use yew_hooks::prelude::*;
 
 use crate::emulation_core::mips::memory::Memory;
-use crate::ui::assembled_view::component::StackSegment;
+use crate::emulation_core::mips::stack::Stack;
+use crate::ui::assembled_view::component::{StackFrameView, StackSegment};
 use crate::{
     agent::datapath_communicator::DatapathCommunicator,
     emulation_core::architectures::AvailableDatapaths,
@@ -49,6 +50,7 @@ pub struct SwimEditorProps {
     pub communicator: &'static DatapathCommunicator,
     pub sp: u64,
     pub memory: Memory,
+    pub stack: Stack,
 }
 
 fn get_options() -> IStandaloneEditorConstructionOptions {
@@ -276,6 +278,7 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
                     <Tab<TabState> label={TabState::TextSegment.to_string()} text={"Text Segment".to_string()} on_click={change_tab.clone()} disabled={false} active_tab={editor_active_tab.clone()} tab_name={TabState::TextSegment}/>
                     <Tab<TabState> label={TabState::DataSegment.to_string()} text={"Data Segment".to_string()} on_click={change_tab.clone()} disabled={false} active_tab={editor_active_tab.clone()} tab_name={TabState::DataSegment}/>
                     <Tab<TabState> label={TabState::StackSegment.to_string()} text={"Stack Segment".to_string()} on_click={change_tab.clone()} disabled={false} active_tab={editor_active_tab.clone()} tab_name={TabState::StackSegment}/>
+                    <Tab<TabState> label={TabState::StackFrameView.to_string()} text={"Stack Frame".to_string()} on_click={change_tab.clone()} disabled={false} active_tab={editor_active_tab.clone()} tab_name={TabState::StackFrameView}/>
                 </div>
                 <div class="flex flex-row flex-wrap justify-end items-center gap-2 cursor-default">
                     <button class={classes!("copy-button", conditional_class)} title="Copy to Clipboard" onclick={on_clipboard_clicked}>{"Copy to Clipboard "}<i class={classes!("fa-regular", "fa-copy")}></i></button>
@@ -294,6 +297,8 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
                 <DataSegment lines_content={props.lines_content.clone()} program_info={props.program_info.clone()} binary={props.binary.clone()} editor_active_tab={editor_active_tab.clone()} console_active_tab={console_active_tab.clone()} memory_curr_instr={props.memory_curr_instr.clone()} editor_curr_line={props.editor_curr_line.clone()} pc_limit={props.pc_limit}/>
             } else if **editor_active_tab == TabState::StackSegment {
                 <StackSegment memory_curr_instr={props.memory_curr_instr.clone()} console_active_tab={console_active_tab.clone()} sp={props.sp} memory={props.memory.clone()}/>
+            } else if **editor_active_tab == TabState::StackFrameView {
+                <StackFrameView memory_curr_instr={props.memory_curr_instr.clone()} stack={props.stack.clone()} console_active_tab={console_active_tab.clone()}/>
             }
         </>
     }
diff --git a/src/ui/swim_editor/tab.rs b/src/ui/swim_editor/tab.rs
index 3d6c50de4..ba2caab58 100644
--- a/src/ui/swim_editor/tab.rs
+++ b/src/ui/swim_editor/tab.rs
@@ -12,6 +12,7 @@ pub enum TabState {
     TextSegment,
     DataSegment,
     StackSegment,
+    StackFrameView
 }
 
 impl FromStr for TabState {
@@ -26,6 +27,7 @@ impl FromStr for TabState {
             "TextSegment" => Ok(TabState::TextSegment),
             "DataSegment" => Ok(TabState::DataSegment),
             "StackSegment" => Ok(TabState::StackSegment),
+            "StackFrameView" => Ok(TabState::StackFrameView),
             _ => Err(()),
         }
     }

From efa6a734c15c9b215e33b6e370e371a00acb154a Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Sun, 24 Mar 2024 18:47:32 -0400
Subject: [PATCH 04/21] Update rust version to 1.73 to support bumpalo

---
 Cargo.lock                     | 247 ++++++++++++++++-----------------
 Cargo.toml                     |   2 +-
 rust-toolchain.toml            |   2 +-
 src/bin/main.rs                |  30 +++-
 src/ui/footer/component.rs     |   5 +-
 src/ui/hex_editor/component.rs |   4 +-
 6 files changed, 155 insertions(+), 135 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 79f07abe3..1cfb591c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -37,9 +37,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
  "addr2line",
  "cc",
@@ -67,24 +67,21 @@ checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9"
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
 
 [[package]]
 name = "cfg-if"
@@ -142,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -157,9 +154,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -167,15 +164,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -184,38 +181,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -231,9 +228,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -277,7 +274,7 @@ dependencies = [
  "gloo-dialogs 0.2.0",
  "gloo-events 0.2.0",
  "gloo-file 0.3.0",
- "gloo-history 0.2.1",
+ "gloo-history 0.2.2",
  "gloo-net 0.4.0",
  "gloo-render 0.2.0",
  "gloo-storage 0.3.0",
@@ -395,15 +392,15 @@ dependencies = [
 
 [[package]]
 name = "gloo-history"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4022e82f5f9e03cb1251b13c0a967e0600e97aa179c617f6519bac40640160"
+checksum = "903f432be5ba34427eac5e16048ef65604a82061fe93789f2212afc73d8617d6"
 dependencies = [
  "getrandom",
  "gloo-events 0.2.0",
  "gloo-utils 0.2.0",
  "serde",
- "serde-wasm-bindgen 0.6.1",
+ "serde-wasm-bindgen 0.6.5",
  "serde_urlencoded",
  "thiserror",
  "wasm-bindgen",
@@ -595,7 +592,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -618,15 +615,15 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "http"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -641,21 +638,21 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "implicit-clone"
-version = "0.3.6"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c6ecbd987bb94f1f3c76c6787879756cf4b6f73bfff48d79308e8c56b46f65f"
+checksum = "cfd6201e7c30ccb24773cac7efa6fec1e06189d414b7439ce756a481c8bfbf53"
 dependencies = [
  "indexmap 1.9.3",
 ]
 
 [[package]]
 name = "implicit-clone"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc06a255cbf402a52ae399c05a518c68c569c916ea11423620111df576b9b9bb"
+checksum = "f8a9aa791c7b5a71b636b7a68207fdebf171ddfc593d9c8506ec4cbc527b6a84"
 dependencies = [
  "implicit-clone-derive",
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
 ]
 
 [[package]]
@@ -665,7 +662,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9311685eb9a34808bbb0608ad2fcab9ae216266beca5848613e95553ac914e3b"
 dependencies = [
  "quote",
- "syn 2.0.39",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -680,9 +677,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.3",
@@ -690,15 +687,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.65"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -711,27 +708,27 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
 
 [[package]]
 name = "libc"
-version = "0.2.150"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
@@ -760,18 +757,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "paste"
@@ -787,22 +784,22 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -840,12 +837,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
+checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
 dependencies = [
  "proc-macro2",
- "syn 2.0.39",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -884,9 +881,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
 dependencies = [
  "unicode-ident",
 ]
@@ -910,9 +907,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -931,15 +928,15 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
@@ -957,9 +954,9 @@ dependencies = [
 
 [[package]]
 name = "serde-wasm-bindgen"
-version = "0.6.1"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d"
+checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b"
 dependencies = [
  "js-sys",
  "serde",
@@ -968,20 +965,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "itoa",
  "ryu",
@@ -1069,9 +1066,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1080,29 +1077,29 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "tokio"
-version = "1.34.0"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
 dependencies = [
  "backtrace",
  "pin-project-lite",
@@ -1110,9 +1107,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -1131,7 +1128,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
  "toml_datetime",
  "winnow",
 ]
@@ -1155,7 +1152,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1187,9 +1184,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -1197,24 +1194,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.55",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.38"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -1224,9 +1221,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1234,28 +1231,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.55",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "web-sys"
-version = "0.3.65"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1263,9 +1260,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.5.19"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
 dependencies = [
  "memchr",
 ]
@@ -1279,7 +1276,7 @@ dependencies = [
  "console_error_panic_hook",
  "futures",
  "gloo 0.8.1",
- "implicit-clone 0.3.6",
+ "implicit-clone 0.3.9",
  "indexmap 1.9.3",
  "js-sys",
  "prokio",
@@ -1304,8 +1301,8 @@ dependencies = [
  "console_error_panic_hook",
  "futures",
  "gloo 0.10.0",
- "implicit-clone 0.4.8",
- "indexmap 2.1.0",
+ "implicit-clone 0.4.9",
+ "indexmap 2.2.6",
  "js-sys",
  "prokio",
  "rustversion",
@@ -1342,7 +1339,7 @@ checksum = "7ad00f6c9436d25c9225ed0fd8eea27e6d2886c1387bf934afdf91e9131b8b77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1384,9 +1381,9 @@ checksum = "02fd8ca5166d69e59f796500a2ce432ff751edecbbb308ca59fd3fe4d0343de2"
 dependencies = [
  "boolinator",
  "once_cell",
- "prettyplease 0.2.15",
+ "prettyplease 0.2.16",
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.55",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 3ffe346c3..701bf1d24 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "swim"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.73"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 2d2656bde..1704bf387 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.67"
+channel = "1.73"
 components = [ "rustc", "cargo", "rustfmt", "rust-std", "rust-docs", "clippy" ]
 targets = [ "wasm32-unknown-unknown" ]
 profile = "default"
\ No newline at end of file
diff --git a/src/bin/main.rs b/src/bin/main.rs
index d68d56300..d75114f0c 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -517,11 +517,37 @@ fn app(props: &AppProps) -> Html {
 
                     // Editor
                     <div class="flex flex-col grow min-h-16 mt-2">
-                        <SwimEditor text_model={text_model} lines_content={lines_content} program_info={program_info_ref.borrow().clone()} pc_limit={*pc_limit} binary={binary_ref.borrow().clone()} memory_curr_instr={memory_curr_instr.clone()} editor_curr_line={editor_curr_line.clone()} editor_active_tab={editor_active_tab.clone()} console_active_tab={console_active_tab.clone()} pc={datapath_state.mips.registers.pc} communicator={props.communicator} current_architecture={datapath_state.current_architecture.clone()} speed={datapath_state.speed} sp={datapath_state.mips.registers[GpRegisterType::Sp]} memory={datapath_state.mips.memory.clone()} stack={datapath_state.mips.stack.clone()}/>
+                        <SwimEditor
+                            text_model={text_model}
+                            lines_content={lines_content}
+                            program_info={program_info_ref.borrow().clone()}
+                            pc_limit={*pc_limit}
+                            binary={binary_ref.borrow().clone()}
+                            memory_curr_instr={memory_curr_instr.clone()}
+                            editor_curr_line={editor_curr_line.clone()}
+                            editor_active_tab={editor_active_tab.clone()}
+                            console_active_tab={console_active_tab.clone()}
+                            pc={datapath_state.mips.registers.pc}
+                            communicator={props.communicator}
+                            current_architecture={datapath_state.current_architecture.clone()}
+                            speed={datapath_state.speed}
+                            sp={datapath_state.mips.registers[GpRegisterType::Sp]}
+                            memory={datapath_state.mips.memory.clone()}
+                            stack={datapath_state.mips.stack.clone()}
+                        />
                     </div>
 
                     // Console
-                    <Footer parsermsg={(*parser_text_output).clone()} datapath_state={datapath_state.clone()} memory_text_model={memory_text_model} memory_curr_instr={memory_curr_instr.clone()} active_tab={console_active_tab.clone()} communicator={props.communicator} show_input={show_input.clone()} on_memory_clicked={on_memory_clicked.clone()}/>
+                    <Footer
+                        parsermsg={(*parser_text_output).clone()}
+                        datapath_state={datapath_state.clone()}
+                        memory_text_model={memory_text_model}
+                        memory_curr_instr={memory_curr_instr.clone()} a
+                        ctive_tab={console_active_tab.clone()}
+                        communicator={props.communicator}
+                        show_input={show_input.clone()}
+                        on_memory_clicked={on_memory_clicked.clone()}
+                    />
                 </div>
 
                 // Right column
diff --git a/src/ui/footer/component.rs b/src/ui/footer/component.rs
index 71d958424..a03a9d960 100644
--- a/src/ui/footer/component.rs
+++ b/src/ui/footer/component.rs
@@ -21,7 +21,6 @@ pub struct Footerprops {
     pub memory_curr_instr: UseStateHandle<u64>,
     pub active_tab: UseStateHandle<TabState>,
     pub on_memory_clicked: Callback<MouseEvent>,
-    pub pc_limit: UseStateHandle<usize>,
 }
 
 #[function_component(Footer)]
@@ -62,13 +61,13 @@ pub fn footer(props: &Footerprops) -> Html {
     html! {
     <>
             // Console buttons
-            if **active_tab == FooterTabState::Console {
+            if **active_tab == TabState::Console {
                 <div class="h-48 border-primary-200 border-groove border-2 p-4 bg-accent-blue-300 text-primary-200 overflow-y-auto overflow-wrap z-10">
                     <Console datapath_state={props.datapath_state.clone()} communicator={props.communicator} parsermsg={props.parsermsg.clone()} show_input={props.show_input.clone()}/>
                 </div>
             } else if **active_tab == TabState::Datapath {
                 <VisualDatapath datapath_state={props.datapath_state.clone()} svg_path={svg_path} />
-            } else if **active_tab == FooterTabState::HexEditor {
+            } else if **active_tab == TabState::HexEditor {
                 <div class="flex h-48 border-primary-200 border-groove border-2 z-10">
                     <HexEditor memory_text_model={props.memory_text_model.clone()} memory_curr_instr={props.memory_curr_instr.clone()} datapath_state={props.datapath_state.clone()}/>
                 </div>
diff --git a/src/ui/hex_editor/component.rs b/src/ui/hex_editor/component.rs
index 48786196f..a4272a70a 100644
--- a/src/ui/hex_editor/component.rs
+++ b/src/ui/hex_editor/component.rs
@@ -35,7 +35,6 @@ pub struct HexEditorProps {
     pub datapath_state: UseReducerHandle<DatapathReducer>,
     // The instruction to highlight
     pub memory_curr_instr: UseStateHandle<u64>,
-    pub pc_limit: UseStateHandle<usize>,
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -146,7 +145,7 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
     let on_editor_created = {
         use_callback(
             move |editor_link: CodeEditorLink,
-                  (datapath_state, memory_text_model, _pc_limit, memory_curr_instr)| {
+                  (datapath_state, memory_text_model, memory_curr_instr)| {
                 match editor_link.with_editor(|editor| {
                     let hexdump = &datapath_state.mips.memory.generate_formatted_hex(CAPACITY_BYTES);
                     memory_text_model.set_value(hexdump);
@@ -193,7 +192,6 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
             (
                 props.datapath_state.clone(),
                 props.memory_text_model.clone(),
-                props.pc_limit.clone(),
                 memory_curr_instr,
             ),
         )

From e21428423f88b159badaf4d8b190c973b18c6040 Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Mon, 25 Mar 2024 15:22:30 -0400
Subject: [PATCH 05/21] Add more info in stack frame

---
 src/bin/main.rs                     |  4 +--
 src/emulation_core/mips/datapath.rs |  8 +++--
 src/emulation_core/mips/stack.rs    | 45 +++++++++++---------------
 src/ui/assembled_view/component.rs  | 50 +++++++++++++++++------------
 src/ui/swim_editor/component.rs     | 14 ++++++--
 5 files changed, 68 insertions(+), 53 deletions(-)

diff --git a/src/bin/main.rs b/src/bin/main.rs
index d75114f0c..89e744a3b 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -542,8 +542,8 @@ fn app(props: &AppProps) -> Html {
                         parsermsg={(*parser_text_output).clone()}
                         datapath_state={datapath_state.clone()}
                         memory_text_model={memory_text_model}
-                        memory_curr_instr={memory_curr_instr.clone()} a
-                        ctive_tab={console_active_tab.clone()}
+                        memory_curr_instr={memory_curr_instr.clone()}
+                        active_tab={console_active_tab.clone()}
                         communicator={props.communicator}
                         show_input={show_input.clone()}
                         on_memory_clicked={on_memory_clicked.clone()}
diff --git a/src/emulation_core/mips/datapath.rs b/src/emulation_core/mips/datapath.rs
index 0cb5e0b37..c8d81875d 100644
--- a/src/emulation_core/mips/datapath.rs
+++ b/src/emulation_core/mips/datapath.rs
@@ -58,6 +58,7 @@ use crate::emulation_core::mips::fp_registers::FpRegisterType;
 use crate::emulation_core::mips::gp_registers::GpRegisterType::{A0, A1};
 use crate::emulation_core::mips::stack::{Stack, StackFrame};
 use serde::{Deserialize, Serialize};
+use gloo_console::log;
 
 /// An implementation of a datapath for the MIPS64 ISA.
 #[derive(Clone, PartialEq)]
@@ -427,10 +428,13 @@ impl MipsDatapath {
         };
 
         if hit_branch || hit_jump {
-            // Add current line to stack if branch is taken
+            // Add current line to stack if branch is taken=
             let frame = StackFrame::new(
                 self.state.instruction,
-                self.registers.pc as u32,
+                self.registers.pc,
+                self.state.pc_plus_4,
+                self.registers.gpr[31],
+                self.registers.gpr[30],
             );
             self.stack.push(frame);
         }
diff --git a/src/emulation_core/mips/stack.rs b/src/emulation_core/mips/stack.rs
index 3300649be..76d8139b4 100644
--- a/src/emulation_core/mips/stack.rs
+++ b/src/emulation_core/mips/stack.rs
@@ -1,14 +1,28 @@
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Stack {
-    pub stack: Vec<StackFrame>,
+pub struct StackFrame {
+    pub call_instruction: u32,
+    pub call_address: u32,
+    pub return_address: u64,
+    pub frame_pointer: u64,
+    pub stack_pointer: u64
 }
 
+impl StackFrame {
+    pub fn new(call_instruction: u32, call_address: u64, return_address: u64, frame_pointer: u64, stack_pointer: u64) -> Self {
+        Self {
+            call_instruction,
+            call_address: call_address as u32,
+            return_address,
+            frame_pointer,
+            stack_pointer
+        }
+    }
+}
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct StackFrame {
-    pub instruction: u32,
-    pub address: u32,
+pub struct Stack {
+    pub stack: Vec<StackFrame>,
 }
 
 impl Default for Stack {
@@ -19,18 +33,6 @@ impl Default for Stack {
     }
 }
 
-impl ToString for Stack {
-    fn to_string(&self) -> String {
-        let mut output = String::new();
-
-        for frame in &self.stack {
-            output.push_str(&format!("{:08x}  {}\n", frame.address, frame.instruction));
-        }
-
-        output
-    }
-}
-
 impl Stack {
     pub fn push(&mut self, frame: StackFrame) {
         self.stack.push(frame);
@@ -45,15 +47,6 @@ impl Stack {
     }
 }
 
-impl StackFrame {
-    pub fn new(instruction: u32, address: u32) -> Self {
-        Self {
-            instruction,
-            address,
-        }
-    }
-}
-
 pub struct StackIter<'a> {
     stack: &'a Stack,
     current_address: u32,
diff --git a/src/ui/assembled_view/component.rs b/src/ui/assembled_view/component.rs
index d1e710ba1..cdd76c0ba 100644
--- a/src/ui/assembled_view/component.rs
+++ b/src/ui/assembled_view/component.rs
@@ -334,6 +334,7 @@ pub struct StackFrameProps {
     pub stack: Stack,
     pub memory_curr_instr: UseStateHandle<u64>,
     pub console_active_tab: UseStateHandle<TabState>,
+    pub program_info: ProgramInfo,
 }
 
 #[function_component]
@@ -341,7 +342,7 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
     let console_active_tab = &props.console_active_tab;
     let memory_curr_instr = &props.memory_curr_instr;
     let stack = &props.stack;
-    log::debug!("Stack: {:?}", stack.stack);
+    let program_info = &props.program_info;
 
     // Go to the memory address in hex editor
     let on_address_click = {
@@ -361,40 +362,47 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
         <table class="h-[96%] bg-primary-900">
         // | address | data in hex
             <tr>
-                <th>{"Address"}</th>
-                <th>{"Hex"}</th>
+                <th>{"Call Address"}</th>
+                <th>{"Call Hex"}</th>
+                <th>{"Call Line"}</th>
+                <th>{"Return Address"}</th>
+                <th>{"Frame Pointer"}</th>
+                <th>{"Stack Pointer"}</th>
             </tr>
             {
                 if !stack.stack.is_empty() {
                     let stack = stack.stack.clone();
                     stack.into_iter().enumerate().map(|(address, frame)| {
-                        let on_address_click = Callback::clone(&on_address_click);
+                        let call_line_number = frame.call_address / 4;
+                        log::debug!("Call Line Number: {}", call_line_number);
+                        let call_recreated_string = program_info.instructions[call_line_number as usize].recreate_string();
+                        log::debug!("Call Recreated String: {:?}", call_recreated_string);
+                        let on_call_address_click = Callback::clone(&on_address_click);
+                        let on_return_address_click = Callback::clone(&on_address_click);
                         log::debug!("Frame: {:?}", frame);
                         html! {
                             <tr>
-                                <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.address)} onclick={move |e: MouseEvent| {on_address_click.emit((e, frame.address as usize))}}>
-                                    {format!("0x{:08x}", frame.address as u64)}
+                                <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.call_address)} onclick={move |e: MouseEvent| {on_call_address_click.emit((e, frame.call_address as usize))}}>
+                                    {format!("0x{:08x}", frame.call_address as u64)}
+                                </td>
+                                <td>
+                                    {format!("0x{:08x}", frame.call_instruction)}
+                                </td>
+                                <td>
+                                    {format!("{}: {:?}", call_line_number + 1, call_recreated_string)}
+                                </td>
+                                <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.return_address)} onclick={move |e: MouseEvent| {on_return_address_click.emit((e, frame.return_address as usize))}}>
+                                    {format!("0x{:08x}", frame.return_address as u64)}
+                                </td>
+                                <td>
+                                    {format!("{:?}", frame.frame_pointer)}
                                 </td>
                                 <td>
-                                    {format!("0x{:08x}", frame.instruction)}
+                                    {format!("{:?}", frame.stack_pointer)}
                                 </td>
                             </tr>
                         }
                     }).collect::<Html>()
-                    // let stack_iter = StackIter::new(&stack, 0);
-                    // stack_iter.map(|frame| {
-                    //     let on_address_click = Callback::clone(&on_address_click);
-                    //     html! {
-                    //         <tr>
-                    //             <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.address)} onclick={move |e: MouseEvent| {on_address_click.emit((e, frame.address as usize))}}>
-                    //                 {format!("0x{:08x}", frame.address as u64)}
-                    //             </td>
-                    //             <td>
-                    //                 {format!("0x{:08x}", frame.instruction)}
-                    //             </td>
-                    //         </tr>
-                    //     }
-                    // }).collect::<Html>()
                 }
                 else {
                     html! {<></>}
diff --git a/src/ui/swim_editor/component.rs b/src/ui/swim_editor/component.rs
index 88aae6bac..9b0930436 100644
--- a/src/ui/swim_editor/component.rs
+++ b/src/ui/swim_editor/component.rs
@@ -296,9 +296,19 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
             } else if **editor_active_tab == TabState::DataSegment {
                 <DataSegment lines_content={props.lines_content.clone()} program_info={props.program_info.clone()} binary={props.binary.clone()} editor_active_tab={editor_active_tab.clone()} console_active_tab={console_active_tab.clone()} memory_curr_instr={props.memory_curr_instr.clone()} editor_curr_line={props.editor_curr_line.clone()} pc_limit={props.pc_limit}/>
             } else if **editor_active_tab == TabState::StackSegment {
-                <StackSegment memory_curr_instr={props.memory_curr_instr.clone()} console_active_tab={console_active_tab.clone()} sp={props.sp} memory={props.memory.clone()}/>
+                <StackSegment
+                    memory_curr_instr={props.memory_curr_instr.clone()}
+                    console_active_tab={console_active_tab.clone()}
+                    sp={props.sp}
+                    memory={props.memory.clone()}
+                />
             } else if **editor_active_tab == TabState::StackFrameView {
-                <StackFrameView memory_curr_instr={props.memory_curr_instr.clone()} stack={props.stack.clone()} console_active_tab={console_active_tab.clone()}/>
+                <StackFrameView
+                    memory_curr_instr={props.memory_curr_instr.clone()}
+                    stack={props.stack.clone()}
+                    console_active_tab={console_active_tab.clone()}
+                    program_info={props.program_info.clone()}
+                />
             }
         </>
     }

From dbb56748b6def129f4592ba96632c9880f543650 Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Mon, 25 Mar 2024 17:01:29 -0400
Subject: [PATCH 06/21] Fix reset causing panic in UI

---
 src/agent.rs                             |  2 +-
 src/bin/main.rs                          | 30 ++++++++++++++++++------
 src/emulation_core/datapath.rs           |  6 ++---
 src/emulation_core/mips/datapath.rs      | 16 +++----------
 src/emulation_core/mips/memory.rs        |  9 ++-----
 src/emulation_core/mips/stack.rs         | 27 +++++++++------------
 src/parser/parser_assembler_main.rs      |  4 ++--
 src/parser/pseudo_instruction_parsing.rs |  2 +-
 src/ui/assembled_view/component.rs       | 24 ++++++++-----------
 src/ui/hex_editor/component.rs           |  5 +++-
 src/ui/swim_editor/tab.rs                |  2 +-
 11 files changed, 61 insertions(+), 66 deletions(-)

diff --git a/src/agent.rs b/src/agent.rs
index 773e4b20c..278652ec7 100644
--- a/src/agent.rs
+++ b/src/agent.rs
@@ -110,7 +110,7 @@ pub async fn emulation_core_agent(scope: ReactorScope<Command, DatapathUpdate>)
                 );
                 send_update_mips!(
                     state.scope,
-                    state.updates.hit_branch,
+                    state.updates.changed_stack,
                     UpdateStack(datapath.stack.clone())
                 )
             }
diff --git a/src/bin/main.rs b/src/bin/main.rs
index 89e744a3b..8d3ce3d33 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -209,7 +209,12 @@ fn app(props: &AppProps) -> Html {
 
                 trigger.force_update();
             },
-            (editor_curr_line, memory_curr_instr, text_model, datapath_state),
+            (
+                editor_curr_line,
+                memory_curr_instr,
+                text_model,
+                datapath_state,
+            ),
         )
     };
 
@@ -243,7 +248,12 @@ fn app(props: &AppProps) -> Html {
 
                 trigger.force_update();
             },
-            (editor_curr_line, memory_curr_instr, text_model, datapath_state),
+            (
+                editor_curr_line,
+                memory_curr_instr,
+                text_model,
+                datapath_state,
+            ),
         )
     };
 
@@ -412,7 +422,7 @@ fn app(props: &AppProps) -> Html {
         let memory_curr_instr = memory_curr_instr.clone();
 
         use_callback(
-            move |_, editor_curr_line| {
+            move |_, (editor_curr_line, program_info_ref, binary_ref)| {
                 // Set highlighted line to 0
                 editor_curr_line.set(0.0);
                 memory_curr_instr.set(0);
@@ -420,10 +430,16 @@ fn app(props: &AppProps) -> Html {
                 parser_text_output.set("".to_string());
                 communicator.reset();
 
-                communicator.reset();
+                *program_info_ref.borrow_mut() = ProgramInfo::default();
+                *binary_ref.borrow_mut() = vec![];
+
                 trigger.force_update();
             },
-            editor_curr_line,
+            (
+                editor_curr_line,
+                program_info_ref.clone(),
+                binary_ref.clone(),
+            ),
         )
     };
 
@@ -474,10 +490,10 @@ fn app(props: &AppProps) -> Html {
                                     <path d="M18 4.30769L14 0H0V28H32V4.30769H18ZM16 11.8462L23 19.3846H18V28H14V19.3846H9L16 11.8462Z" fill="#BBBBBB"/>
                                 </svg>
                             </button>
-                            <button class="group disabled:opacity-30 duration-300 " title="Assemble" onclick={on_assemble_clicked}>
+                            <button class="group disabled:opacity-30 duration-300 " title="Assemble" onclick={on_assemble_clicked} disabled={datapath_state.initialized}>
                                 <svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
                                     <path class="group-hover:stroke-primary-100 group-hover:fill-primary-100" fill-rule="evenodd" clip-rule="evenodd" d="M34.1794 19.1007C34.1794 23.0891 32.595 26.9142 29.7748 29.7345C26.9545 32.5547 23.1294 34.1392 19.141 34.1392C15.1525 34.1392 11.3274 32.5547 8.50714 29.7345C5.68688 26.9142 4.10247 23.0891 4.10247 19.1007C4.10247 15.1122 5.68688 11.2871 8.50714 8.46686C11.3274 5.6466 15.1525 4.06219 19.141 4.06219C23.1294 4.06219 26.9545 5.6466 29.7748 8.46686C32.595 11.2871 34.1794 15.1122 34.1794 19.1007ZM34.1183 17.5507L36.2416 19.1007L34.1183 20.4552L35.9114 22.4366L33.5523 23.3059L34.941 25.6444L32.4369 25.9915L33.3606 28.6029L30.6009 28.8385L31.2344 31.1941L28.5455 30.894L28.6432 33.3203L26.1295 32.508L25.6847 34.9007L23.4439 33.6234L22.4768 35.8711L20.5932 34.0981L19.141 36.2013L17.6887 34.0981L15.8051 35.8711L14.838 33.532L12.5972 34.9007L12.1524 32.4167L9.63871 33.3203L9.5403 30.8617L7.04749 31.1941L7.48485 28.8063L4.92128 28.6029L5.87082 26.3903L3.34095 25.6444L4.75548 23.7047L2.3705 22.4366L4.18939 20.4552L2.04028 19.1007L4.18939 17.5507L2.3705 15.7648L4.75548 14.7L3.34095 12.5569L5.87082 12.0144L4.92128 9.59843H7.48485L7.04749 7.00721L9.64964 7.44457L9.63871 4.881L12.0656 5.83053L12.5972 3.30066L14.7512 4.7152L15.8051 2.33022L17.6019 4.14911L19.141 2L20.4564 3.97315L22.4768 2.33022L23.4161 4.30201L25.6847 3.30066L26.2272 5.83053L28.6432 4.881V7.44457L31.2344 7.00721L30.6986 9.50002L33.3606 9.59843L32.3127 11.916L34.941 12.5569L33.5523 14.7L35.9114 15.7648L34.1183 17.5507Z" stroke="#BBBBBB" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
-                                    <path class="group-hover:stroke-primary-100 group-hover:fill-primary-100" d="M27.4664 24.3107L22.6243 19.1458C22.3246 18.8261 21.8341 18.8261 21.5343 19.1458L21.171 19.5333L18.2164 16.3818L23.0667 11.2081H17.9283L15.6471 13.6413L15.4214 13.4005H14.3314V14.5632L14.5571 14.804L11.2483 18.3334L13.8175 21.0739L17.1263 17.5445L20.0809 20.6961L19.7176 21.0836C19.4178 21.4034 19.4178 21.9266 19.7176 22.2463L24.5597 27.4112C24.8594 27.731 25.3499 27.731 25.6497 27.4112L27.4664 25.4734C27.7662 25.1537 27.7662 24.6305 27.4664 24.3107Z" fill="#BBBBBB"/>
+                                    <path class="group-hover:group-enabled:stroke-primary-100 group-hover:group-enabled:fill-primary-100" d="M27.4664 24.3107L22.6243 19.1458C22.3246 18.8261 21.8341 18.8261 21.5343 19.1458L21.171 19.5333L18.2164 16.3818L23.0667 11.2081H17.9283L15.6471 13.6413L15.4214 13.4005H14.3314V14.5632L14.5571 14.804L11.2483 18.3334L13.8175 21.0739L17.1263 17.5445L20.0809 20.6961L19.7176 21.0836C19.4178 21.4034 19.4178 21.9266 19.7176 22.2463L24.5597 27.4112C24.8594 27.731 25.3499 27.731 25.6497 27.4112L27.4664 25.4734C27.7662 25.1537 27.7662 24.6305 27.4664 24.3107Z" fill="#BBBBBB"/>
                                 </svg>
                             </button>
                             <button class="group hover:stroke-primary-100 disabled:opacity-30 duration-300 " title="Execute" onclick={on_continue_execution} disabled={datapath_state.executing || !datapath_state.initialized}>
diff --git a/src/emulation_core/datapath.rs b/src/emulation_core/datapath.rs
index 5b8483c10..d364021f5 100644
--- a/src/emulation_core/datapath.rs
+++ b/src/emulation_core/datapath.rs
@@ -168,9 +168,9 @@ pub struct DatapathUpdateSignal {
     pub changed_coprocessor_state: bool,
     pub changed_coprocessor_registers: bool,
     pub changed_memory: bool,
+    pub changed_stack: bool,
     pub hit_syscall: bool,
     pub hit_breakpoint: bool,
-    pub hit_branch: bool,
 }
 
 /// Constant used to easily trigger an update for everything but to avoid triggering any other
@@ -181,9 +181,9 @@ pub const UPDATE_EVERYTHING: DatapathUpdateSignal = DatapathUpdateSignal {
     changed_coprocessor_state: true,
     changed_coprocessor_registers: true,
     changed_memory: true,
+    changed_stack: true,
     hit_syscall: false,
     hit_breakpoint: false,
-    hit_branch: false,
 };
 
 impl BitOrAssign for DatapathUpdateSignal {
@@ -193,8 +193,8 @@ impl BitOrAssign for DatapathUpdateSignal {
         self.changed_coprocessor_state |= rhs.changed_coprocessor_state;
         self.changed_coprocessor_registers |= rhs.changed_coprocessor_registers;
         self.changed_memory |= rhs.changed_memory;
+        self.changed_stack |= rhs.changed_stack;
         self.hit_syscall |= rhs.hit_syscall;
         self.hit_breakpoint |= rhs.hit_breakpoint;
-        self.hit_branch |= rhs.hit_branch;
     }
 }
diff --git a/src/emulation_core/mips/datapath.rs b/src/emulation_core/mips/datapath.rs
index c8d81875d..4918d6f60 100644
--- a/src/emulation_core/mips/datapath.rs
+++ b/src/emulation_core/mips/datapath.rs
@@ -58,7 +58,6 @@ use crate::emulation_core::mips::fp_registers::FpRegisterType;
 use crate::emulation_core::mips::gp_registers::GpRegisterType::{A0, A1};
 use crate::emulation_core::mips::stack::{Stack, StackFrame};
 use serde::{Deserialize, Serialize};
-use gloo_console::log;
 
 /// An implementation of a datapath for the MIPS64 ISA.
 #[derive(Clone, PartialEq)]
@@ -244,8 +243,6 @@ impl Datapath for MipsDatapath {
 
             result_signals |= self.execute_stage();
 
-
-
             // This instruction is finished when the datapath has returned
             // to the IF stage.
             if self.current_stage == Stage::InstructionFetch {
@@ -416,16 +413,9 @@ impl MipsDatapath {
         };
 
         // Check if we hit a branch and signal it to the caller
-        let hit_branch = match self.signals.branch {
-            Branch::YesBranch => true,
-            _ => false
-        };
+        let hit_branch = matches!(self.signals.branch, Branch::YesBranch);
 
-        let hit_jump = match self.signals.jump {
-            Jump::YesJump => true,
-            Jump::YesJumpJalr => true,
-            _ => false
-        };
+        let hit_jump = matches!(self.signals.jump, Jump::YesJump | Jump::YesJumpJalr);
 
         if hit_branch || hit_jump {
             // Add current line to stack if branch is taken=
@@ -445,7 +435,7 @@ impl MipsDatapath {
             changed_coprocessor_state: true,
             hit_syscall,
             hit_breakpoint,
-            hit_branch: hit_branch || hit_jump,
+            changed_stack: hit_branch || hit_jump,
             ..Default::default()
         }
     }
diff --git a/src/emulation_core/mips/memory.rs b/src/emulation_core/mips/memory.rs
index ed772335c..7c2d00efd 100644
--- a/src/emulation_core/mips/memory.rs
+++ b/src/emulation_core/mips/memory.rs
@@ -203,11 +203,7 @@ pub struct MemoryIter<'a> {
 }
 
 impl<'a> MemoryIter<'a> {
-    pub fn new(
-        memory: &'a Memory,
-        current_address: usize,
-        end_address: usize,
-    ) -> MemoryIter<'a> {
+    pub fn new(memory: &'a Memory, current_address: usize, end_address: usize) -> MemoryIter<'a> {
         MemoryIter {
             memory,
             current_address,
@@ -221,8 +217,7 @@ impl<'a> Iterator for MemoryIter<'a> {
     type Item = (usize, Vec<u32>);
     fn next(&mut self) -> Option<Self::Item> {
         self.current_address = (self.current_address + 3) & !3;
-        if self.current_address + 16 <= self.end_address
-        {
+        if self.current_address + 16 <= self.end_address {
             let address = self.current_address;
             let words = (0..4)
                 .map(|i| self.memory.load_word(address as u64 + (i * 4)).unwrap())
diff --git a/src/emulation_core/mips/stack.rs b/src/emulation_core/mips/stack.rs
index 76d8139b4..b97cb554d 100644
--- a/src/emulation_core/mips/stack.rs
+++ b/src/emulation_core/mips/stack.rs
@@ -6,33 +6,31 @@ pub struct StackFrame {
     pub call_address: u32,
     pub return_address: u64,
     pub frame_pointer: u64,
-    pub stack_pointer: u64
+    pub stack_pointer: u64,
 }
 
 impl StackFrame {
-    pub fn new(call_instruction: u32, call_address: u64, return_address: u64, frame_pointer: u64, stack_pointer: u64) -> Self {
+    pub fn new(
+        call_instruction: u32,
+        call_address: u64,
+        return_address: u64,
+        frame_pointer: u64,
+        stack_pointer: u64,
+    ) -> Self {
         Self {
             call_instruction,
             call_address: call_address as u32,
             return_address,
             frame_pointer,
-            stack_pointer
+            stack_pointer,
         }
     }
 }
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 pub struct Stack {
     pub stack: Vec<StackFrame>,
 }
 
-impl Default for Stack {
-    fn default() -> Self {
-        Self {
-            stack: Vec::new(),
-        }
-    }
-}
-
 impl Stack {
     pub fn push(&mut self, frame: StackFrame) {
         self.stack.push(frame);
@@ -53,10 +51,7 @@ pub struct StackIter<'a> {
 }
 
 impl<'a> StackIter<'a> {
-    pub fn new(
-        stack: &'a Stack,
-        current_address: u32,
-    ) -> StackIter<'a> {
+    pub fn new(stack: &'a Stack, current_address: u32) -> StackIter<'a> {
         StackIter {
             stack,
             current_address,
diff --git a/src/parser/parser_assembler_main.rs b/src/parser/parser_assembler_main.rs
index 222f6d261..77fa36fee 100644
--- a/src/parser/parser_assembler_main.rs
+++ b/src/parser/parser_assembler_main.rs
@@ -141,7 +141,7 @@ pub fn read_instructions(
     labels: &HashMap<String, usize>,
     monaco_line_info: &mut [MonacoLineInfo],
 ) {
-    for mut instruction in &mut instruction_list.iter_mut() {
+    for instruction in &mut instruction_list.iter_mut() {
         //this match case is the heart of the parser and figures out which instruction type it is
         //then it can call the proper functions for that specific instruction
         match &*instruction.operator.token_name.to_lowercase() {
@@ -1551,7 +1551,7 @@ pub fn read_instructions_riscv(
     _labels: &HashMap<String, usize>,
     monaco_line_info: &mut [MonacoLineInfo],
 ) {
-    for mut instruction in &mut instruction_list.iter_mut() {
+    for instruction in &mut instruction_list.iter_mut() {
         match &*instruction.operator.token_name.to_lowercase() {
             "add" => {
                 // Funct7
diff --git a/src/parser/pseudo_instruction_parsing.rs b/src/parser/pseudo_instruction_parsing.rs
index 02a1dcfbc..4890bb436 100644
--- a/src/parser/pseudo_instruction_parsing.rs
+++ b/src/parser/pseudo_instruction_parsing.rs
@@ -1263,7 +1263,7 @@ pub fn expand_pseudo_instructions_and_assign_instruction_numbers_riscv(
     let vec_of_added_instructions: Vec<Instruction> = Vec::new();
 
     //iterate through every instruction and check if the operator is a pseudo-instruction
-    for (i, mut instruction) in &mut instructions.iter_mut().enumerate() {
+    for (i, instruction) in &mut instructions.iter_mut().enumerate() {
         instruction.instruction_number = i + vec_of_added_instructions.len();
         match &*instruction.operator.token_name.to_lowercase() {
             "nop" => {
diff --git a/src/ui/assembled_view/component.rs b/src/ui/assembled_view/component.rs
index cdd76c0ba..2e35f8de2 100644
--- a/src/ui/assembled_view/component.rs
+++ b/src/ui/assembled_view/component.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 
 use crate::agent::datapath_communicator::DatapathCommunicator;
 use crate::emulation_core::mips::memory::{Memory, MemoryIter};
-use crate::emulation_core::mips::stack::{Stack, StackFrame, StackIter};
+use crate::emulation_core::mips::stack::Stack;
 // use monaco::api::TextModel;
 use crate::parser::parser_structs_and_enums::ProgramInfo;
 use crate::ui::swim_editor::tab::TabState;
@@ -311,9 +311,9 @@ pub fn StackSegment(props: &StackSegmentProps) -> Html {
                                 </td>
                                 <td>
                                     {
-                                        words.iter().map(|word| {
-                                            format!("0x{:08x} ", word)
-                                        }).collect::<String>()
+                                        words.iter().fold(String::new(), |acc, word| {
+                                            format!("{}0x{:08x} ", acc, word)
+                                        })
                                     }
                                 </td>
                             </tr>
@@ -328,7 +328,6 @@ pub fn StackSegment(props: &StackSegmentProps) -> Html {
     }
 }
 
-
 #[derive(PartialEq, Properties)]
 pub struct StackFrameProps {
     pub stack: Stack,
@@ -363,42 +362,39 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
         // | address | data in hex
             <tr>
                 <th>{"Call Address"}</th>
-                <th>{"Call Hex"}</th>
                 <th>{"Call Line"}</th>
                 <th>{"Return Address"}</th>
                 <th>{"Frame Pointer"}</th>
                 <th>{"Stack Pointer"}</th>
             </tr>
             {
-                if !stack.stack.is_empty() {
+                if !stack.stack.is_empty() && program_info.instructions.len() > 0 {
                     let stack = stack.stack.clone();
-                    stack.into_iter().enumerate().map(|(address, frame)| {
+                    stack.into_iter().enumerate().map(|(_address, frame)| {
                         let call_line_number = frame.call_address / 4;
                         log::debug!("Call Line Number: {}", call_line_number);
                         let call_recreated_string = program_info.instructions[call_line_number as usize].recreate_string();
                         log::debug!("Call Recreated String: {:?}", call_recreated_string);
                         let on_call_address_click = Callback::clone(&on_address_click);
                         let on_return_address_click = Callback::clone(&on_address_click);
+                        let on_stack_pointer_click = Callback::clone(&on_address_click);
                         log::debug!("Frame: {:?}", frame);
                         html! {
                             <tr>
                                 <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.call_address)} onclick={move |e: MouseEvent| {on_call_address_click.emit((e, frame.call_address as usize))}}>
                                     {format!("0x{:08x}", frame.call_address as u64)}
                                 </td>
-                                <td>
-                                    {format!("0x{:08x}", frame.call_instruction)}
-                                </td>
                                 <td>
                                     {format!("{}: {:?}", call_line_number + 1, call_recreated_string)}
                                 </td>
                                 <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.return_address)} onclick={move |e: MouseEvent| {on_return_address_click.emit((e, frame.return_address as usize))}}>
-                                    {format!("0x{:08x}", frame.return_address as u64)}
+                                    {format!("0x{:08x}", frame.return_address)}
                                 </td>
                                 <td>
                                     {format!("{:?}", frame.frame_pointer)}
                                 </td>
-                                <td>
-                                    {format!("{:?}", frame.stack_pointer)}
+                                <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.stack_pointer)} onclick={move |e: MouseEvent| {on_stack_pointer_click.emit((e, frame.stack_pointer as usize))}}>
+                                    {format!("0x{:08x}", frame.stack_pointer)}
                                 </td>
                             </tr>
                         }
diff --git a/src/ui/hex_editor/component.rs b/src/ui/hex_editor/component.rs
index a4272a70a..e4b56ec7c 100644
--- a/src/ui/hex_editor/component.rs
+++ b/src/ui/hex_editor/component.rs
@@ -147,7 +147,10 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
             move |editor_link: CodeEditorLink,
                   (datapath_state, memory_text_model, memory_curr_instr)| {
                 match editor_link.with_editor(|editor| {
-                    let hexdump = &datapath_state.mips.memory.generate_formatted_hex(CAPACITY_BYTES);
+                    let hexdump = &datapath_state
+                        .mips
+                        .memory
+                        .generate_formatted_hex(CAPACITY_BYTES);
                     memory_text_model.set_value(hexdump);
 
                     let raw_editor = editor.as_ref();
diff --git a/src/ui/swim_editor/tab.rs b/src/ui/swim_editor/tab.rs
index ba2caab58..a4a60ed95 100644
--- a/src/ui/swim_editor/tab.rs
+++ b/src/ui/swim_editor/tab.rs
@@ -12,7 +12,7 @@ pub enum TabState {
     TextSegment,
     DataSegment,
     StackSegment,
-    StackFrameView
+    StackFrameView,
 }
 
 impl FromStr for TabState {

From 76b1f8e4aa2d7e98e0162ac8eb60753b74d8bad2 Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Mon, 25 Mar 2024 17:07:48 -0400
Subject: [PATCH 07/21] Fix styling

---
 src/bin/main.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/main.rs b/src/bin/main.rs
index 8d3ce3d33..1c716814a 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -492,7 +492,7 @@ fn app(props: &AppProps) -> Html {
                             </button>
                             <button class="group disabled:opacity-30 duration-300 " title="Assemble" onclick={on_assemble_clicked} disabled={datapath_state.initialized}>
                                 <svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                    <path class="group-hover:stroke-primary-100 group-hover:fill-primary-100" fill-rule="evenodd" clip-rule="evenodd" d="M34.1794 19.1007C34.1794 23.0891 32.595 26.9142 29.7748 29.7345C26.9545 32.5547 23.1294 34.1392 19.141 34.1392C15.1525 34.1392 11.3274 32.5547 8.50714 29.7345C5.68688 26.9142 4.10247 23.0891 4.10247 19.1007C4.10247 15.1122 5.68688 11.2871 8.50714 8.46686C11.3274 5.6466 15.1525 4.06219 19.141 4.06219C23.1294 4.06219 26.9545 5.6466 29.7748 8.46686C32.595 11.2871 34.1794 15.1122 34.1794 19.1007ZM34.1183 17.5507L36.2416 19.1007L34.1183 20.4552L35.9114 22.4366L33.5523 23.3059L34.941 25.6444L32.4369 25.9915L33.3606 28.6029L30.6009 28.8385L31.2344 31.1941L28.5455 30.894L28.6432 33.3203L26.1295 32.508L25.6847 34.9007L23.4439 33.6234L22.4768 35.8711L20.5932 34.0981L19.141 36.2013L17.6887 34.0981L15.8051 35.8711L14.838 33.532L12.5972 34.9007L12.1524 32.4167L9.63871 33.3203L9.5403 30.8617L7.04749 31.1941L7.48485 28.8063L4.92128 28.6029L5.87082 26.3903L3.34095 25.6444L4.75548 23.7047L2.3705 22.4366L4.18939 20.4552L2.04028 19.1007L4.18939 17.5507L2.3705 15.7648L4.75548 14.7L3.34095 12.5569L5.87082 12.0144L4.92128 9.59843H7.48485L7.04749 7.00721L9.64964 7.44457L9.63871 4.881L12.0656 5.83053L12.5972 3.30066L14.7512 4.7152L15.8051 2.33022L17.6019 4.14911L19.141 2L20.4564 3.97315L22.4768 2.33022L23.4161 4.30201L25.6847 3.30066L26.2272 5.83053L28.6432 4.881V7.44457L31.2344 7.00721L30.6986 9.50002L33.3606 9.59843L32.3127 11.916L34.941 12.5569L33.5523 14.7L35.9114 15.7648L34.1183 17.5507Z" stroke="#BBBBBB" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
+                                    <path class="group-hover:group-enabled:stroke-primary-100 group-hover:group-enabled:fill-primary-100" fill-rule="evenodd" clip-rule="evenodd" d="M34.1794 19.1007C34.1794 23.0891 32.595 26.9142 29.7748 29.7345C26.9545 32.5547 23.1294 34.1392 19.141 34.1392C15.1525 34.1392 11.3274 32.5547 8.50714 29.7345C5.68688 26.9142 4.10247 23.0891 4.10247 19.1007C4.10247 15.1122 5.68688 11.2871 8.50714 8.46686C11.3274 5.6466 15.1525 4.06219 19.141 4.06219C23.1294 4.06219 26.9545 5.6466 29.7748 8.46686C32.595 11.2871 34.1794 15.1122 34.1794 19.1007ZM34.1183 17.5507L36.2416 19.1007L34.1183 20.4552L35.9114 22.4366L33.5523 23.3059L34.941 25.6444L32.4369 25.9915L33.3606 28.6029L30.6009 28.8385L31.2344 31.1941L28.5455 30.894L28.6432 33.3203L26.1295 32.508L25.6847 34.9007L23.4439 33.6234L22.4768 35.8711L20.5932 34.0981L19.141 36.2013L17.6887 34.0981L15.8051 35.8711L14.838 33.532L12.5972 34.9007L12.1524 32.4167L9.63871 33.3203L9.5403 30.8617L7.04749 31.1941L7.48485 28.8063L4.92128 28.6029L5.87082 26.3903L3.34095 25.6444L4.75548 23.7047L2.3705 22.4366L4.18939 20.4552L2.04028 19.1007L4.18939 17.5507L2.3705 15.7648L4.75548 14.7L3.34095 12.5569L5.87082 12.0144L4.92128 9.59843H7.48485L7.04749 7.00721L9.64964 7.44457L9.63871 4.881L12.0656 5.83053L12.5972 3.30066L14.7512 4.7152L15.8051 2.33022L17.6019 4.14911L19.141 2L20.4564 3.97315L22.4768 2.33022L23.4161 4.30201L25.6847 3.30066L26.2272 5.83053L28.6432 4.881V7.44457L31.2344 7.00721L30.6986 9.50002L33.3606 9.59843L32.3127 11.916L34.941 12.5569L33.5523 14.7L35.9114 15.7648L34.1183 17.5507Z" stroke="#BBBBBB" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
                                     <path class="group-hover:group-enabled:stroke-primary-100 group-hover:group-enabled:fill-primary-100" d="M27.4664 24.3107L22.6243 19.1458C22.3246 18.8261 21.8341 18.8261 21.5343 19.1458L21.171 19.5333L18.2164 16.3818L23.0667 11.2081H17.9283L15.6471 13.6413L15.4214 13.4005H14.3314V14.5632L14.5571 14.804L11.2483 18.3334L13.8175 21.0739L17.1263 17.5445L20.0809 20.6961L19.7176 21.0836C19.4178 21.4034 19.4178 21.9266 19.7176 22.2463L24.5597 27.4112C24.8594 27.731 25.3499 27.731 25.6497 27.4112L27.4664 25.4734C27.7662 25.1537 27.7662 24.6305 27.4664 24.3107Z" fill="#BBBBBB"/>
                                 </svg>
                             </button>
@@ -532,7 +532,7 @@ fn app(props: &AppProps) -> Html {
                     </div>
 
                     // Editor
-                    <div class="flex flex-col grow min-h-16 mt-2">
+                    <div class="flex flex-col grow min-h-16 mt-2 h-full overflow-auto">
                         <SwimEditor
                             text_model={text_model}
                             lines_content={lines_content}

From e3e00ecaaeba074256cdb1ab6d796cd7be15f9c1 Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Mon, 25 Mar 2024 18:11:53 -0400
Subject: [PATCH 08/21] Add label to stack frame

---
 src/bin/main.rs                     | 21 ++++++++----
 src/emulation_core/mips/datapath.rs | 50 ++++++++++++++++++-----------
 src/emulation_core/mips/stack.rs    |  3 ++
 src/parser/parser_assembler_main.rs | 11 +++++--
 src/ui/assembled_view/component.rs  | 17 ++++++++++
 src/ui/swim_editor/component.rs     |  4 +++
 static/styles/main.css              |  1 +
 7 files changed, 80 insertions(+), 27 deletions(-)

diff --git a/src/bin/main.rs b/src/bin/main.rs
index 1c716814a..76fbf3ac7 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -7,12 +7,14 @@ use monaco::{
     api::TextModel,
     sys::{editor::IMarkerData, MarkerSeverity},
 };
+use std::collections::HashMap;
 use std::rc::Rc;
 use swim::agent::datapath_communicator::DatapathCommunicator;
 use swim::agent::datapath_reducer::DatapathReducer;
 use swim::agent::EmulationCoreAgent;
 use swim::emulation_core::mips::datapath::Stage;
 use swim::parser::parser_assembler_main::parser;
+use swim::parser::parser_structs_and_enums::LabelInstance;
 use swim::parser::parser_structs_and_enums::ProgramInfo;
 use swim::ui::footer::component::Footer;
 use swim::ui::regview::component::Regview;
@@ -73,6 +75,7 @@ fn app(props: &AppProps) -> Html {
 
     let program_info_ref = use_mut_ref(ProgramInfo::default);
     let binary_ref = use_mut_ref(Vec::<u32>::new);
+    let labels_ref = use_mut_ref(HashMap::<String, usize>::new);
 
     let memory_text_model =
         use_state_eq(|| TextModel::create(&memory_text_output, Some("ini"), None).unwrap());
@@ -113,14 +116,16 @@ fn app(props: &AppProps) -> Html {
         let pc_limit = pc_limit.clone();
         let program_info_ref = Rc::clone(&program_info_ref);
         let binary_ref = Rc::clone(&binary_ref);
+        let labels_ref = Rc::clone(&labels_ref);
 
         use_callback(
             move |_, (text_model, editor_curr_line, memory_curr_instr, datapath_state)| {
                 let text_model = text_model.clone();
                 // parses through the code to assemble the binary and retrieves programinfo for error marking and mouse hover
-                let (program_info, assembled) = parser(text_model.get_value(), ARCH);
+                let (program_info, assembled, labels) = parser(text_model.get_value(), ARCH);
                 *program_info_ref.borrow_mut() = program_info.clone();
                 *binary_ref.borrow_mut() = assembled.clone();
+                *labels_ref.borrow_mut() = labels.clone();
                 pc_limit.set(assembled.len() * 4);
                 parser_text_output.set(program_info.console_out_post_assembly);
 
@@ -197,7 +202,7 @@ fn app(props: &AppProps) -> Html {
         use_callback(
             move |_, (editor_curr_line, memory_curr_instr, text_model, datapath_state)| {
                 // Get the current line and convert it to f64
-                let (program_info, _assembled) = parser(text_model.get_value(), ARCH);
+                let (program_info, _assembled, _labels) = parser(text_model.get_value(), ARCH);
                 let list_of_line_numbers = program_info.address_to_line_number;
                 let index = datapath_state.mips.registers.pc as usize / 4;
                 log::debug!("Line numbers: {:?}", list_of_line_numbers);
@@ -235,7 +240,7 @@ fn app(props: &AppProps) -> Html {
             move |_, (editor_curr_line, memory_curr_instr, text_model, datapath_state)| {
                 if datapath_state.mips.current_stage == Stage::InstructionDecode {
                     // highlight on InstructionDecode since syscall stops at that stage.
-                    let (program_info, _assembled) = parser(text_model.get_value(), ARCH);
+                    let (program_info, _assembled, _labels) = parser(text_model.get_value(), ARCH);
                     let list_of_line_numbers = program_info.address_to_line_number;
                     let index = datapath_state.mips.registers.pc as usize / 4;
                     editor_curr_line
@@ -326,7 +331,8 @@ fn app(props: &AppProps) -> Html {
                             }
                         }
                         // Memory updated successfully
-                        let (program_info, _assembled) = parser(text_model.get_value(), ARCH);
+                        let (program_info, _assembled, _labels) =
+                            parser(text_model.get_value(), ARCH);
                         let mut lines_beyond_counter = program_info.address_to_line_number.len();
                         let mut curr_value = text_model.get_value();
                         let mut add_new_lines = false;
@@ -399,7 +405,7 @@ fn app(props: &AppProps) -> Html {
                 }
 
                 // Update the parsed info for text and data segment views
-                let (program_info, _) = parser(text_model.get_value(), ARCH);
+                let (program_info, _, _) = parser(text_model.get_value(), ARCH);
 
                 trigger.force_update();
             },
@@ -422,7 +428,7 @@ fn app(props: &AppProps) -> Html {
         let memory_curr_instr = memory_curr_instr.clone();
 
         use_callback(
-            move |_, (editor_curr_line, program_info_ref, binary_ref)| {
+            move |_, (editor_curr_line, program_info_ref, binary_ref, labels_ref)| {
                 // Set highlighted line to 0
                 editor_curr_line.set(0.0);
                 memory_curr_instr.set(0);
@@ -432,6 +438,7 @@ fn app(props: &AppProps) -> Html {
 
                 *program_info_ref.borrow_mut() = ProgramInfo::default();
                 *binary_ref.borrow_mut() = vec![];
+                *labels_ref.borrow_mut() = HashMap::<String, usize>::new();
 
                 trigger.force_update();
             },
@@ -439,6 +446,7 @@ fn app(props: &AppProps) -> Html {
                 editor_curr_line,
                 program_info_ref.clone(),
                 binary_ref.clone(),
+                labels_ref.clone(),
             ),
         )
     };
@@ -539,6 +547,7 @@ fn app(props: &AppProps) -> Html {
                             program_info={program_info_ref.borrow().clone()}
                             pc_limit={*pc_limit}
                             binary={binary_ref.borrow().clone()}
+                            labels={labels_ref.borrow().clone()}
                             memory_curr_instr={memory_curr_instr.clone()}
                             editor_curr_line={editor_curr_line.clone()}
                             editor_active_tab={editor_active_tab.clone()}
diff --git a/src/emulation_core/mips/datapath.rs b/src/emulation_core/mips/datapath.rs
index 4918d6f60..e99a4f054 100644
--- a/src/emulation_core/mips/datapath.rs
+++ b/src/emulation_core/mips/datapath.rs
@@ -50,6 +50,7 @@ use super::super::datapath::Datapath;
 use super::constants::*;
 use super::control_signals::{floating_point::*, *};
 use super::datapath_signals::*;
+use super::gp_registers::GpRegisterType;
 use super::instruction::*;
 use super::{coprocessor::MipsFpCoprocessor, gp_registers::GpRegisters, memory::Memory};
 use crate::emulation_core::architectures::DatapathRef;
@@ -412,30 +413,12 @@ impl MipsDatapath {
             _ => (false, false),
         };
 
-        // Check if we hit a branch and signal it to the caller
-        let hit_branch = matches!(self.signals.branch, Branch::YesBranch);
-
-        let hit_jump = matches!(self.signals.jump, Jump::YesJump | Jump::YesJumpJalr);
-
-        if hit_branch || hit_jump {
-            // Add current line to stack if branch is taken=
-            let frame = StackFrame::new(
-                self.state.instruction,
-                self.registers.pc,
-                self.state.pc_plus_4,
-                self.registers.gpr[31],
-                self.registers.gpr[30],
-            );
-            self.stack.push(frame);
-        }
-
         // Instruction decode always involves a state update
         DatapathUpdateSignal {
             changed_state: true,
             changed_coprocessor_state: true,
             hit_syscall,
             hit_breakpoint,
-            changed_stack: hit_branch || hit_jump,
             ..Default::default()
         }
     }
@@ -483,10 +466,29 @@ impl MipsDatapath {
         self.pick_pc_plus_4_or_relative_branch_addr_mux1();
         self.set_new_pc_mux2();
 
+        // Check if we hit a branch and signal it to the caller
+        let hit_branch = matches!(self.signals.branch, Branch::YesBranch);
+
+        let hit_jump = matches!(self.signals.jump, Jump::YesJump | Jump::YesJumpJalr);
+
+        if hit_branch || hit_jump {
+            // Add current line to stack if branch is taken=
+            let frame = StackFrame::new(
+                self.state.instruction,
+                self.registers.pc,
+                self.state.pc_plus_4,
+                self.registers.gpr[31],
+                self.registers.gpr[30],
+                self.state.new_pc,
+            );
+            self.stack.push(frame);
+        }
+
         DatapathUpdateSignal {
             changed_state: true,
             changed_memory: self.signals.mem_write == MemWrite::YesWrite,
             changed_coprocessor_state: true,
+            changed_stack: hit_branch || hit_jump,
             ..Default::default()
         }
     }
@@ -1350,6 +1352,18 @@ impl MipsDatapath {
             self.state.data_result = self.state.data_result as i32 as u64;
         }
 
+        // If we're updating stack pointer, check if increasing
+        // If so, pop from stack
+        if self.state.write_register_destination == GpRegisterType::Sp as usize {
+            if self.state.register_write_data
+                > self.registers.gpr[self.state.write_register_destination]
+            {
+                self.stack.pop();
+            } else {
+                self.stack.pop();
+            }
+        }
+
         // Write.
         self.registers.gpr[self.state.write_register_destination] = self.state.register_write_data;
     }
diff --git a/src/emulation_core/mips/stack.rs b/src/emulation_core/mips/stack.rs
index b97cb554d..6825842cc 100644
--- a/src/emulation_core/mips/stack.rs
+++ b/src/emulation_core/mips/stack.rs
@@ -7,6 +7,7 @@ pub struct StackFrame {
     pub return_address: u64,
     pub frame_pointer: u64,
     pub stack_pointer: u64,
+    pub jump_address: u64,
 }
 
 impl StackFrame {
@@ -16,6 +17,7 @@ impl StackFrame {
         return_address: u64,
         frame_pointer: u64,
         stack_pointer: u64,
+        jump_address: u64,
     ) -> Self {
         Self {
             call_instruction,
@@ -23,6 +25,7 @@ impl StackFrame {
             return_address,
             frame_pointer,
             stack_pointer,
+            jump_address,
         }
     }
 }
diff --git a/src/parser/parser_assembler_main.rs b/src/parser/parser_assembler_main.rs
index 77fa36fee..94e7a9845 100644
--- a/src/parser/parser_assembler_main.rs
+++ b/src/parser/parser_assembler_main.rs
@@ -13,7 +13,10 @@ use std::collections::HashMap;
 
 ///Parser is the starting function of the parser / assembler process. It takes a string representation of a MIPS
 /// program and builds the binary of the instructions while cataloging any errors that are found.
-pub fn parser(file_string: String, arch: AvailableDatapaths) -> (ProgramInfo, Vec<u32>) {
+pub fn parser(
+    file_string: String,
+    arch: AvailableDatapaths,
+) -> (ProgramInfo, Vec<u32>, HashMap<String, usize>) {
     match arch {
         AvailableDatapaths::MIPS => {
             let mut program_info = ProgramInfo {
@@ -34,6 +37,7 @@ pub fn parser(file_string: String, arch: AvailableDatapaths) -> (ProgramInfo, Ve
 
             let labels: HashMap<String, usize> =
                 create_label_map(&mut program_info.instructions, &mut program_info.data);
+            let labels_clone = labels.clone();
 
             log::debug!("Labels: {:?}", labels);
 
@@ -75,7 +79,7 @@ pub fn parser(file_string: String, arch: AvailableDatapaths) -> (ProgramInfo, Ve
             program_info.pc_starting_point = determine_pc_starting_point(labels);
             program_info.data_starting_point = data_starting_point;
 
-            (program_info.clone(), binary)
+            (program_info.clone(), binary, labels_clone)
         }
         AvailableDatapaths::RISCV => {
             let mut program_info = ProgramInfo {
@@ -97,6 +101,7 @@ pub fn parser(file_string: String, arch: AvailableDatapaths) -> (ProgramInfo, Ve
 
             let labels: HashMap<String, usize> =
                 create_label_map(&mut program_info.instructions, &mut program_info.data);
+            let labels_clone = labels.clone();
 
             read_instructions_riscv(
                 &mut program_info.instructions,
@@ -130,7 +135,7 @@ pub fn parser(file_string: String, arch: AvailableDatapaths) -> (ProgramInfo, Ve
             program_info.pc_starting_point = determine_pc_starting_point(labels);
             program_info.data_starting_point = data_starting_point;
 
-            (program_info.clone(), binary)
+            (program_info.clone(), binary, labels_clone)
         }
     }
 }
diff --git a/src/ui/assembled_view/component.rs b/src/ui/assembled_view/component.rs
index 2e35f8de2..69bd2e035 100644
--- a/src/ui/assembled_view/component.rs
+++ b/src/ui/assembled_view/component.rs
@@ -1,4 +1,5 @@
 use std::cell::RefCell;
+use std::collections::HashMap;
 use std::rc::Rc;
 
 use crate::agent::datapath_communicator::DatapathCommunicator;
@@ -334,6 +335,7 @@ pub struct StackFrameProps {
     pub memory_curr_instr: UseStateHandle<u64>,
     pub console_active_tab: UseStateHandle<TabState>,
     pub program_info: ProgramInfo,
+    pub labels: HashMap<String, usize>,
 }
 
 #[function_component]
@@ -342,6 +344,7 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
     let memory_curr_instr = &props.memory_curr_instr;
     let stack = &props.stack;
     let program_info = &props.program_info;
+    let labels = &props.labels;
 
     // Go to the memory address in hex editor
     let on_address_click = {
@@ -361,6 +364,7 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
         <table class="h-[96%] bg-primary-900">
         // | address | data in hex
             <tr>
+                <th>{"Label"}</th>
                 <th>{"Call Address"}</th>
                 <th>{"Call Line"}</th>
                 <th>{"Return Address"}</th>
@@ -378,9 +382,22 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
                         let on_call_address_click = Callback::clone(&on_address_click);
                         let on_return_address_click = Callback::clone(&on_address_click);
                         let on_stack_pointer_click = Callback::clone(&on_address_click);
+                        log::debug!("Jump to address: {:?}", frame.jump_address);
+                        let default_label = String::from("");
+                        let label = labels.iter().find_map(|(label, address)| {
+                            if *address == frame.jump_address as usize {
+                                Some(label)
+                            }
+                            else {
+                                None
+                            }
+                        }).unwrap_or(&default_label);
                         log::debug!("Frame: {:?}", frame);
                         html! {
                             <tr>
+                                <td>
+                                    {label}
+                                </td>
                                 <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.call_address)} onclick={move |e: MouseEvent| {on_call_address_click.emit((e, frame.call_address as usize))}}>
                                     {format!("0x{:08x}", frame.call_address as u64)}
                                 </td>
diff --git a/src/ui/swim_editor/component.rs b/src/ui/swim_editor/component.rs
index 9b0930436..4ef445a97 100644
--- a/src/ui/swim_editor/component.rs
+++ b/src/ui/swim_editor/component.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+use std::hash::Hash;
 use std::str::FromStr;
 use std::{cell::RefCell, rc::Rc};
 
@@ -39,6 +41,7 @@ pub struct SwimEditorProps {
     pub lines_content: Rc<RefCell<Vec<String>>>,
     pub program_info: ProgramInfo,
     pub binary: Vec<u32>,
+    pub labels: HashMap<String, usize>,
     pub pc: u64,
     pub pc_limit: usize,
     pub memory_curr_instr: UseStateHandle<u64>,
@@ -308,6 +311,7 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
                     stack={props.stack.clone()}
                     console_active_tab={console_active_tab.clone()}
                     program_info={props.program_info.clone()}
+                    labels={props.labels.clone()}
                 />
             }
         </>
diff --git a/static/styles/main.css b/static/styles/main.css
index 270d2771c..3cd10a920 100644
--- a/static/styles/main.css
+++ b/static/styles/main.css
@@ -105,6 +105,7 @@ table {
   border-spacing: 0;
   display: block;
   overflow-y: auto;
+  overflow-x: hidden;
 }
 tr {
   background-color: #1e1e1e;

From ed6d9c7dea43afd5ed43251919c5c057792f24cc Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Mon, 25 Mar 2024 22:26:12 -0400
Subject: [PATCH 09/21] Move stack push/pop operation, track function calls
 only, fix speed not updating in UI

---
 src/agent.rs                                  |  6 +++
 src/agent/datapath_reducer.rs                 |  8 +++
 src/agent/messages.rs                         |  1 +
 src/bin/main.rs                               |  1 -
 src/emulation_core/mips/datapath.rs           | 51 +++++++++++-------
 src/emulation_core/mips/stack.rs              |  7 +--
 src/parser/parser_assembler_main.rs           |  2 -
 src/tests/emulation_core/mips.rs              |  2 +-
 .../integration/core_parser/arithmetic.rs     |  8 +--
 .../core_parser/basic_immediate.rs            | 20 +++----
 .../core_parser/basic_operations.rs           | 12 ++---
 .../integration/core_parser/branch_jump.rs    | 14 ++---
 .../integration/core_parser/conditions.rs     |  4 +-
 .../core_parser/coprocessor_move.rs           | 12 ++---
 .../core_parser/double_arithmetic.rs          |  4 +-
 .../core_parser/double_immediate.rs           | 10 ++--
 .../integration/core_parser/fibonacci.rs      | 14 ++---
 .../core_parser/floating_point_arithmetic.rs  |  4 +-
 .../core_parser/floating_point_branch.rs      |  4 +-
 .../core_parser/floating_point_comparison.rs  |  4 +-
 src/tests/integration/core_parser/mod.rs      |  6 +--
 .../core_parser/store_load_word.rs            | 10 ++--
 src/ui/assembled_view/component.rs            | 54 ++++++++++++-------
 src/ui/swim_editor/component.rs               |  3 +-
 src/ui/visual_datapath/mod.rs                 |  3 --
 25 files changed, 151 insertions(+), 113 deletions(-)

diff --git a/src/agent.rs b/src/agent.rs
index 278652ec7..7b14d4ded 100644
--- a/src/agent.rs
+++ b/src/agent.rs
@@ -48,6 +48,7 @@ pub async fn emulation_core_agent(scope: ReactorScope<Command, DatapathUpdate>)
         // Save the previous state of the emulator core's execution and initialization status
         let is_executing = state.executing;
         let is_initialiized = state.initialized;
+        let curr_speed = state.speed;
 
         // Part 1: Delay/Command Handling
         if state.executing {
@@ -126,6 +127,11 @@ pub async fn emulation_core_agent(scope: ReactorScope<Command, DatapathUpdate>)
             state.initialized != is_initialiized,
             DatapathUpdate::System(SystemUpdate::UpdateInitialized(state.initialized))
         );
+        send_update!(
+            state.scope,
+            state.speed != curr_speed,
+            DatapathUpdate::System(SystemUpdate::UpdateSpeed(state.speed))
+        );
         state.updates = Default::default();
     }
 }
diff --git a/src/agent/datapath_reducer.rs b/src/agent/datapath_reducer.rs
index f035acf41..cbd252eed 100644
--- a/src/agent/datapath_reducer.rs
+++ b/src/agent/datapath_reducer.rs
@@ -119,6 +119,14 @@ impl Reducible for DatapathReducer {
                     executing: self.executing,
                     initialized,
                 },
+                SystemUpdate::UpdateSpeed(speed) => Self {
+                    current_architecture: self.current_architecture.clone(),
+                    mips: self.mips.clone(),
+                    messages: self.messages.clone(),
+                    speed,
+                    executing: self.executing,
+                    initialized: self.initialized,
+                },
             },
         })
     }
diff --git a/src/agent/messages.rs b/src/agent/messages.rs
index efcca90e9..7f3d86d9b 100644
--- a/src/agent/messages.rs
+++ b/src/agent/messages.rs
@@ -43,6 +43,7 @@ pub enum SystemUpdate {
     UpdateMessages(Vec<String>),
     UpdateExecuting(bool),
     UpdateInitialized(bool),
+    UpdateSpeed(u32),
 }
 
 /// Enum containing all types of updates sent from the worker thread to the UI thread.
diff --git a/src/bin/main.rs b/src/bin/main.rs
index 76fbf3ac7..1265d1c85 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -205,7 +205,6 @@ fn app(props: &AppProps) -> Html {
                 let (program_info, _assembled, _labels) = parser(text_model.get_value(), ARCH);
                 let list_of_line_numbers = program_info.address_to_line_number;
                 let index = datapath_state.mips.registers.pc as usize / 4;
-                log::debug!("Line numbers: {:?}", list_of_line_numbers);
                 editor_curr_line.set(*list_of_line_numbers.get(index).unwrap_or(&0) as f64 + 1.0); // add one to account for the editor's line numbers
                 memory_curr_instr.set(datapath_state.mips.registers.pc);
 
diff --git a/src/emulation_core/mips/datapath.rs b/src/emulation_core/mips/datapath.rs
index e99a4f054..547e4660f 100644
--- a/src/emulation_core/mips/datapath.rs
+++ b/src/emulation_core/mips/datapath.rs
@@ -466,29 +466,42 @@ impl MipsDatapath {
         self.pick_pc_plus_4_or_relative_branch_addr_mux1();
         self.set_new_pc_mux2();
 
-        // Check if we hit a branch and signal it to the caller
-        let hit_branch = matches!(self.signals.branch, Branch::YesBranch);
+        let mut changed_stack = false;
 
-        let hit_jump = matches!(self.signals.jump, Jump::YesJump | Jump::YesJumpJalr);
+        // If this is the first instruction, push the initial frame to the stack
+        if self.stack.is_empty() {
+            let frame = StackFrame::new(
+                self.state.instruction,
+                self.registers.pc,
+                self.state.pc_plus_4,
+                self.registers[GpRegisterType::Sp],
+                // self.registers[GpRegisterType::Sp],
+                self.registers.pc,
+            );
+            self.stack.push(frame);
+            changed_stack = true;
+        }
 
-        if hit_branch || hit_jump {
-            // Add current line to stack if branch is taken=
+        // let hit_branch = matches!(self.signals.branch, Branch::YesBranch);
+        let hit_jump = matches!(self.signals.jump, Jump::YesJump);
+        if hit_jump {
+            // Add current line to stack if we call a function
             let frame = StackFrame::new(
                 self.state.instruction,
                 self.registers.pc,
                 self.state.pc_plus_4,
-                self.registers.gpr[31],
-                self.registers.gpr[30],
+                self.registers[GpRegisterType::Sp],
                 self.state.new_pc,
             );
             self.stack.push(frame);
+            changed_stack = true;
         }
 
         DatapathUpdateSignal {
             changed_state: true,
             changed_memory: self.signals.mem_write == MemWrite::YesWrite,
             changed_coprocessor_state: true,
-            changed_stack: hit_branch || hit_jump,
+            changed_stack,
             ..Default::default()
         }
     }
@@ -504,6 +517,16 @@ impl MipsDatapath {
         self.set_pc();
         self.coprocessor.stage_writeback();
 
+        // check if we are writing to the stack pointer
+        if self.state.write_register_destination == GpRegisterType::Sp as usize {
+            if let Some(last_frame) = self.stack.peek() {
+                if self.state.register_write_data >= last_frame.frame_pointer {
+                    // dellocating stack space
+                    self.stack.pop();
+                }
+            }
+        }
+
         DatapathUpdateSignal {
             changed_state: true,
             changed_coprocessor_state: true,
@@ -1352,18 +1375,6 @@ impl MipsDatapath {
             self.state.data_result = self.state.data_result as i32 as u64;
         }
 
-        // If we're updating stack pointer, check if increasing
-        // If so, pop from stack
-        if self.state.write_register_destination == GpRegisterType::Sp as usize {
-            if self.state.register_write_data
-                > self.registers.gpr[self.state.write_register_destination]
-            {
-                self.stack.pop();
-            } else {
-                self.stack.pop();
-            }
-        }
-
         // Write.
         self.registers.gpr[self.state.write_register_destination] = self.state.register_write_data;
     }
diff --git a/src/emulation_core/mips/stack.rs b/src/emulation_core/mips/stack.rs
index 6825842cc..34141dd7d 100644
--- a/src/emulation_core/mips/stack.rs
+++ b/src/emulation_core/mips/stack.rs
@@ -6,7 +6,6 @@ pub struct StackFrame {
     pub call_address: u32,
     pub return_address: u64,
     pub frame_pointer: u64,
-    pub stack_pointer: u64,
     pub jump_address: u64,
 }
 
@@ -16,7 +15,6 @@ impl StackFrame {
         call_address: u64,
         return_address: u64,
         frame_pointer: u64,
-        stack_pointer: u64,
         jump_address: u64,
     ) -> Self {
         Self {
@@ -24,7 +22,6 @@ impl StackFrame {
             call_address: call_address as u32,
             return_address,
             frame_pointer,
-            stack_pointer,
             jump_address,
         }
     }
@@ -46,6 +43,10 @@ impl Stack {
     pub fn peek(&self) -> Option<&StackFrame> {
         self.stack.last()
     }
+
+    pub fn is_empty(&self) -> bool {
+        self.stack.is_empty()
+    }
 }
 
 pub struct StackIter<'a> {
diff --git a/src/parser/parser_assembler_main.rs b/src/parser/parser_assembler_main.rs
index 94e7a9845..84335da72 100644
--- a/src/parser/parser_assembler_main.rs
+++ b/src/parser/parser_assembler_main.rs
@@ -39,8 +39,6 @@ pub fn parser(
                 create_label_map(&mut program_info.instructions, &mut program_info.data);
             let labels_clone = labels.clone();
 
-            log::debug!("Labels: {:?}", labels);
-
             complete_lw_sw_pseudo_instructions(
                 &mut program_info.instructions,
                 &labels,
diff --git a/src/tests/emulation_core/mips.rs b/src/tests/emulation_core/mips.rs
index 610ca8894..f762a7159 100644
--- a/src/tests/emulation_core/mips.rs
+++ b/src/tests/emulation_core/mips.rs
@@ -16,7 +16,7 @@ pub mod api {
 
         // Add instruction into emulation core memory.
         let instruction = String::from("ori $s0, $zero, 5");
-        let (_, instruction_bits) = parser(instruction, AvailableDatapaths::MIPS);
+        let (_, instruction_bits, _labels) = parser(instruction, AvailableDatapaths::MIPS);
         datapath.initialize_legacy(instruction_bits)?;
 
         datapath.execute_instruction();
diff --git a/src/tests/integration/core_parser/arithmetic.rs b/src/tests/integration/core_parser/arithmetic.rs
index 7d37d52c0..0b4fa396c 100644
--- a/src/tests/integration/core_parser/arithmetic.rs
+++ b/src/tests/integration/core_parser/arithmetic.rs
@@ -10,7 +10,7 @@ fn basic_addu() -> Result<(), String> {
 
     let instructions = String::from("addu r20, r19, r18");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[18] = 6849841;
@@ -34,7 +34,7 @@ fn basic_sll() -> Result<(), String> {
 sll $s1, $s1, 3"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
@@ -55,7 +55,7 @@ fn basic_move() -> Result<(), String> {
 move $s5, $s4"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
@@ -73,7 +73,7 @@ fn basic_nop() -> Result<(), String> {
 
     let instructions = String::from(r#"nop"#);
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     let mut expected_registers = datapath.registers;
diff --git a/src/tests/integration/core_parser/basic_immediate.rs b/src/tests/integration/core_parser/basic_immediate.rs
index 169b1389f..068feb582 100644
--- a/src/tests/integration/core_parser/basic_immediate.rs
+++ b/src/tests/integration/core_parser/basic_immediate.rs
@@ -12,7 +12,7 @@ fn basic_addi() -> Result<(), String> {
 
     let instructions = String::from("addi r11, r15, 2");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[15] = 100;
@@ -32,7 +32,7 @@ fn basic_addiu() -> Result<(), String> {
 
     let instructions = String::from("addiu r14, r17, 5");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[17] = 500;
@@ -52,7 +52,7 @@ fn basic_subi() -> Result<(), String> {
 
     let instructions = String::from("subi r11, r15, 2");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[15] = 100;
@@ -72,7 +72,7 @@ fn basic_muli() -> Result<(), String> {
 
     let instructions = String::from("muli r11, r15, 2");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[15] = 100;
@@ -92,7 +92,7 @@ fn basic_divi() -> Result<(), String> {
 
     let instructions = String::from("divi r11, r15, 2");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[15] = 100;
@@ -112,7 +112,7 @@ fn basic_ori() -> Result<(), String> {
 
     let instructions = String::from("ori r11, r15, 2");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[15] = 100;
@@ -132,7 +132,7 @@ fn basic_andi() -> Result<(), String> {
 
     let instructions = String::from("andi r11, r15, 4");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[15] = 100;
@@ -152,7 +152,7 @@ fn basic_li() -> Result<(), String> {
 
     let instructions = String::from("li r15, 56");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
@@ -171,7 +171,7 @@ fn basic_lui() -> Result<(), String> {
     // 65530 == 0xFFFA
     let instructions = String::from("lui r20, 65530");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
@@ -191,7 +191,7 @@ fn basic_aui() -> Result<(), String> {
     // 4612 == 0x1204
     let instructions = String::from("aui r15, r18, 4612");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[18] = 0x0000_0000_0030_ABCD;
diff --git a/src/tests/integration/core_parser/basic_operations.rs b/src/tests/integration/core_parser/basic_operations.rs
index 6319b01c8..00b8041b8 100644
--- a/src/tests/integration/core_parser/basic_operations.rs
+++ b/src/tests/integration/core_parser/basic_operations.rs
@@ -10,7 +10,7 @@ fn basic_add() -> Result<(), String> {
 
     let instructions = String::from("add r11, r7, r8");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[7] = 51;
@@ -31,7 +31,7 @@ fn basic_sub() -> Result<(), String> {
 
     let instructions = String::from("sub r12, r7, r8");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[7] = 51;
@@ -52,7 +52,7 @@ fn basic_mul() -> Result<(), String> {
 
     let instructions = String::from("mul r13, r7, r8");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[7] = 51;
@@ -73,7 +73,7 @@ fn basic_div() -> Result<(), String> {
 
     let instructions = String::from("div r14, r7, r8");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[7] = 51;
@@ -94,7 +94,7 @@ fn basic_or() -> Result<(), String> {
 
     let instructions = String::from("or r15, r7, r8");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[7] = 51;
@@ -115,7 +115,7 @@ fn basic_and() -> Result<(), String> {
 
     let instructions = String::from("and r16, r7, r8");
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[7] = 51;
diff --git a/src/tests/integration/core_parser/branch_jump.rs b/src/tests/integration/core_parser/branch_jump.rs
index 7c19f8cf3..ab1202331 100644
--- a/src/tests/integration/core_parser/branch_jump.rs
+++ b/src/tests/integration/core_parser/branch_jump.rs
@@ -18,7 +18,7 @@ loop: daddu $s1, $s1, $s0
 j loop"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     // Execute the ori instruction.
@@ -46,7 +46,7 @@ fn basic_jr() -> Result<(), String> {
 jr r15"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     // Execute 2 instructions.
@@ -71,7 +71,7 @@ syscall
 function: ori $t0, $zero, 5831"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
@@ -97,7 +97,7 @@ or $zero, $zero, $zero
 function: ori $t1, $zero, 9548"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     // Execute 3 instructions.
@@ -146,7 +146,7 @@ daddiu $s2, $s2, 20
 change10: daddiu $s2, $s2, 10"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
@@ -187,7 +187,7 @@ syscall
 changez: daddiu $s2, $s2, 20"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
@@ -219,7 +219,7 @@ daddiu $s0, $s0, 1
 bne $s0, $s2, loop"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     let mut iterations = 0;
diff --git a/src/tests/integration/core_parser/conditions.rs b/src/tests/integration/core_parser/conditions.rs
index 6f2503498..4d05649d8 100644
--- a/src/tests/integration/core_parser/conditions.rs
+++ b/src/tests/integration/core_parser/conditions.rs
@@ -28,7 +28,7 @@ akin! {
         let mut datapath = MipsDatapath::default();
 
         let instructions = String::from("*instruction_name r*destination_register, r5, r6");
-        let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+        let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
         datapath.initialize_legacy(instruction_bits)?;
 
         datapath.registers.gpr[5] = *true_value1;
@@ -47,7 +47,7 @@ akin! {
         let mut datapath = MipsDatapath::default();
 
         let instructions = String::from("*instruction_name r*destination_register, r5, r6");
-        let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+        let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
         datapath.initialize_legacy(instruction_bits)?;
 
         datapath.registers.gpr[5] = *false_value1;
diff --git a/src/tests/integration/core_parser/coprocessor_move.rs b/src/tests/integration/core_parser/coprocessor_move.rs
index 36380e127..7885eda3b 100644
--- a/src/tests/integration/core_parser/coprocessor_move.rs
+++ b/src/tests/integration/core_parser/coprocessor_move.rs
@@ -9,7 +9,7 @@ fn basic_mtc1() -> Result<(), String> {
     let mut datapath = MipsDatapath::default();
 
     let instructions = String::from("mtc1 $t2, $f5");
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[10] = 658461658; // $t2
@@ -27,7 +27,7 @@ fn truncate_32_bit_mtc1() -> Result<(), String> {
     let mut datapath = MipsDatapath::default();
 
     let instructions = String::from("mtc1 $t3, $f6");
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[11] = 0x0000_02F2_AC71_AC41; // $t3
@@ -45,7 +45,7 @@ fn basic_mfc1() -> Result<(), String> {
     let mut datapath = MipsDatapath::default();
 
     let instructions = String::from("mfc1 $t3, $f5");
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.coprocessor.registers.fpr[5] = 657861659;
@@ -63,7 +63,7 @@ fn truncate_32_bit_mfc1() -> Result<(), String> {
     let mut datapath = MipsDatapath::default();
 
     let instructions = String::from("mfc1 $t4, $f6");
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.coprocessor.registers.fpr[6] = 0x0003_7F80_E5E7_D785;
@@ -81,7 +81,7 @@ fn basic_dmtc1() -> Result<(), String> {
     let mut datapath = MipsDatapath::default();
 
     let instructions = String::from("dmtc1 $t3, $f6");
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[11] = 0x0120_02F2_AC71_AC41; // $t3
@@ -99,7 +99,7 @@ fn basic_dmfc1() -> Result<(), String> {
     let mut datapath = MipsDatapath::default();
 
     let instructions = String::from("dmfc1 $t4, $f6");
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.coprocessor.registers.fpr[6] = 0x0003_7F90_E5E7_D785;
diff --git a/src/tests/integration/core_parser/double_arithmetic.rs b/src/tests/integration/core_parser/double_arithmetic.rs
index 9e975fc80..391b5f8cb 100644
--- a/src/tests/integration/core_parser/double_arithmetic.rs
+++ b/src/tests/integration/core_parser/double_arithmetic.rs
@@ -18,7 +18,7 @@ akin! {
         let mut datapath = MipsDatapath::default();
 
         let instructions = String::from(*instruction);
-        let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+        let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
         datapath.initialize_legacy(instruction_bits)?;
 
         datapath.registers.gpr[16] = *value1;
@@ -47,7 +47,7 @@ akin! {
         let mut datapath = MipsDatapath::default();
 
         let instructions = String::from(*instruction);
-        let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+        let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
         datapath.initialize_legacy(instruction_bits)?;
 
         datapath.registers.gpr[25] = *value1;
diff --git a/src/tests/integration/core_parser/double_immediate.rs b/src/tests/integration/core_parser/double_immediate.rs
index 773c47680..6709667a7 100644
--- a/src/tests/integration/core_parser/double_immediate.rs
+++ b/src/tests/integration/core_parser/double_immediate.rs
@@ -9,7 +9,7 @@ fn basic_dahi() -> Result<(), String> {
     let mut datapath = MipsDatapath::default();
 
     let instructions = String::from("dahi r3, 123");
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[3] = 0;
@@ -30,7 +30,7 @@ fn dahi_sign_extend() -> Result<(), String> {
     let mut datapath = MipsDatapath::default();
 
     let instructions = String::from("dahi r5, 43158");
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[5] = 0;
@@ -51,7 +51,7 @@ fn basic_dati() -> Result<(), String> {
     let mut datapath = MipsDatapath::default();
 
     let instructions = String::from("dati r10, 4321");
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.registers.gpr[10] = 0;
@@ -79,7 +79,7 @@ akin! {
         let mut datapath = MipsDatapath::default();
 
         let instructions = String::from(*instruction);
-        let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+        let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
         datapath.initialize_legacy(instruction_bits)?;
 
         datapath.registers.gpr[20] = *rs_value;
@@ -105,7 +105,7 @@ akin! {
         let mut datapath = MipsDatapath::default();
 
         let instructions = String::from(*instruction);
-        let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+        let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
         datapath.initialize_legacy(instruction_bits)?;
 
         datapath.registers.gpr[20] = *rs_value;
diff --git a/src/tests/integration/core_parser/fibonacci.rs b/src/tests/integration/core_parser/fibonacci.rs
index 3fe8924e7..e27c99648 100644
--- a/src/tests/integration/core_parser/fibonacci.rs
+++ b/src/tests/integration/core_parser/fibonacci.rs
@@ -23,11 +23,11 @@ fn recursive_fibonacci() -> Result<(), String> {
             slt     $v0,$v0,$s1
             beq     $v0,$zero,L2
             nop
-    
+
             lw      $v0,40($fp)
             b       L3
             nop
-    
+
     L2:
             lw      $v0,40($fp)
             nop
@@ -35,7 +35,7 @@ fn recursive_fibonacci() -> Result<(), String> {
             move    $a0,$v0
             jal     fib(int)
             nop
-    
+
             move    $s0,$v0
             lw      $v0,40($fp)
             nop
@@ -43,7 +43,7 @@ fn recursive_fibonacci() -> Result<(), String> {
             move    $a0,$v0
             jal     fib(int)
             nop
-    
+
             addu    $v0,$s0,$v0
     L3:
             move    $sp,$fp
@@ -53,7 +53,7 @@ fn recursive_fibonacci() -> Result<(), String> {
             addiu   $sp,$sp,40
             jr      $ra
             nop
-    
+
     main:
             addiu   $sp,$sp,-40
             sw      $ra,36($sp)
@@ -64,7 +64,7 @@ fn recursive_fibonacci() -> Result<(), String> {
             lw      $a0,24($fp)
             jal     fib(int)
             nop
-    
+
             sw      $v0,28($fp)
             lw      $v0,28($fp)      # This is where the final answer gets loaded off the stack
             move    $sp,$fp
@@ -75,7 +75,7 @@ fn recursive_fibonacci() -> Result<(), String> {
             nop",
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
diff --git a/src/tests/integration/core_parser/floating_point_arithmetic.rs b/src/tests/integration/core_parser/floating_point_arithmetic.rs
index 9d68307d6..5f9ac2d96 100644
--- a/src/tests/integration/core_parser/floating_point_arithmetic.rs
+++ b/src/tests/integration/core_parser/floating_point_arithmetic.rs
@@ -20,7 +20,7 @@ akin! {
         let mut datapath = MipsDatapath::default();
 
         let instructions = String::from(*instruction);
-        let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+        let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
         datapath.initialize_legacy(instruction_bits)?;
 
         datapath.coprocessor.registers.fpr[15] = *value1;
@@ -51,7 +51,7 @@ akin! {
         let mut datapath = MipsDatapath::default();
 
         let instructions = String::from(*instruction);
-        let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+        let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
         datapath.initialize_legacy(instruction_bits)?;
 
         datapath.coprocessor.registers.fpr[15] = *value1;
diff --git a/src/tests/integration/core_parser/floating_point_branch.rs b/src/tests/integration/core_parser/floating_point_branch.rs
index 60444e64b..5db8b9bc3 100644
--- a/src/tests/integration/core_parser/floating_point_branch.rs
+++ b/src/tests/integration/core_parser/floating_point_branch.rs
@@ -32,7 +32,7 @@ c.lt.s $f0, $f2
 bc1t loop"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
@@ -78,7 +78,7 @@ c.lt.s $f2, $f0
 bc1f loop"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
diff --git a/src/tests/integration/core_parser/floating_point_comparison.rs b/src/tests/integration/core_parser/floating_point_comparison.rs
index e5632850d..5a729d553 100644
--- a/src/tests/integration/core_parser/floating_point_comparison.rs
+++ b/src/tests/integration/core_parser/floating_point_comparison.rs
@@ -18,7 +18,7 @@ akin! {
         let mut datapath = MipsDatapath::default();
 
         let instructions = String::from(*instruction);
-        let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+        let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
         datapath.initialize_legacy(instruction_bits)?;
 
         datapath.coprocessor.registers.fpr[15] = *value1;
@@ -47,7 +47,7 @@ akin! {
         let mut datapath = MipsDatapath::default();
 
         let instructions = String::from(*instruction);
-        let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+        let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
         datapath.initialize_legacy(instruction_bits)?;
 
         datapath.coprocessor.registers.fpr[15] = *value1;
diff --git a/src/tests/integration/core_parser/mod.rs b/src/tests/integration/core_parser/mod.rs
index 7b94c18ee..597b85848 100644
--- a/src/tests/integration/core_parser/mod.rs
+++ b/src/tests/integration/core_parser/mod.rs
@@ -31,7 +31,7 @@ add $s1, $s0, $s0"#,
     );
 
     // Parse instructions and load into emulation core memory.
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     // Execute 2 instructions.
@@ -70,7 +70,7 @@ dati r1, 43982"#,
     // dati r1, 43982    | ABCD 8765 CCCC EEEE | 43982 == 0xABCE. FFFF + ABCE = ABCD.
 
     // Parse instructions and load into emulation core memory.
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     // Execute 4 instructions.
@@ -97,7 +97,7 @@ dadd r7, r5, r6
 dmuli r8, r7, 2"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
diff --git a/src/tests/integration/core_parser/store_load_word.rs b/src/tests/integration/core_parser/store_load_word.rs
index 5cdfec739..ecea03d3f 100644
--- a/src/tests/integration/core_parser/store_load_word.rs
+++ b/src/tests/integration/core_parser/store_load_word.rs
@@ -12,7 +12,7 @@ li r25, 1234
 sw r25, 0(r14)"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
@@ -33,7 +33,7 @@ fn basic_lw() -> Result<(), String> {
 lw r25, 0(r14)"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.memory.memory[403] = 36;
@@ -61,7 +61,7 @@ daddiu $s2, $s1, 1
 sw $s2, secret_number"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
@@ -88,7 +88,7 @@ mtc1 $s1, $f25
 swc1 $f25, 0($s0)"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     while !datapath.is_halted() {
@@ -109,7 +109,7 @@ fn basic_lwc1() -> Result<(), String> {
 lwc1 $f12, 0($t4)"#,
     );
 
-    let (_, instruction_bits) = parser(instructions, AvailableDatapaths::MIPS);
+    let (_, instruction_bits, _labels) = parser(instructions, AvailableDatapaths::MIPS);
     datapath.initialize_legacy(instruction_bits)?;
 
     datapath.memory.memory[403] = 36;
diff --git a/src/ui/assembled_view/component.rs b/src/ui/assembled_view/component.rs
index 69bd2e035..027d99fa9 100644
--- a/src/ui/assembled_view/component.rs
+++ b/src/ui/assembled_view/component.rs
@@ -101,7 +101,7 @@ pub fn TextSegment(props: &TextSegmentProps) -> Html {
 
     let mut address = -4;
     html! {
-        <table class="h-[96%] bg-primary-900">
+        <table class="h-[96%] bg-primary-900 overflow-x-auto">
         // | breakpoint checkbox | address | instruction in binary | instruction in hex | updated string | source string
             <tr>
                 <th>{"Bkpt"}</th>
@@ -219,7 +219,7 @@ pub fn DataSegment(props: &DataSegmentProps) -> Html {
     };
 
     html! {
-        <table class="h-[96%] bg-primary-900">
+        <table class="h-[96%] bg-primary-900 overflow-x-auto">
         // | address | data in hex | source string
             <tr>
                 <th>{"Address"}</th>
@@ -294,7 +294,7 @@ pub fn StackSegment(props: &StackSegmentProps) -> Html {
     };
 
     html! {
-        <table class="h-[96%] bg-primary-900">
+        <table class="h-[96%] bg-primary-900 overflow-x-auto">
         // | address | data in hex
             <tr>
                 <th>{"Address"}</th>
@@ -336,6 +336,8 @@ pub struct StackFrameProps {
     pub console_active_tab: UseStateHandle<TabState>,
     pub program_info: ProgramInfo,
     pub labels: HashMap<String, usize>,
+    pub editor_curr_line: UseStateHandle<f64>,
+    pub editor_active_tab: UseStateHandle<TabState>,
 }
 
 #[function_component]
@@ -345,6 +347,8 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
     let stack = &props.stack;
     let program_info = &props.program_info;
     let labels = &props.labels;
+    let editor_curr_line = &props.editor_curr_line;
+    let editor_active_tab = &props.editor_active_tab;
 
     // Go to the memory address in hex editor
     let on_address_click = {
@@ -360,30 +364,43 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
         )
     };
 
+    let on_assembled_click = {
+        let editor_curr_line = editor_curr_line.clone();
+        let editor_active_tab = editor_active_tab.clone();
+        use_callback(
+            move |args: (MouseEvent, usize), _| {
+                let (_e, line_number) = args;
+                editor_curr_line.set(line_number as f64);
+                editor_active_tab.set(TabState::Editor);
+            },
+            (),
+        )
+    };
+
     html! {
-        <table class="h-[96%] bg-primary-900">
-        // | address | data in hex
+        <table class="h-[96%] bg-primary-900 overflow-x-auto">
+        // | label | frame pointer | call mem address | call assembled line | return address | return to line
             <tr>
                 <th>{"Label"}</th>
+                <th>{"Frame Pointer"}</th>
                 <th>{"Call Address"}</th>
                 <th>{"Call Line"}</th>
                 <th>{"Return Address"}</th>
-                <th>{"Frame Pointer"}</th>
-                <th>{"Stack Pointer"}</th>
+                <th>{"Return Line"}</th>
             </tr>
             {
-                if !stack.stack.is_empty() && program_info.instructions.len() > 0 {
+                if !stack.is_empty() && !program_info.instructions.is_empty() {
                     let stack = stack.stack.clone();
                     stack.into_iter().enumerate().map(|(_address, frame)| {
                         let call_line_number = frame.call_address / 4;
-                        log::debug!("Call Line Number: {}", call_line_number);
                         let call_recreated_string = program_info.instructions[call_line_number as usize].recreate_string();
-                        log::debug!("Call Recreated String: {:?}", call_recreated_string);
+                        let return_line_number = frame.return_address / 4;
+                        let return_recreated_string = program_info.instructions[return_line_number as usize].recreate_string();
                         let on_call_address_click = Callback::clone(&on_address_click);
                         let on_return_address_click = Callback::clone(&on_address_click);
-                        let on_stack_pointer_click = Callback::clone(&on_address_click);
-                        log::debug!("Jump to address: {:?}", frame.jump_address);
+                        let on_frame_pointer_click = Callback::clone(&on_address_click);
                         let default_label = String::from("");
+                        let on_return_line_click = Callback::clone(&on_assembled_click);
                         let label = labels.iter().find_map(|(label, address)| {
                             if *address == frame.jump_address as usize {
                                 Some(label)
@@ -392,26 +409,25 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
                                 None
                             }
                         }).unwrap_or(&default_label);
-                        log::debug!("Frame: {:?}", frame);
                         html! {
                             <tr>
                                 <td>
                                     {label}
                                 </td>
+                                <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.frame_pointer)} onclick={move |e: MouseEvent| {on_frame_pointer_click.emit((e, frame.frame_pointer as usize))}}>
+                                    {format!("0x{:08x}", frame.frame_pointer)}
+                                </td>
                                 <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.call_address)} onclick={move |e: MouseEvent| {on_call_address_click.emit((e, frame.call_address as usize))}}>
                                     {format!("0x{:08x}", frame.call_address as u64)}
                                 </td>
                                 <td>
-                                    {format!("{}: {:?}", call_line_number + 1, call_recreated_string)}
+                                    {call_recreated_string}
                                 </td>
                                 <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.return_address)} onclick={move |e: MouseEvent| {on_return_address_click.emit((e, frame.return_address as usize))}}>
                                     {format!("0x{:08x}", frame.return_address)}
                                 </td>
-                                <td>
-                                    {format!("{:?}", frame.frame_pointer)}
-                                </td>
-                                <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.stack_pointer)} onclick={move |e: MouseEvent| {on_stack_pointer_click.emit((e, frame.stack_pointer as usize))}}>
-                                    {format!("0x{:08x}", frame.stack_pointer)}
+                                <td class="text-accent-blue-200 hover:text-accent-blue-100 cursor-pointer" title="Go to line" onclick={move |e: MouseEvent| {on_return_line_click.emit((e, frame.return_address as usize))}}>
+                                    {return_recreated_string}
                                 </td>
                             </tr>
                         }
diff --git a/src/ui/swim_editor/component.rs b/src/ui/swim_editor/component.rs
index 4ef445a97..ffa8a3084 100644
--- a/src/ui/swim_editor/component.rs
+++ b/src/ui/swim_editor/component.rs
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::hash::Hash;
 use std::str::FromStr;
 use std::{cell::RefCell, rc::Rc};
 
@@ -312,6 +311,8 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
                     console_active_tab={console_active_tab.clone()}
                     program_info={props.program_info.clone()}
                     labels={props.labels.clone()}
+                    editor_curr_line={props.editor_curr_line.clone()}
+                    editor_active_tab={props.editor_active_tab.clone()}
                 />
             }
         </>
diff --git a/src/ui/visual_datapath/mod.rs b/src/ui/visual_datapath/mod.rs
index 67ffb541d..0b8ddcc85 100644
--- a/src/ui/visual_datapath/mod.rs
+++ b/src/ui/visual_datapath/mod.rs
@@ -28,7 +28,6 @@ pub mod utils;
 use std::{cell::RefCell, rc::Rc};
 
 use gloo_events::EventListener;
-use log::debug;
 use wasm_bindgen::{JsCast, JsValue};
 use web_sys::{Element, Event, HtmlCollection, HtmlElement, HtmlInputElement};
 use yew::prelude::*;
@@ -108,7 +107,6 @@ impl Component for VisualDatapath {
                     <input type="range" min="0" max="200" step="10" value={zoom_value_size.borrow().to_string()} onchange={ctx.link().callback(move |e: Event| {
                         let target = e.target().unwrap().unchecked_into::<HtmlInputElement>();
                         let value = target.value().parse::<i32>().unwrap();
-                        log::debug!("Value: {:?}", value);
                         let mut size = zoom_range_size.borrow_mut();
                         *size = value;
                     })}/>
@@ -138,7 +136,6 @@ impl Component for VisualDatapath {
             Stage::WriteBack => "memory",
         });
 
-        debug!("Current stage: {:?}", current_stage);
         if first_render || self.should_reinitialize {
             self.initialize(current_stage, ctx.props().datapath_state.clone());
             self.should_reinitialize = false;

From 3c44674a4261a60ca4e75a45fa4320c583657318 Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Mon, 25 Mar 2024 22:43:45 -0400
Subject: [PATCH 10/21] Show correct architecture type and change rust version

---
 Cargo.toml                          | 2 +-
 rust-toolchain.toml                 | 2 +-
 src/bin/main.rs                     | 3 ---
 src/emulation_core/architectures.rs | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 701bf1d24..14e4e94e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "swim"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.77"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 1704bf387..35dd0253c 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.73"
+channel = "1.77"
 components = [ "rustc", "cargo", "rustfmt", "rust-std", "rust-docs", "clippy" ]
 targets = [ "wasm32-unknown-unknown" ]
 profile = "default"
\ No newline at end of file
diff --git a/src/bin/main.rs b/src/bin/main.rs
index 1265d1c85..f4a85251a 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -403,9 +403,6 @@ fn app(props: &AppProps) -> Html {
                     }
                 }
 
-                // Update the parsed info for text and data segment views
-                let (program_info, _, _) = parser(text_model.get_value(), ARCH);
-
                 trigger.force_update();
             },
             datapath_state,
diff --git a/src/emulation_core/architectures.rs b/src/emulation_core/architectures.rs
index d7744a923..0ea4d45be 100644
--- a/src/emulation_core/architectures.rs
+++ b/src/emulation_core/architectures.rs
@@ -5,8 +5,8 @@ use strum_macros::EnumIter;
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, EnumIter)]
 pub enum AvailableDatapaths {
-    MIPS,
     RISCV,
+    MIPS,
 }
 
 impl fmt::Display for AvailableDatapaths {

From b3d29c8740c96c779b2e83ccce12a5d590f014d4 Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Wed, 27 Mar 2024 14:35:43 -0400
Subject: [PATCH 11/21] Add back parser on execute so assembled views/stack
 frame is updated after edits

---
 src/bin/main.rs                    | 32 ++++++++++++++++++++++++++----
 src/ui/assembled_view/component.rs | 27 +++++++++++++++++--------
 src/ui/visual_datapath/mod.rs      |  2 +-
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/src/bin/main.rs b/src/bin/main.rs
index f4a85251a..10fc99360 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -199,10 +199,17 @@ fn app(props: &AppProps) -> Html {
         let trigger = use_force_update();
         let communicator = props.communicator;
 
+        let program_info_ref = Rc::clone(&program_info_ref);
+        let binary_ref = Rc::clone(&binary_ref);
+        let labels_ref = Rc::clone(&labels_ref);
+
         use_callback(
             move |_, (editor_curr_line, memory_curr_instr, text_model, datapath_state)| {
                 // Get the current line and convert it to f64
-                let (program_info, _assembled, _labels) = parser(text_model.get_value(), ARCH);
+                let (program_info, assembled, labels) = parser(text_model.get_value(), ARCH);
+                *program_info_ref.borrow_mut() = program_info.clone();
+                *binary_ref.borrow_mut() = assembled.clone();
+                *labels_ref.borrow_mut() = labels.clone();
                 let list_of_line_numbers = program_info.address_to_line_number;
                 let index = datapath_state.mips.registers.pc as usize / 4;
                 editor_curr_line.set(*list_of_line_numbers.get(index).unwrap_or(&0) as f64 + 1.0); // add one to account for the editor's line numbers
@@ -235,11 +242,18 @@ fn app(props: &AppProps) -> Html {
 
         let trigger = use_force_update();
 
+        let program_info_ref = Rc::clone(&program_info_ref);
+        let binary_ref = Rc::clone(&binary_ref);
+        let labels_ref = Rc::clone(&labels_ref);
+
         use_callback(
             move |_, (editor_curr_line, memory_curr_instr, text_model, datapath_state)| {
                 if datapath_state.mips.current_stage == Stage::InstructionDecode {
                     // highlight on InstructionDecode since syscall stops at that stage.
-                    let (program_info, _assembled, _labels) = parser(text_model.get_value(), ARCH);
+                    let (program_info, assembled, labels) = parser(text_model.get_value(), ARCH);
+                    *program_info_ref.borrow_mut() = program_info.clone();
+                    *binary_ref.borrow_mut() = assembled.clone();
+                    *labels_ref.borrow_mut() = labels.clone();
                     let list_of_line_numbers = program_info.address_to_line_number;
                     let index = datapath_state.mips.registers.pc as usize / 4;
                     editor_curr_line
@@ -263,11 +277,21 @@ fn app(props: &AppProps) -> Html {
 
     let on_continue_execution = {
         let communicator = props.communicator;
+        let program_info_ref = Rc::clone(&program_info_ref);
+        let binary_ref = Rc::clone(&binary_ref);
+        let labels_ref = Rc::clone(&labels_ref);
+
+        let text_model = text_model.clone();
         use_callback(
-            move |_, _| {
+            move |_, text_model| {
+                let (program_info, assembled, labels) = parser(text_model.get_value(), ARCH);
+                *program_info_ref.borrow_mut() = program_info.clone();
+                *binary_ref.borrow_mut() = assembled.clone();
+                *labels_ref.borrow_mut() = labels.clone();
+
                 communicator.execute();
             },
-            (),
+            text_model,
         )
     };
 
diff --git a/src/ui/assembled_view/component.rs b/src/ui/assembled_view/component.rs
index 027d99fa9..c50dc488e 100644
--- a/src/ui/assembled_view/component.rs
+++ b/src/ui/assembled_view/component.rs
@@ -350,7 +350,7 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
     let editor_curr_line = &props.editor_curr_line;
     let editor_active_tab = &props.editor_active_tab;
 
-    // Go to the memory address in hex editor
+    // Open the memory address in hex editor
     let on_address_click = {
         let memory_curr_instr = memory_curr_instr.clone();
         let console_active_tab = console_active_tab.clone();
@@ -364,6 +364,7 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
         )
     };
 
+    // Open the line in code editor
     let on_assembled_click = {
         let editor_curr_line = editor_curr_line.clone();
         let editor_active_tab = editor_active_tab.clone();
@@ -392,15 +393,24 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
                 if !stack.is_empty() && !program_info.instructions.is_empty() {
                     let stack = stack.stack.clone();
                     stack.into_iter().enumerate().map(|(_address, frame)| {
-                        let call_line_number = frame.call_address / 4;
-                        let call_recreated_string = program_info.instructions[call_line_number as usize].recreate_string();
-                        let return_line_number = frame.return_address / 4;
-                        let return_recreated_string = program_info.instructions[return_line_number as usize].recreate_string();
+                        // Get the call and return lines
+                        let call_line_index = frame.call_address / 4;
+                        let call_recreated_string = program_info.instructions[call_line_index as usize].recreate_string();
+                        let call_line_number = program_info.instructions[call_line_index as usize].line_number;
+
+                        let return_line_index = frame.return_address / 4;
+                        let return_recreated_string = program_info.instructions[return_line_index as usize].recreate_string();
+                        let return_line_number = program_info.instructions[return_line_index as usize].line_number + 1;
+
+                        // Create the callbacks for cross reference links
                         let on_call_address_click = Callback::clone(&on_address_click);
                         let on_return_address_click = Callback::clone(&on_address_click);
                         let on_frame_pointer_click = Callback::clone(&on_address_click);
-                        let default_label = String::from("");
                         let on_return_line_click = Callback::clone(&on_assembled_click);
+                        let on_call_line_click = Callback::clone(&on_assembled_click);
+
+                        // Get the label for the frame
+                        let default_label = String::from("");
                         let label = labels.iter().find_map(|(label, address)| {
                             if *address == frame.jump_address as usize {
                                 Some(label)
@@ -409,6 +419,7 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
                                 None
                             }
                         }).unwrap_or(&default_label);
+
                         html! {
                             <tr>
                                 <td>
@@ -420,13 +431,13 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
                                 <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.call_address)} onclick={move |e: MouseEvent| {on_call_address_click.emit((e, frame.call_address as usize))}}>
                                     {format!("0x{:08x}", frame.call_address as u64)}
                                 </td>
-                                <td>
+                                <td class="text-accent-blue-200 hover:text-accent-blue-100 cursor-pointer" title="Go to line" onclick={move |e: MouseEvent| {on_call_line_click.emit((e, call_line_number as usize))}}>
                                     {call_recreated_string}
                                 </td>
                                 <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.return_address)} onclick={move |e: MouseEvent| {on_return_address_click.emit((e, frame.return_address as usize))}}>
                                     {format!("0x{:08x}", frame.return_address)}
                                 </td>
-                                <td class="text-accent-blue-200 hover:text-accent-blue-100 cursor-pointer" title="Go to line" onclick={move |e: MouseEvent| {on_return_line_click.emit((e, frame.return_address as usize))}}>
+                                <td class="text-accent-blue-200 hover:text-accent-blue-100 cursor-pointer" title="Go to line" onclick={move |e: MouseEvent| {on_return_line_click.emit((e, return_line_number as usize))}}>
                                     {return_recreated_string}
                                 </td>
                             </tr>
diff --git a/src/ui/visual_datapath/mod.rs b/src/ui/visual_datapath/mod.rs
index 0b8ddcc85..0a0561ba1 100644
--- a/src/ui/visual_datapath/mod.rs
+++ b/src/ui/visual_datapath/mod.rs
@@ -72,7 +72,7 @@ impl Component for VisualDatapath {
         VisualDatapath {
             active_listeners: Rc::new(RefCell::new(vec![])),
             should_reinitialize: false,
-            size: Rc::new(RefCell::new(50)),
+            size: Rc::new(RefCell::new(0)),
         }
     }
 

From 94a7eefae616afcaeab1162cc272ed50906099b1 Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Wed, 27 Mar 2024 14:43:01 -0400
Subject: [PATCH 12/21] Additional merging

---
 src/bin/main.rs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/bin/main.rs b/src/bin/main.rs
index 395493b4d..b05e9c680 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -7,11 +7,8 @@ use monaco::{
     api::TextModel,
     sys::{editor::IMarkerData, MarkerSeverity},
 };
-<<<<<<< HEAD
 use std::collections::HashMap;
-=======
 use std::collections::HashSet;
->>>>>>> ca0500262e9198ba50f36d5de428d2da1bbf7059
 use std::rc::Rc;
 use swim::agent::datapath_communicator::DatapathCommunicator;
 use swim::agent::datapath_reducer::DatapathReducer;
@@ -465,15 +462,12 @@ fn app(props: &AppProps) -> Html {
 
                 parser_text_output.set("".to_string());
 
-<<<<<<< HEAD
                 *program_info_ref.borrow_mut() = ProgramInfo::default();
                 *binary_ref.borrow_mut() = vec![];
                 *labels_ref.borrow_mut() = HashMap::<String, usize>::new();
 
-=======
                 communicator.reset();
                 breakpoints.set(HashSet::default());
->>>>>>> ca0500262e9198ba50f36d5de428d2da1bbf7059
                 trigger.force_update();
             },
             (

From a4a351917e2de237a2dcb2b0d3776761b1471057 Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Wed, 27 Mar 2024 15:02:36 -0400
Subject: [PATCH 13/21] Update executed line + hex editor line on continuous
 execution

---
 src/bin/main.rs                 | 1 -
 src/ui/hex_editor/component.rs  | 6 +++++-
 src/ui/swim_editor/component.rs | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/bin/main.rs b/src/bin/main.rs
index b05e9c680..4b6a43586 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -15,7 +15,6 @@ use swim::agent::datapath_reducer::DatapathReducer;
 use swim::agent::EmulationCoreAgent;
 use swim::emulation_core::mips::datapath::Stage;
 use swim::parser::parser_assembler_main::parser;
-use swim::parser::parser_structs_and_enums::LabelInstance;
 use swim::parser::parser_structs_and_enums::ProgramInfo;
 use swim::ui::footer::component::Footer;
 use swim::ui::regview::component::Regview;
diff --git a/src/ui/hex_editor/component.rs b/src/ui/hex_editor/component.rs
index e4b56ec7c..e78795689 100644
--- a/src/ui/hex_editor/component.rs
+++ b/src/ui/hex_editor/component.rs
@@ -143,6 +143,10 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
     }
 
     let on_editor_created = {
+        let memory_curr_instr = props.memory_curr_instr.clone();
+        let datapath_state = props.datapath_state.clone();
+        memory_curr_instr.set(datapath_state.mips.registers.pc);
+
         use_callback(
             move |editor_link: CodeEditorLink,
                   (datapath_state, memory_text_model, memory_curr_instr)| {
@@ -156,7 +160,7 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
                     let raw_editor = editor.as_ref();
                     let cb_func = &cb.as_ref().unchecked_ref();
 
-                    let coords = get_hex_coords(*memory_curr_instr);
+                    let coords = get_hex_coords(**memory_curr_instr);
                     raw_editor.on_did_change_cursor_selection(cb_func);
                     raw_editor.reveal_line_in_center(coords.line_number, Some(ScrollType::Smooth));
 
diff --git a/src/ui/swim_editor/component.rs b/src/ui/swim_editor/component.rs
index 21ae6985e..858f5054d 100644
--- a/src/ui/swim_editor/component.rs
+++ b/src/ui/swim_editor/component.rs
@@ -21,6 +21,7 @@ use yew::prelude::*;
 use yew::{html, Callback, Properties};
 use yew_hooks::prelude::*;
 
+use crate::agent::datapath_reducer::DatapathReducer;
 use crate::emulation_core::mips::memory::Memory;
 use crate::emulation_core::mips::stack::Stack;
 use crate::ui::assembled_view::component::{StackFrameView, StackSegment};
@@ -105,8 +106,13 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
 
     let on_editor_created = {
         let curr_line = props.editor_curr_line.clone();
+        let program_info = props.program_info.clone();
         let lines_content = Rc::clone(&props.lines_content);
 
+        let list_of_line_numbers = program_info.address_to_line_number;
+        let index = props.pc as usize / 4;
+        curr_line.set(*list_of_line_numbers.get(index).unwrap_or(&0) as f64 + 1.0); // add one to account for the editor's line numbers
+
         use_callback(
             move |editor_link: CodeEditorLink, curr_line| {
                 match editor_link.with_editor(|editor| {

From 9cbf0977aac1707c51bc67f9999537a252c9a47f Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Wed, 27 Mar 2024 15:07:17 -0400
Subject: [PATCH 14/21] Move stack one directory up

---
 src/agent/datapath_reducer.rs          | 2 +-
 src/agent/messages.rs                  | 2 +-
 src/emulation_core.rs                  | 1 +
 src/emulation_core/mips.rs             | 3 +--
 src/emulation_core/mips/datapath.rs    | 2 +-
 src/emulation_core/{mips => }/stack.rs | 0
 src/ui/assembled_view/component.rs     | 2 +-
 src/ui/swim_editor/component.rs        | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename src/emulation_core/{mips => }/stack.rs (100%)

diff --git a/src/agent/datapath_reducer.rs b/src/agent/datapath_reducer.rs
index cbd252eed..0d1144c1b 100644
--- a/src/agent/datapath_reducer.rs
+++ b/src/agent/datapath_reducer.rs
@@ -6,7 +6,7 @@ use crate::emulation_core::mips::datapath::{DatapathState, Stage};
 use crate::emulation_core::mips::fp_registers::FpRegisters;
 use crate::emulation_core::mips::gp_registers::GpRegisters;
 use crate::emulation_core::mips::memory::Memory;
-use crate::emulation_core::mips::stack::Stack;
+use crate::emulation_core::stack::Stack;
 use gloo_console::log;
 use std::rc::Rc;
 use yew::Reducible;
diff --git a/src/agent/messages.rs b/src/agent/messages.rs
index 1013baa2d..c40bd0b49 100644
--- a/src/agent/messages.rs
+++ b/src/agent/messages.rs
@@ -3,7 +3,7 @@ use crate::emulation_core::mips::datapath::DatapathState;
 use crate::emulation_core::mips::fp_registers::FpRegisters;
 use crate::emulation_core::mips::gp_registers::GpRegisters;
 use crate::emulation_core::mips::memory::Memory;
-use crate::emulation_core::mips::stack::Stack;
+use crate::emulation_core::stack::Stack;
 use crate::emulation_core::{architectures::AvailableDatapaths, mips::datapath::Stage};
 use serde::{Deserialize, Serialize};
 
diff --git a/src/emulation_core.rs b/src/emulation_core.rs
index ba1dedcb5..1ad19e59d 100644
--- a/src/emulation_core.rs
+++ b/src/emulation_core.rs
@@ -5,3 +5,4 @@ pub mod datapath;
 pub mod line_info;
 pub mod mips;
 pub mod riscv;
+pub mod stack;
diff --git a/src/emulation_core/mips.rs b/src/emulation_core/mips.rs
index bf26cd90d..0f309bd3f 100644
--- a/src/emulation_core/mips.rs
+++ b/src/emulation_core/mips.rs
@@ -9,5 +9,4 @@ pub mod datapath_signals;
 pub mod fp_registers;
 pub mod gp_registers;
 pub mod instruction;
-pub mod memory;
-pub mod stack;
+pub mod memory;
\ No newline at end of file
diff --git a/src/emulation_core/mips/datapath.rs b/src/emulation_core/mips/datapath.rs
index 547e4660f..c43c53fd8 100644
--- a/src/emulation_core/mips/datapath.rs
+++ b/src/emulation_core/mips/datapath.rs
@@ -57,7 +57,7 @@ use crate::emulation_core::architectures::DatapathRef;
 use crate::emulation_core::datapath::{DatapathUpdateSignal, Syscall};
 use crate::emulation_core::mips::fp_registers::FpRegisterType;
 use crate::emulation_core::mips::gp_registers::GpRegisterType::{A0, A1};
-use crate::emulation_core::mips::stack::{Stack, StackFrame};
+use crate::emulation_core::stack::{Stack, StackFrame};
 use serde::{Deserialize, Serialize};
 
 /// An implementation of a datapath for the MIPS64 ISA.
diff --git a/src/emulation_core/mips/stack.rs b/src/emulation_core/stack.rs
similarity index 100%
rename from src/emulation_core/mips/stack.rs
rename to src/emulation_core/stack.rs
diff --git a/src/ui/assembled_view/component.rs b/src/ui/assembled_view/component.rs
index 704e2b2fe..ac36bf287 100644
--- a/src/ui/assembled_view/component.rs
+++ b/src/ui/assembled_view/component.rs
@@ -6,7 +6,7 @@ use std::rc::Rc;
 
 use crate::agent::datapath_communicator::DatapathCommunicator;
 use crate::emulation_core::mips::memory::{Memory, MemoryIter};
-use crate::emulation_core::mips::stack::Stack;
+use crate::emulation_core::stack::Stack;
 // use monaco::api::TextModel;
 use crate::parser::parser_structs_and_enums::ProgramInfo;
 use crate::ui::swim_editor::tab::TabState;
diff --git a/src/ui/swim_editor/component.rs b/src/ui/swim_editor/component.rs
index 858f5054d..a17f9d47e 100644
--- a/src/ui/swim_editor/component.rs
+++ b/src/ui/swim_editor/component.rs
@@ -23,7 +23,7 @@ use yew_hooks::prelude::*;
 
 use crate::agent::datapath_reducer::DatapathReducer;
 use crate::emulation_core::mips::memory::Memory;
-use crate::emulation_core::mips::stack::Stack;
+use crate::emulation_core::stack::Stack;
 use crate::ui::assembled_view::component::{StackFrameView, StackSegment};
 use crate::{
     agent::datapath_communicator::DatapathCommunicator,

From 879d24b9edbdf4d3a03b54161f9824c0de2c503f Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Wed, 27 Mar 2024 15:58:22 -0400
Subject: [PATCH 15/21] Fix clippy errors in UI

---
 src/bin/main.rs                       |  3 +
 src/emulation_core/architectures.rs   |  2 +-
 src/emulation_core/mips.rs            |  2 +-
 src/tests/emulation_core/registers.rs |  1 +
 src/ui/assembled_view/component.rs    |  4 +-
 src/ui/footer/component.rs            |  5 +-
 src/ui/hex_editor/component.rs        | 88 +++++++++++++--------------
 src/ui/swim_editor/component.rs       | 60 +++++++++---------
 8 files changed, 88 insertions(+), 77 deletions(-)

diff --git a/src/bin/main.rs b/src/bin/main.rs
index 4b6a43586..473350ec5 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -587,6 +587,7 @@ fn app(props: &AppProps) -> Html {
                             sp={datapath_state.mips.registers[GpRegisterType::Sp]}
                             memory={datapath_state.mips.memory.clone()}
                             stack={datapath_state.mips.stack.clone()}
+                            initialized={datapath_state.initialized}
                         />
                     </div>
 
@@ -600,6 +601,8 @@ fn app(props: &AppProps) -> Html {
                         communicator={props.communicator}
                         show_input={show_input.clone()}
                         on_memory_clicked={on_memory_clicked.clone()}
+                        memory={datapath_state.mips.memory.clone()}
+                        pc={datapath_state.mips.registers.pc}
                     />
                 </div>
 
diff --git a/src/emulation_core/architectures.rs b/src/emulation_core/architectures.rs
index c1415fdb1..c15cf6af3 100644
--- a/src/emulation_core/architectures.rs
+++ b/src/emulation_core/architectures.rs
@@ -6,8 +6,8 @@ use strum_macros::EnumIter;
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, EnumIter)]
 pub enum AvailableDatapaths {
-    RISCV,
     MIPS,
+    RISCV,
 }
 
 impl fmt::Display for AvailableDatapaths {
diff --git a/src/emulation_core/mips.rs b/src/emulation_core/mips.rs
index 0f309bd3f..739e7731b 100644
--- a/src/emulation_core/mips.rs
+++ b/src/emulation_core/mips.rs
@@ -9,4 +9,4 @@ pub mod datapath_signals;
 pub mod fp_registers;
 pub mod gp_registers;
 pub mod instruction;
-pub mod memory;
\ No newline at end of file
+pub mod memory;
diff --git a/src/tests/emulation_core/registers.rs b/src/tests/emulation_core/registers.rs
index 26539a345..695b87f90 100644
--- a/src/tests/emulation_core/registers.rs
+++ b/src/tests/emulation_core/registers.rs
@@ -13,6 +13,7 @@ fn direct_access_register() {
 #[test]
 #[should_panic]
 #[allow(unconditional_panic)]
+#[allow(clippy::out_of_bounds_indexing)]
 fn direct_access_register_bad_gpr() {
     let mut registers = GpRegisters::default();
 
diff --git a/src/ui/assembled_view/component.rs b/src/ui/assembled_view/component.rs
index ac36bf287..f87c83ea5 100644
--- a/src/ui/assembled_view/component.rs
+++ b/src/ui/assembled_view/component.rs
@@ -454,13 +454,13 @@ pub fn StackFrameView(props: &StackFrameProps) -> Html {
                                 <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.call_address)} onclick={move |e: MouseEvent| {on_call_address_click.emit((e, frame.call_address as usize))}}>
                                     {format!("0x{:08x}", frame.call_address as u64)}
                                 </td>
-                                <td class="text-accent-blue-200 hover:text-accent-blue-100 cursor-pointer" title="Go to line" onclick={move |e: MouseEvent| {on_call_line_click.emit((e, call_line_number as usize))}}>
+                                <td class="text-accent-blue-200 hover:text-accent-blue-100 cursor-pointer" title="Go to line" onclick={move |e: MouseEvent| {on_call_line_click.emit((e, call_line_number))}}>
                                     {call_recreated_string}
                                 </td>
                                 <td class="text-accent-green-300 hover:text-accent-green-200 cursor-pointer" title={format!("Go to address in memory {:08x}", frame.return_address)} onclick={move |e: MouseEvent| {on_return_address_click.emit((e, frame.return_address as usize))}}>
                                     {format!("0x{:08x}", frame.return_address)}
                                 </td>
-                                <td class="text-accent-blue-200 hover:text-accent-blue-100 cursor-pointer" title="Go to line" onclick={move |e: MouseEvent| {on_return_line_click.emit((e, return_line_number as usize))}}>
+                                <td class="text-accent-blue-200 hover:text-accent-blue-100 cursor-pointer" title="Go to line" onclick={move |e: MouseEvent| {on_return_line_click.emit((e, return_line_number))}}>
                                     {return_recreated_string}
                                 </td>
                             </tr>
diff --git a/src/ui/footer/component.rs b/src/ui/footer/component.rs
index a03a9d960..84cd8ad90 100644
--- a/src/ui/footer/component.rs
+++ b/src/ui/footer/component.rs
@@ -1,5 +1,6 @@
 use crate::agent::datapath_communicator::DatapathCommunicator;
 use crate::agent::datapath_reducer::DatapathReducer;
+use crate::emulation_core::mips::memory::Memory;
 use crate::ui::console::component::Console;
 use crate::ui::hex_editor::component::HexEditor;
 use crate::ui::swim_editor::tab::TabState;
@@ -21,6 +22,8 @@ pub struct Footerprops {
     pub memory_curr_instr: UseStateHandle<u64>,
     pub active_tab: UseStateHandle<TabState>,
     pub on_memory_clicked: Callback<MouseEvent>,
+    pub memory: Memory,
+    pub pc: u64
 }
 
 #[function_component(Footer)]
@@ -69,7 +72,7 @@ pub fn footer(props: &Footerprops) -> Html {
                 <VisualDatapath datapath_state={props.datapath_state.clone()} svg_path={svg_path} />
             } else if **active_tab == TabState::HexEditor {
                 <div class="flex h-48 border-primary-200 border-groove border-2 z-10">
-                    <HexEditor memory_text_model={props.memory_text_model.clone()} memory_curr_instr={props.memory_curr_instr.clone()} datapath_state={props.datapath_state.clone()}/>
+                    <HexEditor memory_text_model={props.memory_text_model.clone()} memory_curr_instr={props.memory_curr_instr.clone()} memory={props.memory.clone()} pc={props.pc} initialized={props.datapath_state.initialized}/>
                 </div>
             }
             <div class="flex flex-row justify-between w-full">
diff --git a/src/ui/hex_editor/component.rs b/src/ui/hex_editor/component.rs
index e78795689..68ac46a4f 100644
--- a/src/ui/hex_editor/component.rs
+++ b/src/ui/hex_editor/component.rs
@@ -19,8 +19,7 @@ use monaco::{
     yew::{CodeEditor, CodeEditorLink},
 };
 
-use crate::agent::datapath_reducer::DatapathReducer;
-use crate::emulation_core::mips::memory::CAPACITY_BYTES;
+use crate::emulation_core::mips::memory::{Memory, CAPACITY_BYTES};
 
 #[derive(PartialEq, Properties)]
 pub struct HexCoord {
@@ -32,9 +31,11 @@ pub struct HexCoord {
 #[derive(PartialEq, Properties)]
 pub struct HexEditorProps {
     pub memory_text_model: UseStateHandle<TextModel>,
-    pub datapath_state: UseReducerHandle<DatapathReducer>,
+    pub memory: Memory,
+    pub pc: u64,
     // The instruction to highlight
     pub memory_curr_instr: UseStateHandle<u64>,
+    pub initialized: bool,
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -51,8 +52,6 @@ impl UpdatedLine {
 #[function_component(HexEditor)]
 pub fn hex_editor(props: &HexEditorProps) -> Html {
     let editor_link = CodeEditorLink::new();
-    // Program counter - will probably change
-    let memory_curr_instr = *props.memory_curr_instr;
     let memory_text_model = &props.memory_text_model;
 
     // Store highlight decoration IDs
@@ -144,62 +143,63 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
 
     let on_editor_created = {
         let memory_curr_instr = props.memory_curr_instr.clone();
-        let datapath_state = props.datapath_state.clone();
-        memory_curr_instr.set(datapath_state.mips.registers.pc);
+        memory_curr_instr.set(props.pc); // should this only be done in execute clicked for usability
 
         use_callback(
             move |editor_link: CodeEditorLink,
-                  (datapath_state, memory_text_model, memory_curr_instr)| {
-                match editor_link.with_editor(|editor| {
-                    let hexdump = &datapath_state
-                        .mips
-                        .memory
+                  (memory, memory_text_model, memory_curr_instr, initialized)| {
+                let result = editor_link.with_editor(|editor| {
+                    let hexdump = &memory
                         .generate_formatted_hex(CAPACITY_BYTES);
                     memory_text_model.set_value(hexdump);
 
                     let raw_editor = editor.as_ref();
                     let cb_func = &cb.as_ref().unchecked_ref();
 
-                    let coords = get_hex_coords(**memory_curr_instr);
-                    raw_editor.on_did_change_cursor_selection(cb_func);
-                    raw_editor.reveal_line_in_center(coords.line_number, Some(ScrollType::Smooth));
-
-                    // Highlight line using delta decorations
-                    let not_highlighted = js_sys::Array::new();
-                    let executed_line = js_sys::Array::new();
-                    let decoration: IModelDeltaDecoration = js_sys::Object::new().unchecked_into();
-                    let options: IModelDecorationOptions = js_sys::Object::new().unchecked_into();
-                    if coords.line_number != 0.0 {
-                        // Show highlight if current line is not 0
-                        options.set_inline_class_name("executedLine".into());
-                        options.set_is_whole_line(false.into());
+                    if *initialized {
+                        let coords = get_hex_coords(**memory_curr_instr);
+                        raw_editor.on_did_change_cursor_selection(cb_func);
+                        raw_editor.reveal_line_in_center(coords.line_number, Some(ScrollType::Smooth));
+
+                        // Highlight line using delta decorations
+                        let not_highlighted = js_sys::Array::new();
+                        let executed_line = js_sys::Array::new();
+                        let decoration: IModelDeltaDecoration = js_sys::Object::new().unchecked_into();
+                        let options: IModelDecorationOptions = js_sys::Object::new().unchecked_into();
+                        if coords.line_number != 0.0 {
+                            // Show highlight if current line is not 0
+                            options.set_inline_class_name("executedLine".into());
+                            options.set_is_whole_line(false.into());
+                        }
+                        decoration.set_options(&options);
+                        let curr_range = Range::new(
+                            coords.line_number,
+                            coords.start_column,
+                            coords.line_number,
+                            coords.end_column,
+                        );
+                        let range_js = curr_range
+                            .dyn_into::<JsValue>()
+                            .expect("Range is not found.");
+                        decoration.set_range(&monaco::sys::IRange::from(range_js));
+                        let decoration_js = decoration
+                            .dyn_into::<JsValue>()
+                            .expect("Highlight is not found.");
+                        executed_line.push(&decoration_js);
+
+                        raw_editor.delta_decorations(&not_highlighted, &executed_line);
                     }
-                    decoration.set_options(&options);
-                    let curr_range = Range::new(
-                        coords.line_number,
-                        coords.start_column,
-                        coords.line_number,
-                        coords.end_column,
-                    );
-                    let range_js = curr_range
-                        .dyn_into::<JsValue>()
-                        .expect("Range is not found.");
-                    decoration.set_range(&monaco::sys::IRange::from(range_js));
-                    let decoration_js = decoration
-                        .dyn_into::<JsValue>()
-                        .expect("Highlight is not found.");
-                    executed_line.push(&decoration_js);
-
-                    raw_editor.delta_decorations(&not_highlighted, &executed_line);
-                }) {
+                });
+                match result {
                     Some(()) => debug!("Hex Editor linked!"),
                     None => debug!("No editor :<"),
                 };
             },
             (
-                props.datapath_state.clone(),
+                props.memory.clone(),
                 props.memory_text_model.clone(),
                 memory_curr_instr,
+                props.initialized
             ),
         )
     };
diff --git a/src/ui/swim_editor/component.rs b/src/ui/swim_editor/component.rs
index a17f9d47e..4f86f2f10 100644
--- a/src/ui/swim_editor/component.rs
+++ b/src/ui/swim_editor/component.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
-use std::str::FromStr;
 use std::collections::HashSet;
+use std::str::FromStr;
 use std::{cell::RefCell, rc::Rc};
 
 use monaco::{
@@ -21,7 +21,6 @@ use yew::prelude::*;
 use yew::{html, Callback, Properties};
 use yew_hooks::prelude::*;
 
-use crate::agent::datapath_reducer::DatapathReducer;
 use crate::emulation_core::mips::memory::Memory;
 use crate::emulation_core::stack::Stack;
 use crate::ui::assembled_view::component::{StackFrameView, StackSegment};
@@ -56,6 +55,7 @@ pub struct SwimEditorProps {
     pub memory: Memory,
     pub stack: Stack,
     pub breakpoints: UseStateHandle<HashSet<u64>>,
+    pub initialized: bool
 }
 
 #[derive(Default, PartialEq)]
@@ -114,8 +114,8 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
         curr_line.set(*list_of_line_numbers.get(index).unwrap_or(&0) as f64 + 1.0); // add one to account for the editor's line numbers
 
         use_callback(
-            move |editor_link: CodeEditorLink, curr_line| {
-                match editor_link.with_editor(|editor| {
+            move |editor_link: CodeEditorLink, (curr_line, initialized)| {
+                let result = editor_link.with_editor(|editor| {
                     let raw_editor = editor.as_ref();
                     let model = raw_editor.get_model().unwrap();
                     // store each line from the original code editor's contents for assembled view
@@ -126,35 +126,39 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
                         lines.push(model.get_line_content(i as f64));
                     }
                     *lines_content = lines;
-                    // Scroll to current line
-                    raw_editor.reveal_line_in_center(**curr_line, Some(ScrollType::Smooth));
-                    // Highlight current line using delta decorations
-                    let not_highlighted = js_sys::Array::new();
-                    let executed_line = js_sys::Array::new();
-                    let decoration: IModelDeltaDecoration = js_sys::Object::new().unchecked_into();
-                    let options: IModelDecorationOptions = js_sys::Object::new().unchecked_into();
-                    if **curr_line != 0.0 {
-                        // Show highlight if current line is not 0
-                        options.set_inline_class_name("executedLine".into());
-                        options.set_is_whole_line(true.into());
+
+                    if *initialized {
+                        // Scroll to current line
+                        raw_editor.reveal_line_in_center(**curr_line, Some(ScrollType::Smooth));
+                        // Highlight current line using delta decorations
+                        let not_highlighted = js_sys::Array::new();
+                        let executed_line = js_sys::Array::new();
+                        let decoration: IModelDeltaDecoration = js_sys::Object::new().unchecked_into();
+                        let options: IModelDecorationOptions = js_sys::Object::new().unchecked_into();
+                        if **curr_line != 0.0 {
+                            // Show highlight if current line is not 0
+                            options.set_inline_class_name("executedLine".into());
+                            options.set_is_whole_line(true.into());
+                        }
+                        decoration.set_options(&options);
+                        let curr_range = Range::new(**curr_line, 0.0, **curr_line, 0.0);
+                        let range_js = curr_range
+                            .dyn_into::<JsValue>()
+                            .expect("Range is not found.");
+                        decoration.set_range(&monaco::sys::IRange::from(range_js));
+                        let decoration_js = decoration
+                            .dyn_into::<JsValue>()
+                            .expect("Highlight is not found.");
+                        executed_line.push(&decoration_js);
+                        raw_editor.delta_decorations(&not_highlighted, &executed_line);
                     }
-                    decoration.set_options(&options);
-                    let curr_range = Range::new(**curr_line, 0.0, **curr_line, 0.0);
-                    let range_js = curr_range
-                        .dyn_into::<JsValue>()
-                        .expect("Range is not found.");
-                    decoration.set_range(&monaco::sys::IRange::from(range_js));
-                    let decoration_js = decoration
-                        .dyn_into::<JsValue>()
-                        .expect("Highlight is not found.");
-                    executed_line.push(&decoration_js);
-                    raw_editor.delta_decorations(&not_highlighted, &executed_line);
-                }) {
+                });
+                match result {
                     Some(()) => log::debug!("Swim Editor linked!"),
                     None => log::debug!("No swim editor :<"),
                 };
             },
-            curr_line,
+            (curr_line, props.initialized),
         )
     };
 

From 3978d4a604ff5306611df1e5da7bbe49b2f7ec0c Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Wed, 27 Mar 2024 16:19:59 -0400
Subject: [PATCH 16/21] Fix clippy errors in parser

---
 src/parser/assembling.rs                 | 256 ++++++++++++-----------
 src/parser/parsing.rs                    |  27 +--
 src/parser/pseudo_instruction_parsing.rs |   8 +-
 src/ui/footer/component.rs               |   2 +-
 src/ui/hex_editor/component.rs           |  14 +-
 src/ui/swim_editor/component.rs          |   8 +-
 6 files changed, 162 insertions(+), 153 deletions(-)

diff --git a/src/parser/assembling.rs b/src/parser/assembling.rs
index 4c11fb276..67d504fe3 100644
--- a/src/parser/assembling.rs
+++ b/src/parser/assembling.rs
@@ -40,10 +40,9 @@ pub fn read_operands(
         return instruction;
     }
 
-    let labels = if let Some(..) = labels_option {
-        labels_option.unwrap()
-    } else {
-        HashMap::new()
+    let labels = match labels_option {
+        Some(labels_option) => labels_option,
+        None => HashMap::new(),
     };
 
     //operands aren't represented in the binary in the order they're read so the vec<u32> allows us to concatenate them in the proper order after they're all read.
@@ -206,10 +205,9 @@ pub fn read_operands_riscv(
         return instruction;
     }
 
-    let labels = if let Some(..) = labels_option {
-        labels_option.unwrap()
-    } else {
-        HashMap::new()
+    let labels = match labels_option {
+        Some(labels_option) => labels_option,
+        None => HashMap::new(),
     };
 
     //operands aren't represented in the binary in the order they're read so the vec<u32> allows us to concatenate them in the proper order after they're all read.
@@ -573,55 +571,61 @@ pub fn read_register(
     if register_type == GeneralPurpose {
         //this section is for matching general purpose registers
         let general_result = match_gp_register(register);
-        if let Some(..) = general_result {
-            (general_result.unwrap(), None)
-        } else if match_fp_register(register).is_some() {
-            // Creates Error if supplied a fp register for gp
-            (
-                0,
-                Some(Error {
-                    error_name: IncorrectRegisterTypeFP,
-                    token_causing_error: register.to_string(),
-                    start_end_columns,
-                    message: "".to_string(),
-                }),
-            )
-        } else {
-            (
-                0,
-                Some(Error {
-                    error_name: UnrecognizedGPRegister,
-                    token_causing_error: register.to_string(),
-                    start_end_columns,
-                    message: "".to_string(),
-                }),
-            )
+        match general_result {
+            Some(general_result) => (general_result, None),
+            None => {
+                if match_fp_register(register).is_some() {
+                    // Creates Error if supplied a fp register for gp
+                    (
+                        0,
+                        Some(Error {
+                            error_name: IncorrectRegisterTypeFP,
+                            token_causing_error: register.to_string(),
+                            start_end_columns,
+                            message: "".to_string(),
+                        }),
+                    )
+                } else {
+                    (
+                        0,
+                        Some(Error {
+                            error_name: UnrecognizedGPRegister,
+                            token_causing_error: register.to_string(),
+                            start_end_columns,
+                            message: "".to_string(),
+                        }),
+                    )
+                }
+            }
         }
     } else {
         //this section is for matching floating point registers
         let floating_result = match_fp_register(register);
-        if let Some(..) = floating_result {
-            (floating_result.unwrap(), None)
-        } else if match_gp_register(register).is_some() {
-            (
-                0,
-                Some(Error {
-                    error_name: IncorrectRegisterTypeGP,
-                    token_causing_error: register.to_string(),
-                    start_end_columns,
-                    message: "".to_string(),
-                }),
-            )
-        } else {
-            (
-                0,
-                Some(Error {
-                    error_name: UnrecognizedFPRegister,
-                    token_causing_error: register.to_string(),
-                    start_end_columns,
-                    message: "".to_string(),
-                }),
-            )
+        match floating_result {
+            Some(floating_result) => (floating_result, None),
+            None => {
+                if match_gp_register(register).is_some() {
+                    (
+                        0,
+                        Some(Error {
+                            error_name: IncorrectRegisterTypeGP,
+                            token_causing_error: register.to_string(),
+                            start_end_columns,
+                            message: "".to_string(),
+                        }),
+                    )
+                } else {
+                    (
+                        0,
+                        Some(Error {
+                            error_name: UnrecognizedFPRegister,
+                            token_causing_error: register.to_string(),
+                            start_end_columns,
+                            message: "".to_string(),
+                        }),
+                    )
+                }
+            }
         }
     }
 }
@@ -636,55 +640,61 @@ pub fn read_register_riscv(
     if register_type == GeneralPurpose {
         //this section is for matching general purpose registers
         let general_result = match_gp_register_riscv(register);
-        if let Some(..) = general_result {
-            (general_result.unwrap(), None)
-        } else if match_fp_register_riscv(register).is_some() {
-            // Creates Error if supplied a fp register for gp
-            (
-                0,
-                Some(Error {
-                    error_name: IncorrectRegisterTypeFP,
-                    token_causing_error: register.to_string(),
-                    start_end_columns,
-                    message: "".to_string(),
-                }),
-            )
-        } else {
-            (
-                0,
-                Some(Error {
-                    error_name: UnrecognizedGPRegister,
-                    token_causing_error: register.to_string(),
-                    start_end_columns,
-                    message: "".to_string(),
-                }),
-            )
+        match general_result {
+            Some(general_result) => (general_result, None),
+            None => {
+                if match_fp_register_riscv(register).is_some() {
+                    // Creates Error if supplied a fp register for gp
+                    (
+                        0,
+                        Some(Error {
+                            error_name: IncorrectRegisterTypeFP,
+                            token_causing_error: register.to_string(),
+                            start_end_columns,
+                            message: "".to_string(),
+                        }),
+                    )
+                } else {
+                    (
+                        0,
+                        Some(Error {
+                            error_name: UnrecognizedGPRegister,
+                            token_causing_error: register.to_string(),
+                            start_end_columns,
+                            message: "".to_string(),
+                        }),
+                    )
+                }
+            }
         }
     } else {
         //this section is for matching floating point registers
         let floating_result = match_fp_register_riscv(register);
-        if let Some(..) = floating_result {
-            (floating_result.unwrap(), None)
-        } else if match_gp_register(register).is_some() {
-            (
-                0,
-                Some(Error {
-                    error_name: IncorrectRegisterTypeGP,
-                    token_causing_error: register.to_string(),
-                    start_end_columns,
-                    message: "".to_string(),
-                }),
-            )
-        } else {
-            (
-                0,
-                Some(Error {
-                    error_name: UnrecognizedFPRegister,
-                    token_causing_error: register.to_string(),
-                    start_end_columns,
-                    message: "".to_string(),
-                }),
-            )
+        match floating_result {
+            Some(floating_result) => (floating_result, None),
+            None => {
+                if match_gp_register_riscv(register).is_some() {
+                    (
+                        0,
+                        Some(Error {
+                            error_name: IncorrectRegisterTypeGP,
+                            token_causing_error: register.to_string(),
+                            start_end_columns,
+                            message: "".to_string(),
+                        }),
+                    )
+                } else {
+                    (
+                        0,
+                        Some(Error {
+                            error_name: UnrecognizedFPRegister,
+                            token_causing_error: register.to_string(),
+                            start_end_columns,
+                            message: "".to_string(),
+                        }),
+                    )
+                }
+            }
         }
     }
 }
@@ -753,8 +763,8 @@ pub fn read_immediate(
     //if that results in an error, try to read it as hex
     if parse_results.is_err() {
         let removed_prefix = given_text.strip_prefix("0x");
-        if let Some(..) = removed_prefix {
-            parse_results = i64::from_str_radix(removed_prefix.unwrap(), 16);
+        if let Some(removed_prefix) = removed_prefix {
+            parse_results = i64::from_str_radix(removed_prefix, 16);
         }
     }
 
@@ -891,23 +901,24 @@ pub fn assemble_data_binary(data_list: &mut [Data]) -> Vec<u8> {
                 for value in datum.data_entries.iter_mut() {
                     value.token_type = Float;
                     let parse_results = value.token_name.parse::<f64>();
-                    if let Ok(..) = parse_results {
-                        let float_bits = parse_results.unwrap().to_bits();
-                        vec_of_data.push((float_bits >> 56) as u8);
-                        vec_of_data.push((float_bits >> 48) as u8);
-                        vec_of_data.push((float_bits >> 40) as u8);
-                        vec_of_data.push((float_bits >> 32) as u8);
-                        vec_of_data.push((float_bits >> 24) as u8);
-                        vec_of_data.push((float_bits >> 16) as u8);
-                        vec_of_data.push((float_bits >> 8) as u8);
-                        vec_of_data.push(float_bits as u8);
-                    } else {
-                        datum.errors.push(Error {
+                    match parse_results {
+                        Ok(..) => {
+                            let float_bits = parse_results.unwrap().to_bits();
+                            vec_of_data.push((float_bits >> 56) as u8);
+                            vec_of_data.push((float_bits >> 48) as u8);
+                            vec_of_data.push((float_bits >> 40) as u8);
+                            vec_of_data.push((float_bits >> 32) as u8);
+                            vec_of_data.push((float_bits >> 24) as u8);
+                            vec_of_data.push((float_bits >> 16) as u8);
+                            vec_of_data.push((float_bits >> 8) as u8);
+                            vec_of_data.push(float_bits as u8);
+                        }
+                        Err(_) => datum.errors.push(Error {
                             error_name: NonFloatImmediate,
                             token_causing_error: value.token_name.to_string(),
                             start_end_columns: value.start_end_columns,
                             message: "".to_string(),
-                        })
+                        }),
                     }
                 }
             }
@@ -916,19 +927,20 @@ pub fn assemble_data_binary(data_list: &mut [Data]) -> Vec<u8> {
                 for value in datum.data_entries.iter_mut() {
                     value.token_type = Float;
                     let parse_results = value.token_name.parse::<f32>();
-                    if let Ok(..) = parse_results {
-                        let float_bits = parse_results.unwrap().to_bits();
-                        vec_of_data.push((float_bits >> 24) as u8);
-                        vec_of_data.push((float_bits >> 16) as u8);
-                        vec_of_data.push((float_bits >> 8) as u8);
-                        vec_of_data.push(float_bits as u8);
-                    } else {
-                        datum.errors.push(Error {
+                    match parse_results {
+                        Ok(..) => {
+                            let float_bits = parse_results.unwrap().to_bits();
+                            vec_of_data.push((float_bits >> 24) as u8);
+                            vec_of_data.push((float_bits >> 16) as u8);
+                            vec_of_data.push((float_bits >> 8) as u8);
+                            vec_of_data.push(float_bits as u8);
+                        }
+                        Err(_) => datum.errors.push(Error {
                             error_name: NonFloatImmediate,
                             token_causing_error: value.token_name.to_string(),
                             start_end_columns: value.start_end_columns,
                             message: "".to_string(),
-                        })
+                        }),
                     }
                 }
             }
diff --git a/src/parser/parsing.rs b/src/parser/parsing.rs
index 4881ce8e6..a7182b3e1 100644
--- a/src/parser/parsing.rs
+++ b/src/parser/parsing.rs
@@ -191,7 +191,7 @@ pub fn remove_commas(line: &mut MonacoLineInfo) {
 
 ///This function takes the vector of lines created by tokenize program and turns them into instructions
 ///assigning labels, operators, operands, and line numbers and data assigning labels, data types, and values
-pub fn separate_data_and_text(lines: &mut Vec<MonacoLineInfo>) -> (Vec<Instruction>, Vec<Data>) {
+pub fn separate_data_and_text(lines: &mut [MonacoLineInfo]) -> (Vec<Instruction>, Vec<Data>) {
     let mut instruction_list: Vec<Instruction> = Vec::new();
     let mut data_list: Vec<Data> = Vec::new();
     let mut labels: Vec<LabelInstance> = Vec::new();
@@ -211,8 +211,7 @@ pub fn separate_data_and_text(lines: &mut Vec<MonacoLineInfo>) -> (Vec<Instructi
             || lines[i].tokens[0].token_name.to_lowercase() == ".data"
         {
             lines[i].tokens[0].token_type = Directive;
-            while !labels.is_empty() {
-                let last = labels.pop().unwrap();
+            while let Some(last) = labels.pop() {
                 lines[last.token_line].errors.push(Error {
                     error_name: LabelAssignmentError,
                     token_causing_error: last.token.token_name,
@@ -220,11 +219,7 @@ pub fn separate_data_and_text(lines: &mut Vec<MonacoLineInfo>) -> (Vec<Instructi
                     message: "".to_string(),
                 });
             }
-            if lines[i].tokens[0].token_name.to_lowercase() == ".text" {
-                is_text = true;
-            } else {
-                is_text = false;
-            }
+            is_text = lines[i].tokens[0].token_name.to_lowercase() == ".text";
             i += 1;
             continue;
         }
@@ -252,8 +247,8 @@ pub fn separate_data_and_text(lines: &mut Vec<MonacoLineInfo>) -> (Vec<Instructi
                 ..Default::default()
             };
             //push all incomplete labels to reference this instruction
-            while !labels.is_empty() {
-                instruction.labels.push(labels.pop().unwrap());
+            while let Some(label) = labels.pop() {
+                instruction.labels.push(label);
             }
             //the next token is the operator
             lines[i].tokens[j].token_type = Operator;
@@ -369,14 +364,12 @@ pub fn create_label_map(
     }
 
     let last_instruction = instruction_list.last();
+    let offset_for_instructions: u32 = match last_instruction {
+        Some(last_instruction) => ((last_instruction.instruction_number + 1) << 2) as u32,
+        None => 0_u32,
+    };
 
-    let offset_for_instructions: u32 = if let Some(..) = last_instruction {
-        (last_instruction.unwrap().instruction_number + 1) << 2
-    } else {
-        0
-    } as u32;
-
-    for (_i, data) in data_list.iter_mut().enumerate() {
+    for data in data_list.iter_mut() {
         //if the given label name is already used, an error is generated
         if labels.contains_key(&*data.label.clone().token_name) {
             data.errors.push(Error {
diff --git a/src/parser/pseudo_instruction_parsing.rs b/src/parser/pseudo_instruction_parsing.rs
index 4890bb436..b3ecffb25 100644
--- a/src/parser/pseudo_instruction_parsing.rs
+++ b/src/parser/pseudo_instruction_parsing.rs
@@ -31,7 +31,7 @@ pub fn expand_pseudo_instructions_and_assign_instruction_numbers(
     let mut vec_of_added_instructions: Vec<Instruction> = Vec::new();
 
     //iterate through every instruction and check if the operator is a pseudo-instruction
-    for (i, mut instruction) in &mut instructions.iter_mut().enumerate() {
+    for (i, instruction) in &mut instructions.iter_mut().enumerate() {
         instruction.instruction_number = i + vec_of_added_instructions.len();
         match &*instruction.operator.token_name.to_lowercase() {
             "li" => {
@@ -2050,7 +2050,7 @@ pub fn expand_pseudo_instructions_and_assign_instruction_numbers_riscv(
 ///the second part of completing pseudo-instructions. LW and SW with labels requires the address of the label to be known,
 /// the second part of this must occur after the label hashmap is completed.
 pub fn complete_lw_sw_pseudo_instructions(
-    instructions: &mut Vec<Instruction>,
+    instructions: &mut [Instruction],
     labels: &HashMap<String, usize>,
     monaco_line_info: &mut [MonacoLineInfo],
 ) {
@@ -2082,8 +2082,8 @@ pub fn complete_lw_sw_pseudo_instructions(
             instructions[index].operands[1].start_end_columns = (0, 0);
 
             monaco_line_info[instructions[index].line_number].update_pseudo_string(vec![
-                &mut instructions.clone()[index - 1],
-                &mut instructions.clone()[index],
+                &mut instructions.to_owned()[index - 1],
+                &mut instructions.to_owned()[index],
             ]);
         }
     }
diff --git a/src/ui/footer/component.rs b/src/ui/footer/component.rs
index 84cd8ad90..c0d9b9bbb 100644
--- a/src/ui/footer/component.rs
+++ b/src/ui/footer/component.rs
@@ -23,7 +23,7 @@ pub struct Footerprops {
     pub active_tab: UseStateHandle<TabState>,
     pub on_memory_clicked: Callback<MouseEvent>,
     pub memory: Memory,
-    pub pc: u64
+    pub pc: u64,
 }
 
 #[function_component(Footer)]
diff --git a/src/ui/hex_editor/component.rs b/src/ui/hex_editor/component.rs
index 68ac46a4f..33ea4f2f7 100644
--- a/src/ui/hex_editor/component.rs
+++ b/src/ui/hex_editor/component.rs
@@ -149,8 +149,7 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
             move |editor_link: CodeEditorLink,
                   (memory, memory_text_model, memory_curr_instr, initialized)| {
                 let result = editor_link.with_editor(|editor| {
-                    let hexdump = &memory
-                        .generate_formatted_hex(CAPACITY_BYTES);
+                    let hexdump = &memory.generate_formatted_hex(CAPACITY_BYTES);
                     memory_text_model.set_value(hexdump);
 
                     let raw_editor = editor.as_ref();
@@ -159,13 +158,16 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
                     if *initialized {
                         let coords = get_hex_coords(**memory_curr_instr);
                         raw_editor.on_did_change_cursor_selection(cb_func);
-                        raw_editor.reveal_line_in_center(coords.line_number, Some(ScrollType::Smooth));
+                        raw_editor
+                            .reveal_line_in_center(coords.line_number, Some(ScrollType::Smooth));
 
                         // Highlight line using delta decorations
                         let not_highlighted = js_sys::Array::new();
                         let executed_line = js_sys::Array::new();
-                        let decoration: IModelDeltaDecoration = js_sys::Object::new().unchecked_into();
-                        let options: IModelDecorationOptions = js_sys::Object::new().unchecked_into();
+                        let decoration: IModelDeltaDecoration =
+                            js_sys::Object::new().unchecked_into();
+                        let options: IModelDecorationOptions =
+                            js_sys::Object::new().unchecked_into();
                         if coords.line_number != 0.0 {
                             // Show highlight if current line is not 0
                             options.set_inline_class_name("executedLine".into());
@@ -199,7 +201,7 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
                 props.memory.clone(),
                 props.memory_text_model.clone(),
                 memory_curr_instr,
-                props.initialized
+                props.initialized,
             ),
         )
     };
diff --git a/src/ui/swim_editor/component.rs b/src/ui/swim_editor/component.rs
index 4f86f2f10..1a0f37d5e 100644
--- a/src/ui/swim_editor/component.rs
+++ b/src/ui/swim_editor/component.rs
@@ -55,7 +55,7 @@ pub struct SwimEditorProps {
     pub memory: Memory,
     pub stack: Stack,
     pub breakpoints: UseStateHandle<HashSet<u64>>,
-    pub initialized: bool
+    pub initialized: bool,
 }
 
 #[derive(Default, PartialEq)]
@@ -133,8 +133,10 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
                         // Highlight current line using delta decorations
                         let not_highlighted = js_sys::Array::new();
                         let executed_line = js_sys::Array::new();
-                        let decoration: IModelDeltaDecoration = js_sys::Object::new().unchecked_into();
-                        let options: IModelDecorationOptions = js_sys::Object::new().unchecked_into();
+                        let decoration: IModelDeltaDecoration =
+                            js_sys::Object::new().unchecked_into();
+                        let options: IModelDecorationOptions =
+                            js_sys::Object::new().unchecked_into();
                         if **curr_line != 0.0 {
                             // Show highlight if current line is not 0
                             options.set_inline_class_name("executedLine".into());

From ae24ef871983429562723749602f332b88a3de7b Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Wed, 27 Mar 2024 16:37:54 -0400
Subject: [PATCH 17/21] Prevent executed line from appearing on assemble

---
 src/bin/main.rs                 |  7 +++++++
 src/ui/footer/component.rs      | 16 ++++++++++++++--
 src/ui/hex_editor/component.rs  |  6 +++++-
 src/ui/swim_editor/component.rs | 12 ++++++++----
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/bin/main.rs b/src/bin/main.rs
index 473350ec5..392282298 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -174,6 +174,12 @@ fn app(props: &AppProps) -> Html {
                     memory_curr_instr.set(datapath_state.mips.registers.pc);
 
                     text_model.set_value(&program_info.updated_monaco_string); // Expands pseudo-instructions to their hardware counterpart.
+
+                    // After adding pseudo instructions, update program info
+                    let (program_info, assembled, labels) = parser(text_model.get_value(), ARCH);
+                    *program_info_ref.borrow_mut() = program_info.clone();
+                    *binary_ref.borrow_mut() = assembled.clone();
+                    *labels_ref.borrow_mut() = labels.clone();
                 }
 
                 trigger.force_update();
@@ -588,6 +594,7 @@ fn app(props: &AppProps) -> Html {
                             memory={datapath_state.mips.memory.clone()}
                             stack={datapath_state.mips.stack.clone()}
                             initialized={datapath_state.initialized}
+                            executing={datapath_state.executing}
                         />
                     </div>
 
diff --git a/src/ui/footer/component.rs b/src/ui/footer/component.rs
index c0d9b9bbb..d14316a57 100644
--- a/src/ui/footer/component.rs
+++ b/src/ui/footer/component.rs
@@ -66,13 +66,25 @@ pub fn footer(props: &Footerprops) -> Html {
             // Console buttons
             if **active_tab == TabState::Console {
                 <div class="h-48 border-primary-200 border-groove border-2 p-4 bg-accent-blue-300 text-primary-200 overflow-y-auto overflow-wrap z-10">
-                    <Console datapath_state={props.datapath_state.clone()} communicator={props.communicator} parsermsg={props.parsermsg.clone()} show_input={props.show_input.clone()}/>
+                    <Console
+                        datapath_state={props.datapath_state.clone()}
+                        communicator={props.communicator}
+                        parsermsg={props.parsermsg.clone()}
+                        show_input={props.show_input.clone()}
+                    />
                 </div>
             } else if **active_tab == TabState::Datapath {
                 <VisualDatapath datapath_state={props.datapath_state.clone()} svg_path={svg_path} />
             } else if **active_tab == TabState::HexEditor {
                 <div class="flex h-48 border-primary-200 border-groove border-2 z-10">
-                    <HexEditor memory_text_model={props.memory_text_model.clone()} memory_curr_instr={props.memory_curr_instr.clone()} memory={props.memory.clone()} pc={props.pc} initialized={props.datapath_state.initialized}/>
+                    <HexEditor
+                        memory_text_model={props.memory_text_model.clone()}
+                        memory_curr_instr={props.memory_curr_instr.clone()}
+                        memory={props.memory.clone()}
+                        pc={props.pc}
+                        initialized={props.datapath_state.initialized}
+                        executing={props.datapath_state.executing}
+                    />
                 </div>
             }
             <div class="flex flex-row justify-between w-full">
diff --git a/src/ui/hex_editor/component.rs b/src/ui/hex_editor/component.rs
index 33ea4f2f7..cc455ce30 100644
--- a/src/ui/hex_editor/component.rs
+++ b/src/ui/hex_editor/component.rs
@@ -36,6 +36,7 @@ pub struct HexEditorProps {
     // The instruction to highlight
     pub memory_curr_instr: UseStateHandle<u64>,
     pub initialized: bool,
+    pub executing: bool,
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -143,7 +144,10 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
 
     let on_editor_created = {
         let memory_curr_instr = props.memory_curr_instr.clone();
-        memory_curr_instr.set(props.pc); // should this only be done in execute clicked for usability
+
+        if props.executing {
+            memory_curr_instr.set(props.pc);
+        }
 
         use_callback(
             move |editor_link: CodeEditorLink,
diff --git a/src/ui/swim_editor/component.rs b/src/ui/swim_editor/component.rs
index 1a0f37d5e..14cb5c26a 100644
--- a/src/ui/swim_editor/component.rs
+++ b/src/ui/swim_editor/component.rs
@@ -56,6 +56,7 @@ pub struct SwimEditorProps {
     pub stack: Stack,
     pub breakpoints: UseStateHandle<HashSet<u64>>,
     pub initialized: bool,
+    pub executing: bool,
 }
 
 #[derive(Default, PartialEq)]
@@ -106,12 +107,15 @@ pub fn SwimEditor(props: &SwimEditorProps) -> Html {
 
     let on_editor_created = {
         let curr_line = props.editor_curr_line.clone();
-        let program_info = props.program_info.clone();
         let lines_content = Rc::clone(&props.lines_content);
 
-        let list_of_line_numbers = program_info.address_to_line_number;
-        let index = props.pc as usize / 4;
-        curr_line.set(*list_of_line_numbers.get(index).unwrap_or(&0) as f64 + 1.0); // add one to account for the editor's line numbers
+        if props.executing {
+            let program_info = props.program_info.clone();
+            let list_of_line_numbers = program_info.address_to_line_number;
+            let index = props.pc as usize / 4;
+            curr_line.set(*list_of_line_numbers.get(index).unwrap_or(&0) as f64 + 1.0);
+            // add one to account for the editor's line numbers
+        }
 
         use_callback(
             move |editor_link: CodeEditorLink, (curr_line, initialized)| {

From d0ba6b6d06d9ee999f6eef78b13e20982d80788a Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Wed, 27 Mar 2024 16:41:47 -0400
Subject: [PATCH 18/21] Replace datapath_state prop in console with messages

---
 src/ui/console/component.rs | 4 ++--
 src/ui/footer/component.rs  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ui/console/component.rs b/src/ui/console/component.rs
index 997350d81..4462f6615 100644
--- a/src/ui/console/component.rs
+++ b/src/ui/console/component.rs
@@ -7,7 +7,7 @@ use yew::prelude::*;
 #[derive(PartialEq, Properties)]
 pub struct Consoleprops {
     pub communicator: &'static DatapathCommunicator,
-    pub datapath_state: UseReducerHandle<DatapathReducer>,
+    pub messages: Vec<String>,
     pub parsermsg: String,
     pub show_input: UseStateHandle<bool>,
 }
@@ -56,7 +56,7 @@ pub fn console(props: &Consoleprops) -> Html {
                 {*error_msg}
             </div>
             <div>
-                {props.datapath_state.messages.iter().map(|msg| html! { <div>{msg}</div> }).collect::<Html>()}
+                {props.messages.iter().map(|msg| html! { <div>{msg}</div> }).collect::<Html>()}
             </div>
             if *show_input {
                 <div class="console-input">
diff --git a/src/ui/footer/component.rs b/src/ui/footer/component.rs
index d14316a57..1168226ec 100644
--- a/src/ui/footer/component.rs
+++ b/src/ui/footer/component.rs
@@ -67,7 +67,7 @@ pub fn footer(props: &Footerprops) -> Html {
             if **active_tab == TabState::Console {
                 <div class="h-48 border-primary-200 border-groove border-2 p-4 bg-accent-blue-300 text-primary-200 overflow-y-auto overflow-wrap z-10">
                     <Console
-                        datapath_state={props.datapath_state.clone()}
+                        messages={props.datapath_state.messages.clone()}
                         communicator={props.communicator}
                         parsermsg={props.parsermsg.clone()}
                         show_input={props.show_input.clone()}

From 0d9adfd4ed2455b35295db6cd53d567932d712e9 Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Wed, 27 Mar 2024 16:46:11 -0400
Subject: [PATCH 19/21] Clippy police

---
 src/emulation_core/mips/datapath.rs | 1 -
 src/ui/console/component.rs         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/emulation_core/mips/datapath.rs b/src/emulation_core/mips/datapath.rs
index c43c53fd8..41c643e55 100644
--- a/src/emulation_core/mips/datapath.rs
+++ b/src/emulation_core/mips/datapath.rs
@@ -482,7 +482,6 @@ impl MipsDatapath {
             changed_stack = true;
         }
 
-        // let hit_branch = matches!(self.signals.branch, Branch::YesBranch);
         let hit_jump = matches!(self.signals.jump, Jump::YesJump);
         if hit_jump {
             // Add current line to stack if we call a function
diff --git a/src/ui/console/component.rs b/src/ui/console/component.rs
index 4462f6615..0c7a61e52 100644
--- a/src/ui/console/component.rs
+++ b/src/ui/console/component.rs
@@ -1,5 +1,4 @@
 use crate::agent::datapath_communicator::DatapathCommunicator;
-use crate::agent::datapath_reducer::DatapathReducer;
 use wasm_bindgen::JsCast;
 use web_sys::{HtmlInputElement, InputEvent, KeyboardEvent};
 use yew::prelude::*;

From d8d135920bd6e38b88f273f90323fc76acea678b Mon Sep 17 00:00:00 2001
From: Cay <cay.henning@proton.me>
Date: Wed, 27 Mar 2024 17:38:06 -0400
Subject: [PATCH 20/21] Cargo fmt

---
 src/agent/datapath_reducer.rs  |  2 +-
 src/agent/messages.rs          |  2 +-
 src/bin/main.rs                | 26 ++++++++++++++++++++------
 src/ui/hex_editor/component.rs |  3 ++-
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/agent/datapath_reducer.rs b/src/agent/datapath_reducer.rs
index f7a0a5deb..f7738c963 100644
--- a/src/agent/datapath_reducer.rs
+++ b/src/agent/datapath_reducer.rs
@@ -6,10 +6,10 @@ use crate::emulation_core::mips::datapath::{DatapathState, Stage};
 use crate::emulation_core::mips::fp_registers::FpRegisters;
 use crate::emulation_core::mips::gp_registers::GpRegisters;
 use crate::emulation_core::mips::memory::Memory;
-use crate::emulation_core::stack::Stack;
 use crate::emulation_core::register::{RegisterType, Registers};
 use crate::emulation_core::riscv::datapath::{RiscDatapathState, RiscStage};
 use crate::emulation_core::riscv::registers::RiscGpRegisters;
+use crate::emulation_core::stack::Stack;
 use gloo_console::log;
 use std::rc::Rc;
 use yew::Reducible;
diff --git a/src/agent/messages.rs b/src/agent/messages.rs
index 7d52ea9c6..2943f4caa 100644
--- a/src/agent/messages.rs
+++ b/src/agent/messages.rs
@@ -3,9 +3,9 @@ use crate::emulation_core::mips::datapath::DatapathState;
 use crate::emulation_core::mips::fp_registers::FpRegisters;
 use crate::emulation_core::mips::gp_registers::GpRegisters;
 use crate::emulation_core::mips::memory::Memory;
-use crate::emulation_core::stack::Stack;
 use crate::emulation_core::riscv::datapath::{RiscDatapathState, RiscStage};
 use crate::emulation_core::riscv::registers::RiscGpRegisters;
+use crate::emulation_core::stack::Stack;
 use crate::emulation_core::{architectures::AvailableDatapaths, mips::datapath::Stage};
 use serde::{Deserialize, Serialize};
 
diff --git a/src/bin/main.rs b/src/bin/main.rs
index 3c22036a4..254a6fd2a 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -184,7 +184,10 @@ fn app(props: &AppProps) -> Html {
                     text_model.set_value(&program_info.updated_monaco_string); // Expands pseudo-instructions to their hardware counterpart.
 
                     // After adding pseudo instructions, update program info
-                    let (program_info, assembled, labels) = parser(text_model.get_value(), datapath_state.current_architecture.clone());
+                    let (program_info, assembled, labels) = parser(
+                        text_model.get_value(),
+                        datapath_state.current_architecture.clone(),
+                    );
                     *program_info_ref.borrow_mut() = program_info.clone();
                     *binary_ref.borrow_mut() = assembled.clone();
                     *labels_ref.borrow_mut() = labels.clone();
@@ -225,7 +228,10 @@ fn app(props: &AppProps) -> Html {
         use_callback(
             move |_, (editor_curr_line, memory_curr_instr, text_model, datapath_state)| {
                 // Get the current line and convert it to f64
-                let (program_info, assembled, labels) = parser(text_model.get_value(), datapath_state.current_architecture.clone());
+                let (program_info, assembled, labels) = parser(
+                    text_model.get_value(),
+                    datapath_state.current_architecture.clone(),
+                );
                 *program_info_ref.borrow_mut() = program_info.clone();
                 *binary_ref.borrow_mut() = assembled.clone();
                 *labels_ref.borrow_mut() = labels.clone();
@@ -281,7 +287,10 @@ fn app(props: &AppProps) -> Html {
                     // highlight on InstructionDecode since syscall stops at that stage.
 
                     // highlight on InstructionDecode since syscall stops at that stage.
-                    let (program_info, assembled, labels) = parser(text_model.get_value(), datapath_state.current_architecture.clone());
+                    let (program_info, assembled, labels) = parser(
+                        text_model.get_value(),
+                        datapath_state.current_architecture.clone(),
+                    );
                     *program_info_ref.borrow_mut() = program_info.clone();
                     *binary_ref.borrow_mut() = assembled.clone();
                     *labels_ref.borrow_mut() = labels.clone();
@@ -318,7 +327,10 @@ fn app(props: &AppProps) -> Html {
         let datapath_state = datapath_state.clone();
         use_callback(
             move |_, (text_model, datapath_state)| {
-                let (program_info, assembled, labels) = parser(text_model.get_value(), datapath_state.current_architecture.clone());
+                let (program_info, assembled, labels) = parser(
+                    text_model.get_value(),
+                    datapath_state.current_architecture.clone(),
+                );
                 *program_info_ref.borrow_mut() = program_info.clone();
                 *binary_ref.borrow_mut() = assembled.clone();
                 *labels_ref.borrow_mut() = labels.clone();
@@ -390,8 +402,10 @@ fn app(props: &AppProps) -> Html {
                             }
                         }
                         // Memory updated successfully
-                        let (program_info, _assembled, _labels) =
-                            parser(text_model.get_value(), datapath_state.current_architecture.clone());
+                        let (program_info, _assembled, _labels) = parser(
+                            text_model.get_value(),
+                            datapath_state.current_architecture.clone(),
+                        );
                         let mut lines_beyond_counter = program_info.address_to_line_number.len();
                         let mut curr_value = text_model.get_value();
                         let mut add_new_lines = false;
diff --git a/src/ui/hex_editor/component.rs b/src/ui/hex_editor/component.rs
index 8541ce952..ff25a589a 100644
--- a/src/ui/hex_editor/component.rs
+++ b/src/ui/hex_editor/component.rs
@@ -150,7 +150,8 @@ pub fn hex_editor(props: &HexEditorProps) -> Html {
         }
 
         use_callback(
-            move |editor_link: CodeEditorLink, (memory, memory_text_model, memory_curr_instr, initialized)| {
+            move |editor_link: CodeEditorLink,
+                  (memory, memory_text_model, memory_curr_instr, initialized)| {
                 let result = editor_link.with_editor(|editor| {
                     let hexdump = memory.generate_formatted_hex(CAPACITY_BYTES);
                     memory_text_model.set_value(&hexdump);

From c09941bd64b02321543094aa94008adbbc429e5d Mon Sep 17 00:00:00 2001
From: Brooks McKinley <31021010+brooksmckinley@users.noreply.github.com>
Date: Wed, 27 Mar 2024 18:57:47 -0400
Subject: [PATCH 21/21] Add RISC-V support to the stack viewer

---
 src/agent/datapath_reducer.rs         |  18 ++-
 src/bin/main.rs                       |  15 +--
 src/emulation_core/riscv/datapath.rs  |  10 +-
 src/emulation_core/riscv/registers.rs | 168 +++++++++++++-------------
 4 files changed, 111 insertions(+), 100 deletions(-)

diff --git a/src/agent/datapath_reducer.rs b/src/agent/datapath_reducer.rs
index f7738c963..2e32746e9 100644
--- a/src/agent/datapath_reducer.rs
+++ b/src/agent/datapath_reducer.rs
@@ -4,11 +4,11 @@ use crate::emulation_core::architectures::AvailableDatapaths::{MIPS, RISCV};
 use crate::emulation_core::mips::coprocessor::FpuState;
 use crate::emulation_core::mips::datapath::{DatapathState, Stage};
 use crate::emulation_core::mips::fp_registers::FpRegisters;
-use crate::emulation_core::mips::gp_registers::GpRegisters;
+use crate::emulation_core::mips::gp_registers::{GpRegisterType, GpRegisters};
 use crate::emulation_core::mips::memory::Memory;
 use crate::emulation_core::register::{RegisterType, Registers};
 use crate::emulation_core::riscv::datapath::{RiscDatapathState, RiscStage};
-use crate::emulation_core::riscv::registers::RiscGpRegisters;
+use crate::emulation_core::riscv::registers::{RiscGpRegisterType, RiscGpRegisters};
 use crate::emulation_core::stack::Stack;
 use gloo_console::log;
 use std::rc::Rc;
@@ -166,6 +166,13 @@ impl DatapathReducer {
         }
     }
 
+    pub fn get_sp(&self) -> u64 {
+        match self.current_architecture {
+            MIPS => self.mips.registers[GpRegisterType::Sp],
+            RISCV => self.riscv.registers[RiscGpRegisterType::X1],
+        }
+    }
+
     pub fn get_dyn_gp_registers(&self) -> Vec<(Rc<dyn RegisterType>, u64)> {
         match self.current_architecture {
             MIPS => self.mips.registers.get_dyn_register_list(),
@@ -179,4 +186,11 @@ impl DatapathReducer {
             RISCV => &self.riscv.memory,
         }
     }
+
+    pub fn get_stack(&self) -> &Stack {
+        match self.current_architecture {
+            MIPS => &self.mips.stack,
+            RISCV => &self.riscv.stack,
+        }
+    }
 }
diff --git a/src/bin/main.rs b/src/bin/main.rs
index 254a6fd2a..e6f7d9c82 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -20,10 +20,7 @@ use swim::ui::footer::component::Footer;
 use swim::ui::regview::component::Regview;
 use swim::ui::swim_editor::component::SwimEditor;
 use swim::{
-    emulation_core::{
-        architectures::AvailableDatapaths, mips::gp_registers::GpRegisterType,
-        mips::instruction::get_string_version,
-    },
+    emulation_core::{architectures::AvailableDatapaths, mips::instruction::get_string_version},
     ui::{
         hex_editor::component::{parse_hexdump, UpdatedLine},
         swim_editor::tab::TabState,
@@ -636,9 +633,9 @@ fn app(props: &AppProps) -> Html {
                             communicator={props.communicator}
                             current_architecture={datapath_state.current_architecture.clone()}
                             speed={datapath_state.speed}
-                            sp={datapath_state.mips.registers[GpRegisterType::Sp]}
-                            memory={datapath_state.mips.memory.clone()}
-                            stack={datapath_state.mips.stack.clone()}
+                            sp={datapath_state.get_sp()}
+                            memory={datapath_state.get_memory().clone()}
+                            stack={datapath_state.get_stack().clone()}
                             initialized={datapath_state.initialized}
                             executing={datapath_state.executing}
                         />
@@ -654,8 +651,8 @@ fn app(props: &AppProps) -> Html {
                         communicator={props.communicator}
                         show_input={show_input.clone()}
                         on_memory_clicked={on_memory_clicked.clone()}
-                        memory={datapath_state.mips.memory.clone()}
-                        pc={datapath_state.mips.registers.pc}
+                        memory={datapath_state.get_memory().clone()}
+                        pc={datapath_state.get_pc()}
                     />
                 </div>
 
diff --git a/src/emulation_core/riscv/datapath.rs b/src/emulation_core/riscv/datapath.rs
index b225c1730..827a447c6 100644
--- a/src/emulation_core/riscv/datapath.rs
+++ b/src/emulation_core/riscv/datapath.rs
@@ -52,11 +52,11 @@ use super::constants::*;
 use super::control_signals::*;
 use super::datapath_signals::*;
 use super::instruction::*;
-use super::registers::GpRegisterType;
+use super::registers::RiscGpRegisterType;
 use super::{super::mips::memory::Memory, registers::RiscGpRegisters};
 use crate::emulation_core::architectures::DatapathRef;
 use crate::emulation_core::datapath::{DatapathUpdateSignal, Syscall};
-use crate::emulation_core::riscv::registers::GpRegisterType::{X10, X11};
+use crate::emulation_core::riscv::registers::RiscGpRegisterType::{X10, X11};
 use crate::emulation_core::stack::Stack;
 use crate::emulation_core::stack::StackFrame;
 use serde::{Deserialize, Serialize};
@@ -425,7 +425,7 @@ impl RiscDatapath {
                 self.state.instruction,
                 self.registers.pc,
                 self.state.pc_plus_4,
-                self.registers[GpRegisterType::X2],
+                self.registers[RiscGpRegisterType::X2],
                 // self.registers[GpRegisterType::Sp],
                 self.registers.pc,
             );
@@ -440,7 +440,7 @@ impl RiscDatapath {
                 self.state.instruction,
                 self.registers.pc,
                 self.state.pc_plus_4,
-                self.registers[GpRegisterType::X2],
+                self.registers[RiscGpRegisterType::X2],
                 self.state.new_pc,
             );
             self.stack.push(frame);
@@ -468,7 +468,7 @@ impl RiscDatapath {
 
         // check if we are writing to the stack pointer
         let mut changed_stack = false;
-        if self.state.write_register_destination == GpRegisterType::X2 as usize {
+        if self.state.write_register_destination == RiscGpRegisterType::X2 as usize {
             if let Some(last_frame) = self.stack.peek() {
                 if self.state.register_write_data >= last_frame.frame_pointer {
                     // dellocating stack space
diff --git a/src/emulation_core/riscv/registers.rs b/src/emulation_core/riscv/registers.rs
index 77f092d8e..4672f077f 100644
--- a/src/emulation_core/riscv/registers.rs
+++ b/src/emulation_core/riscv/registers.rs
@@ -21,7 +21,7 @@ pub struct RiscGpRegisters {
 #[derive(Clone, Copy, Debug, Display, EnumIter, EnumString, Eq, PartialEq)]
 #[strum(ascii_case_insensitive)]
 #[strum(serialize_all = "lowercase")]
-pub enum GpRegisterType {
+pub enum RiscGpRegisterType {
     Pc = -1,
     X0 = 0,
     X1 = 1,
@@ -57,21 +57,21 @@ pub enum GpRegisterType {
     X31 = 31,
 }
 
-impl RegisterType for GpRegisterType {
+impl RegisterType for RiscGpRegisterType {
     fn get_register_name(&self) -> String {
         match self {
-            GpRegisterType::Pc => self.to_string(),
+            RiscGpRegisterType::Pc => self.to_string(),
             _ => format!("{}", self),
         }
     }
     fn is_valid_register_value(&self, value: u64, pc_limit: usize) -> bool {
         match self {
-            GpRegisterType::X0 => false, // Zero register is immutable
-            GpRegisterType::Pc => {
+            RiscGpRegisterType::X0 => false, // Zero register is immutable
+            RiscGpRegisterType::Pc => {
                 // Check if PC is more than the number of instructions or not word-aligned
                 value <= pc_limit as u64 && value % 4 == 0
             }
-            GpRegisterType::X2 => {
+            RiscGpRegisterType::X2 => {
                 // Check if SP is more than memory capacity or not word-aligned
                 value <= CAPACITY_BYTES as u64 && value % 4 == 0
             }
@@ -116,7 +116,7 @@ impl Index<&str> for RiscGpRegisters {
     // Convert string to the corresponding RegistersEnum value and use this to index.
     // If this is an invalid string, no enum will be returned, causing a panic as desired.
     fn index(&self, index: &str) -> &Self::Output {
-        match GpRegisterType::from_str(index) {
+        match RiscGpRegisterType::from_str(index) {
             Ok(register) => &self[register],
             _ => panic!("{index} is not a valid register"),
         }
@@ -127,91 +127,91 @@ impl IndexMut<&str> for RiscGpRegisters {
     // Convert string to the corresponding RegistersEnum value and use this to index.
     // If this is an invalid string, no enum will be returned, causing a panic as desired.
     fn index_mut(&mut self, index: &str) -> &mut Self::Output {
-        match GpRegisterType::from_str(index) {
+        match RiscGpRegisterType::from_str(index) {
             Ok(register) => &mut self[register],
             _ => panic!("{index} is not a valid register"),
         }
     }
 }
 
-impl Index<GpRegisterType> for RiscGpRegisters {
+impl Index<RiscGpRegisterType> for RiscGpRegisters {
     type Output = u64;
 
-    fn index(&self, index: GpRegisterType) -> &Self::Output {
+    fn index(&self, index: RiscGpRegisterType) -> &Self::Output {
         match index {
-            GpRegisterType::Pc => &self.pc,
-            GpRegisterType::X0 => &self.gpr[0],
-            GpRegisterType::X1 => &self.gpr[1],
-            GpRegisterType::X2 => &self.gpr[2],
-            GpRegisterType::X3 => &self.gpr[3],
-            GpRegisterType::X4 => &self.gpr[4],
-            GpRegisterType::X5 => &self.gpr[5],
-            GpRegisterType::X6 => &self.gpr[6],
-            GpRegisterType::X7 => &self.gpr[7],
-            GpRegisterType::X8 => &self.gpr[8],
-            GpRegisterType::X9 => &self.gpr[9],
-            GpRegisterType::X10 => &self.gpr[10],
-            GpRegisterType::X11 => &self.gpr[11],
-            GpRegisterType::X12 => &self.gpr[12],
-            GpRegisterType::X13 => &self.gpr[13],
-            GpRegisterType::X14 => &self.gpr[14],
-            GpRegisterType::X15 => &self.gpr[15],
-            GpRegisterType::X16 => &self.gpr[16],
-            GpRegisterType::X17 => &self.gpr[17],
-            GpRegisterType::X18 => &self.gpr[18],
-            GpRegisterType::X19 => &self.gpr[19],
-            GpRegisterType::X20 => &self.gpr[20],
-            GpRegisterType::X21 => &self.gpr[21],
-            GpRegisterType::X22 => &self.gpr[22],
-            GpRegisterType::X23 => &self.gpr[23],
-            GpRegisterType::X24 => &self.gpr[24],
-            GpRegisterType::X25 => &self.gpr[25],
-            GpRegisterType::X26 => &self.gpr[26],
-            GpRegisterType::X27 => &self.gpr[27],
-            GpRegisterType::X28 => &self.gpr[28],
-            GpRegisterType::X29 => &self.gpr[29],
-            GpRegisterType::X30 => &self.gpr[30],
-            GpRegisterType::X31 => &self.gpr[31],
+            RiscGpRegisterType::Pc => &self.pc,
+            RiscGpRegisterType::X0 => &self.gpr[0],
+            RiscGpRegisterType::X1 => &self.gpr[1],
+            RiscGpRegisterType::X2 => &self.gpr[2],
+            RiscGpRegisterType::X3 => &self.gpr[3],
+            RiscGpRegisterType::X4 => &self.gpr[4],
+            RiscGpRegisterType::X5 => &self.gpr[5],
+            RiscGpRegisterType::X6 => &self.gpr[6],
+            RiscGpRegisterType::X7 => &self.gpr[7],
+            RiscGpRegisterType::X8 => &self.gpr[8],
+            RiscGpRegisterType::X9 => &self.gpr[9],
+            RiscGpRegisterType::X10 => &self.gpr[10],
+            RiscGpRegisterType::X11 => &self.gpr[11],
+            RiscGpRegisterType::X12 => &self.gpr[12],
+            RiscGpRegisterType::X13 => &self.gpr[13],
+            RiscGpRegisterType::X14 => &self.gpr[14],
+            RiscGpRegisterType::X15 => &self.gpr[15],
+            RiscGpRegisterType::X16 => &self.gpr[16],
+            RiscGpRegisterType::X17 => &self.gpr[17],
+            RiscGpRegisterType::X18 => &self.gpr[18],
+            RiscGpRegisterType::X19 => &self.gpr[19],
+            RiscGpRegisterType::X20 => &self.gpr[20],
+            RiscGpRegisterType::X21 => &self.gpr[21],
+            RiscGpRegisterType::X22 => &self.gpr[22],
+            RiscGpRegisterType::X23 => &self.gpr[23],
+            RiscGpRegisterType::X24 => &self.gpr[24],
+            RiscGpRegisterType::X25 => &self.gpr[25],
+            RiscGpRegisterType::X26 => &self.gpr[26],
+            RiscGpRegisterType::X27 => &self.gpr[27],
+            RiscGpRegisterType::X28 => &self.gpr[28],
+            RiscGpRegisterType::X29 => &self.gpr[29],
+            RiscGpRegisterType::X30 => &self.gpr[30],
+            RiscGpRegisterType::X31 => &self.gpr[31],
         }
     }
 }
 
-impl IndexMut<GpRegisterType> for RiscGpRegisters {
-    fn index_mut(&mut self, index: GpRegisterType) -> &mut Self::Output {
+impl IndexMut<RiscGpRegisterType> for RiscGpRegisters {
+    fn index_mut(&mut self, index: RiscGpRegisterType) -> &mut Self::Output {
         match index {
-            GpRegisterType::Pc => &mut self.pc,
-            GpRegisterType::X0 => panic!("The $zero register cannot be accessed as mutable"),
-            GpRegisterType::X1 => &mut self.gpr[1],
-            GpRegisterType::X2 => &mut self.gpr[2],
-            GpRegisterType::X3 => &mut self.gpr[3],
-            GpRegisterType::X4 => &mut self.gpr[4],
-            GpRegisterType::X5 => &mut self.gpr[5],
-            GpRegisterType::X6 => &mut self.gpr[6],
-            GpRegisterType::X7 => &mut self.gpr[7],
-            GpRegisterType::X8 => &mut self.gpr[8],
-            GpRegisterType::X9 => &mut self.gpr[9],
-            GpRegisterType::X10 => &mut self.gpr[10],
-            GpRegisterType::X11 => &mut self.gpr[11],
-            GpRegisterType::X12 => &mut self.gpr[12],
-            GpRegisterType::X13 => &mut self.gpr[13],
-            GpRegisterType::X14 => &mut self.gpr[14],
-            GpRegisterType::X15 => &mut self.gpr[15],
-            GpRegisterType::X16 => &mut self.gpr[16],
-            GpRegisterType::X17 => &mut self.gpr[17],
-            GpRegisterType::X18 => &mut self.gpr[18],
-            GpRegisterType::X19 => &mut self.gpr[19],
-            GpRegisterType::X20 => &mut self.gpr[20],
-            GpRegisterType::X21 => &mut self.gpr[21],
-            GpRegisterType::X22 => &mut self.gpr[22],
-            GpRegisterType::X23 => &mut self.gpr[23],
-            GpRegisterType::X24 => &mut self.gpr[24],
-            GpRegisterType::X25 => &mut self.gpr[25],
-            GpRegisterType::X26 => &mut self.gpr[26],
-            GpRegisterType::X27 => &mut self.gpr[27],
-            GpRegisterType::X28 => &mut self.gpr[28],
-            GpRegisterType::X29 => &mut self.gpr[29],
-            GpRegisterType::X30 => &mut self.gpr[30],
-            GpRegisterType::X31 => &mut self.gpr[31],
+            RiscGpRegisterType::Pc => &mut self.pc,
+            RiscGpRegisterType::X0 => panic!("The $zero register cannot be accessed as mutable"),
+            RiscGpRegisterType::X1 => &mut self.gpr[1],
+            RiscGpRegisterType::X2 => &mut self.gpr[2],
+            RiscGpRegisterType::X3 => &mut self.gpr[3],
+            RiscGpRegisterType::X4 => &mut self.gpr[4],
+            RiscGpRegisterType::X5 => &mut self.gpr[5],
+            RiscGpRegisterType::X6 => &mut self.gpr[6],
+            RiscGpRegisterType::X7 => &mut self.gpr[7],
+            RiscGpRegisterType::X8 => &mut self.gpr[8],
+            RiscGpRegisterType::X9 => &mut self.gpr[9],
+            RiscGpRegisterType::X10 => &mut self.gpr[10],
+            RiscGpRegisterType::X11 => &mut self.gpr[11],
+            RiscGpRegisterType::X12 => &mut self.gpr[12],
+            RiscGpRegisterType::X13 => &mut self.gpr[13],
+            RiscGpRegisterType::X14 => &mut self.gpr[14],
+            RiscGpRegisterType::X15 => &mut self.gpr[15],
+            RiscGpRegisterType::X16 => &mut self.gpr[16],
+            RiscGpRegisterType::X17 => &mut self.gpr[17],
+            RiscGpRegisterType::X18 => &mut self.gpr[18],
+            RiscGpRegisterType::X19 => &mut self.gpr[19],
+            RiscGpRegisterType::X20 => &mut self.gpr[20],
+            RiscGpRegisterType::X21 => &mut self.gpr[21],
+            RiscGpRegisterType::X22 => &mut self.gpr[22],
+            RiscGpRegisterType::X23 => &mut self.gpr[23],
+            RiscGpRegisterType::X24 => &mut self.gpr[24],
+            RiscGpRegisterType::X25 => &mut self.gpr[25],
+            RiscGpRegisterType::X26 => &mut self.gpr[26],
+            RiscGpRegisterType::X27 => &mut self.gpr[27],
+            RiscGpRegisterType::X28 => &mut self.gpr[28],
+            RiscGpRegisterType::X29 => &mut self.gpr[29],
+            RiscGpRegisterType::X30 => &mut self.gpr[30],
+            RiscGpRegisterType::X31 => &mut self.gpr[31],
         }
     }
 }
@@ -220,18 +220,18 @@ impl IndexMut<GpRegisterType> for RiscGpRegisters {
 ///
 /// This contains a copy of all the registers and their values, and a [`GpRegisterTypeIter`],
 /// as generated by [`strum::IntoEnumIterator`]. In other iterator implementations,
-/// the internal state might be data like a [`GpRegisterType`]. However, since we can't
+/// the internal state might be data like a [`RiscGpRegisterType`]. However, since we can't
 /// normally just "add 1" to get to the next register, we use an internal iterator
-/// that can track the progression of one [`GpRegisterType`] to the next.
+/// that can track the progression of one [`RiscGpRegisterType`] to the next.
 pub struct GpRegistersIter {
     registers: RiscGpRegisters,
-    register_iter: GpRegisterTypeIter,
+    register_iter: RiscGpRegisterTypeIter,
 }
 
 /// This implementation of the [`Iterator`] trait essentially wraps the existing
 /// [`GpRegisterTypeIter`] so that the register type can be paired with register data.
 impl Iterator for GpRegistersIter {
-    type Item = (GpRegisterType, u64);
+    type Item = (RiscGpRegisterType, u64);
 
     fn next(&mut self) -> Option<Self::Item> {
         match self.register_iter.next() {
@@ -245,7 +245,7 @@ impl Iterator for GpRegistersIter {
 /// an [`Iterator`]. In this case, this is an instance of [`GpRegistersIter`] with all the
 /// data in the registers and a new [`GpRegisterTypeIter`].
 impl IntoIterator for RiscGpRegisters {
-    type Item = (GpRegisterType, u64);
+    type Item = (RiscGpRegisterType, u64);
     type IntoIter = GpRegistersIter;
 
     /// Consumes the [`RiscGpRegisters`] struct to create a new [`GpRegistersIter`] that can
@@ -253,7 +253,7 @@ impl IntoIterator for RiscGpRegisters {
     fn into_iter(self) -> Self::IntoIter {
         GpRegistersIter {
             registers: self,
-            register_iter: GpRegisterType::iter(),
+            register_iter: RiscGpRegisterType::iter(),
         }
     }
 }