paoda
/
gb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(emu): remove bus and bus_mut from cpu

This commit is contained in:
Rekai Nyangadzayi Musuka 2021-11-01 17:56:42 +09:00
parent 80a15039e0
commit 7dfcd44820
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpu.rs
View File

@ -151,16 +151,6 @@ impl BusIo for Cpu {
} }
impl Cpu { impl Cpu {
#[inline]
pub(crate) fn bus(&self) -> &Bus {
&self.bus
}
#[inline]
pub(crate) fn bus_mut(&mut self) -> &mut Bus {
&mut self.bus
}
fn handle_ei(&mut self) { fn handle_ei(&mut self) {
match self.ime { match self.ime {
ImeState::EiExecuted => self.ime = ImeState::Pending, ImeState::EiExecuted => self.ime = ImeState::Pending,

16
src/emu.rs
View File

@ -32,7 +32,7 @@ pub fn run_frame(emu: &mut Emulator, gamepad: &mut Gilrs, key: &WinitInputHelper
} }
pub fn draw_frame(emu: &Emulator, buf: &mut [u8; GB_HEIGHT * GB_WIDTH * 4]) { pub fn draw_frame(emu: &Emulator, buf: &mut [u8; GB_HEIGHT * GB_WIDTH * 4]) {
buf.copy_from_slice(emu.cpu.bus().ppu().frame_buf()); buf.copy_from_slice(emu.cpu.bus.ppu().frame_buf());
} }
pub struct Emulator { pub struct Emulator {
@ -81,25 +81,25 @@ impl Emulator {
} }
fn load_rom(&mut self, rom: Vec<u8>) { fn load_rom(&mut self, rom: Vec<u8>) {
self.cpu.bus_mut().load_cart(rom); self.cpu.bus.load_cart(rom);
} }
#[inline] #[inline]
fn joyp_mut(&mut self) -> &mut Joypad { fn joyp_mut(&mut self) -> &mut Joypad {
self.cpu.bus_mut().joyp_mut() self.cpu.bus.joyp_mut()
} }
pub fn set_prod(&mut self, prod: SampleProducer<f32>) { pub fn set_prod(&mut self, prod: SampleProducer<f32>) {
self.cpu.bus_mut().apu_mut().attach_producer(prod) self.cpu.bus.apu_mut().attach_producer(prod)
} }
pub fn title(&self) -> &str { pub fn title(&self) -> &str {
self.cpu.bus().cart_title().unwrap_or(DEFAULT_TITLE) self.cpu.bus.cart_title().unwrap_or(DEFAULT_TITLE)
} }
pub fn try_write_sav(&self) -> std::io::Result<()> { pub fn try_write_sav(&self) -> std::io::Result<()> {
if let Some(ext_ram) = self.cpu.bus().cart().map(|c| c.ext_ram()).flatten() { if let Some(ext_ram) = self.cpu.bus.cart().map(|c| c.ext_ram()).flatten() {
if let Some(title) = self.cpu.bus().cart_title() { if let Some(title) = self.cpu.bus.cart_title() {
let mut save_path = Self::data_path().unwrap_or_else(|| PathBuf::from(".")); let mut save_path = Self::data_path().unwrap_or_else(|| PathBuf::from("."));
save_path.push(title); save_path.push(title);
save_path.set_extension("sav"); save_path.set_extension("sav");
@ -113,7 +113,7 @@ impl Emulator {
} }
pub fn try_load_sav(&mut self) -> std::io::Result<()> { pub fn try_load_sav(&mut self) -> std::io::Result<()> {
if let Some(cart) = self.cpu.bus_mut().cart_mut() { if let Some(cart) = self.cpu.bus.cart_mut() {
if let Some(title) = cart.title() { if let Some(title) = cart.title() {
let mut save_path = Self::data_path().unwrap_or_else(|| PathBuf::from(".")); let mut save_path = Self::data_path().unwrap_or_else(|| PathBuf::from("."));
save_path.push(title); save_path.push(title);