zenithsiz/ddw3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ddw3_psexe::Header now properly formats fields on debugging

Browse Source
This commit is contained in:
Filipe Rodrigues 2022-10-25 19:13:43 +01:00
parent ace335443a
commit 0d7b4dc4cc
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/ddw3-mkpsexe/src/main.rs
View File

@ -116,6 +116,7 @@ fn main() -> Result<(), anyhow::Error> {
},
},
};
tracing::trace!(?header);
output_file
.write_serialize::<_, Result<_, anyhow::Error>>(&header)
.context("Unable to write output file header")?;

17
tools/ddw3-psexe/src/lib.rs
View File

@ -7,10 +7,11 @@
use {
byteorder::{ByteOrder, LittleEndian},
ddw3_bytes::Bytes,
std::fmt,
};
/// Psx header
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
#[derive(PartialEq, Eq, Clone, Copy)]
pub struct Header {
/// Start address
pub pc0: u32,
@ -28,6 +29,20 @@ pub struct Header {
pub license: [u8; Self::LICENSE_SIZE],
}
impl fmt::Debug for Header {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let license_end_idx = self.license.iter().position(|&b| b == 0).unwrap_or(self.license.len());
f.debug_struct("Header")
.field("pc0", &format_args!("{:#010x}", self.pc0))
.field("text_base", &format_args!("{:#010x}", self.text_base))
.field("text_size", &format_args!("{:#010x}", self.text_size))
.field("sp", &format_args!("{:#010x}", self.sp))
.field("license", &String::from_utf8(self.license[..license_end_idx].to_vec()))
.finish()
}
}
impl Header {
/// License size
pub const LICENSE_SIZE: usize = 0x800 - 0x4c;