Main now initializes System object
This commit is contained in:
parent
a459a31210
commit
b59fb83e60
14
src/main.rs
14
src/main.rs
@ -2,15 +2,15 @@ mod simulator;
|
|||||||
mod kernel;
|
mod kernel;
|
||||||
pub mod utility;
|
pub mod utility;
|
||||||
|
|
||||||
|
use kernel::{
|
||||||
|
scheduler::Scheduler,
|
||||||
|
system::System
|
||||||
|
};
|
||||||
use simulator::machine::Machine;
|
use simulator::machine::Machine;
|
||||||
use simulator::mem_cmp;
|
use simulator::mem_cmp;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let mut m = Machine::_init_machine();
|
let machine = Machine::_init_machine();
|
||||||
let path = "memoryComp.txt".to_string();
|
let scheduler = Scheduler::new();
|
||||||
let checker = mem_cmp::MemChecker::from(&path);
|
let system = System::new(machine, scheduler);
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user