add option to show/hide unwinds

Author: rjkiv

objdiff-core/config-schema.json

@@ -215,6 +215,13 @@
       "name": "Calculate pooled data references",
       "description": "Display pooled data references in functions as fake relocations."
     },
+    {
+      "id": "ppc.showUnwinds",
+      "type": "boolean",
+      "default": false,
+      "name": "Show unwinds",
+      "description": "Show auto-generated SEH __unwind functions. Useful if you're trying to link."
+    },
     {
       "id": "x86.formatter",
       "type": "choice",
@@ -279,7 +286,8 @@
       "name": "PowerPC",
       "properties": [
         "ppc.calculatePoolRelocations",
-        "analyzeDataFlow"
+        "analyzeDataFlow",
+        "ppc.showUnwinds"
       ]
     },
     {

objdiff-core/src/arch/arm.rs

@@ -457,7 +457,7 @@ impl Arch for ArchArm {
         if kind == SymbolKind::Function { address & !1 } else { address }
     }
 
-    fn extra_symbol_flags(&self, symbol: &object::Symbol) -> SymbolFlagSet {
+    fn extra_symbol_flags(&self, symbol: &object::Symbol, _diff_config: &DiffObjConfig) -> SymbolFlagSet {
         let mut flags = SymbolFlagSet::default();
         if DisasmMode::from_object_symbol(symbol).is_some() {
             flags |= SymbolFlag::Hidden;

objdiff-core/src/arch/mips.rs

@@ -331,7 +331,7 @@ impl Arch for ArchMips {
         }
     }
 
-    fn extra_symbol_flags(&self, symbol: &object::Symbol) -> SymbolFlagSet {
+    fn extra_symbol_flags(&self, symbol: &object::Symbol, _diff_config: &DiffObjConfig) -> SymbolFlagSet {
         let mut flags = SymbolFlagSet::default();
         if self.ignored_symbols.contains(&symbol.index().0) {
             flags |= SymbolFlag::Ignored;

objdiff-core/src/arch/mod.rs

@@ -376,7 +376,7 @@ pub trait Arch: Any + Debug + Send + Sync {
 
     fn symbol_address(&self, address: u64, _kind: SymbolKind) -> u64 { address }
 
-    fn extra_symbol_flags(&self, _symbol: &object::Symbol) -> SymbolFlagSet {
+    fn extra_symbol_flags(&self, _symbol: &object::Symbol, _diff_config: &DiffObjConfig) -> SymbolFlagSet {
         SymbolFlagSet::default()
     }
 

objdiff-core/src/arch/ppc/mod.rs

@@ -357,7 +357,7 @@ impl Arch for ArchPpc {
         }
     }
 
-    fn extra_symbol_flags(&self, symbol: &object::Symbol) -> SymbolFlagSet {
+    fn extra_symbol_flags(&self, symbol: &object::Symbol, diff_config: &DiffObjConfig) -> SymbolFlagSet {
         // X360 COFFs should automatically hide all symbols starting with "except_data",
         // because those are not functions - they're pointers to exception data structs
         if self.extensions.eq(&powerpc::Extensions::xenon()) {
@@ -366,10 +366,7 @@ impl Arch for ArchPpc {
                     if name.starts_with("except_data_"){
                         SymbolFlag::Hidden.into()
                     }
-                    // if the symbol name starts with __unwind and 
-                    // TODO: a "show unwinds" modifier is unchecked,
-                    // hide the symbol
-                    else if name.starts_with("__unwind"){
+                    else if name.starts_with("__unwind") && !diff_config.ppc_show_unwinds {
                         SymbolFlag::Hidden.into()
                     }
                     else {

objdiff-core/src/obj/read.rs

@@ -41,6 +41,7 @@ fn map_symbol(
     symbol: &object::Symbol,
     section_indices: &[usize],
     split_meta: Option<&SplitMeta>,
+    diff_config: &DiffObjConfig
 ) -> Result<Symbol> {
     let mut name = symbol.name().context("Failed to process symbol name")?.to_string();
     let mut size = symbol.size();
@@ -57,7 +58,7 @@ fn map_symbol(
         size = 0;
     }
 
-    let mut flags = arch.extra_symbol_flags(symbol);
+    let mut flags = arch.extra_symbol_flags(symbol, diff_config);
     if symbol.is_global() {
         flags |= SymbolFlag::Global;
     }
@@ -108,6 +109,7 @@ fn map_symbols(
     sections: &[Section],
     section_indices: &[usize],
     split_meta: Option<&SplitMeta>,
+    diff_config: &DiffObjConfig,
 ) -> Result<(Vec<Symbol>, Vec<usize>)> {
     let symbol_count = obj_file.symbols().count();
     let mut symbols = Vec::<Symbol>::with_capacity(symbol_count);
@@ -116,7 +118,7 @@ fn map_symbols(
         if symbol_indices.len() <= obj_symbol.index().0 {
             symbol_indices.resize(obj_symbol.index().0 + 1, usize::MAX);
         }
-        let symbol = map_symbol(arch, obj_file, &obj_symbol, section_indices, split_meta)?;
+        let symbol = map_symbol(arch, obj_file, &obj_symbol, section_indices, split_meta, diff_config)?;
         symbol_indices[obj_symbol.index().0] = symbols.len();
         symbols.push(symbol);
     }
@@ -936,7 +938,7 @@ pub fn parse(data: &[u8], config: &DiffObjConfig) -> Result<Object> {
     let (mut sections, section_indices) =
         map_sections(arch.as_ref(), &obj_file, split_meta.as_ref())?;
     let (mut symbols, symbol_indices) =
-        map_symbols(arch.as_ref(), &obj_file, &sections, &section_indices, split_meta.as_ref())?;
+        map_symbols(arch.as_ref(), &obj_file, &sections, &section_indices, split_meta.as_ref(), config)?;
     map_relocations(arch.as_ref(), &obj_file, &mut sections, &section_indices, &symbol_indices)?;
     parse_line_info(&obj_file, &mut sections, &section_indices, data)?;
     if config.combine_data_sections || config.combine_text_sections {