fix: start the stack pointer from one address lower than the minimum

heypoom · Oct 5, 2023 · d3ae610 · d3ae610
1 parent 244ba6a
commit d3ae610
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/register/mod.rs b/src/register/mod.rs
@@ -28,7 +28,7 @@ impl Registers {
 
         // Initialize the stack pointer.
         v.set(PC, 0);
-        v.set(SP, MIN_STACK_ADDR);
+        v.set(SP, MIN_STACK_ADDR - 1);
 
         v
     }

diff --git a/tests/machine.rs b/tests/machine.rs
@@ -9,6 +9,6 @@ mod tests {
         let mut m: M = vec![I::Push(10), I::Push(3), I::Sub].into();
         m.run();
 
-        assert_eq!(m.mem.read_stack(2), [0, 7]);
+        assert_eq!(m.stack().peek(), 7);
     }
 }
diff --git a/tests/math.rs b/tests/math.rs
@@ -10,15 +10,15 @@ mod tests {
 
         m.tick();
         m.tick();
-        assert_eq!(m.mem.read_stack(3), [0, 5, 10]);
+        assert_eq!(m.mem.read_stack(2), [5, 10]);
 
         m.tick();
-        assert_eq!(m.mem.read_stack(3), [0, 15, 0]);
+        assert_eq!(m.stack().peek(), 15);
 
         m.tick();
         assert_eq!(m.stack().peek(), 3);
 
         m.tick();
-        assert_eq!(m.mem.read_stack(3), [0, 12, 0]);
+        assert_eq!(m.stack().peek(), 12);
     }
 }
diff --git a/tests/strings.rs b/tests/strings.rs
@@ -22,7 +22,7 @@ mod tests {
         assert_eq!(m.mem.read_stack(5), [0, 0, 0, 0, 0]);
 
         m.run();
-        assert_eq!(m.mem.read_stack(6), [0, 104, 101, 108, 108, 111]);
+        assert_eq!(m.mem.read_stack(5), [104, 101, 108, 108, 111]);
     }
 
     #[test]
@@ -50,6 +50,6 @@ mod tests {
         let s_addr = ms.add_str("poom");
         m.mem.load_code(vec![I::LoadString(s_addr)]);
         m.tick();
-        assert_eq!(m.mem.read_stack(5), [0, 112, 111, 111, 109]);
+        assert_eq!(m.mem.read_stack(4), [112, 111, 111, 109]);
     }
 }