Arch-independent demangling and add gnuv2_demangle for old g++ projects
#262
Conversation
|
I've seen old and new mangling formats in gcc built binaries for Windows and Mac so it's definitely not a old mips binary exclusive thing |
|
What arch is used for Mac? I assume Windows uses x86, but dunno what Mac uses. Maybe ppc? |
AngheloAlf
changed the title
gnuv2_demangle for better demangling of old g++ compiled projectsgnuv2_demangle for better demangling of old g++ compiled projects
Yes it is ppc/intel but most likely ppc |
AngheloAlf
changed the title
gnuv2_demangle for better demangling of old g++ compiled projectsgnuv2_demangle for old g++ projects
|
I refactored the demangling code to be architecture-independent. Now the user can manually select which demangler they prefer to use. objdiff will still try to guess demangling the symbols by default. 
I also updated the "Tools" -> "Demangle..." pop-up to use the selected demangler instead of leaving it hardcoded to codewarrior. |
| @@ -12,11 +13,12 @@ pub fn demangle_window( | |||
| show: &mut bool, | |||
| state: &mut DemangleViewState, | |||
| appearance: &Appearance, | |||
| demangler: Demangler, | |||
| ) { | |||
| egui::Window::new("Demangle").open(show).show(ctx, |ui| { | |||
There was a problem hiding this comment.
Could we add the demangler option to this window as well?
There was a problem hiding this comment.
As-in, keeping each option independent to each other?
There was a problem hiding this comment.
Something like this?
objdiff-core/config-schema.json
Outdated
| "name": "MSVC" | ||
| }, | ||
| { | ||
| "value": "gnu_modern", |
There was a problem hiding this comment.
Should we just call this itanium?
There was a problem hiding this comment.
tbh I don't really know what's the best way to refer to this. I guess plain "itanium" should be fine
| if name.starts_with('?') { | ||
| msvc_demangler::demangle(name, msvc_demangler::DemangleFlags::llvm()).ok() | ||
| } else { | ||
| name = name.trim_start_matches('.'); |
There was a problem hiding this comment.
Let's keep this . trimming logic
There was a problem hiding this comment.
From what I can see only ppc has this trimming logic.
Do you want to always trim . when the demangler is not msvc? Or should it be only be applied to specific demanglers (cpp_demangle, cwdemangle, etc) ?
There was a problem hiding this comment.
I think we can just add it for itanium/gnuv2
| if name.starts_with('?') { | ||
| msvc_demangler::demangle(name, msvc_demangler::DemangleFlags::llvm()).ok() | ||
| } else { | ||
| name = name.trim_start_matches('.'); |
There was a problem hiding this comment.
I think we can just add it for itanium/gnuv2
| @@ -157,6 +157,7 @@ rlwinmdec = { version = "1.1", optional = true } | |||
|
|
|||
| # mips | |||
| rabbitizer = { version = "2.0.0-alpha.4", default-features = false, features = ["all_extensions"], optional = true } | |||
| gnuv2_demangle ={ version = "0.1.0", optional = true } | |||
There was a problem hiding this comment.
| gnuv2_demangle ={ version = "0.1.0", optional = true } | |
| gnuv2_demangle = { version = "0.1.0", optional = true } |
| @@ -12,11 +13,12 @@ pub fn demangle_window( | |||
| show: &mut bool, | |||
| state: &mut DemangleViewState, | |||
| appearance: &Appearance, | |||
| demangler: Demangler, | |||
| ) { | |||
| egui::Window::new("Demangle").open(show).show(ctx, |ui| { | |||
| "name": "Itanium" | ||
| }, | ||
| { | ||
| "value": "gnu_v2", |
There was a problem hiding this comment.
Thoughts on gnu_legacy? And "GNU g++ (Legacy)". I think it would make it more clear that this is the old version. Open to other ideas
I tested it locally and works fine.
I'm unsure about a few things.
cpp_demanglebe removed from mips? I don't know if there's any mips project that uses a new enough g++ compiler that uses the new mangling abi. Or maybe invertcwdemangleandcpp_demanglesince it is more likely for cw to be used in mips than a new g++.