xenia/fox32
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Possibly fix an issue where a 32 bit page fault would cause 4 PFs

Browse Source 
Same for 16 bit page faults causing 2 page faults, one for each byte.
This commit is contained in:
Ry 2022-09-18 22:09:29 -07:00
parent 56e41e3915
commit 5c5a8722e4
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/memory.rs
View File

@ -201,14 +201,12 @@ impl Memory {
}
}
pub fn read_opt_16(&mut self, address: u32) -> Option<u16> {
Some(
(self.read_opt_8(address)? as u16) |
Some(self.read_opt_8(address)? as u16 |
(self.read_opt_8(address + 1)? as u16) << 8
)
}
pub fn read_opt_32(&mut self, address: u32) -> Option<u32> {
Some(
(self.read_opt_8(address)? as u32) |
Some(self.read_opt_8(address)? as u32 |
(self.read_opt_8(address + 1)? as u32) << 8 |
(self.read_opt_8(address + 2)? as u32) << 16 |
(self.read_opt_8(address + 3)? as u32) << 24
@ -226,26 +224,16 @@ impl Memory {
}
}
pub fn read_16(&mut self, address: u32) -> Option<u16> {
let mut read_ok = true;
let value = self.read_8(address).unwrap_or_else(|| { read_ok = false; 0 }) as u16 |
(self.read_8(address + 1).unwrap_or_else(|| { read_ok = false; 0 }) as u16) << 8;
if read_ok {
Some(value)
} else {
None
}
Some(self.read_8(address)? as u16 |
(self.read_8(address + 1)? as u16) << 8
)
}
pub fn read_32(&mut self, address: u32) -> Option<u32> {
let mut read_ok = true;
let value = self.read_8(address).unwrap_or_else(|| { read_ok = false; 0 }) as u32 |
(self.read_8(address + 1).unwrap_or_else(|| { read_ok = false; 0 }) as u32) << 8 |
(self.read_8(address + 2).unwrap_or_else(|| { read_ok = false; 0 }) as u32) << 16 |
(self.read_8(address + 3).unwrap_or_else(|| { read_ok = false; 0 }) as u32) << 24;
if read_ok {
Some(value)
} else {
None
}
Some(self.read_8(address)? as u32 |
(self.read_8(address + 1)? as u32) << 8 |
(self.read_8(address + 2)? as u32) << 16 |
(self.read_8(address + 3)? as u32) << 24
)
}
pub fn write_8(&mut self, mut address: u32, byte: u8) -> Option<()> {