diff options
| Commit | 963d107c295927a90b5f6c8c6005f541f1c12541 (patch) | |
|---|---|---|
| Author | 2025-02-13 18:42:49 +0200 | |
| Committer | 2025-02-13 18:44:07 +0200 | |
| Files | 4292300382dfc985c51ae3ed01ccb4b29c310d42 /vm/src | |
| tonkobali-963d107c295927a90b5f6c8c6005f541f1c12541.tar tonkobali-963d107c295927a90b5f6c8c6005f541f1c12541.tar.gz tonkobali-963d107c295927a90b5f6c8c6005f541f1c12541.zip | ||
| Parent | 65a1e742f5fa853d2cdb9ba43eaa8bbf70f2a97d (diff) | |
feat(vm): Change word type to i64
3 files changed, 11 insertions, 12 deletions
| -rw-r--r-- | vm/src/main.rs | 11 | ||||
| -rw-r--r-- | vm/src/vm/memory.rs | 6 | ||||
| -rw-r--r-- | vm/src/vm/primitive.rs | 6 |
diff --git a/vm/src/main.rs b/vm/src/main.rs index bf3655c..69ede65 100644 --- a/vm/src/main.rs +++ b/vm/src/main.rs @@ -7,7 +7,7 @@ mod vmm; use vmm::VirtualMachineMonitor; fn main() { - /* This is a simple program: calculate 331 + 95 in address 5 + /* This is a simple program: calculate 331 + 95 in address 5 (answer 426) * * > ADD 331, 95 * > JMP 0 @@ -17,19 +17,18 @@ fn main() { * > subleq 0, 0 * > subleq 0, 0, 0 * - * > subleq 3, 0 - * > subleq 0, 4 - * > subleq 0, 0 + * > subleq 3, 0, next + * > subleq 0, 4, next + * > subleq 0, 0, next * > subleq 0, 0, 0 */ let vm = VirtualMachine::create_with_memory(&vec![ /* 0 */ 0, - /* 1 */ -1_i64 as u64, + /* 1 */ -1, /* 2 */ 5, /* 3 */ 331, /* 4 */ 95, - /* 5 */ 3, /* 6 */ 0, /* 7 */ 8, diff --git a/vm/src/vm/memory.rs b/vm/src/vm/memory.rs index e341827..33a6de6 100644 --- a/vm/src/vm/memory.rs +++ b/vm/src/vm/memory.rs @@ -3,7 +3,7 @@ use std::{ ops::Index, }; -pub(crate) type Word = u64; +pub(crate) type Word = i64; // Size of each memory block in words // Since words are 64bit, each word corresponds to 4 bytes @@ -130,7 +130,7 @@ mod tests { #[test] fn parse_63bit_address_correct() { /* #|-- Address --| */ - let value: Word = 0b0111100010000010000000000001111100010101001000000000000100001001; + let value: Word = 0b0111100010000010000000000001111100010101001000000000000100001001u64 as Word; let out = Memory::parse_address(value); assert!(out.len() == 1); assert_eq!(out[0], value as usize); @@ -139,7 +139,7 @@ mod tests { #[test] fn parse_21bit_addresses_correct() { /* #|-- Address --||-- Address --||-- Address --| */ - let value: Word = 0b1111100010000010000000000001111100010101001000000000000100001001; + let value: Word = 0b1111100010000010000000000001111100010101001000000000000100001001u64 as Word; let out = Memory::parse_address(value); assert!(out.len() == 3); assert_eq!(out[0], 0b111100010000010000000, "First address is incorrect"); diff --git a/vm/src/vm/primitive.rs b/vm/src/vm/primitive.rs index c748a1b..c7eda45 100644 --- a/vm/src/vm/primitive.rs +++ b/vm/src/vm/primitive.rs @@ -51,11 +51,11 @@ impl PrimitiveVirtualMachine { let a = self.mem[addrs[0]]; let b = self.mem.get_mut(addrs[1]); - let c = addrs[2] as u64; + let c = addrs[2] as Word; // SUBLEQ - *b = b.overflowing_sub(a).0; - if *b == 0 || b.leading_ones() > 0 { + *b = *b - a; + if *b <= 0 { *self.pc_mut() = c; } else { |
