encounter/objdiff
1
0
Fork 0
mirror of https://github.com/encounter/objdiff.git synced 2025-10-05 09:29:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement automatic symbol pairing for MSVC generated static functions (#255)

Browse Source
This commit is contained in:
Toms 2025-09-07 20:28:01 +03:00 committed by GitHub
parent fb1d434bbc
commit 532b684682
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
objdiff-core/src/diff/mod.rs
View File

@ -680,16 +680,16 @@ fn symbol_section_kind(obj: &Object, symbol: &Symbol) -> SectionKind {
} }
} }
/// Check if a symbol is a compiler-generated literal like @1234. /// Check if a symbol is a compiler-generated like @1234 or _$E1234.
fn is_symbol_compiler_generated_literal(symbol: &Symbol) -> bool { fn is_symbol_compiler_generated(symbol: &Symbol) -> bool {
if !symbol.name.starts_with('@') { if symbol.name.starts_with('@') && symbol.name[1..].chars().all(char::is_numeric) {
return false;
}
if !symbol.name[1..].chars().all(char::is_numeric) {
// Exclude @stringBase0, @GUARD@, etc. // Exclude @stringBase0, @GUARD@, etc.
return false; return true;
} }
true if symbol.name.starts_with("_$E") && symbol.name[3..].chars().all(char::is_numeric) {
return true;
}
false
} }
fn find_symbol( fn find_symbol(
@ -705,8 +705,8 @@ fn find_symbol(
// Match compiler-generated symbols against each other (e.g. @251 -> @60) // Match compiler-generated symbols against each other (e.g. @251 -> @60)
// If they are in the same section and have the same value // If they are in the same section and have the same value
if is_symbol_compiler_generated_literal(in_symbol) if is_symbol_compiler_generated(in_symbol)
&& matches!(section_kind, SectionKind::Data | SectionKind::Bss) && matches!(section_kind, SectionKind::Code | SectionKind::Data | SectionKind::Bss)
{ {
let mut closest_match_symbol_idx = None; let mut closest_match_symbol_idx = None;
let mut closest_match_percent = 0.0; let mut closest_match_percent = 0.0;
@ -717,12 +717,12 @@ fn find_symbol(
if obj.sections[section_index].name != section_name { if obj.sections[section_index].name != section_name {
continue; continue;
} }
if !is_symbol_compiler_generated_literal(symbol) { if !is_symbol_compiler_generated(symbol) {
continue; continue;
} }
match section_kind { match section_kind {
SectionKind::Data => { SectionKind::Data | SectionKind::Code => {
// For data, pick the first symbol with exactly matching bytes and relocations. // For code or data, pick the first symbol with exactly matching bytes and relocations.
// If no symbols match exactly, and `fuzzy_literals` is true, pick the closest // If no symbols match exactly, and `fuzzy_literals` is true, pick the closest
// plausible match instead. // plausible match instead.
if let Ok((left_diff, _right_diff)) = if let Ok((left_diff, _right_diff)) =