Moving files to simulator module

src/main.rs

@@ -1,7 +1,6 @@
-mod decode;
+mod simulator;
-mod print;
+
-mod machine;
+use simulator::machine::Machine;
-use machine::Machine;
 
 fn main() {
     let mut m = Machine::_init_machine();

src/simulator/machine.rs

@@ -1,5 +1,4 @@
-use crate::decode::*;
+use super::{decode::{Instruction, decode}, print::*};
-use crate::print::*;
 
 /// doit disparaitre
 const MEM_SIZE : usize= 4096;

src/simulator/mod.rs

@@ -0,0 +1,3 @@
+pub mod machine;
+pub mod decode;
+pub mod print;

src/simulator/print.rs

@@ -1,6 +1,6 @@
 #![allow(dead_code)]
 #![allow(unused_variables)]
-use crate::decode::Instruction;
+use super::decode::{Instruction};
 
 
 pub const RISCV_LUI: u8 = 0x37;
@@ -307,8 +307,8 @@ pub fn print(ins: Instruction, pc: i32) -> String { //TODO pc should be u64
 
 #[cfg(test)]
 mod test {
+    use crate::simulator::{decode, print};
 
-    use crate::{print, decode};
 
     #[test]
     fn test_op() {