encounter/decomp-toolkit
1
0
Fork 0
mirror of https://github.com/encounter/decomp-toolkit.git synced 2025-12-12 22:56:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use map in dol diff and dol apply; remove common BSS hack

Browse Source
This commit is contained in:
Luke Street
2023-09-10 02:20:08 -04:00
parent 788ffb9e17
commit 18170a96a2
4 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cmd/dol.rs
View File

@@ -115,9 +115,6 @@ pub struct DiffArgs {
#[argp(positional)]
/// linked ELF
elf_file: PathBuf,
#[argp(positional)]
/// map file
map_file: PathBuf,
}
#[derive(FromArgs, PartialEq, Eq, Debug)]
@@ -130,9 +127,6 @@ pub struct ApplyArgs {
#[argp(positional)]
/// linked ELF
elf_file: PathBuf,
#[argp(positional)]
/// map file
map_file: PathBuf,
}
#[derive(FromArgs, PartialEq, Eq, Debug)]
@@ -1226,9 +1220,6 @@ fn diff(args: DiffArgs) -> Result<()> {
log::info!("Loading {}", args.elf_file.display());
let mut linked_obj = process_elf(&args.elf_file)?;
log::info!("Loading {}", args.map_file.display());
apply_map_file(&args.map_file, &mut linked_obj)?;
for orig_sym in obj
.symbols
.iter()
@@ -1380,9 +1371,6 @@ fn apply(args: ApplyArgs) -> Result<()> {
log::info!("Loading {}", args.elf_file.display());
let mut linked_obj = process_elf(&args.elf_file)?;
log::info!("Loading {}", args.map_file.display());
apply_map_file(&args.map_file, &mut linked_obj)?;
let mut replacements: Vec<(SymbolIndex, Option<ObjSymbol>)> = vec![];
for (orig_idx, orig_sym) in obj.symbols.iter().enumerate() {
// skip ABS for now