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

dtk dol apply: skip updating anonymous symbols by default (#97)

Browse Source 
* Add --relaxed flag to dtk dol apply to skip updating anonymous symbols

* Invert --relaxed switch -> --full
This commit is contained in:
robojumper 2025-05-08 05:02:15 +02:00 committed by GitHub
parent 18987ed330
commit 97302e5127
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/cmd/dol.rs
View File

@ -132,6 +132,9 @@ pub struct ApplyArgs {
#[argp(positional, from_str_fn(native_path))]
/// linked ELF
elf_file: Utf8NativePathBuf,
#[argp(switch)]
/// always update anonymous local symbol names, even if they are similar
full: bool,
}
#[derive(FromArgs, PartialEq, Eq, Debug)]
@ -1841,6 +1844,31 @@ fn diff(args: DiffArgs) -> Result<()> {
Ok(())
}
fn are_local_anonymous_names_similar<'a>(left: &'a ObjSymbol, right: &'a ObjSymbol) -> bool {
if left.flags.scope() != ObjSymbolScope::Local || right.flags.scope() != ObjSymbolScope::Local {
return false;
}
let is_at_symbol =
|name: &str| name.starts_with('@') && name[1..].chars().all(|c| c.is_numeric());
if is_at_symbol(&left.name) && is_at_symbol(&right.name) {
// consider e.g. @8280 -> @8536 equal
return true;
}
let split_dollar_symbol = |name: &'a str| -> Option<&'a str> {
name.rsplit_once('$')
.and_then(|(prefix, suffix)| suffix.chars().all(|c| c.is_numeric()).then_some(prefix))
};
// consider e.g. __arraydtor$3926 -> __arraydtor$7669 equal
match (split_dollar_symbol(&left.name), split_dollar_symbol(&right.name)) {
(Some(left_prefix), Some(right_prefix)) => left_prefix == right_prefix,
_ => false,
}
}
fn apply(args: ApplyArgs) -> Result<()> {
log::info!("Loading {}", args.config);
let mut config_file = open_file(&args.config, true)?;
@ -1891,7 +1919,9 @@ fn apply(args: ApplyArgs) -> Result<()> {
let mut updated_sym = orig_sym.clone();
let is_globalized = linked_sym.name.ends_with(&format!("_{:08X}", linked_sym.address));
if (is_globalized && !linked_sym.name.starts_with(&orig_sym.name))
|| (!is_globalized && linked_sym.name != orig_sym.name)
|| (!is_globalized
&& (linked_sym.name != orig_sym.name
&& (args.full || !are_local_anonymous_names_similar(linked_sym, orig_sym))))
{
log::info!(
"Changing name of {} (type {:?}) to {}",