From a16f57c737ed1fe7aed3eb92885b8d1743573762 Mon Sep 17 00:00:00 2001 From: zxq5 Date: Sun, 15 Jun 2025 03:10:18 +0100 Subject: [PATCH] cargo fmt --- src/emulator/mod.rs | 2 +- src/emulator/system/processor.rs | 4 ++-- src/emulator/ui/memory_inspector.rs | 13 +++++++++---- src/emulator/ui/mod.rs | 4 ++-- src/emulator/ui/stack_inspector.rs | 17 +++++++++-------- src/main.rs | 5 ++++- 6 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/emulator/mod.rs b/src/emulator/mod.rs index 20a6533..140dea3 100644 --- a/src/emulator/mod.rs +++ b/src/emulator/mod.rs @@ -1,2 +1,2 @@ pub mod system; -pub mod ui; \ No newline at end of file +pub mod ui; diff --git a/src/emulator/system/processor.rs b/src/emulator/system/processor.rs index bd5f0a7..92fd693 100644 --- a/src/emulator/system/processor.rs +++ b/src/emulator/system/processor.rs @@ -284,7 +284,7 @@ impl Executable for Instruction { ); } - // Right shifts the value in Reg by the given amount (either a register, or a literal value). + // Right shifts the value in Reg by the given amount (either a register, or a literal value). Self::ShiftRight(src, reg, imm) => { let regval = cpu.get(reg); *cpu.reg(reg) = shr( @@ -339,7 +339,7 @@ impl Executable for Instruction { cpu.begin_interrupt(interrupt_code); } - // Returns from an interrupt, + // Returns from an interrupt, Self::IntReturn => { cpu.end_interrupt(); } diff --git a/src/emulator/ui/memory_inspector.rs b/src/emulator/ui/memory_inspector.rs index 85dab98..154f6f8 100644 --- a/src/emulator/ui/memory_inspector.rs +++ b/src/emulator/ui/memory_inspector.rs @@ -1,6 +1,9 @@ use std::{num::ParseIntError, sync::mpsc::Sender}; -use crate::emulator::{system::model::{Command, State}, ui::interface::Component}; +use crate::emulator::{ + system::model::{Command, State}, + ui::interface::Component, +}; pub struct MemoryInspector { view_size: u32, @@ -36,7 +39,7 @@ impl Component for MemoryInspector { } fn render(&mut self, state: &mut State, ui: &mut egui::Ui, ctx: &egui::Context) { - // Right column - Memory + // Right column - Memory ui.vertical(|ui| { ui.heading("Memory Inspector"); ui.add_space(10.0); @@ -63,7 +66,9 @@ impl Component for MemoryInspector { if search_clicked || enter_pressed { if let Ok(new) = parse_address(&self.addr_input) { self.view_addr = new; - self.sender.send(Command::Read(new, self.view_size)).unwrap(); + self.sender + .send(Command::Read(new, self.view_size)) + .unwrap(); } else { state.error = Some("Invalid address".to_string()); } @@ -144,4 +149,4 @@ fn parse_address(address: &str) -> Result { } u32::from_str_radix(address, 10) -} \ No newline at end of file +} diff --git a/src/emulator/ui/mod.rs b/src/emulator/ui/mod.rs index b5aa439..2c87b7f 100644 --- a/src/emulator/ui/mod.rs +++ b/src/emulator/ui/mod.rs @@ -1,5 +1,5 @@ pub mod control_unit; pub mod interface; -pub mod menu; pub mod memory_inspector; -pub mod stack_inspector; \ No newline at end of file +pub mod menu; +pub mod stack_inspector; diff --git a/src/emulator/ui/stack_inspector.rs b/src/emulator/ui/stack_inspector.rs index 559fd22..80bde39 100644 --- a/src/emulator/ui/stack_inspector.rs +++ b/src/emulator/ui/stack_inspector.rs @@ -1,14 +1,18 @@ -use crate::{common::instructions::Register, emulator::{system::model::State, ui::interface::{Component, EmulatorUI}}}; +use crate::{ + common::instructions::Register, + emulator::{ + system::model::State, + ui::interface::{Component, EmulatorUI}, + }, +}; pub struct StackInspector { - visible: bool + visible: bool, } impl StackInspector { pub fn new() -> Self { - Self { - visible: false - } + Self { visible: false } } } @@ -60,6 +64,3 @@ impl Component for StackInspector { }); } } - - - diff --git a/src/main.rs b/src/main.rs index a9a5efb..2dd2511 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,7 +5,10 @@ use std::{ use dsa_rs::emulator::{ system::{emulator::run_emulator, memory::MainStore, processor::Processor}, - ui::{control_unit::ControlPanel, interface::EmulatorUI, memory_inspector::MemoryInspector, stack_inspector::StackInspector}, + ui::{ + control_unit::ControlPanel, interface::EmulatorUI, memory_inspector::MemoryInspector, + stack_inspector::StackInspector, + }, }; fn main() -> Result<(), eframe::Error> {