encounter/decomp-toolkit
1
0
Fork 0
mirror of https://github.com/encounter/decomp-toolkit.git synced 2025-07-06 13:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

dol split: Write units file

Browse Source
This commit is contained in:
Luke Street 2023-08-03 19:05:00 -04:00
parent f06a6ffbdd
commit 6723245ed6
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cmd/dol.rs
View File

@ -217,12 +217,14 @@ fn split(args: SplitArgs) -> Result<()> {
} }
let mut rsp_file = BufWriter::new(File::create(args.out_dir.join("rsp"))?); let mut rsp_file = BufWriter::new(File::create(args.out_dir.join("rsp"))?);
let mut units_file = BufWriter::new(File::create(args.out_dir.join("units"))?);
for unit in &obj.link_order { for unit in &obj.link_order {
let object = file_map let object = file_map
.get(unit) .get(unit)
.ok_or_else(|| anyhow!("Failed to find object file for unit '{unit}'"))?; .ok_or_else(|| anyhow!("Failed to find object file for unit '{unit}'"))?;
let out_path = obj_dir.join(obj_path_for_unit(unit)); let out_path = obj_dir.join(obj_path_for_unit(unit));
writeln!(rsp_file, "{}", out_path.display())?; writeln!(rsp_file, "{}", out_path.display())?;
writeln!(units_file, "{}:{}", out_path.display(), unit)?;
if let Some(parent) = out_path.parent() { if let Some(parent) = out_path.parent() {
DirBuilder::new().recursive(true).create(parent)?; DirBuilder::new().recursive(true).create(parent)?;
} }
@ -232,19 +234,12 @@ fn split(args: SplitArgs) -> Result<()> {
file.flush()?; file.flush()?;
} }
rsp_file.flush()?; rsp_file.flush()?;
units_file.flush()?;
// Generate ldscript.lcf // Generate ldscript.lcf
fs::write(args.out_dir.join("ldscript.lcf"), generate_ldscript(&obj)?)?; fs::write(args.out_dir.join("ldscript.lcf"), generate_ldscript(&obj)?)?;
log::info!("Writing disassembly"); log::info!("Writing disassembly");
// let mut files_out = File::create(args.out_dir.join("build.ps1"))?;
// writeln!(files_out, "$ErrorActionPreference = 'Stop'")?;
// writeln!(
// files_out,
// "$asflags = '-mgekko', '-I', '{}', '--defsym', 'version=0', '-W', '--strip-local-absolute', '-gdwarf-2'",
// include_dir.display()
// )?;
// writeln!(files_out, "$env:PATH = \"$env:PATH;C:\\devkitPro\\devkitPPC\\bin\"")?;
for (unit, split_obj) in obj.link_order.iter().zip(&split_objs) { for (unit, split_obj) in obj.link_order.iter().zip(&split_objs) {
let out_path = asm_dir.join(asm_path_for_unit(unit)); let out_path = asm_dir.join(asm_path_for_unit(unit));
@ -254,23 +249,7 @@ fn split(args: SplitArgs) -> Result<()> {
let mut w = BufWriter::new(File::create(&out_path)?); let mut w = BufWriter::new(File::create(&out_path)?);
write_asm(&mut w, split_obj)?; write_asm(&mut w, split_obj)?;
w.flush()?; w.flush()?;
// let obj_path = obj_dir.join(obj_path_for_unit(unit));
// writeln!(files_out, "Write-Host 'Compiling {}'", obj_path.display())?;
// writeln!(
// files_out,
// "powerpc-eabi-as @asflags -o '{}' '{}'",
// obj_path.display(),
// out_path.display()
// )?;
// writeln!(
// files_out,
// "dtk elf fixup '{}' '{}'",
// obj_path.display(),
// obj_path.display()
// )?;
} }
// files_out.flush()?;
// (debugging) validate against ELF // (debugging) validate against ELF
if let Some(file) = &args.elf_file { if let Some(file) = &args.elf_file {