Skip to content

Commit 2d79869

Browse files
author
Aurélien Nicolas
committed
sync-platform: rename is_prog_code
1 parent ec8ed09 commit 2d79869

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

ceno_emul/src/platform.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@ pub const CENO_PLATFORM: Platform = Platform {
3232
impl Platform {
3333
// Virtual memory layout.
3434

35-
pub fn is_rom(&self, addr: Addr) -> bool {
35+
pub fn is_prog_code(&self, addr: Addr) -> bool {
3636
self.prog_code.contains(&addr)
3737
}
3838

39-
pub fn is_ram(&self, addr: Addr) -> bool {
40-
self.stack.contains(&addr) || self.heap.contains(&addr) || self.is_prog_data(addr)
41-
}
42-
4339
pub fn is_prog_data(&self, addr: Addr) -> bool {
4440
self.prog_data
4541
.as_ref()
4642
.map(|set| set.contains(&(addr & !0x3)))
4743
.unwrap_or(false)
4844
}
4945

46+
pub fn is_ram(&self, addr: Addr) -> bool {
47+
self.stack.contains(&addr) || self.heap.contains(&addr) || self.is_prog_data(addr)
48+
}
49+
5050
pub fn is_pub_io(&self, addr: Addr) -> bool {
5151
self.public_io.contains(&addr)
5252
}
@@ -83,7 +83,7 @@ impl Platform {
8383
}
8484

8585
pub fn can_execute(&self, addr: Addr) -> bool {
86-
self.is_rom(addr)
86+
self.is_prog_code(addr)
8787
}
8888

8989
// Environment calls.
@@ -124,16 +124,16 @@ mod tests {
124124
let p = CENO_PLATFORM;
125125
assert!(p.can_execute(p.pc_base()));
126126
// ROM and RAM do not overlap.
127-
assert!(!p.is_rom(p.heap.start));
128-
assert!(!p.is_rom(p.heap.end - WORD_SIZE as Addr));
127+
assert!(!p.is_prog_code(p.heap.start));
128+
assert!(!p.is_prog_code(p.heap.end - WORD_SIZE as Addr));
129129
assert!(!p.is_ram(p.prog_code.start));
130130
assert!(!p.is_ram(p.prog_code.end - WORD_SIZE as Addr));
131131
// Registers do not overlap with ROM or RAM.
132132
for reg in [
133133
Platform::register_vma(0),
134134
Platform::register_vma(VMState::REG_COUNT - 1),
135135
] {
136-
assert!(!p.is_rom(reg));
136+
assert!(!p.is_prog_code(reg));
137137
assert!(!p.is_ram(reg));
138138
}
139139
}

0 commit comments

Comments
 (0)