[MIPS] Use gnuv2_demangle for better demangling

Author: AngheloAlf

Cargo.lock

@@ -91,6 +91,7 @@ mips = [
     "dep:cpp_demangle",
     "dep:cwdemangle",
     "dep:rabbitizer",
+    "dep:gnuv2_demangle",
 ]
 ppc = [
     "any-arch",
@@ -157,6 +158,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 }
 
 # x86
 cpp_demangle = { version = "0.4", default-features = false, features = ["alloc"], optional = true }

objdiff-core/Cargo.toml

@@ -305,10 +305,14 @@ impl Arch for ArchMips {
     }
 
     fn demangle(&self, name: &str) -> Option<String> {
-        cpp_demangle::Symbol::new(name)
+        gnuv2_demangle::demangle(name, &gnuv2_demangle::DemangleConfig::new_no_cfilt_mimics())
             .ok()
-            .and_then(|s| s.demangle(&cpp_demangle::DemangleOptions::default()).ok())
-            .or_else(|| cwdemangle::demangle(name, &cwdemangle::DemangleOptions::default()))
+            .or_else(|| {
+                cpp_demangle::Symbol::new(name)
+                    .ok()
+                    .and_then(|s| s.demangle(&cpp_demangle::DemangleOptions::default()).ok())
+                    .or_else(|| cwdemangle::demangle(name, &cwdemangle::DemangleOptions::default()))
+            })
     }
 
     fn reloc_name(&self, flags: RelocationFlags) -> Option<&'static str> {