Website Summary Files Commits Branches @commit @diff @stats
path: root / vm / src
diff options
context:
space:
mode:
Commit9372bbd7617de25d1729765401f4ed00c23e0a22 (patch)
Author
 Syndamia <kamen@syndamia.com>
2025-02-15 09:03:34 +0200
Committer
 Syndamia <kamen@syndamia.com>
2025-02-15 09:03:34 +0200
Filesb1c52583d9df0aabb3905c19f3ee3528bb567b77 /vm/src
tonkobali-9372bbd7617de25d1729765401f4ed00c23e0a22.tar
tonkobali-9372bbd7617de25d1729765401f4ed00c23e0a22.tar.gz
tonkobali-9372bbd7617de25d1729765401f4ed00c23e0a22.zip
Parent8195dbb65842beb1999717411921cfe3dfb74305 (diff)
feat(vm/vm): Move SPA to memory and add STACK_POINTER
2 files changed, 11 insertions, 10 deletions
-rw-r--r--vm/src/vm/memory.rs11
-rw-r--r--vm/src/vm/primitive.rs10
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 {