diff options
2 files changed, 11 insertions, 10 deletions
| -rw-r--r-- | vm/src/vm/memory.rs | 11 | ||||
| -rw-r--r-- | vm/src/vm/primitive.rs | 10 |
diff --git a/vm/src/vm/memory.rs b/vm/src/vm/memory.rs index 319b647..0a6b47c 100644 --- a/vm/src/vm/memory.rs +++ b/vm/src/vm/memory.rs @@ -3,7 +3,14 @@ use std::{ ops::Index, }; -use super::primitive::spa; +// Special addrs +pub mod spa { + pub(crate) const Z: usize = 0; + pub(crate) const E: usize = 1; + pub(crate) const N: usize = 2; + pub(crate) const PROGRAM_COUNTER: usize = 3; + pub(crate) const STACK_POINTER: usize = 4; +} pub(crate) type Word = i64; @@ -48,6 +55,7 @@ impl Memory { *out.get_mut(spa::Z) = 0; *out.get_mut(spa::E) = 1; *out.get_mut(spa::N) = -1; + *out.get_mut(spa::STACK_POINTER) = spa::STACK_POINTER as Word; out } @@ -59,6 +67,7 @@ impl Memory { *memobj.get_mut(spa::Z) = 0; *memobj.get_mut(spa::E) = 1; *memobj.get_mut(spa::N) = -1; + *memobj.get_mut(spa::STACK_POINTER) = spa::STACK_POINTER as Word; memobj } diff --git a/vm/src/vm/primitive.rs b/vm/src/vm/primitive.rs index 3e41bd0..9b63d20 100644 --- a/vm/src/vm/primitive.rs +++ b/vm/src/vm/primitive.rs @@ -1,12 +1,4 @@ -use crate::vm::memory::{ Memory, Word }; - -// Special addrs -pub mod spa { - pub(crate) const Z: usize = 0; - pub(crate) const E: usize = 1; - pub(crate) const N: usize = 2; - pub(crate) const PROGRAM_COUNTER: usize = 3; -} +use crate::vm::memory::{ Memory, Word, spa }; #[derive(Debug, PartialEq, Eq)] pub(crate) enum VirtualMachineStatus { |
