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

Relax string size requirement for auto symbols (#102)

Browse Source
This commit is contained in:
Robin Avery 2025-06-04 23:01:39 -04:00 committed by GitHub
parent 5e33fea49f
commit d92a892c2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/analysis/objects.rs
View File

@ -2,7 +2,7 @@ use anyhow::Result;
use crate::{ use crate::{
obj::{ObjDataKind, ObjInfo, ObjSectionKind, ObjSymbolKind, SymbolIndex}, obj::{ObjDataKind, ObjInfo, ObjSectionKind, ObjSymbolKind, SymbolIndex},
util::split::is_linker_generated_label, util::{config::is_auto_symbol, split::is_linker_generated_label},
}; };
pub fn detect_objects(obj: &mut ObjInfo) -> Result<()> { pub fn detect_objects(obj: &mut ObjInfo) -> Result<()> {
@ -134,7 +134,9 @@ pub fn detect_strings(obj: &mut ObjInfo) -> Result<()> {
StringResult::None => {} StringResult::None => {}
StringResult::String { length, terminated } => { StringResult::String { length, terminated } => {
let size = if terminated { length + 1 } else { length }; let size = if terminated { length + 1 } else { length };
if !symbol.size_known || symbol.size == size as u64 { if symbol.size == size as u64
|| (is_auto_symbol(symbol) && symbol.size > size as u64)
{
let str = String::from_utf8_lossy(&data[..length]); let str = String::from_utf8_lossy(&data[..length]);
log::debug!("Found string '{}' @ {}", str, symbol.name); log::debug!("Found string '{}' @ {}", str, symbol.name);
symbols_set.push((symbol_idx, ObjDataKind::String, size)); symbols_set.push((symbol_idx, ObjDataKind::String, size));
@ -142,7 +144,9 @@ pub fn detect_strings(obj: &mut ObjInfo) -> Result<()> {
} }
StringResult::WString { length, str } => { StringResult::WString { length, str } => {
let size = length + 2; let size = length + 2;
if !symbol.size_known || symbol.size == size as u64 { if symbol.size == size as u64
|| (is_auto_symbol(symbol) && symbol.size > size as u64)
{
log::debug!("Found wide string '{}' @ {}", str, symbol.name); log::debug!("Found wide string '{}' @ {}", str, symbol.name);
symbols_set.push((symbol_idx, ObjDataKind::String16, size)); symbols_set.push((symbol_idx, ObjDataKind::String16, size));
} }