From d05d88df002ffa50fda710e4e3c2a2ab071ab6eb Mon Sep 17 00:00:00 2001 From: Ben Kyd Date: Wed, 31 May 2023 22:25:26 +0100 Subject: [PATCH] oop --- src/main.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 7de64e2..b9dead8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,10 +3,10 @@ use std::fs::File; use std::io::BufReader; use std::io::Read; -mod rv32; mod bus; -mod ram; mod inst; +mod ram; +mod rv32; use crate::bus::*; @@ -65,20 +65,23 @@ impl VMRV32I { } fn fetch(&mut self) -> inst::Instruction { - inst::Instruction { inst: self.bus.load_32(self.pc) } + inst::Instruction { + inst: self.bus.load_32(self.pc), + } } fn exec(&mut self) { while self.pc > self.bus.memory.len() as u32 { // fetch let inst = self.fetch(); - println!("VM > Fetched 0x{:08x}: 0x{:08x}", self.pc, unsafe {inst.inst}); + println!("VM > Fetched 0x{:08x}: 0x{:08x}", self.pc, unsafe { + inst.inst + }); self.pc = self.pc + rv32::WORD as u32; //decode // exec - self.x[0] = 0x00000000; }