encounter/objdiff
1
0
Fork 0
mirror of https://github.com/encounter/objdiff.git synced 2025-12-11 14:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust symbol name matching logic for GCC (#278)

Browse Source 
* Adjust symbol name matching logic for GCC

* Turn $ and . into a list

* Fix borrow issue
This commit is contained in:
Dávid Balatoni
2025-11-19 05:55:55 +01:00
committed by GitHub
parent 66da80ff69
commit 67b237eab6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
objdiff-core/src/diff/data.rs
View File

@@ -37,12 +37,13 @@ pub fn diff_bss_symbol(
pub fn symbol_name_matches(left_name: &str, right_name: &str) -> bool { pub fn symbol_name_matches(left_name: &str, right_name: &str) -> bool {
// Match Metrowerks symbol$1234 against symbol$2345 // Match Metrowerks symbol$1234 against symbol$2345
if let Some((prefix, suffix)) = left_name.split_once('$') { // and GCC symbol.1234 against symbol.2345
if let Some((prefix, suffix)) = left_name.split_once(['$', '.']) {
if !suffix.chars().all(char::is_numeric) { if !suffix.chars().all(char::is_numeric) {
return false; return false;
} }
right_name right_name
.split_once('$') .split_once(['$', '.'])
.is_some_and(|(p, s)| p == prefix && s.chars().all(char::is_numeric)) .is_some_and(|(p, s)| p == prefix && s.chars().all(char::is_numeric))
} else { } else {
left_name == right_name left_name == right_name