Add Fudge Factors to Stack and Heap (#598)

Author: bhoberman

vm/src/emulator/memory_stats.rs

@@ -92,7 +92,9 @@ impl MemoryStats {
         // For safety, we just check the stack pointer directly rather than looking for the lowest memory access.
         // This ensures we respect the full stack frame that was reserved, even if not all of it is used.
         // We could optimize this in the future by tracking actual stack accesses if needed.
-        self.min_stack_access = min(self.min_stack_access, stack_pointer);
+        if stack_pointer > 0 {
+            self.min_stack_access = min(self.min_stack_access, stack_pointer);
+        }
         Ok(())
     }
 
@@ -105,8 +107,8 @@ impl MemoryStats {
         output_size: u32,
     ) -> Result<LinearMemoryLayout> {
         LinearMemoryLayout::new(
-            self.max_heap_access - self.heap_bottom,
-            self.stack_top - self.min_stack_access,
+            self.max_heap_access - self.heap_bottom + 0x100,
+            self.stack_top - self.min_stack_access + 0x100,
             input_size,
             output_size,
             program_size,
@@ -183,9 +185,9 @@ mod tests {
             .create_optimized_layout(program_size, ad_size, 0, 0)
             .unwrap();
 
-        assert_eq!(layout.heap_end(), 5504);
-        assert_eq!(layout.stack_bottom(), 9600);
-        assert_eq!(layout.stack_top(), 1006596);
+        assert_eq!(layout.heap_end(), 5760);
+        assert_eq!(layout.stack_bottom(), 9856);
+        assert_eq!(layout.stack_top(), 1007108);
         assert_eq!(layout.public_input_end(), 4400);
         assert_eq!(layout.ad_end(), 4500);
         assert_eq!(layout.public_output_end(), 4504);

vm/src/trace.rs

@@ -535,7 +535,7 @@ mod tests {
         assert!(step
             .memory_records
             .take(&MemoryRecord::StoreRecord(
-                (MemAccessSize::Word, 0x80403898, 4128, 0),
+                (MemAccessSize::Word, 0x3C1C, 4128, 0),
                 13,
             ))
             .is_some());
@@ -595,7 +595,7 @@ mod tests {
         assert!(step
             .memory_records
             .take(&MemoryRecord::StoreRecord(
-                (MemAccessSize::Word, 0x80403898, 4128, 0),
+                (MemAccessSize::Word, 0x3C1C, 4128, 0),
                 13,
             ))
             .is_some());
@@ -652,10 +652,12 @@ mod tests {
         assert_eq!(step.result, None);
         assert_eq!(step.memory_records.len(), 1);
 
+        println!("{:?}", step.memory_records);
+
         assert!(step
             .memory_records
             .take(&MemoryRecord::StoreRecord(
-                (MemAccessSize::Word, 0x80403898, 4128, 0),
+                (MemAccessSize::Word, 0x3C1C, 4128, 0),
                 13,
             ))
             .is_some());