diff --git a/src/main.rs b/src/main.rs index 10c00e9..f703804 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,15 +2,15 @@ mod simulator; mod kernel; pub mod utility; +use kernel::{ + scheduler::Scheduler, + system::System +}; use simulator::machine::Machine; use simulator::mem_cmp; fn main() { - let mut m = Machine::_init_machine(); - let path = "memoryComp.txt".to_string(); - let checker = mem_cmp::MemChecker::from(&path); - mem_cmp::MemChecker::fill_memory_from_mem_checker(&checker, &mut m); - //mem_cmp::Mem_Checker::print_Mem_Checker(&checker); - //Machine::print_memory(&mut m, 0x400000, 0x405000); - Machine::run(&mut m); + let machine = Machine::_init_machine(); + let scheduler = Scheduler::new(); + let system = System::new(machine, scheduler); }