From 5d95eadd2e7d43e1c0a42660d7d3d32648804bd6 Mon Sep 17 00:00:00 2001 From: Rekai Musuka Date: Mon, 15 Mar 2021 19:08:19 -0500 Subject: [PATCH] fix: implement Default and Clone for Box --- src/cartridge.rs | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/cartridge.rs b/src/cartridge.rs index 82288b2..be7dfa5 100644 --- a/src/cartridge.rs +++ b/src/cartridge.rs @@ -29,7 +29,6 @@ impl Cartridge { let mbc = match mbc_kind { MBCKind::None => todo!("Handle no MBC Situation"), MBCKind::MBC1 => MBC1 { - kind: mbc_kind, ram_size, ram: vec![0; ram_byte_count as usize].into_boxed_slice(), bank_count, @@ -87,7 +86,6 @@ impl Cartridge { #[derive(Debug, Clone, Default)] struct MBC1 { - pub kind: MBCKind, current_rom_bank: u8, // 5-bit Number current_ram_bank: u8, // 2-bit number mode: bool, @@ -215,11 +213,24 @@ impl MBC for MBC1 { } } -trait MBC { +trait MBC: CloneMBC { fn handle_read(&self, addr: u16) -> MBCResult; fn handle_write(&mut self, addr: u16, byte: u8); } +trait CloneMBC { + fn clone_mbc<'a>(&self) -> Box; +} + +impl CloneMBC for T +where + T: MBC + Clone + 'static, +{ + fn clone_mbc<'a>(&self) -> Box { + Box::new(self.clone()) + } +} + enum MBCResult { Address(u16), RamValue(u8), @@ -345,18 +356,18 @@ impl From for BankCount { impl std::fmt::Debug for Box { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - todo!() + todo!("Implement Debug for Box Trait Object"); } } impl std::clone::Clone for Box { fn clone(&self) -> Self { - todo!() + self.clone_mbc() } } impl std::default::Default for Box { fn default() -> Self { - todo!() + Box::new(MBC1::default()) } }