diff --git a/src/cpu.rs b/src/cpu.rs index 631e0f9..508187a 100644 --- a/src/cpu.rs +++ b/src/cpu.rs @@ -539,6 +539,7 @@ impl CPU { /// ``` pub fn dump(&self) { //let dumpstyle = owo_colors::Style::new().bright_black(); + use std::fmt::Write; std::println!( "PC: {:04x}, SP: {:04x}, I: {:04x}\n{}DLY: {}, SND: {}, CYC: {:6}", self.pc, @@ -547,16 +548,17 @@ impl CPU { self.v .into_iter() .enumerate() - .map(|(i, gpr)| { - format!( - "v{i:X}: {gpr:02x} {}", + .fold(String::new(), |mut s, (i, gpr)| { + let _ = write!( + s, + "{}v{i:X}: {gpr:02x}", match i % 4 { - 3 => "\n", + 0 => "\n", _ => "", } - ) - }) - .collect::(), + ); + s + }), self.delay, self.sound, self.cycle, diff --git a/src/cpu/tests.rs b/src/cpu/tests.rs index 7e262f2..345e5a8 100644 --- a/src/cpu/tests.rs +++ b/src/cpu/tests.rs @@ -956,7 +956,7 @@ mod io { } mod bcdtest { - pub(self) use super::*; + use super::*; struct BCDTest { // value to test