Skip to content

Commit 1866158

Browse files
committed
Add 'None' demangler option
1 parent fe8e702 commit 1866158

File tree

3 files changed

+16
-17
lines changed

3 files changed

+16
-17
lines changed

objdiff-core/config-schema.json

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,22 @@
3838
"description": "Try to automatically guess the mangling format."
3939
},
4040
{
41-
"value": "codewarrior",
42-
"name": "CodeWarrior"
41+
"value": "none",
42+
"name": "None",
43+
"description": "Disable demangling."
4344
},
4445
{
45-
"value": "msvc",
46-
"name": "MSVC"
46+
"value": "codewarrior",
47+
"name": "CodeWarrior"
4748
},
4849
{
4950
"value": "itanium",
5051
"name": "Itanium"
5152
},
53+
{
54+
"value": "msvc",
55+
"name": "MSVC"
56+
},
5257
{
5358
"value": "gnu_legacy",
5459
"name": "GNU g++ (Legacy)",
@@ -312,26 +317,17 @@
312317
{
313318
"id": "mips",
314319
"name": "MIPS",
315-
"properties": [
316-
"mips.abi",
317-
"mips.instrCategory",
318-
"mips.registerPrefix"
319-
]
320+
"properties": ["mips.abi", "mips.instrCategory", "mips.registerPrefix"]
320321
},
321322
{
322323
"id": "ppc",
323324
"name": "PowerPC",
324-
"properties": [
325-
"ppc.calculatePoolRelocations",
326-
"analyzeDataFlow"
327-
]
325+
"properties": ["ppc.calculatePoolRelocations", "analyzeDataFlow"]
328326
},
329327
{
330328
"id": "x86",
331329
"name": "x86",
332-
"properties": [
333-
"x86.formatter"
334-
]
330+
"properties": ["x86.formatter"]
335331
}
336332
]
337333
}

objdiff-core/src/diff/demangler.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use crate::diff::Demangler;
66
impl Demangler {
77
pub fn demangle(&self, name: &str) -> Option<String> {
88
match self {
9+
Demangler::None => None,
910
Demangler::Codewarrior => Self::demangle_codewarrior(name),
1011
Demangler::Msvc => Self::demangle_msvc(name),
1112
Demangler::Itanium => Self::demangle_itanium(name),

objdiff-gui/src/views/demangle.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ pub fn demangle_window(
2020
.selected_text(state.demangler.name().to_string())
2121
.show_ui(ui, |ui| {
2222
for demangler in Demangler::variants() {
23-
ui.selectable_value(&mut state.demangler, *demangler, demangler.name());
23+
if *demangler != Demangler::None {
24+
ui.selectable_value(&mut state.demangler, *demangler, demangler.name());
25+
}
2426
}
2527
});
2628
ui.separator();

0 commit comments

Comments
 (0)