@@ -32,21 +32,21 @@ pub const CENO_PLATFORM: Platform = Platform {
32
32
impl Platform {
33
33
// Virtual memory layout.
34
34
35
- pub fn is_rom ( & self , addr : Addr ) -> bool {
35
+ pub fn is_prog_code ( & self , addr : Addr ) -> bool {
36
36
self . prog_code . contains ( & addr)
37
37
}
38
38
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
-
43
39
pub fn is_prog_data ( & self , addr : Addr ) -> bool {
44
40
self . prog_data
45
41
. as_ref ( )
46
42
. map ( |set| set. contains ( & ( addr & !0x3 ) ) )
47
43
. unwrap_or ( false )
48
44
}
49
45
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
+
50
50
pub fn is_pub_io ( & self , addr : Addr ) -> bool {
51
51
self . public_io . contains ( & addr)
52
52
}
@@ -83,7 +83,7 @@ impl Platform {
83
83
}
84
84
85
85
pub fn can_execute ( & self , addr : Addr ) -> bool {
86
- self . is_rom ( addr)
86
+ self . is_prog_code ( addr)
87
87
}
88
88
89
89
// Environment calls.
@@ -124,16 +124,16 @@ mod tests {
124
124
let p = CENO_PLATFORM ;
125
125
assert ! ( p. can_execute( p. pc_base( ) ) ) ;
126
126
// 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 ) ) ;
129
129
assert ! ( !p. is_ram( p. prog_code. start) ) ;
130
130
assert ! ( !p. is_ram( p. prog_code. end - WORD_SIZE as Addr ) ) ;
131
131
// Registers do not overlap with ROM or RAM.
132
132
for reg in [
133
133
Platform :: register_vma ( 0 ) ,
134
134
Platform :: register_vma ( VMState :: REG_COUNT - 1 ) ,
135
135
] {
136
- assert ! ( !p. is_rom ( reg) ) ;
136
+ assert ! ( !p. is_prog_code ( reg) ) ;
137
137
assert ! ( !p. is_ram( reg) ) ;
138
138
}
139
139
}
0 commit comments