diff --git a/Cargo.lock b/Cargo.lock index 870ae8c..3fe7792 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -390,37 +390,24 @@ dependencies = [ [[package]] name = "hbbytecode" version = "0.1.0" -source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#8e62bd747b88a1db1d07ffa355690fac48977bb2" - -[[package]] -name = "hbbytecode" -version = "0.1.0" -source = "git+https://git.ablecorp.us/ableos/holey-bytes.git#0d118c17b2d0e770161be834c5452753eb9c34dd" +source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#0e9f4402cb686da817ef876abd764676e262759a" [[package]] name = "hblang" version = "0.1.0" -source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#8e62bd747b88a1db1d07ffa355690fac48977bb2" +source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#0e9f4402cb686da817ef876abd764676e262759a" dependencies = [ - "hbbytecode 0.1.0 (git+https://git.ablecorp.us/AbleOS/holey-bytes.git)", - "hbvm 0.1.0 (git+https://git.ablecorp.us/AbleOS/holey-bytes.git)", + "hbbytecode", + "hbvm", "regalloc2", ] [[package]] name = "hbvm" version = "0.1.0" -source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#8e62bd747b88a1db1d07ffa355690fac48977bb2" +source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#0e9f4402cb686da817ef876abd764676e262759a" dependencies = [ - "hbbytecode 0.1.0 (git+https://git.ablecorp.us/AbleOS/holey-bytes.git)", -] - -[[package]] -name = "hbvm" -version = "0.1.0" -source = "git+https://git.ablecorp.us/ableos/holey-bytes.git#0d118c17b2d0e770161be834c5452753eb9c34dd" -dependencies = [ - "hbbytecode 0.1.0 (git+https://git.ablecorp.us/ableos/holey-bytes.git)", + "hbbytecode", ] [[package]] @@ -599,7 +586,7 @@ dependencies = [ "derive_more", "embedded-graphics", "hashbrown", - "hbvm 0.1.0 (git+https://git.ablecorp.us/ableos/holey-bytes.git)", + "hbvm", "limine", "log", "sbi", diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index b21af68..f42624c 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -6,7 +6,7 @@ version = "0.2.0" [dependencies] embedded-graphics = "0.8" -hbvm.git = "https://git.ablecorp.us/ableos/holey-bytes.git" +hbvm.git = "https://git.ablecorp.us/AbleOS/holey-bytes.git" log = "0.4" spin = "0.9" slab = { version = "0.4", default-features = false } diff --git a/kernel/src/holeybytes/ecah.rs b/kernel/src/holeybytes/ecah.rs index fcb37e0..1566dd7 100644 --- a/kernel/src/holeybytes/ecah.rs +++ b/kernel/src/holeybytes/ecah.rs @@ -106,13 +106,13 @@ pub fn handler(vm: &mut Vm) { 2 => x86_in::(addr) as u64, _ => panic!("Trying to read size other than: 8, 16, 32 from port."), }; - info!("Read the value {} from address {}", value, addr); + // info!("Read the value {} from address {}", value, addr); vm.registers[1] = hbvm::value::Value(value); }, 1 => unsafe { let size = msg_vec[1]; let addr = u16::from_le_bytes(msg_vec[2..4].try_into().unwrap()); - info!("Setting address {}", addr); + // info!("Setting address {}", addr); match size { 0 => x86_out(addr, msg_vec[4]), @@ -212,7 +212,7 @@ pub fn handler(vm: &mut Vm) { x86_64::instructions::port::Port::new(address).write(value); } let x = hbvm::value::Value(unsafe { x86_in(r2 as u16) } as u64); - info!("Read {:?} from Port {:?}", x, r2); + // info!("Read {:?} from Port {:?}", x, r2); vm.registers[3] = x } }