Refactor...

AGH-Code-Industry · Dec 8, 2024 · f76354e · f76354e
1 parent fcbbbd8
commit f76354e
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 27 deletions.
diff --git a/emulator/src/cartridge/cartridge.rs b/emulator/src/cartridge/cartridge.rs
@@ -1,7 +1,8 @@
 use crate::cartridge::common::consts::NES_FILE_MAGIC_BYTES;
 use crate::cartridge::common::enums::errors::NesRomReadError;
 use crate::cartridge::common::enums::nes::Nes;
-use crate::cartridge::file_loader::FileLoadable;
+use crate::cartridge::common::traits::cartridge_data::CartridgeData;
+use crate::cartridge::common::traits::file_loadable::FileLoadable;
 use crate::cartridge::formats::i_nes::Ines;
 use crate::cartridge::formats::nes_2::Nes2;
 use crate::cartridge::registers::chr_rom::ChrRom;
@@ -10,11 +11,6 @@ use std::fs::File;
 use std::io::{BufReader, Read, Seek, SeekFrom};
 use std::path::Path;
 
-pub trait CartridgeData {
-    fn prg_rom(&self) -> &PrgRom;
-    fn chr_rom(&self) -> &ChrRom;
-}
-
 pub struct Cartridge {
     data: Box<dyn CartridgeData>,
 }

diff --git a/emulator/src/cartridge/common/mod.rs b/emulator/src/cartridge/common/mod.rs
@@ -1,2 +1,4 @@
 pub mod consts;
 pub mod enums;
+pub mod traits;
+pub mod utils;
diff --git a/emulator/src/cartridge/common/traits/cartridge_data.rs b/emulator/src/cartridge/common/traits/cartridge_data.rs
@@ -0,0 +1,7 @@
+use crate::cartridge::registers::chr_rom::ChrRom;
+use crate::cartridge::registers::prg_rom::PrgRom;
+
+pub trait CartridgeData {
+    fn prg_rom(&self) -> &PrgRom;
+    fn chr_rom(&self) -> &ChrRom;
+}
diff --git a/emulator/src/cartridge/common/traits/file_loadable.rs b/emulator/src/cartridge/common/traits/file_loadable.rs
@@ -0,0 +1,7 @@
+use std::path::Path;
+
+pub trait FileLoadable {
+    fn from_file<P: AsRef<Path>>(path: P) -> anyhow::Result<Self>
+    where
+        Self: Sized;
+}
diff --git a/emulator/src/cartridge/common/traits/mod.rs b/emulator/src/cartridge/common/traits/mod.rs
@@ -0,0 +1,2 @@
+pub mod cartridge_data;
+pub mod file_loadable;
diff --git a/emulator/src/cartridge/file_loader.rs → emulator/src/cartridge/common/utils/file.rs b/emulator/src/cartridge/file_loader.rs → emulator/src/cartridge/common/utils/file.rs
@@ -1,11 +1,4 @@
 use std::io::Read;
-use std::path::Path;
-
-pub trait FileLoadable {
-    fn from_file<P: AsRef<Path>>(path: P) -> anyhow::Result<Self>
-    where
-        Self: Sized;
-}
 
 pub fn read_banks<R: Read>(
     file: &mut R,
@@ -23,8 +16,7 @@ pub fn read_banks<R: Read>(
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
+    use crate::cartridge::common::utils::file::read_banks;
     #[test]
     fn test_read_banks_2_4() {
         let data = vec![1, 2, 3, 4, 5, 6, 7, 8];

diff --git a/emulator/src/cartridge/common/utils/mod.rs b/emulator/src/cartridge/common/utils/mod.rs
@@ -0,0 +1 @@
+pub mod file;
diff --git a/emulator/src/cartridge/formats/i_nes.rs b/emulator/src/cartridge/formats/i_nes.rs
@@ -1,7 +1,7 @@
-use crate::cartridge::cartridge::CartridgeData;
 use crate::cartridge::common::enums::mirroring::Mirroring;
-use crate::cartridge::file_loader::read_banks;
-use crate::cartridge::file_loader::FileLoadable;
+use crate::cartridge::common::traits::cartridge_data::CartridgeData;
+use crate::cartridge::common::traits::file_loadable::FileLoadable;
+use crate::cartridge::common::utils::file::read_banks;
 use crate::cartridge::registers::chr_rom::ChrRom;
 use crate::cartridge::registers::prg_rom::PrgRom;
 use std::fs::File;
@@ -197,7 +197,7 @@ impl CartridgeData for Ines {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::cartridge::formats::i_nes::FileLoadable;
+    use crate::cartridge::common::traits::file_loadable::FileLoadable;
     use std::io::Cursor;
 
     #[test]

diff --git a/emulator/src/cartridge/formats/nes_2.rs b/emulator/src/cartridge/formats/nes_2.rs
@@ -1,10 +1,10 @@
-use crate::cartridge::cartridge::CartridgeData;
 use crate::cartridge::common::consts::NES_FILE_MAGIC_BYTES;
 use crate::cartridge::common::consts::PRG_UNIT_SIZE;
 use crate::cartridge::common::enums::errors::NesRomReadError;
 use crate::cartridge::common::enums::mirroring::Mirroring;
-use crate::cartridge::file_loader::read_banks;
-use crate::cartridge::file_loader::FileLoadable;
+use crate::cartridge::common::traits::cartridge_data::CartridgeData;
+use crate::cartridge::common::traits::file_loadable::FileLoadable;
+use crate::cartridge::common::utils::file::read_banks;
 use crate::cartridge::registers::chr_ram::ChrRam;
 use crate::cartridge::registers::chr_rom::ChrRom;
 use crate::cartridge::registers::prg_ram::PrgRam;
@@ -62,6 +62,7 @@ pub struct Nes2 {
     trainer: Option<[u8; 512]>,
     prg_ram: Option<PrgRam>,
     chr_ram: Option<ChrRam>,
+    mirroring: Mirroring,
 }
 
 impl Debug for Nes2 {
@@ -156,8 +157,6 @@ impl FileLoadable for Nes2 {
             Mirroring::Horizontal
         };
 
-        let battery = header.flags_6 & 0b00000010 != 0;
-
         let mut trainer = if is_trainer_present {
             let mut trainer_data = [0; 512];
             file.read_exact(&mut trainer_data)?;
@@ -166,8 +165,6 @@ impl FileLoadable for Nes2 {
             None
         };
 
-        let four_screen_vram = header.flags_6 & 0b00001000 != 0;
-
         let prg_rom =
             PrgRom::new_with_data(read_banks(&mut file, header.prg_rom_size, PRG_UNIT_SIZE)?);
 
@@ -200,6 +197,7 @@ impl FileLoadable for Nes2 {
             trainer,
             prg_ram,
             chr_ram,
+            mirroring,
         })
     }
 }

diff --git a/emulator/src/cartridge/mod.rs b/emulator/src/cartridge/mod.rs
@@ -1,6 +1,5 @@
 pub mod cartridge;
 
 pub mod common;
-pub mod file_loader;
 mod formats;
 mod registers;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		pub mod cartridge_data;
		pub mod file_loadable;