sync-platform: rename rom to prog_code

scroll-tech · Dec 12, 2024 · 1dfc478 · 1dfc478
1 parent 952da9c
commit 1dfc478
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/ceno_emul/src/platform.rs b/ceno_emul/src/platform.rs
@@ -9,7 +9,7 @@ use crate::addr::{Addr, RegIdx};
 /// - codes of environment calls.
 #[derive(Clone, Debug)]
 pub struct Platform {
-    pub rom: Range<Addr>, // TODO: rename.
+    pub prog_code: Range<Addr>,
     pub ram: Range<Addr>, // TODO: remove.
     pub prog_data: Option<HashSet<Addr>>,
     pub stack: Range<Addr>,
@@ -21,7 +21,7 @@ pub struct Platform {
 }
 
 pub const CENO_PLATFORM: Platform = Platform {
-    rom: 0x2000_0000..0x3000_0000,
+    prog_code: 0x2000_0000..0x3000_0000,
     ram: 0x8000_0000..0xFFFF_0000,
     prog_data: None, // This is an `Option` to allow `const` here.
     stack: 0xB0000000..0xC0000000,
@@ -35,7 +35,7 @@ impl Platform {
     // Virtual memory layout.
 
     pub fn is_rom(&self, addr: Addr) -> bool {
-        self.rom.contains(&addr)
+        self.prog_code.contains(&addr)
     }
 
     pub fn is_ram(&self, addr: Addr) -> bool {
@@ -74,7 +74,7 @@ impl Platform {
     // Startup.
 
     pub const fn pc_base(&self) -> Addr {
-        self.rom.start
+        self.prog_code.start
     }
 
     // Permissions.
@@ -84,7 +84,8 @@ impl Platform {
     }
 
     pub fn can_write(&self, addr: Addr) -> bool {
-        self.is_ram(addr) || self.is_pub_io(addr) || self.is_hints(addr)
+        // TODO: Remove is_rom (fails a unittest).
+        self.is_rom(addr) || self.is_ram(addr) || self.is_pub_io(addr) || self.is_hints(addr)
     }
 
     pub fn can_execute(&self, addr: Addr) -> bool {
@@ -131,8 +132,8 @@ mod tests {
         // ROM and RAM do not overlap.
         assert!(!p.is_rom(p.heap.start));
         assert!(!p.is_rom(p.heap.end - WORD_SIZE as Addr));
-        assert!(!p.is_ram(p.rom.start));
-        assert!(!p.is_ram(p.rom.end - WORD_SIZE as Addr));
+        assert!(!p.is_ram(p.prog_code.start));
+        assert!(!p.is_ram(p.prog_code.end - WORD_SIZE as Addr));
         // Registers do not overlap with ROM or RAM.
         for reg in [
             Platform::register_vma(0),

diff --git a/ceno_zkvm/src/e2e.rs b/ceno_zkvm/src/e2e.rs
@@ -202,7 +202,7 @@ pub fn setup_platform(
     };
 
     Platform {
-        rom: program.base_address
+        prog_code: program.base_address
             ..program.base_address + (program.instructions.len() * WORD_SIZE) as u32,
         prog_data: Some(prog_data),
         stack,