diff --git a/objdiff-core/src/diff/data.rs b/objdiff-core/src/diff/data.rs index 5eeed55f..bad5e09f 100644 --- a/objdiff-core/src/diff/data.rs +++ b/objdiff-core/src/diff/data.rs @@ -35,31 +35,13 @@ pub fn diff_bss_symbol( )) } -pub fn symbol_name_matches(left_name: &str, right_name: &str) -> bool { - if let Some((left_prefix, left_suffix)) = left_name.split_once("@class$") - && let Some((right_prefix, right_suffix)) = right_name.split_once("@class$") +pub fn symbol_name_matches(left: &Symbol, right: &Symbol) -> bool { + if let Some(left_name) = &left.normalized_name + && let Some(right_name) = &right.normalized_name { - // Match Metrowerks anonymous class symbol names, ignoring the unique ID. - // e.g. __dt__Q29dCamera_c23@class$3665d_camera_cppFv - if left_prefix == right_prefix - && let Some(left_idx) = left_suffix.chars().position(|c| !c.is_numeric()) - && let Some(right_idx) = right_suffix.chars().position(|c| !c.is_numeric()) - { - // e.g. d_camera_cppFv (after the unique ID) - left_suffix[left_idx..] == right_suffix[right_idx..] - } else { - false - } - } else if let Some((prefix, suffix)) = left_name.split_once(['$', '.']) - && suffix.chars().all(char::is_numeric) - { - // Match Metrowerks symbol$1234 against symbol$2345 - // and GCC symbol.1234 against symbol.2345 - right_name - .split_once(['$', '.']) - .is_some_and(|(p, s)| p == prefix && s.chars().all(char::is_numeric)) - } else { left_name == right_name + } else { + left.name == right.name } } @@ -73,7 +55,7 @@ fn reloc_eq( return false; } - let symbol_name_addend_matches = symbol_name_matches(&left.symbol.name, &right.symbol.name) + let symbol_name_addend_matches = symbol_name_matches(left.symbol, right.symbol) && left.relocation.addend == right.relocation.addend; match (left.symbol.section, right.symbol.section) { (Some(sl), Some(sr)) => { diff --git a/objdiff-core/src/diff/display.rs b/objdiff-core/src/diff/display.rs index 12317f57..11b72bac 100644 --- a/objdiff-core/src/diff/display.rs +++ b/objdiff-core/src/diff/display.rs @@ -812,19 +812,15 @@ pub fn display_sections( } let section_diff = &diff.sections[section_idx]; let reverse_fn_order = section.kind == SectionKind::Code && reverse_fn_order; - symbols.sort_by(|a, b| { - let a = &obj.symbols[a.symbol]; - let b = &obj.symbols[b.symbol]; - section_symbol_sort(a, b) - .then_with(|| { - if reverse_fn_order { - b.address.cmp(&a.address) - } else { - a.address.cmp(&b.address) - } - }) - .then_with(|| a.size.cmp(&b.size)) - }); + if reverse_fn_order { + symbols.sort_by(|a, b| { + let a = &obj.symbols[a.symbol]; + let b = &obj.symbols[b.symbol]; + section_symbol_sort(a, b) + .then_with(|| b.address.cmp(&a.address)) + .then_with(|| a.size.cmp(&b.size)) + }); + } sections.push(SectionDisplay { id: section.id.clone(), name: if section.flags.contains(SectionFlag::Combined) { diff --git a/objdiff-core/src/diff/mod.rs b/objdiff-core/src/diff/mod.rs index c8c9c316..e0aa91b7 100644 --- a/objdiff-core/src/diff/mod.rs +++ b/objdiff-core/src/diff/mod.rs @@ -7,7 +7,6 @@ use alloc::{ use core::{num::NonZeroU32, ops::Range}; use anyhow::Result; -use itertools::Itertools; use crate::{ diff::{ @@ -687,18 +686,6 @@ fn symbol_section_kind(obj: &Object, symbol: &Symbol) -> SectionKind { } } -/// Check if a symbol is a compiler-generated like @1234 or _$E1234. -fn is_symbol_compiler_generated(symbol: &Symbol) -> bool { - if symbol.name.starts_with('@') && symbol.name[1..].chars().all(char::is_numeric) { - // Exclude @stringBase0, @GUARD@, etc. - return true; - } - if symbol.name.starts_with("_$E") && symbol.name[3..].chars().all(char::is_numeric) { - return true; - } - false -} - fn find_symbol( obj: Option<&Object>, in_obj: &Object, @@ -712,7 +699,7 @@ fn find_symbol( // Match compiler-generated symbols against each other (e.g. @251 -> @60) // If they are in the same section and have the same value - if is_symbol_compiler_generated(in_symbol) + if in_symbol.flags.contains(SymbolFlag::CompilerGenerated) && matches!(section_kind, SectionKind::Code | SectionKind::Data | SectionKind::Bss) { let mut closest_match_symbol_idx = None; @@ -724,7 +711,7 @@ fn find_symbol( if obj.sections[section_index].name != section_name { continue; } - if !is_symbol_compiler_generated(symbol) { + if !symbol.flags.contains(SymbolFlag::CompilerGenerated) { continue; } match section_kind { @@ -761,15 +748,11 @@ fn find_symbol( } // Try to find a symbol with a matching name - if let Some((symbol_idx, _)) = unmatched_symbols(obj, used) - .filter(|&(_, symbol)| { - symbol_name_matches(&in_symbol.name, &symbol.name) - && symbol_section_kind(obj, symbol) == section_kind - && symbol_section(obj, symbol).is_some_and(|(name, _)| name == section_name) - }) - .sorted_unstable_by_key(|&(_, symbol)| (symbol.section, symbol.address)) - .next() - { + if let Some((symbol_idx, _)) = unmatched_symbols(obj, used).find(|&(_, symbol)| { + symbol_name_matches(in_symbol, symbol) + && symbol_section_kind(obj, symbol) == section_kind + && symbol_section(obj, symbol).is_some_and(|(name, _)| name == section_name) + }) { return Some(symbol_idx); } diff --git a/objdiff-core/src/obj/mod.rs b/objdiff-core/src/obj/mod.rs index cc91f036..479186e1 100644 --- a/objdiff-core/src/obj/mod.rs +++ b/objdiff-core/src/obj/mod.rs @@ -37,7 +37,7 @@ pub enum SectionKind { flags! { #[derive(Hash)] - pub enum SymbolFlag: u8 { + pub enum SymbolFlag: u16 { Global, Local, Weak, @@ -50,6 +50,8 @@ flags! { SizeInferred, /// Symbol should be ignored by any diffing Ignored, + /// Symbol name is compiler-generated; compare by value instead of name + CompilerGenerated, } } @@ -264,6 +266,7 @@ pub trait FlowAnalysisResult: core::fmt::Debug + Send { pub struct Symbol { pub name: String, pub demangled_name: Option, + pub normalized_name: Option, pub address: u64, pub size: u64, pub kind: SymbolKind, @@ -403,6 +406,7 @@ pub struct ResolvedInstructionRef<'obj> { static DUMMY_SYMBOL: Symbol = Symbol { name: String::new(), demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: SymbolKind::Unknown, diff --git a/objdiff-core/src/obj/read.rs b/objdiff-core/src/obj/read.rs index ad231c5f..a8aa1ddf 100644 --- a/objdiff-core/src/obj/read.rs +++ b/objdiff-core/src/obj/read.rs @@ -3,6 +3,7 @@ use alloc::{ collections::BTreeMap, format, string::{String, ToString}, + vec, vec::Vec, }; use core::{cmp::Ordering, num::NonZeroU64}; @@ -35,6 +36,46 @@ fn map_section_kind(section: &object::Section) -> SectionKind { } } +/// Check if a symbol's name is partially compiler-generated, and if so normalize it for pairing. +/// e.g. symbol$1234 and symbol$2345 will both be replaced with symbol$0000 internally. +fn get_normalized_symbol_name(name: &str) -> Option { + const DUMMY_UNIQUE_ID: &str = "0000"; + if let Some((prefix, suffix)) = name.split_once("@class$") + && let Some(idx) = suffix.chars().position(|c| !c.is_numeric()) + && idx > 0 + { + // Match Metrowerks anonymous class symbol names, ignoring the unique ID. + // e.g. __dt__Q29dCamera_c23@class$3665d_camera_cppFv + // and: __dt__Q29dCamera_c23@class$1727d_camera_cppFv + let suffix = &suffix[idx..]; + Some(format!("{prefix}@class${DUMMY_UNIQUE_ID}{suffix}")) + } else if let Some((prefix, suffix)) = name.split_once('$') + && suffix.chars().all(char::is_numeric) + { + // Match Metrowerks symbol$1234 against symbol$2345 + Some(format!("{prefix}${DUMMY_UNIQUE_ID}")) + } else if let Some((prefix, suffix)) = name.split_once('.') + && suffix.chars().all(char::is_numeric) + { + // Match GCC symbol.1234 against symbol.2345 + Some(format!("{prefix}.{DUMMY_UNIQUE_ID}")) + } else { + None + } +} + +/// Check if a symbol's name is entirely compiler-generated, such as @1234 or _$E1234. +/// This enables pairing these symbols up by their value instead of their name. +fn is_symbol_name_compiler_generated(name: &str) -> bool { + if name.starts_with('@') && name[1..].chars().all(char::is_numeric) { + // Exclude @stringBase0, @GUARD@, etc. + return true; + } else if name.starts_with("_$E") && name[3..].chars().all(char::is_numeric) { + return true; + } + false +} + fn map_symbol( arch: &dyn Arch, file: &object::File, @@ -97,10 +138,15 @@ fn map_symbol( .and_then(|m| m.virtual_addresses.as_ref()) .and_then(|v| v.get(symbol.index().0).cloned()); let section = symbol.section_index().and_then(|i| section_indices.get(i.0).copied()); + let normalized_name = get_normalized_symbol_name(&name); + if is_symbol_name_compiler_generated(&name) { + flags |= SymbolFlag::CompilerGenerated; + } Ok(Symbol { name, demangled_name, + normalized_name, address, size, kind, @@ -119,13 +165,38 @@ fn map_symbols( split_meta: Option<&SplitMeta>, config: &DiffObjConfig, ) -> Result<(Vec, Vec)> { - let symbol_count = obj_file.symbols().count(); - let mut symbols = Vec::::with_capacity(symbol_count + obj_file.sections().count()); - let mut symbol_indices = Vec::::with_capacity(symbol_count + 1); - for obj_symbol in obj_file.symbols() { - if symbol_indices.len() <= obj_symbol.index().0 { - symbol_indices.resize(obj_symbol.index().0 + 1, usize::MAX); - } + // symbols() is not guaranteed to be sorted by address. + // We sort it here to fix pairing bugs with diff algorithms that assume the symbols are ordered. + // Sorting everything here once is less expensive than sorting subsets later in expensive loops. + let mut max_index = 0; + let mut obj_symbols = obj_file + .symbols() + .filter(|s| s.kind() != object::SymbolKind::File) + .inspect(|sym| max_index = max_index.max(sym.index().0)) + .collect::>(); + obj_symbols.sort_by(|a, b| { + // Sort symbols by section index, placing absolute symbols last + a.section_index() + .map_or(usize::MAX, |s| s.0) + .cmp(&b.section_index().map_or(usize::MAX, |s| s.0)) + .then_with(|| { + // Sort section symbols first in a section + if a.kind() == object::SymbolKind::Section { + Ordering::Less + } else if b.kind() == object::SymbolKind::Section { + Ordering::Greater + } else { + Ordering::Equal + } + }) + // Sort by address within section + .then_with(|| a.address().cmp(&b.address())) + // If there are multiple symbols with the same address, smaller symbol first + .then_with(|| a.size().cmp(&b.size())) + }); + let mut symbols = Vec::::with_capacity(obj_symbols.len() + obj_file.sections().count()); + let mut symbol_indices = vec![usize::MAX; max_index + 1]; + for obj_symbol in obj_symbols { let symbol = map_symbol(arch, obj_file, &obj_symbol, section_indices, split_meta, config)?; symbol_indices[obj_symbol.index().0] = symbols.len(); symbols.push(symbol); @@ -172,6 +243,7 @@ fn add_section_symbols(sections: &[Section], symbols: &mut Vec) { symbols.push(Symbol { name, demangled_name: None, + normalized_name: None, address: 0, size, kind: SymbolKind::Section, @@ -193,40 +265,18 @@ fn is_local_label(symbol: &Symbol) -> bool { } fn infer_symbol_sizes(arch: &dyn Arch, symbols: &mut [Symbol], sections: &[Section]) -> Result<()> { - // Create a sorted list of symbol indices by section - let mut symbols_with_section = Vec::::with_capacity(symbols.len()); - for (i, symbol) in symbols.iter().enumerate() { - if symbol.section.is_some() { - symbols_with_section.push(i); - } - } - symbols_with_section.sort_by(|a, b| { - let a = &symbols[*a]; - let b = &symbols[*b]; - a.section - .unwrap_or(usize::MAX) - .cmp(&b.section.unwrap_or(usize::MAX)) - .then_with(|| { - // Sort section symbols first - if a.kind == SymbolKind::Section { - Ordering::Less - } else if b.kind == SymbolKind::Section { - Ordering::Greater - } else { - Ordering::Equal - } - }) - .then_with(|| a.address.cmp(&b.address)) - .then_with(|| a.size.cmp(&b.size)) - }); + // Above, we've sorted the symbols by section and then by address. // Set symbol sizes based on the next symbol's address let mut iter_idx = 0; let mut last_end = (0, 0); - while iter_idx < symbols_with_section.len() { - let symbol_idx = symbols_with_section[iter_idx]; + while iter_idx < symbols.len() { + let symbol_idx = iter_idx; let symbol = &symbols[symbol_idx]; - let section_idx = symbol.section.unwrap(); + let Some(section_idx) = symbol.section else { + // Start of absolute symbols + break; + }; iter_idx += 1; if symbol.size != 0 { if symbol.kind != SymbolKind::Section { @@ -239,10 +289,9 @@ fn infer_symbol_sizes(arch: &dyn Arch, symbols: &mut [Symbol], sections: &[Secti continue; } let next_symbol = loop { - if iter_idx >= symbols_with_section.len() { + let Some(next_symbol) = symbols.get(iter_idx) else { break None; - } - let next_symbol = &symbols[symbols_with_section[iter_idx]]; + }; if next_symbol.section != Some(section_idx) { break None; } @@ -298,9 +347,11 @@ fn map_sections( split_meta: Option<&SplitMeta>, ) -> Result<(Vec
, Vec)> { let mut section_names = BTreeMap::::new(); - let section_count = obj_file.sections().count(); + let mut max_index = 0; + let section_count = + obj_file.sections().inspect(|s| max_index = max_index.max(s.index().0)).count(); let mut result = Vec::
::with_capacity(section_count); - let mut section_indices = Vec::::with_capacity(section_count + 1); + let mut section_indices = vec![usize::MAX; max_index + 1]; for section in obj_file.sections() { let name = section.name().context("Failed to process section name")?; let kind = map_section_kind(§ion); @@ -325,9 +376,6 @@ fn map_sections( let id = format!("{name}-{unique_id}"); *unique_id += 1; - if section_indices.len() <= section.index().0 { - section_indices.resize(section.index().0 + 1, usize::MAX); - } section_indices[section.index().0] = result.len(); result.push(Section { id, diff --git a/objdiff-core/src/obj/snapshots/objdiff_core__obj__read__test__combine_sections.snap b/objdiff-core/src/obj/snapshots/objdiff_core__obj__read__test__combine_sections.snap index 7568db79..9645afb9 100644 --- a/objdiff-core/src/obj/snapshots/objdiff_core__obj__read__test__combine_sections.snap +++ b/objdiff-core/src/obj/snapshots/objdiff_core__obj__read__test__combine_sections.snap @@ -114,6 +114,7 @@ expression: "(sections, symbols)" Symbol { name: ".data", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -127,6 +128,7 @@ expression: "(sections, symbols)" Symbol { name: "symbol", demangled_name: None, + normalized_name: None, address: 4, size: 4, kind: Object, @@ -140,6 +142,7 @@ expression: "(sections, symbols)" Symbol { name: "function", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Function, @@ -153,6 +156,7 @@ expression: "(sections, symbols)" Symbol { name: ".data", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, diff --git a/objdiff-core/tests/snapshots/arch_arm__combine_text_sections-2.snap b/objdiff-core/tests/snapshots/arch_arm__combine_text_sections-2.snap index 15b066b1..1f55da77 100644 --- a/objdiff-core/tests/snapshots/arch_arm__combine_text_sections-2.snap +++ b/objdiff-core/tests/snapshots/arch_arm__combine_text_sections-2.snap @@ -4,4 +4,4 @@ expression: output --- [(Line(90), Dim, 5), (Address(0), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 32792), Normal, 10), (Argument(Opaque("r12")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(0)), Normal, 0), (Basic("]"), Normal, 0), (Basic(" (->"), Normal, 0), (BranchDest(8), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Line(90), Dim, 5), (Address(4), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bx", 32777), Normal, 10), (Argument(Opaque("r12")), Normal, 0), (Eol, Normal, 0)] -[(Line(90), Dim, 5), (Address(8), Dim, 5), (Spacing(4), Normal, 0), (Opcode(".word", 65534), Normal, 10), (Symbol(Symbol { name: "esEnemyDraw", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Line(90), Dim, 5), (Address(8), Dim, 5), (Spacing(4), Normal, 0), (Opcode(".word", 65534), Normal, 10), (Symbol(Symbol { name: "esEnemyDraw", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] diff --git a/objdiff-core/tests/snapshots/arch_arm__read_arm-3.snap b/objdiff-core/tests/snapshots/arch_arm__read_arm-3.snap index 7b1b0386..165958dd 100644 --- a/objdiff-core/tests/snapshots/arch_arm__read_arm-3.snap +++ b/objdiff-core/tests/snapshots/arch_arm__read_arm-3.snap @@ -5,7 +5,7 @@ expression: output [(Address(0), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stmdb", 32883), Normal, 10), (Argument(Opaque("sp")), Normal, 0), (Basic("!"), Normal, 0), (Basic(", "), Normal, 0), (Basic("{"), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("lr")), Normal, 0), (Basic("}"), Normal, 0), (Eol, Normal, 0)] [(Address(4), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Eol, Normal, 0)] [(Address(8), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Eol, Normal, 0)] -[(Address(12), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateBase12OnStateLeaveEi", demangled_name: Some("LinkStateBase::OnStateLeave(int)"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(12), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateBase12OnStateLeaveEi", demangled_name: Some("LinkStateBase::OnStateLeave(int)"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(16), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 32792), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(20)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] [(Address(20), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmp", 32784), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(10)), Normal, 0), (Eol, Normal, 0)] [(Address(24), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addls", 32769), Normal, 10), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("lsl")), Normal, 0), (Spacing(1), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(2)), Normal, 0), (Eol, Normal, 0)] @@ -23,41 +23,41 @@ expression: output [(Address(72), Dim, 5), (Spacing(4), Normal, 0), (Opcode("b", 32772), Normal, 10), (BranchDest(164), Normal, 0), (BranchArrow(41), Rotating(6), 0), (Eol, Normal, 0)] [(Address(76), Dim, 5), (BranchArrow(15), Rotating(4), 0), (Opcode("ldr", 32792), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(336)), Normal, 0), (Basic("]"), Normal, 0), (Basic(" (->"), Normal, 0), (BranchDest(420), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(80), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 32792), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(0)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] -[(Address(84), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN18UnkStruct_027e103c19func_ov000_020cf01cEv", demangled_name: Some("UnkStruct_027e103c::func_ov000_020cf01c()"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(84), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN18UnkStruct_027e103c19func_ov000_020cf01cEv", demangled_name: Some("UnkStruct_027e103c::func_ov000_020cf01c()"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(88), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldrb", 32793), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(224)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] [(Address(92), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmp", 32784), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(0)), Normal, 0), (Eol, Normal, 0)] [(Address(96), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 32772), Normal, 10), (BranchDest(108), Normal, 0), (BranchArrow(27), Rotating(7), 0), (Eol, Normal, 0)] [(Address(100), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (BranchDest(424), Normal, 0), (BranchArrow(106), Rotating(8), 0), (Eol, Normal, 0)] -[(Address(104), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN12EquipBombchu19func_ov014_0213ec64Ev", demangled_name: Some("EquipBombchu::func_ov014_0213ec64()"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(104), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN12EquipBombchu19func_ov014_0213ec64Ev", demangled_name: Some("EquipBombchu::func_ov014_0213ec64()"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(108), Dim, 5), (BranchArrow(24), Rotating(7), 0), (Opcode("ldr", 32792), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(308)), Normal, 0), (Basic("]"), Normal, 0), (Basic(" (->"), Normal, 0), (BranchDest(424), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(112), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 32792), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(0)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] -[(Address(116), Dim, 5), (Spacing(4), Normal, 0), (Opcode("blx", 32776), Normal, 10), (Symbol(Symbol { name: "_Z19func_ov014_0211fd04Pi", demangled_name: Some("func_ov014_0211fd04(int*)"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(116), Dim, 5), (Spacing(4), Normal, 0), (Opcode("blx", 32776), Normal, 10), (Symbol(Symbol { name: "_Z19func_ov014_0211fd04Pi", demangled_name: Some("func_ov014_0211fd04(int*)"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(120), Dim, 5), (Spacing(4), Normal, 0), (Opcode("b", 32772), Normal, 10), (BranchDest(200), Normal, 0), (BranchArrow(50), Rotating(0), 0), (Eol, Normal, 0)] [(Address(124), Dim, 5), (BranchArrow(12), Rotating(2), 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] [(Address(128), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Eol, Normal, 0)] -[(Address(132), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateItem13StopUsingBombEi", demangled_name: Some("LinkStateItem::StopUsingBomb(int)"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(132), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateItem13StopUsingBombEi", demangled_name: Some("LinkStateItem::StopUsingBomb(int)"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(136), Dim, 5), (Spacing(4), Normal, 0), (Opcode("b", 32772), Normal, 10), (BranchDest(200), Normal, 0), (BranchArrow(50), Rotating(0), 0), (Eol, Normal, 0)] [(Address(140), Dim, 5), (BranchArrow(14), Rotating(3), 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] -[(Address(144), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateItem13StopUsingRopeEv", demangled_name: Some("LinkStateItem::StopUsingRope()"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(144), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateItem13StopUsingRopeEv", demangled_name: Some("LinkStateItem::StopUsingRope()"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(148), Dim, 5), (Spacing(4), Normal, 0), (Opcode("b", 32772), Normal, 10), (BranchDest(200), Normal, 0), (BranchArrow(50), Rotating(0), 0), (Eol, Normal, 0)] [(Address(152), Dim, 5), (BranchArrow(16), Rotating(5), 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] -[(Address(156), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateItem15StopUsingHammerEv", demangled_name: Some("LinkStateItem::StopUsingHammer()"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(156), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateItem15StopUsingHammerEv", demangled_name: Some("LinkStateItem::StopUsingHammer()"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(160), Dim, 5), (Spacing(4), Normal, 0), (Opcode("b", 32772), Normal, 10), (BranchDest(200), Normal, 0), (BranchArrow(50), Rotating(0), 0), (Eol, Normal, 0)] [(Address(164), Dim, 5), (BranchArrow(17), Rotating(6), 0), (Opcode("ldr", 32792), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(248)), Normal, 0), (Basic("]"), Normal, 0), (Basic(" (->"), Normal, 0), (BranchDest(420), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(168), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(0)), Normal, 0), (Eol, Normal, 0)] [(Address(172), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 32792), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(0)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] [(Address(176), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r2")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Eol, Normal, 0)] [(Address(180), Dim, 5), (Spacing(4), Normal, 0), (Opcode("strb", 32885), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(42)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] -[(Address(184), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN18UnkStruct_027e103c19func_ov000_020cf9dcEii", demangled_name: Some("UnkStruct_027e103c::func_ov000_020cf9dc(int, int)"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(184), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN18UnkStruct_027e103c19func_ov000_020cf9dcEii", demangled_name: Some("UnkStruct_027e103c::func_ov000_020cf9dc(int, int)"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(188), Dim, 5), (Spacing(4), Normal, 0), (Opcode("b", 32772), Normal, 10), (BranchDest(200), Normal, 0), (BranchArrow(50), Rotating(0), 0), (Eol, Normal, 0)] [(Address(192), Dim, 5), (BranchArrow(11), Rotating(1), 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] -[(Address(196), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateItem14StopUsingScoopEv", demangled_name: Some("LinkStateItem::StopUsingScoop()"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(196), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateItem14StopUsingScoopEv", demangled_name: Some("LinkStateItem::StopUsingScoop()"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(200), Dim, 5), (BranchArrow(7), Rotating(0), 0), (Opcode("ldr", 32792), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(20)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] [(Address(204), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mvn", 32819), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(0)), Normal, 0), (Eol, Normal, 0)] [(Address(208), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmp", 32784), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Eol, Normal, 0)] [(Address(212), Dim, 5), (Spacing(4), Normal, 0), (Opcode("beq", 32772), Normal, 10), (BranchDest(236), Normal, 0), (BranchArrow(59), Rotating(9), 0), (Eol, Normal, 0)] [(Address(216), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] -[(Address(220), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateBase12GetEquipItemEi", demangled_name: Some("LinkStateBase::GetEquipItem(int)"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(220), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateBase12GetEquipItemEi", demangled_name: Some("LinkStateBase::GetEquipItem(int)"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(224), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 32792), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(0)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] [(Address(228), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 32792), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(28)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] [(Address(232), Dim, 5), (Spacing(4), Normal, 0), (Opcode("blx", 32776), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Eol, Normal, 0)] @@ -77,14 +77,14 @@ expression: output [(Address(288), Dim, 5), (BranchArrow(61), Rotating(10), 0), (Opcode("cmp", 32784), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(10)), Normal, 0), (Eol, Normal, 0)] [(Address(292), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 32772), Normal, 10), (BranchDest(308), Normal, 0), (BranchArrow(77), Rotating(12), 0), (Eol, Normal, 0)] [(Address(296), Dim, 5), (BranchArrow(62), Rotating(11), 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] -[(Address(300), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateBase18EquipItem_vfunc_28Ev", demangled_name: Some("LinkStateBase::EquipItem_vfunc_28()"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(300), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateBase18EquipItem_vfunc_28Ev", demangled_name: Some("LinkStateBase::EquipItem_vfunc_28()"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(304), Dim, 5), (Spacing(4), Normal, 0), (Opcode("b", 32772), Normal, 10), (BranchDest(340), Normal, 0), (BranchArrow(85), Rotating(13), 0), (Eol, Normal, 0)] [(Address(308), Dim, 5), (BranchArrow(64), Rotating(12), 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] -[(Address(312), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateBase18EquipItem_vfunc_28Ev", demangled_name: Some("LinkStateBase::EquipItem_vfunc_28()"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(312), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateBase18EquipItem_vfunc_28Ev", demangled_name: Some("LinkStateBase::EquipItem_vfunc_28()"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(316), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmp", 32784), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(4)), Normal, 0), (Eol, Normal, 0)] [(Address(320), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmpne", 32784), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(2)), Normal, 0), (Eol, Normal, 0)] [(Address(324), Dim, 5), (Spacing(4), Normal, 0), (Opcode("beq", 32772), Normal, 10), (BranchDest(340), Normal, 0), (BranchArrow(85), Rotating(13), 0), (Eol, Normal, 0)] -[(Address(328), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateItem16GetLinkStateMoveEv", demangled_name: Some("LinkStateItem::GetLinkStateMove()"), address: 488, size: 16, kind: Function, section: Some(0), flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(328), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13LinkStateItem16GetLinkStateMoveEv", demangled_name: Some("LinkStateItem::GetLinkStateMove()"), normalized_name: None, address: 488, size: 16, kind: Function, section: Some(0), flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(332), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(1)), Normal, 0), (Eol, Normal, 0)] [(Address(336), Dim, 5), (Spacing(4), Normal, 0), (Opcode("strb", 32885), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(20)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] [(Address(340), Dim, 5), (BranchArrow(70), Rotating(13), 0), (Opcode("mvn", 32819), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(0)), Normal, 0), (Eol, Normal, 0)] @@ -94,7 +94,7 @@ expression: output [(Address(356), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmp", 32784), Normal, 10), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Eol, Normal, 0)] [(Address(360), Dim, 5), (Spacing(4), Normal, 0), (Opcode("beq", 32772), Normal, 10), (BranchDest(384), Normal, 0), (BranchArrow(96), Rotating(14), 0), (Eol, Normal, 0)] [(Address(364), Dim, 5), (BranchArrow(95), Rotating(15), 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Eol, Normal, 0)] -[(Address(368), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_Z19func_ov000_020b7e6cPi", demangled_name: Some("func_ov000_020b7e6c(int*)"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(368), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_Z19func_ov000_020b7e6cPi", demangled_name: Some("func_ov000_020b7e6c(int*)"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(372), Dim, 5), (Spacing(4), Normal, 0), (Opcode("add", 32769), Normal, 10), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(4)), Normal, 0), (Eol, Normal, 0)] [(Address(376), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmp", 32784), Normal, 10), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Eol, Normal, 0)] [(Address(380), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 32772), Normal, 10), (BranchDest(364), Normal, 0), (BranchArrow(91), Rotating(15), 0), (Eol, Normal, 0)] @@ -103,10 +103,10 @@ expression: output [(Address(392), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldrb", 32793), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(128)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] [(Address(396), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmp", 32784), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(0)), Normal, 0), (Eol, Normal, 0)] [(Address(400), Dim, 5), (Spacing(4), Normal, 0), (Opcode("beq", 32772), Normal, 10), (BranchDest(408), Normal, 0), (BranchArrow(102), Rotating(16), 0), (Eol, Normal, 0)] -[(Address(404), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13PlayerControl13StopFollowingEv", demangled_name: Some("PlayerControl::StopFollowing()"), address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] +[(Address(404), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 32775), Normal, 10), (Symbol(Symbol { name: "_ZN13PlayerControl13StopFollowingEv", demangled_name: Some("PlayerControl::StopFollowing()"), normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Addend(-8), Bright, 0), (Eol, Normal, 0)] [(Address(408), Dim, 5), (BranchArrow(100), Rotating(16), 0), (Opcode("mov", 32811), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(0)), Normal, 0), (Eol, Normal, 0)] [(Address(412), Dim, 5), (Spacing(4), Normal, 0), (Opcode("strb", 32885), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(38)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] [(Address(416), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldmia", 32791), Normal, 10), (Argument(Opaque("sp")), Normal, 0), (Basic("!"), Normal, 0), (Basic(", "), Normal, 0), (Basic("{"), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic("}"), Normal, 0), (Eol, Normal, 0)] -[(Address(420), Dim, 5), (Spacing(4), Normal, 0), (Opcode(".word", 65534), Normal, 10), (Symbol(Symbol { name: "data_027e103c", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] -[(Address(424), Dim, 5), (BranchArrow(25), Rotating(8), 0), (Opcode(".word", 65534), Normal, 10), (Symbol(Symbol { name: "data_027e1098", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] -[(Address(428), Dim, 5), (Spacing(4), Normal, 0), (Opcode(".word", 65534), Normal, 10), (Symbol(Symbol { name: "gPlayerControl", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(420), Dim, 5), (Spacing(4), Normal, 0), (Opcode(".word", 65534), Normal, 10), (Symbol(Symbol { name: "data_027e103c", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(424), Dim, 5), (BranchArrow(25), Rotating(8), 0), (Opcode(".word", 65534), Normal, 10), (Symbol(Symbol { name: "data_027e1098", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(428), Dim, 5), (Spacing(4), Normal, 0), (Opcode(".word", 65534), Normal, 10), (Symbol(Symbol { name: "gPlayerControl", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global | Weak), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] diff --git a/objdiff-core/tests/snapshots/arch_arm__read_arm.snap b/objdiff-core/tests/snapshots/arch_arm__read_arm.snap index 674a3b01..927858c6 100644 --- a/objdiff-core/tests/snapshots/arch_arm__read_arm.snap +++ b/objdiff-core/tests/snapshots/arch_arm__read_arm.snap @@ -148,6 +148,7 @@ Object { Symbol { name: ".text", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -161,6 +162,7 @@ Object { Symbol { name: "$t", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -171,9 +173,26 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "_ZN13LinkStateItem8vfunc_00Ev", + demangled_name: Some( + "LinkStateItem::vfunc_00()", + ), + normalized_name: None, + address: 0, + size: 4, + kind: Function, + section: Some( + 0, + ), + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 4, size: 0, kind: Unknown, @@ -184,9 +203,26 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "_ZN13LinkStateItem5GetIdEv", + demangled_name: Some( + "LinkStateItem::GetId()", + ), + normalized_name: None, + address: 4, + size: 8, + kind: Function, + section: Some( + 0, + ), + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 12, size: 0, kind: Unknown, @@ -197,9 +233,26 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "_ZN13LinkStateItem16IsHammerEquippedEv", + demangled_name: Some( + "LinkStateItem::IsHammerEquipped()", + ), + normalized_name: None, + address: 12, + size: 28, + kind: Function, + section: Some( + 0, + ), + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, Symbol { name: "_020abd38", demangled_name: None, + normalized_name: None, address: 32, size: 0, kind: Unknown, @@ -213,6 +266,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 32, size: 0, kind: Unknown, @@ -226,6 +280,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 40, size: 0, kind: Unknown, @@ -236,9 +291,26 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "_ZN13LinkStateItem12OnStateLeaveEi", + demangled_name: Some( + "LinkStateItem::OnStateLeave(int)", + ), + normalized_name: None, + address: 40, + size: 432, + kind: Function, + section: Some( + 0, + ), + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, Symbol { name: "_020abd60", demangled_name: None, + normalized_name: None, address: 72, size: 0, kind: Unknown, @@ -252,6 +324,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 72, size: 0, kind: Unknown, @@ -265,6 +338,7 @@ Object { Symbol { name: "_020abd8c", demangled_name: None, + normalized_name: None, address: 116, size: 0, kind: Unknown, @@ -278,6 +352,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 116, size: 0, kind: Unknown, @@ -291,6 +366,7 @@ Object { Symbol { name: "_020abdac", demangled_name: None, + normalized_name: None, address: 148, size: 0, kind: Unknown, @@ -304,6 +380,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 148, size: 0, kind: Unknown, @@ -317,6 +394,7 @@ Object { Symbol { name: "_020abdbc", demangled_name: None, + normalized_name: None, address: 164, size: 0, kind: Unknown, @@ -330,6 +408,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 164, size: 0, kind: Unknown, @@ -343,6 +422,7 @@ Object { Symbol { name: "_020abdcc", demangled_name: None, + normalized_name: None, address: 180, size: 0, kind: Unknown, @@ -356,6 +436,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 180, size: 0, kind: Unknown, @@ -369,6 +450,7 @@ Object { Symbol { name: "_020abdd8", demangled_name: None, + normalized_name: None, address: 192, size: 0, kind: Unknown, @@ -382,6 +464,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 192, size: 0, kind: Unknown, @@ -395,6 +478,7 @@ Object { Symbol { name: "_020abde4", demangled_name: None, + normalized_name: None, address: 204, size: 0, kind: Unknown, @@ -408,6 +492,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 204, size: 0, kind: Unknown, @@ -421,6 +506,7 @@ Object { Symbol { name: "_020abe00", demangled_name: None, + normalized_name: None, address: 232, size: 0, kind: Unknown, @@ -434,6 +520,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 232, size: 0, kind: Unknown, @@ -447,6 +534,7 @@ Object { Symbol { name: "_020abe08", demangled_name: None, + normalized_name: None, address: 240, size: 0, kind: Unknown, @@ -460,6 +548,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 240, size: 0, kind: Unknown, @@ -473,6 +562,7 @@ Object { Symbol { name: "_020abe2c", demangled_name: None, + normalized_name: None, address: 276, size: 0, kind: Unknown, @@ -486,6 +576,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 276, size: 0, kind: Unknown, @@ -499,6 +590,7 @@ Object { Symbol { name: "_020abe60", demangled_name: None, + normalized_name: None, address: 328, size: 0, kind: Unknown, @@ -512,6 +604,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 328, size: 0, kind: Unknown, @@ -525,6 +618,7 @@ Object { Symbol { name: "_020abe68", demangled_name: None, + normalized_name: None, address: 336, size: 0, kind: Unknown, @@ -538,6 +632,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 336, size: 0, kind: Unknown, @@ -551,6 +646,7 @@ Object { Symbol { name: "_020abe74", demangled_name: None, + normalized_name: None, address: 348, size: 0, kind: Unknown, @@ -564,6 +660,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 348, size: 0, kind: Unknown, @@ -577,6 +674,7 @@ Object { Symbol { name: "_020abe94", demangled_name: None, + normalized_name: None, address: 380, size: 0, kind: Unknown, @@ -590,6 +688,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 380, size: 0, kind: Unknown, @@ -603,6 +702,7 @@ Object { Symbol { name: "_020abeac", demangled_name: None, + normalized_name: None, address: 404, size: 0, kind: Unknown, @@ -616,6 +716,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 404, size: 0, kind: Unknown, @@ -629,6 +730,7 @@ Object { Symbol { name: "_020abec0", demangled_name: None, + normalized_name: None, address: 424, size: 0, kind: Unknown, @@ -642,6 +744,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 424, size: 0, kind: Unknown, @@ -655,6 +758,7 @@ Object { Symbol { name: "_020abed8", demangled_name: None, + normalized_name: None, address: 448, size: 0, kind: Unknown, @@ -668,6 +772,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 448, size: 0, kind: Unknown, @@ -681,6 +786,7 @@ Object { Symbol { name: "_020abee4", demangled_name: None, + normalized_name: None, address: 460, size: 0, kind: Object, @@ -694,6 +800,7 @@ Object { Symbol { name: "$d", demangled_name: None, + normalized_name: None, address: 460, size: 0, kind: Unknown, @@ -707,6 +814,7 @@ Object { Symbol { name: "_020abee8", demangled_name: None, + normalized_name: None, address: 464, size: 0, kind: Object, @@ -720,6 +828,7 @@ Object { Symbol { name: "$d", demangled_name: None, + normalized_name: None, address: 464, size: 0, kind: Unknown, @@ -733,6 +842,7 @@ Object { Symbol { name: "_020abeec", demangled_name: None, + normalized_name: None, address: 468, size: 0, kind: Object, @@ -746,6 +856,7 @@ Object { Symbol { name: "$d", demangled_name: None, + normalized_name: None, address: 468, size: 0, kind: Unknown, @@ -759,6 +870,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 472, size: 0, kind: Unknown, @@ -769,9 +881,26 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "_ZN13LinkStateItem15GetEquipBombchuEv", + demangled_name: Some( + "LinkStateItem::GetEquipBombchu()", + ), + normalized_name: None, + address: 472, + size: 16, + kind: Function, + section: Some( + 0, + ), + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, Symbol { name: "_020abefc", demangled_name: None, + normalized_name: None, address: 484, size: 0, kind: Object, @@ -785,6 +914,7 @@ Object { Symbol { name: "$d", demangled_name: None, + normalized_name: None, address: 484, size: 0, kind: Unknown, @@ -798,6 +928,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 488, size: 0, kind: Unknown, @@ -808,9 +939,26 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "_ZN13LinkStateItem16GetLinkStateMoveEv", + demangled_name: Some( + "LinkStateItem::GetLinkStateMove()", + ), + normalized_name: None, + address: 488, + size: 16, + kind: Function, + section: Some( + 0, + ), + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, Symbol { name: "_020abf0c", demangled_name: None, + normalized_name: None, address: 500, size: 0, kind: Object, @@ -824,6 +972,7 @@ Object { Symbol { name: "$d", demangled_name: None, + normalized_name: None, address: 500, size: 0, kind: Unknown, @@ -837,6 +986,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 504, size: 0, kind: Unknown, @@ -847,9 +997,26 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "_ZN13LinkStateItem18func_ov00_020abf70Ev", + demangled_name: Some( + "LinkStateItem::func_ov00_020abf70()", + ), + normalized_name: None, + address: 504, + size: 32, + kind: Function, + section: Some( + 0, + ), + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, Symbol { name: "_020abf28", demangled_name: None, + normalized_name: None, address: 528, size: 0, kind: Object, @@ -863,6 +1030,7 @@ Object { Symbol { name: "$d", demangled_name: None, + normalized_name: None, address: 528, size: 0, kind: Unknown, @@ -876,6 +1044,7 @@ Object { Symbol { name: "_020abf2c", demangled_name: None, + normalized_name: None, address: 532, size: 0, kind: Object, @@ -889,6 +1058,7 @@ Object { Symbol { name: "$d", demangled_name: None, + normalized_name: None, address: 532, size: 0, kind: Unknown, @@ -902,6 +1072,7 @@ Object { Symbol { name: "$a", demangled_name: None, + normalized_name: None, address: 536, size: 0, kind: Unknown, @@ -912,9 +1083,26 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "_ZN13LinkStateItem8vfunc_28Ev", + demangled_name: Some( + "LinkStateItem::vfunc_28()", + ), + normalized_name: None, + address: 536, + size: 20, + kind: Function, + section: Some( + 0, + ), + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, Symbol { name: ".data", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Object, @@ -928,6 +1116,7 @@ Object { Symbol { name: "$d", demangled_name: None, + normalized_name: None, address: 8, size: 0, kind: Unknown, @@ -938,11 +1127,28 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "_ZTV13LinkStateItem", + demangled_name: Some( + "{vtable(LinkStateItem)}", + ), + normalized_name: None, + address: 8, + size: 68, + kind: Object, + section: Some( + 2, + ), + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, Symbol { name: "_ZN13LinkStateBase12OnStateLeaveEi", demangled_name: Some( "LinkStateBase::OnStateLeave(int)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -956,6 +1162,7 @@ Object { demangled_name: Some( "UnkStruct_027e103c::func_ov000_020cf01c()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -969,6 +1176,7 @@ Object { demangled_name: Some( "EquipBombchu::func_ov014_0213ec64()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -982,6 +1190,7 @@ Object { demangled_name: Some( "func_ov014_0211fd04(int*)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -995,6 +1204,7 @@ Object { demangled_name: Some( "LinkStateItem::StopUsingBomb(int)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1008,6 +1218,7 @@ Object { demangled_name: Some( "LinkStateItem::StopUsingRope()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1021,6 +1232,7 @@ Object { demangled_name: Some( "LinkStateItem::StopUsingHammer()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1034,6 +1246,7 @@ Object { demangled_name: Some( "UnkStruct_027e103c::func_ov000_020cf9dc(int, int)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1047,6 +1260,7 @@ Object { demangled_name: Some( "LinkStateItem::StopUsingScoop()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1060,6 +1274,7 @@ Object { demangled_name: Some( "LinkStateBase::GetEquipItem(int)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1073,6 +1288,7 @@ Object { demangled_name: Some( "LinkStateBase::EquipItem_vfunc_28()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1086,6 +1302,7 @@ Object { demangled_name: Some( "func_ov000_020b7e6c(int*)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1099,6 +1316,7 @@ Object { demangled_name: Some( "PlayerControl::StopFollowing()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1110,6 +1328,7 @@ Object { Symbol { name: "data_027e103c", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1121,6 +1340,7 @@ Object { Symbol { name: "data_027e1098", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1132,6 +1352,7 @@ Object { Symbol { name: "gPlayerControl", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1145,6 +1366,7 @@ Object { demangled_name: Some( "ItemManager::GetEquipItemUnchecked(int)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1158,6 +1380,7 @@ Object { demangled_name: Some( "GetLinkState(int)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1169,6 +1392,7 @@ Object { Symbol { name: "gAdventureFlags", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1182,6 +1406,7 @@ Object { demangled_name: Some( "AdventureFlags::func_ov00_02097b9c(int)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1195,6 +1420,7 @@ Object { demangled_name: Some( "LinkStateItem::vfunc_00()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1208,6 +1434,7 @@ Object { demangled_name: Some( "LinkStateItem::~LinkStateItem()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1221,6 +1448,7 @@ Object { demangled_name: Some( "LinkStateItem::~LinkStateItem()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1234,6 +1462,7 @@ Object { demangled_name: Some( "LinkStateBase::CreateDebugHierarchy()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1247,6 +1476,7 @@ Object { demangled_name: Some( "LinkStateItem::OnStateEnter()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1260,6 +1490,7 @@ Object { demangled_name: Some( "LinkStateItem::vfunc_1c()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1273,6 +1504,7 @@ Object { demangled_name: Some( "LinkStateItem::vfunc_20(int)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1286,6 +1518,7 @@ Object { demangled_name: Some( "LinkStateItem::vfunc_24(int)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1299,6 +1532,7 @@ Object { demangled_name: Some( "LinkStateBase::vfunc_2c(unsigned short*)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1312,6 +1546,7 @@ Object { demangled_name: Some( "LinkStateBase::vfunc_30(int)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1325,6 +1560,7 @@ Object { demangled_name: Some( "LinkStateBase::vfunc_34(Vec3p*)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1338,6 +1574,7 @@ Object { demangled_name: Some( "LinkStateBase::vfunc_38()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1351,6 +1588,7 @@ Object { demangled_name: Some( "LinkStateBase::vfunc_3c()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1364,6 +1602,7 @@ Object { demangled_name: Some( "LinkStateBase::vfunc_40()", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -1372,144 +1611,10 @@ Object { align: None, virtual_address: None, }, - Symbol { - name: "_ZN13LinkStateItem8vfunc_00Ev", - demangled_name: Some( - "LinkStateItem::vfunc_00()", - ), - address: 0, - size: 4, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, - Symbol { - name: "_ZN13LinkStateItem5GetIdEv", - demangled_name: Some( - "LinkStateItem::GetId()", - ), - address: 4, - size: 8, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, - Symbol { - name: "_ZN13LinkStateItem16IsHammerEquippedEv", - demangled_name: Some( - "LinkStateItem::IsHammerEquipped()", - ), - address: 12, - size: 28, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, - Symbol { - name: "_ZN13LinkStateItem12OnStateLeaveEi", - demangled_name: Some( - "LinkStateItem::OnStateLeave(int)", - ), - address: 40, - size: 432, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, - Symbol { - name: "_ZN13LinkStateItem15GetEquipBombchuEv", - demangled_name: Some( - "LinkStateItem::GetEquipBombchu()", - ), - address: 472, - size: 16, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, - Symbol { - name: "_ZN13LinkStateItem16GetLinkStateMoveEv", - demangled_name: Some( - "LinkStateItem::GetLinkStateMove()", - ), - address: 488, - size: 16, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, - Symbol { - name: "_ZN13LinkStateItem18func_ov00_020abf70Ev", - demangled_name: Some( - "LinkStateItem::func_ov00_020abf70()", - ), - address: 504, - size: 32, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, - Symbol { - name: "_ZN13LinkStateItem8vfunc_28Ev", - demangled_name: Some( - "LinkStateItem::vfunc_28()", - ), - address: 536, - size: 20, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, - Symbol { - name: "_ZTV13LinkStateItem", - demangled_name: Some( - "{vtable(LinkStateItem)}", - ), - address: 8, - size: 68, - kind: Object, - section: Some( - 2, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, Symbol { name: "[.data-0]", demangled_name: None, + normalized_name: None, address: 0, size: 76, kind: Section, @@ -1541,7 +1646,7 @@ Object { 1, ), address: 52, - target_symbol: 61, + target_symbol: 70, addend: -8, }, Relocation { @@ -1549,7 +1654,7 @@ Object { 1, ), address: 124, - target_symbol: 62, + target_symbol: 71, addend: -8, }, Relocation { @@ -1557,7 +1662,7 @@ Object { 1, ), address: 140, - target_symbol: 99, + target_symbol: 52, addend: -8, }, Relocation { @@ -1565,7 +1670,7 @@ Object { 1, ), address: 144, - target_symbol: 63, + target_symbol: 72, addend: -8, }, Relocation { @@ -1573,7 +1678,7 @@ Object { 15, ), address: 156, - target_symbol: 64, + target_symbol: 73, addend: -8, }, Relocation { @@ -1581,7 +1686,7 @@ Object { 1, ), address: 172, - target_symbol: 65, + target_symbol: 74, addend: -8, }, Relocation { @@ -1589,7 +1694,7 @@ Object { 1, ), address: 184, - target_symbol: 66, + target_symbol: 75, addend: -8, }, Relocation { @@ -1597,7 +1702,7 @@ Object { 1, ), address: 196, - target_symbol: 67, + target_symbol: 76, addend: -8, }, Relocation { @@ -1605,7 +1710,7 @@ Object { 1, ), address: 224, - target_symbol: 68, + target_symbol: 77, addend: -8, }, Relocation { @@ -1613,7 +1718,7 @@ Object { 1, ), address: 236, - target_symbol: 69, + target_symbol: 78, addend: -8, }, Relocation { @@ -1621,7 +1726,7 @@ Object { 1, ), address: 260, - target_symbol: 70, + target_symbol: 79, addend: -8, }, Relocation { @@ -1629,7 +1734,7 @@ Object { 1, ), address: 340, - target_symbol: 71, + target_symbol: 80, addend: -8, }, Relocation { @@ -1637,7 +1742,7 @@ Object { 1, ), address: 352, - target_symbol: 71, + target_symbol: 80, addend: -8, }, Relocation { @@ -1645,7 +1750,7 @@ Object { 1, ), address: 368, - target_symbol: 100, + target_symbol: 56, addend: -8, }, Relocation { @@ -1653,7 +1758,7 @@ Object { 1, ), address: 408, - target_symbol: 72, + target_symbol: 81, addend: -8, }, Relocation { @@ -1661,7 +1766,7 @@ Object { 1, ), address: 444, - target_symbol: 73, + target_symbol: 82, addend: -8, }, Relocation { @@ -1669,7 +1774,7 @@ Object { 2, ), address: 460, - target_symbol: 74, + target_symbol: 83, addend: 0, }, Relocation { @@ -1677,7 +1782,7 @@ Object { 2, ), address: 464, - target_symbol: 75, + target_symbol: 84, addend: 0, }, Relocation { @@ -1685,7 +1790,7 @@ Object { 2, ), address: 468, - target_symbol: 76, + target_symbol: 85, addend: 0, }, Relocation { @@ -1693,7 +1798,7 @@ Object { 2, ), address: 484, - target_symbol: 77, + target_symbol: 86, addend: 0, }, Relocation { @@ -1701,7 +1806,7 @@ Object { 2, ), address: 500, - target_symbol: 78, + target_symbol: 87, addend: 0, }, Relocation { @@ -1709,7 +1814,7 @@ Object { 2, ), address: 528, - target_symbol: 79, + target_symbol: 88, addend: 0, }, Relocation { @@ -1717,7 +1822,7 @@ Object { 2, ), address: 532, - target_symbol: 80, + target_symbol: 89, addend: 0, }, ], @@ -1760,7 +1865,7 @@ Object { 2, ), address: 8, - target_symbol: 81, + target_symbol: 90, addend: 0, }, Relocation { @@ -1768,7 +1873,7 @@ Object { 2, ), address: 12, - target_symbol: 82, + target_symbol: 91, addend: 0, }, Relocation { @@ -1776,7 +1881,7 @@ Object { 2, ), address: 16, - target_symbol: 83, + target_symbol: 92, addend: 0, }, Relocation { @@ -1784,7 +1889,7 @@ Object { 2, ), address: 20, - target_symbol: 96, + target_symbol: 4, addend: 0, }, Relocation { @@ -1792,7 +1897,7 @@ Object { 2, ), address: 24, - target_symbol: 84, + target_symbol: 93, addend: 0, }, Relocation { @@ -1800,7 +1905,7 @@ Object { 2, ), address: 28, - target_symbol: 85, + target_symbol: 94, addend: 0, }, Relocation { @@ -1808,7 +1913,7 @@ Object { 2, ), address: 32, - target_symbol: 98, + target_symbol: 10, addend: 0, }, Relocation { @@ -1816,7 +1921,7 @@ Object { 2, ), address: 36, - target_symbol: 86, + target_symbol: 95, addend: 0, }, Relocation { @@ -1824,7 +1929,7 @@ Object { 2, ), address: 40, - target_symbol: 87, + target_symbol: 96, addend: 0, }, Relocation { @@ -1832,7 +1937,7 @@ Object { 2, ), address: 44, - target_symbol: 88, + target_symbol: 97, addend: 0, }, Relocation { @@ -1840,7 +1945,7 @@ Object { 2, ), address: 48, - target_symbol: 102, + target_symbol: 66, addend: 0, }, Relocation { @@ -1848,7 +1953,7 @@ Object { 2, ), address: 52, - target_symbol: 89, + target_symbol: 98, addend: 0, }, Relocation { @@ -1856,7 +1961,7 @@ Object { 2, ), address: 56, - target_symbol: 90, + target_symbol: 99, addend: 0, }, Relocation { @@ -1864,7 +1969,7 @@ Object { 2, ), address: 60, - target_symbol: 91, + target_symbol: 100, addend: 0, }, Relocation { @@ -1872,7 +1977,7 @@ Object { 2, ), address: 64, - target_symbol: 92, + target_symbol: 101, addend: 0, }, Relocation { @@ -1880,7 +1985,7 @@ Object { 2, ), address: 68, - target_symbol: 93, + target_symbol: 102, addend: 0, }, Relocation { @@ -1888,7 +1993,7 @@ Object { 2, ), address: 72, - target_symbol: 94, + target_symbol: 103, addend: 0, }, ], diff --git a/objdiff-core/tests/snapshots/arch_arm__read_thumb-3.snap b/objdiff-core/tests/snapshots/arch_arm__read_thumb-3.snap index 891890ac..ea9844f4 100644 --- a/objdiff-core/tests/snapshots/arch_arm__read_thumb-3.snap +++ b/objdiff-core/tests/snapshots/arch_arm__read_thumb-3.snap @@ -9,7 +9,7 @@ expression: output [(Line(39), Dim, 5), (Address(8), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Eol, Normal, 0)] [(Line(39), Dim, 5), (Address(10), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r2")), Normal, 0), (Eol, Normal, 0)] [(Line(39), Dim, 5), (Address(12), Dim, 5), (Spacing(4), Normal, 0), (Opcode("str", 116), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("sp")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(4)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] -[(Line(39), Dim, 5), (Address(14), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "PokeSet_IsRemovedAll", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] +[(Line(39), Dim, 5), (Address(14), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "PokeSet_IsRemovedAll", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] [(Line(39), Dim, 5), (Address(18), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmp", 16), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(0)), Normal, 0), (Eol, Normal, 0)] [(Line(39), Dim, 5), (Address(20), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 4), Normal, 10), (BranchDest(212), Normal, 0), (BranchArrow(97), Rotating(0), 0), (Eol, Normal, 0)] [(Line(44), Dim, 5), (Address(22), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldrh", 32), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(0)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] @@ -21,12 +21,12 @@ expression: output [(Line(47), Dim, 5), (Address(34), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 24), Normal, 10), (Argument(Opaque("r2")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("sp")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(4)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] [(Line(47), Dim, 5), (Address(36), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] [(Line(47), Dim, 5), (Address(38), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Eol, Normal, 0)] -[(Line(47), Dim, 5), (Address(40), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "ServerDisplay_SkillSwap", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] +[(Line(47), Dim, 5), (Address(40), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "ServerDisplay_SkillSwap", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] [(Line(86), Dim, 5), (Address(44), Dim, 5), (Spacing(4), Normal, 0), (Opcode("add", 1), Normal, 10), (Argument(Opaque("sp")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(16)), Normal, 0), (Eol, Normal, 0)] [(Line(86), Dim, 5), (Address(46), Dim, 5), (Spacing(4), Normal, 0), (Opcode("pop", 58), Normal, 10), (Basic("{"), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r7")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic("}"), Normal, 0), (Eol, Normal, 0)] [(Line(50), Dim, 5), (Address(48), Dim, 5), (BranchArrow(12), Rotating(1), 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] [(Line(50), Dim, 5), (Address(50), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Eol, Normal, 0)] -[(Line(50), Dim, 5), (Address(52), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "ServerEvent_CreateSubstitute", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] +[(Line(50), Dim, 5), (Address(52), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "ServerEvent_CreateSubstitute", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] [(Line(50), Dim, 5), (Address(56), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmp", 16), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(0)), Normal, 0), (Eol, Normal, 0)] [(Line(50), Dim, 5), (Address(58), Dim, 5), (Spacing(4), Normal, 0), (Opcode("beq", 4), Normal, 10), (BranchDest(212), Normal, 0), (BranchArrow(97), Rotating(0), 0), (Eol, Normal, 0)] [(Line(52), Dim, 5), (Address(60), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 24), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(156)), Normal, 0), (Basic("]"), Normal, 0), (Basic(" (->"), Normal, 0), (BranchDest(220), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] @@ -49,10 +49,10 @@ expression: output [(Line(57), Dim, 5), (Address(94), Dim, 5), (BranchArrow(15), Rotating(2), 0), (Opcode("ldr", 24), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(128)), Normal, 0), (Basic("]"), Normal, 0), (Basic(" (->"), Normal, 0), (BranchDest(224), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Line(57), Dim, 5), (Address(96), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 24), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(128)), Normal, 0), (Basic("]"), Normal, 0), (Basic(" (->"), Normal, 0), (BranchDest(228), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Line(57), Dim, 5), (Address(98), Dim, 5), (Spacing(4), Normal, 0), (Opcode("add", 1), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Eol, Normal, 0)] -[(Line(57), Dim, 5), (Address(100), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "HEManager_PushState", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] +[(Line(57), Dim, 5), (Address(100), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "HEManager_PushState", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] [(Line(57), Dim, 5), (Address(104), Dim, 5), (Spacing(4), Normal, 0), (Opcode("str", 116), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("sp")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(8)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] [(Line(61), Dim, 5), (Address(106), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] -[(Line(61), Dim, 5), (Address(108), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "BattleHandler_Result", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] +[(Line(61), Dim, 5), (Address(108), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "BattleHandler_Result", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] [(Line(61), Dim, 5), (Address(112), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r7")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Eol, Normal, 0)] [(Line(63), Dim, 5), (Address(114), Dim, 5), (Spacing(4), Normal, 0), (Opcode("add", 1), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("sp")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(12)), Normal, 0), (Eol, Normal, 0)] [(Line(63), Dim, 5), (Address(116), Dim, 5), (Spacing(4), Normal, 0), (Opcode("str", 116), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("sp")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(0)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] @@ -60,11 +60,11 @@ expression: output [(Line(63), Dim, 5), (Address(120), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] [(Line(63), Dim, 5), (Address(122), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Eol, Normal, 0)] [(Line(63), Dim, 5), (Address(124), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r2")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Eol, Normal, 0)] -[(Line(63), Dim, 5), (Address(126), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "ServerEvent_UncategorizedMove", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] +[(Line(63), Dim, 5), (Address(126), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "ServerEvent_UncategorizedMove", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] [(Line(63), Dim, 5), (Address(130), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmp", 16), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(0)), Normal, 0), (Eol, Normal, 0)] [(Line(63), Dim, 5), (Address(132), Dim, 5), (Spacing(4), Normal, 0), (Opcode("beq", 4), Normal, 10), (BranchDest(168), Normal, 0), (BranchArrow(77), Rotating(3), 0), (Eol, Normal, 0)] [(Line(65), Dim, 5), (Address(134), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] -[(Line(65), Dim, 5), (Address(136), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "BattleHandler_Result", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] +[(Line(65), Dim, 5), (Address(136), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "BattleHandler_Result", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] [(Line(65), Dim, 5), (Address(140), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r7")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Eol, Normal, 0)] [(Line(66), Dim, 5), (Address(142), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmp", 16), Normal, 10), (Argument(Opaque("r7")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(2)), Normal, 0), (Eol, Normal, 0)] [(Line(66), Dim, 5), (Address(144), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 4), Normal, 10), (BranchDest(168), Normal, 0), (BranchArrow(77), Rotating(3), 0), (Eol, Normal, 0)] @@ -93,12 +93,12 @@ expression: output [(Line(77), Dim, 5), (Address(190), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 24), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(44)), Normal, 0), (Basic("]"), Normal, 0), (Basic(" (->"), Normal, 0), (BranchDest(236), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Line(77), Dim, 5), (Address(192), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(90)), Normal, 0), (Eol, Normal, 0)] [(Line(77), Dim, 5), (Address(194), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 43), Normal, 10), (Argument(Opaque("r2")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(71)), Normal, 0), (Eol, Normal, 0)] -[(Line(77), Dim, 5), (Address(196), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "SCQUE_PUT_MsgImpl", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] +[(Line(77), Dim, 5), (Address(196), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "SCQUE_PUT_MsgImpl", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] [(Line(81), Dim, 5), (Address(200), Dim, 5), (BranchArrow(78), Rotating(4), 0), (Opcode("ldr", 24), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(20)), Normal, 0), (Basic("]"), Normal, 0), (Basic(" (->"), Normal, 0), (BranchDest(224), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Line(81), Dim, 5), (Address(202), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 24), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("sp")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(8)), Normal, 0), (Basic("]"), Normal, 0), (Eol, Normal, 0)] [(Line(81), Dim, 5), (Address(204), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ldr", 24), Normal, 10), (Argument(Opaque("r2")), Normal, 0), (Basic(", "), Normal, 0), (Basic("["), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Signed(32)), Normal, 0), (Basic("]"), Normal, 0), (Basic(" (->"), Normal, 0), (BranchDest(240), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Line(81), Dim, 5), (Address(206), Dim, 5), (Spacing(4), Normal, 0), (Opcode("add", 1), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Eol, Normal, 0)] -[(Line(81), Dim, 5), (Address(208), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "HEManager_PopState", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] +[(Line(81), Dim, 5), (Address(208), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 7), Normal, 10), (Symbol(Symbol { name: "HEManager_PopState", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Addend(-4), Bright, 0), (Eol, Normal, 0)] [(Line(86), Dim, 5), (Address(212), Dim, 5), (BranchArrow(9), Rotating(0), 0), (Opcode("add", 1), Normal, 10), (Argument(Opaque("sp")), Normal, 0), (Basic(", "), Normal, 0), (Basic("#"), Normal, 0), (Argument(Unsigned(16)), Normal, 0), (Eol, Normal, 0)] [(Line(86), Dim, 5), (Address(214), Dim, 5), (Spacing(4), Normal, 0), (Opcode("pop", 58), Normal, 10), (Basic("{"), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r7")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("pc")), Normal, 0), (Basic("}"), Normal, 0), (Eol, Normal, 0)] [(Line(86), Dim, 5), (Address(216), Dim, 5), (Spacing(4), Normal, 0), (Opcode(".word", 65534), Normal, 10), (Argument(Unsigned(285)), Normal, 0), (Eol, Normal, 0)] diff --git a/objdiff-core/tests/snapshots/arch_arm__read_thumb.snap b/objdiff-core/tests/snapshots/arch_arm__read_thumb.snap index 9e861939..6aca4f86 100644 --- a/objdiff-core/tests/snapshots/arch_arm__read_thumb.snap +++ b/objdiff-core/tests/snapshots/arch_arm__read_thumb.snap @@ -21,35 +21,10 @@ Object { }, endianness: Little, symbols: [ - Symbol { - name: "$t", - demangled_name: None, - address: 0, - size: 0, - kind: Function, - section: Some( - 17, - ), - flags: FlagSet(Local | Hidden), - align: None, - virtual_address: None, - }, - Symbol { - name: "$d", - demangled_name: None, - address: 216, - size: 0, - kind: Function, - section: Some( - 17, - ), - flags: FlagSet(Local | Hidden), - align: None, - virtual_address: None, - }, Symbol { name: "[.debug_info]", demangled_name: None, + normalized_name: None, address: 0, size: 70, kind: Section, @@ -61,75 +36,67 @@ Object { virtual_address: None, }, Symbol { - name: "[.debug_line]", - demangled_name: None, - address: 0, - size: 91, - kind: Section, - section: Some( - 9, - ), - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, - Symbol { - name: "[.debug_line]", + name: ".dwarf_type.void", demangled_name: None, - address: 0, - size: 0, - kind: Section, + normalized_name: None, + address: 70, + size: 12, + kind: Object, section: Some( - 11, + 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: "[.debug_abbrev]", + name: ".dwarf_type.102", demangled_name: None, - address: 0, - size: 211, - kind: Section, + normalized_name: None, + address: 82, + size: 6, + kind: Object, section: Some( - 16, + 4, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "[.debug_pubnames]", + name: ".dwarf_type.103", demangled_name: None, - address: 0, - size: 18, - kind: Section, + normalized_name: None, + address: 88, + size: 1923, + kind: Object, section: Some( - 13, + 4, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.102", + name: ".dwarf_typedef.ServerFlow", demangled_name: None, - address: 82, - size: 6, + normalized_name: None, + address: 2011, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.103", + name: ".dwarf_type.104", demangled_name: None, - address: 88, - size: 1923, + normalized_name: None, + address: 2028, + size: 6, kind: Object, section: Some( 4, @@ -139,10 +106,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.104", + name: ".dwarf_type.105", demangled_name: None, - address: 2028, - size: 6, + normalized_name: None, + address: 2034, + size: 666, kind: Object, section: Some( 4, @@ -152,21 +120,23 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.105", + name: ".dwarf_typedef.BTL_SERVER", demangled_name: None, - address: 2034, - size: 666, + normalized_name: None, + address: 2700, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { name: ".dwarf_type.106", demangled_name: None, + normalized_name: None, address: 2717, size: 6, kind: Object, @@ -180,6 +150,7 @@ Object { Symbol { name: ".dwarf_type.107", demangled_name: None, + normalized_name: None, address: 2723, size: 39, kind: Object, @@ -191,75 +162,81 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.108", + name: ".dwarf_type.int", demangled_name: None, - address: 2819, - size: 6, + normalized_name: None, + address: 2762, + size: 11, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.109", + name: ".dwarf_typedef.bool", demangled_name: None, - address: 2825, - size: 6, + normalized_name: None, + address: 2773, + size: 11, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.110", + name: ".dwarf_typedef.fx32", demangled_name: None, - address: 2831, - size: 1517, + normalized_name: None, + address: 2784, + size: 11, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.111", + name: ".dwarf_typedef.s32", demangled_name: None, - address: 4370, - size: 6, + normalized_name: None, + address: 2795, + size: 10, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.112", + name: ".dwarf_typedef.int32_t", demangled_name: None, - address: 4376, - size: 1199, + normalized_name: None, + address: 2805, + size: 14, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.113", + name: ".dwarf_type.108", demangled_name: None, - address: 5672, - size: 17, + normalized_name: None, + address: 2819, + size: 6, kind: Object, section: Some( 4, @@ -269,9 +246,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.114", + name: ".dwarf_type.109", demangled_name: None, - address: 5797, + normalized_name: None, + address: 2825, size: 6, kind: Object, section: Some( @@ -282,10 +260,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.115", + name: ".dwarf_type.110", demangled_name: None, - address: 5803, - size: 17, + normalized_name: None, + address: 2831, + size: 1517, kind: Object, section: Some( 4, @@ -295,23 +274,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.116", + name: ".dwarf_typedef.BTL_MAIN_MODULE", demangled_name: None, - address: 5820, - size: 6, + normalized_name: None, + address: 4348, + size: 22, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.117", + name: ".dwarf_type.111", demangled_name: None, - address: 5826, - size: 17, + normalized_name: None, + address: 4370, + size: 6, kind: Object, section: Some( 4, @@ -321,10 +302,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.118", + name: ".dwarf_type.112", demangled_name: None, - address: 5843, - size: 6, + normalized_name: None, + address: 4376, + size: 1199, kind: Object, section: Some( 4, @@ -334,88 +316,95 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.119", + name: ".dwarf_typedef.BATTLE_SETUP_PARAM", demangled_name: None, - address: 5849, - size: 17, + normalized_name: None, + address: 5575, + size: 25, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.120", + name: ".dwarf_type.unsigned int", demangled_name: None, - address: 5866, - size: 17, + normalized_name: None, + address: 5600, + size: 20, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.121", + name: ".dwarf_typedef.uint32_t", demangled_name: None, - address: 5883, - size: 6, + normalized_name: None, + address: 5620, + size: 15, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.122", + name: ".dwarf_typedef.uptr", demangled_name: None, - address: 5889, - size: 17, + normalized_name: None, + address: 5635, + size: 11, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.123", + name: ".dwarf_typedef.uintptr_t", demangled_name: None, - address: 5906, - size: 6, + normalized_name: None, + address: 5646, + size: 16, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.124", + name: ".dwarf_typedef.u32", demangled_name: None, - address: 5912, - size: 6, + normalized_name: None, + address: 5662, + size: 10, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.125", + name: ".dwarf_type.113", demangled_name: None, - address: 5918, - size: 6, + normalized_name: None, + address: 5672, + size: 17, kind: Object, section: Some( 4, @@ -425,87 +414,108 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.126", + name: ".dwarf_type.unsigned char", demangled_name: None, - address: 5924, - size: 6, + normalized_name: None, + address: 5689, + size: 21, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.127", + name: ".dwarf_typedef.BtlPokePos", demangled_name: None, - address: 5930, - size: 6, + normalized_name: None, + address: 5710, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.128", + name: ".dwarf_typedef.u8", demangled_name: None, - address: 5936, - size: 6, + normalized_name: None, + address: 5727, + size: 9, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.129", + name: ".dwarf_typedef.uint8_t", demangled_name: None, - address: 5942, - size: 17, + normalized_name: None, + address: 5736, + size: 14, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.130", + name: ".dwarf_type.unsigned short", demangled_name: None, - address: 5959, - size: 17, + normalized_name: None, + address: 5750, + size: 22, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.131", + name: ".dwarf_typedef.uint16_t", demangled_name: None, - address: 5976, - size: 17, + normalized_name: None, + address: 5772, + size: 15, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.132", + name: ".dwarf_typedef.u16", demangled_name: None, - address: 5993, + normalized_name: None, + address: 5787, + size: 10, + kind: Object, + section: Some( + 4, + ), + flags: FlagSet(Global | Weak), + align: None, + virtual_address: None, + }, + Symbol { + name: ".dwarf_type.114", + demangled_name: None, + normalized_name: None, + address: 5797, size: 6, kind: Object, section: Some( @@ -516,9 +526,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.133", + name: ".dwarf_type.115", demangled_name: None, - address: 6090, + normalized_name: None, + address: 5803, size: 17, kind: Object, section: Some( @@ -529,10 +540,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.134", + name: ".dwarf_type.116", demangled_name: None, - address: 6107, - size: 289, + normalized_name: None, + address: 5820, + size: 6, kind: Object, section: Some( 4, @@ -542,9 +554,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.135", + name: ".dwarf_type.117", demangled_name: None, - address: 6423, + normalized_name: None, + address: 5826, size: 17, kind: Object, section: Some( @@ -555,10 +568,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.136", + name: ".dwarf_type.118", demangled_name: None, - address: 6440, - size: 17, + normalized_name: None, + address: 5843, + size: 6, kind: Object, section: Some( 4, @@ -568,10 +582,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.137", + name: ".dwarf_type.119", demangled_name: None, - address: 6457, - size: 6, + normalized_name: None, + address: 5849, + size: 17, kind: Object, section: Some( 4, @@ -581,9 +596,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.138", + name: ".dwarf_type.120", demangled_name: None, - address: 6463, + normalized_name: None, + address: 5866, size: 17, kind: Object, section: Some( @@ -594,9 +610,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.139", + name: ".dwarf_type.121", demangled_name: None, - address: 6480, + normalized_name: None, + address: 5883, size: 6, kind: Object, section: Some( @@ -607,9 +624,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.140", + name: ".dwarf_type.122", demangled_name: None, - address: 6486, + normalized_name: None, + address: 5889, size: 17, kind: Object, section: Some( @@ -620,10 +638,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.141", + name: ".dwarf_type.123", demangled_name: None, - address: 6503, - size: 360, + normalized_name: None, + address: 5906, + size: 6, kind: Object, section: Some( 4, @@ -633,9 +652,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.142", + name: ".dwarf_type.124", demangled_name: None, - address: 6882, + normalized_name: None, + address: 5912, size: 6, kind: Object, section: Some( @@ -646,9 +666,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.143", + name: ".dwarf_type.125", demangled_name: None, - address: 6888, + normalized_name: None, + address: 5918, size: 6, kind: Object, section: Some( @@ -659,9 +680,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.144", + name: ".dwarf_type.126", demangled_name: None, - address: 6894, + normalized_name: None, + address: 5924, size: 6, kind: Object, section: Some( @@ -672,10 +694,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.145", + name: ".dwarf_type.127", demangled_name: None, - address: 6900, - size: 17, + normalized_name: None, + address: 5930, + size: 6, kind: Object, section: Some( 4, @@ -685,9 +708,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.146", + name: ".dwarf_type.128", demangled_name: None, - address: 6917, + normalized_name: None, + address: 5936, size: 6, kind: Object, section: Some( @@ -698,9 +722,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.147", + name: ".dwarf_type.129", demangled_name: None, - address: 6923, + normalized_name: None, + address: 5942, size: 17, kind: Object, section: Some( @@ -711,10 +736,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.148", + name: ".dwarf_type.130", demangled_name: None, - address: 6940, - size: 127, + normalized_name: None, + address: 5959, + size: 17, kind: Object, section: Some( 4, @@ -724,10 +750,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.149", + name: ".dwarf_type.131", demangled_name: None, - address: 7081, - size: 6, + normalized_name: None, + address: 5976, + size: 17, kind: Object, section: Some( 4, @@ -737,10 +764,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.150", + name: ".dwarf_type.132", demangled_name: None, - address: 7087, - size: 17, + normalized_name: None, + address: 5993, + size: 6, kind: Object, section: Some( 4, @@ -750,36 +778,39 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.151", + name: ".dwarf_type.TINYMT32_T", demangled_name: None, - address: 7104, - size: 102, + normalized_name: None, + address: 5999, + size: 74, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.152", + name: ".dwarf_typedef.tinymt32_t", demangled_name: None, - address: 7222, + normalized_name: None, + address: 6073, size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.153", + name: ".dwarf_type.133", demangled_name: None, - address: 7239, - size: 6, + normalized_name: None, + address: 6090, + size: 17, kind: Object, section: Some( 4, @@ -789,10 +820,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.154", + name: ".dwarf_type.134", demangled_name: None, - address: 7245, - size: 17, + normalized_name: None, + address: 6107, + size: 289, kind: Object, section: Some( 4, @@ -802,23 +834,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.155", + name: ".dwarf_typedef.BATTLE_KENTEI_RESULT", demangled_name: None, - address: 7262, - size: 6, + normalized_name: None, + address: 6396, + size: 27, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.156", + name: ".dwarf_type.135", demangled_name: None, - address: 7268, - size: 82, + normalized_name: None, + address: 6423, + size: 17, kind: Object, section: Some( 4, @@ -828,9 +862,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.157", + name: ".dwarf_type.136", demangled_name: None, - address: 7366, + normalized_name: None, + address: 6440, size: 17, kind: Object, section: Some( @@ -841,9 +876,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.158", + name: ".dwarf_type.137", demangled_name: None, - address: 7383, + normalized_name: None, + address: 6457, size: 6, kind: Object, section: Some( @@ -854,9 +890,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.159", + name: ".dwarf_type.138", demangled_name: None, - address: 7389, + normalized_name: None, + address: 6463, size: 17, kind: Object, section: Some( @@ -867,9 +904,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.160", + name: ".dwarf_type.139", demangled_name: None, - address: 7406, + normalized_name: None, + address: 6480, size: 6, kind: Object, section: Some( @@ -880,9 +918,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.161", + name: ".dwarf_type.140", demangled_name: None, - address: 7412, + normalized_name: None, + address: 6486, size: 17, kind: Object, section: Some( @@ -893,10 +932,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.162", + name: ".dwarf_type.141", demangled_name: None, - address: 7429, - size: 6, + normalized_name: None, + address: 6503, + size: 360, kind: Object, section: Some( 4, @@ -906,22 +946,24 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.163", + name: ".dwarf_typedef.TRAINER_DATA", demangled_name: None, - address: 7435, - size: 17, + normalized_name: None, + address: 6863, + size: 19, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.164", + name: ".dwarf_type.142", demangled_name: None, - address: 7452, + normalized_name: None, + address: 6882, size: 6, kind: Object, section: Some( @@ -932,9 +974,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.165", + name: ".dwarf_type.143", demangled_name: None, - address: 7458, + normalized_name: None, + address: 6888, size: 6, kind: Object, section: Some( @@ -945,9 +988,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.166", + name: ".dwarf_type.144", demangled_name: None, - address: 7464, + normalized_name: None, + address: 6894, size: 6, kind: Object, section: Some( @@ -958,10 +1002,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.167", + name: ".dwarf_type.145", demangled_name: None, - address: 7470, - size: 6, + normalized_name: None, + address: 6900, + size: 17, kind: Object, section: Some( 4, @@ -971,9 +1016,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.168", + name: ".dwarf_type.146", demangled_name: None, - address: 7476, + normalized_name: None, + address: 6917, size: 6, kind: Object, section: Some( @@ -984,10 +1030,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.169", + name: ".dwarf_type.147", demangled_name: None, - address: 7482, - size: 22, + normalized_name: None, + address: 6923, + size: 17, kind: Object, section: Some( 4, @@ -997,10 +1044,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.170", + name: ".dwarf_type.148", demangled_name: None, - address: 7517, - size: 17, + normalized_name: None, + address: 6940, + size: 127, kind: Object, section: Some( 4, @@ -1010,23 +1058,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.171", + name: ".dwarf_typedef.POKECON", demangled_name: None, - address: 7534, - size: 17, + normalized_name: None, + address: 7067, + size: 14, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.172", + name: ".dwarf_type.149", demangled_name: None, - address: 7551, - size: 17, + normalized_name: None, + address: 7081, + size: 6, kind: Object, section: Some( 4, @@ -1036,10 +1086,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.173", + name: ".dwarf_type.150", demangled_name: None, - address: 7568, - size: 204, + normalized_name: None, + address: 7087, + size: 17, kind: Object, section: Some( 4, @@ -1049,10 +1100,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.174", + name: ".dwarf_type.151", demangled_name: None, - address: 7798, - size: 17, + normalized_name: None, + address: 7104, + size: 102, kind: Object, section: Some( 4, @@ -1062,22 +1114,24 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.175", + name: ".dwarf_typedef.BTL_PARTY", demangled_name: None, - address: 7815, - size: 48, + normalized_name: None, + address: 7206, + size: 16, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.176", + name: ".dwarf_type.152", demangled_name: None, - address: 7880, + normalized_name: None, + address: 7222, size: 17, kind: Object, section: Some( @@ -1088,22 +1142,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.177", - demangled_name: None, - address: 7897, - size: 81, - kind: Object, - section: Some( - 4, - ), - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, - Symbol { - name: ".dwarf_type.178", + name: ".dwarf_type.153", demangled_name: None, - address: 7999, + normalized_name: None, + address: 7239, size: 6, kind: Object, section: Some( @@ -1114,10 +1156,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.179", + name: ".dwarf_type.154", demangled_name: None, - address: 8005, - size: 39, + normalized_name: None, + address: 7245, + size: 17, kind: Object, section: Some( 4, @@ -1127,9 +1170,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.180", + name: ".dwarf_type.155", demangled_name: None, - address: 8044, + normalized_name: None, + address: 7262, size: 6, kind: Object, section: Some( @@ -1140,10 +1184,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.181", + name: ".dwarf_type.156", demangled_name: None, - address: 8050, - size: 6, + normalized_name: None, + address: 7268, + size: 82, kind: Object, section: Some( 4, @@ -1153,23 +1198,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.182", + name: ".dwarf_typedef.PokeParty", demangled_name: None, - address: 8056, - size: 39, + normalized_name: None, + address: 7350, + size: 16, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.183", + name: ".dwarf_type.157", demangled_name: None, - address: 8095, - size: 6, + normalized_name: None, + address: 7366, + size: 17, kind: Object, section: Some( 4, @@ -1179,9 +1226,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.184", + name: ".dwarf_type.158", demangled_name: None, - address: 8101, + normalized_name: None, + address: 7383, size: 6, kind: Object, section: Some( @@ -1192,10 +1240,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.185", + name: ".dwarf_type.159", demangled_name: None, - address: 8107, - size: 9, + normalized_name: None, + address: 7389, + size: 17, kind: Object, section: Some( 4, @@ -1205,9 +1254,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.186", + name: ".dwarf_type.160", demangled_name: None, - address: 8116, + normalized_name: None, + address: 7406, size: 6, kind: Object, section: Some( @@ -1218,10 +1268,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.187", + name: ".dwarf_type.161", demangled_name: None, - address: 8122, - size: 61, + normalized_name: None, + address: 7412, + size: 17, kind: Object, section: Some( 4, @@ -1231,9 +1282,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.188", + name: ".dwarf_type.162", demangled_name: None, - address: 8231, + normalized_name: None, + address: 7429, size: 6, kind: Object, section: Some( @@ -1244,9 +1296,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.189", + name: ".dwarf_type.163", demangled_name: None, - address: 8237, + normalized_name: None, + address: 7435, size: 17, kind: Object, section: Some( @@ -1257,10 +1310,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.190", + name: ".dwarf_type.164", demangled_name: None, - address: 8254, - size: 142, + normalized_name: None, + address: 7452, + size: 6, kind: Object, section: Some( 4, @@ -1270,9 +1324,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.191", + name: ".dwarf_type.165", demangled_name: None, - address: 8412, + normalized_name: None, + address: 7458, size: 6, kind: Object, section: Some( @@ -1283,9 +1338,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.192", + name: ".dwarf_type.166", demangled_name: None, - address: 8418, + normalized_name: None, + address: 7464, size: 6, kind: Object, section: Some( @@ -1296,9 +1352,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.193", + name: ".dwarf_type.167", demangled_name: None, - address: 8424, + normalized_name: None, + address: 7470, size: 6, kind: Object, section: Some( @@ -1309,10 +1366,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.194", + name: ".dwarf_type.168", demangled_name: None, - address: 8430, - size: 17, + normalized_name: None, + address: 7476, + size: 6, kind: Object, section: Some( 4, @@ -1322,10 +1380,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.195", + name: ".dwarf_type.169", demangled_name: None, - address: 8447, - size: 53, + normalized_name: None, + address: 7482, + size: 22, kind: Object, section: Some( 4, @@ -1335,23 +1394,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.196", + name: ".dwarf_typedef.Reader", demangled_name: None, - address: 8525, - size: 6, + normalized_name: None, + address: 7504, + size: 13, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.197", + name: ".dwarf_type.170", demangled_name: None, - address: 8531, - size: 45, + normalized_name: None, + address: 7517, + size: 17, kind: Object, section: Some( 4, @@ -1361,9 +1422,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.198", + name: ".dwarf_type.171", demangled_name: None, - address: 8594, + normalized_name: None, + address: 7534, size: 17, kind: Object, section: Some( @@ -1374,9 +1436,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.199", + name: ".dwarf_type.172", demangled_name: None, - address: 8611, + normalized_name: None, + address: 7551, size: 17, kind: Object, section: Some( @@ -1387,10 +1450,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.200", + name: ".dwarf_type.173", demangled_name: None, - address: 8628, - size: 120, + normalized_name: None, + address: 7568, + size: 204, kind: Object, section: Some( 4, @@ -1400,23 +1464,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.201", + name: ".dwarf_typedef.SERVER_NOTIFY_PARAM", demangled_name: None, - address: 8771, - size: 55, + normalized_name: None, + address: 7772, + size: 26, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.202", + name: ".dwarf_type.174", demangled_name: None, - address: 8826, - size: 116, + normalized_name: None, + address: 7798, + size: 17, kind: Object, section: Some( 4, @@ -1426,10 +1492,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.203", + name: ".dwarf_type.175", demangled_name: None, - address: 8942, - size: 195, + normalized_name: None, + address: 7815, + size: 48, kind: Object, section: Some( 4, @@ -1439,23 +1506,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.204", + name: ".dwarf_typedef.EscapeInfo", demangled_name: None, - address: 9137, - size: 75, + normalized_name: None, + address: 7863, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.205", + name: ".dwarf_type.176", demangled_name: None, - address: 9212, - size: 132, + normalized_name: None, + address: 7880, + size: 17, kind: Object, section: Some( 4, @@ -1465,10 +1534,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.206", + name: ".dwarf_type.177", demangled_name: None, - address: 9344, - size: 17, + normalized_name: None, + address: 7897, + size: 81, kind: Object, section: Some( 4, @@ -1478,23 +1548,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.207", + name: ".dwarf_typedef.unk_struct_450", demangled_name: None, - address: 9361, - size: 70, + normalized_name: None, + address: 7978, + size: 21, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.208", + name: ".dwarf_type.178", demangled_name: None, - address: 9443, - size: 17, + normalized_name: None, + address: 7999, + size: 6, kind: Object, section: Some( 4, @@ -1504,10 +1576,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.209", + name: ".dwarf_type.179", demangled_name: None, - address: 9460, - size: 6, + normalized_name: None, + address: 8005, + size: 39, kind: Object, section: Some( 4, @@ -1517,10 +1590,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.210", + name: ".dwarf_type.180", demangled_name: None, - address: 9466, - size: 17, + normalized_name: None, + address: 8044, + size: 6, kind: Object, section: Some( 4, @@ -1530,9 +1604,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.211", + name: ".dwarf_type.181", demangled_name: None, - address: 9483, + normalized_name: None, + address: 8050, size: 6, kind: Object, section: Some( @@ -1543,10 +1618,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.212", + name: ".dwarf_type.182", demangled_name: None, - address: 9489, - size: 6, + normalized_name: None, + address: 8056, + size: 39, kind: Object, section: Some( 4, @@ -1556,9 +1632,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.213", + name: ".dwarf_type.183", demangled_name: None, - address: 9495, + normalized_name: None, + address: 8095, size: 6, kind: Object, section: Some( @@ -1569,10 +1646,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.214", + name: ".dwarf_type.184", demangled_name: None, - address: 9501, - size: 48, + normalized_name: None, + address: 8101, + size: 6, kind: Object, section: Some( 4, @@ -1582,10 +1660,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.215", + name: ".dwarf_type.185", demangled_name: None, - address: 9563, - size: 17, + normalized_name: None, + address: 8107, + size: 9, kind: Object, section: Some( 4, @@ -1595,10 +1674,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.216", + name: ".dwarf_type.186", demangled_name: None, - address: 9580, - size: 89, + normalized_name: None, + address: 8116, + size: 6, kind: Object, section: Some( 4, @@ -1608,10 +1688,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.217", + name: ".dwarf_type.187", demangled_name: None, - address: 9669, - size: 33, + normalized_name: None, + address: 8122, + size: 61, kind: Object, section: Some( 4, @@ -1621,49 +1702,53 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.218", + name: ".dwarf_typedef.struct_unk478", demangled_name: None, - address: 9716, - size: 17, + normalized_name: None, + address: 8183, + size: 20, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.219", + name: ".dwarf_type.signed char", demangled_name: None, - address: 9733, - size: 73, + normalized_name: None, + address: 8203, + size: 19, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.220", + name: ".dwarf_typedef.s8", demangled_name: None, - address: 9817, - size: 17, + normalized_name: None, + address: 8222, + size: 9, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.221", + name: ".dwarf_type.188", demangled_name: None, - address: 9834, - size: 17, + normalized_name: None, + address: 8231, + size: 6, kind: Object, section: Some( 4, @@ -1673,10 +1758,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.222", + name: ".dwarf_type.189", demangled_name: None, - address: 9851, - size: 6, + normalized_name: None, + address: 8237, + size: 17, kind: Object, section: Some( 4, @@ -1686,10 +1772,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.223", + name: ".dwarf_type.190", demangled_name: None, - address: 9857, - size: 202, + normalized_name: None, + address: 8254, + size: 142, kind: Object, section: Some( 4, @@ -1699,23 +1786,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.224", + name: ".dwarf_typedef.SVCL_WORK", demangled_name: None, - address: 10078, - size: 234, + normalized_name: None, + address: 8396, + size: 16, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.225", + name: ".dwarf_type.191", demangled_name: None, - address: 10312, - size: 197, + normalized_name: None, + address: 8412, + size: 6, kind: Object, section: Some( 4, @@ -1725,9 +1814,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.226", + name: ".dwarf_type.192", demangled_name: None, - address: 10509, + normalized_name: None, + address: 8418, size: 6, kind: Object, section: Some( @@ -1738,9 +1828,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.227", + name: ".dwarf_type.193", demangled_name: None, - address: 10515, + normalized_name: None, + address: 8424, size: 6, kind: Object, section: Some( @@ -1751,10 +1842,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.228", + name: ".dwarf_type.194", demangled_name: None, - address: 10521, - size: 107, + normalized_name: None, + address: 8430, + size: 17, kind: Object, section: Some( 4, @@ -1764,10 +1856,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.229", + name: ".dwarf_type.195", demangled_name: None, - address: 10649, - size: 17, + normalized_name: None, + address: 8447, + size: 53, kind: Object, section: Some( 4, @@ -1777,23 +1870,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.230", + name: ".dwarf_typedef.BTL_RESULT_CONTEXT", demangled_name: None, - address: 10666, - size: 17, + normalized_name: None, + address: 8500, + size: 25, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.231", + name: ".dwarf_type.196", demangled_name: None, - address: 10683, - size: 17, + normalized_name: None, + address: 8525, + size: 6, kind: Object, section: Some( 4, @@ -1803,10 +1898,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.232", + name: ".dwarf_type.197", demangled_name: None, - address: 10700, - size: 17, + normalized_name: None, + address: 8531, + size: 45, kind: Object, section: Some( 4, @@ -1816,23 +1912,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.233", + name: ".dwarf_typedef.SVCL_ACTION", demangled_name: None, - address: 10717, - size: 17, + normalized_name: None, + address: 8576, + size: 18, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.234", + name: ".dwarf_type.198", demangled_name: None, - address: 10734, - size: 66, + normalized_name: None, + address: 8594, + size: 17, kind: Object, section: Some( 4, @@ -1842,9 +1940,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.235", + name: ".dwarf_type.199", demangled_name: None, - address: 10819, + normalized_name: None, + address: 8611, size: 17, kind: Object, section: Some( @@ -1855,10 +1954,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.236", + name: ".dwarf_type.200", demangled_name: None, - address: 10836, - size: 25, + normalized_name: None, + address: 8628, + size: 120, kind: Object, section: Some( 4, @@ -1868,23 +1968,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.237", + name: ".dwarf_typedef.BTL_ACTION_PARAM", demangled_name: None, - address: 10896, - size: 17, + normalized_name: None, + address: 8748, + size: 23, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.238", + name: ".dwarf_type.201", demangled_name: None, - address: 10913, - size: 17, + normalized_name: None, + address: 8771, + size: 55, kind: Object, section: Some( 4, @@ -1894,10 +1996,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.239", + name: ".dwarf_type.202", demangled_name: None, - address: 10930, - size: 17, + normalized_name: None, + address: 8826, + size: 116, kind: Object, section: Some( 4, @@ -1907,10 +2010,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.240", + name: ".dwarf_type.203", demangled_name: None, - address: 10947, - size: 17, + normalized_name: None, + address: 8942, + size: 195, kind: Object, section: Some( 4, @@ -1920,10 +2024,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.241", + name: ".dwarf_type.204", demangled_name: None, - address: 10964, - size: 17, + normalized_name: None, + address: 9137, + size: 75, kind: Object, section: Some( 4, @@ -1933,10 +2038,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.242", + name: ".dwarf_type.205", demangled_name: None, - address: 10981, - size: 17, + normalized_name: None, + address: 9212, + size: 132, kind: Object, section: Some( 4, @@ -1946,9 +2052,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.243", + name: ".dwarf_type.206", demangled_name: None, - address: 10998, + normalized_name: None, + address: 9344, size: 17, kind: Object, section: Some( @@ -1959,10 +2066,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.244", + name: ".dwarf_type.207", demangled_name: None, - address: 11015, - size: 17, + normalized_name: None, + address: 9361, + size: 70, kind: Object, section: Some( 4, @@ -1972,23 +2080,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.245", + name: ".dwarf_typedef.SCQUE", demangled_name: None, - address: 11032, - size: 17, + normalized_name: None, + address: 9431, + size: 12, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.246", + name: ".dwarf_type.208", demangled_name: None, - address: 11049, - size: 149, + normalized_name: None, + address: 9443, + size: 17, kind: Object, section: Some( 4, @@ -1998,9 +2108,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.247", + name: ".dwarf_type.209", demangled_name: None, - address: 11222, + normalized_name: None, + address: 9460, size: 6, kind: Object, section: Some( @@ -2011,10 +2122,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.248", + name: ".dwarf_type.210", demangled_name: None, - address: 11228, - size: 83, + normalized_name: None, + address: 9466, + size: 17, kind: Object, section: Some( 4, @@ -2024,9 +2136,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.249", + name: ".dwarf_type.211", demangled_name: None, - address: 11331, + normalized_name: None, + address: 9483, size: 6, kind: Object, section: Some( @@ -2037,9 +2150,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.250", + name: ".dwarf_type.212", demangled_name: None, - address: 11337, + normalized_name: None, + address: 9489, size: 6, kind: Object, section: Some( @@ -2050,9 +2164,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.251", + name: ".dwarf_type.213", demangled_name: None, - address: 11343, + normalized_name: None, + address: 9495, size: 6, kind: Object, section: Some( @@ -2063,10 +2178,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.252", + name: ".dwarf_type.214", demangled_name: None, - address: 11349, - size: 6, + normalized_name: None, + address: 9501, + size: 48, kind: Object, section: Some( 4, @@ -2076,22 +2192,24 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.253", + name: ".dwarf_typedef.WazaRec", demangled_name: None, - address: 11355, - size: 17, + normalized_name: None, + address: 9549, + size: 14, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.254", + name: ".dwarf_type.215", demangled_name: None, - address: 11372, + normalized_name: None, + address: 9563, size: 17, kind: Object, section: Some( @@ -2102,10 +2220,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.255", + name: ".dwarf_type.216", demangled_name: None, - address: 11389, - size: 243, + normalized_name: None, + address: 9580, + size: 89, kind: Object, section: Some( 4, @@ -2115,10 +2234,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.256", + name: ".dwarf_type.217", demangled_name: None, - address: 11646, - size: 17, + normalized_name: None, + address: 9669, + size: 33, kind: Object, section: Some( 4, @@ -2128,22 +2248,24 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.257", + name: ".dwarf_typedef.DeadRec", demangled_name: None, - address: 11663, - size: 6, + normalized_name: None, + address: 9702, + size: 14, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.258", + name: ".dwarf_type.218", demangled_name: None, - address: 11669, + normalized_name: None, + address: 9716, size: 17, kind: Object, section: Some( @@ -2154,10 +2276,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.259", + name: ".dwarf_type.219", demangled_name: None, - address: 11686, - size: 17, + normalized_name: None, + address: 9733, + size: 73, kind: Object, section: Some( 4, @@ -2167,22 +2290,24 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.260", + name: ".dwarf_typedef.Unit", demangled_name: None, - address: 11703, - size: 17, + normalized_name: None, + address: 9806, + size: 11, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.261", + name: ".dwarf_type.220", demangled_name: None, - address: 11720, + normalized_name: None, + address: 9817, size: 17, kind: Object, section: Some( @@ -2193,10 +2318,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.262", + name: ".dwarf_type.221", demangled_name: None, - address: 11737, - size: 6, + normalized_name: None, + address: 9834, + size: 17, kind: Object, section: Some( 4, @@ -2206,10 +2332,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.263", + name: ".dwarf_type.222", demangled_name: None, - address: 11743, - size: 355, + normalized_name: None, + address: 9851, + size: 6, kind: Object, section: Some( 4, @@ -2219,10 +2346,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.264", + name: ".dwarf_type.223", demangled_name: None, - address: 12114, - size: 161, + normalized_name: None, + address: 9857, + size: 202, kind: Object, section: Some( 4, @@ -2232,23 +2360,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.265", + name: ".dwarf_typedef.WAZAEFF_CTRL", demangled_name: None, - address: 12275, - size: 122, + normalized_name: None, + address: 10059, + size: 19, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.266", + name: ".dwarf_type.224", demangled_name: None, - address: 12397, - size: 6, + normalized_name: None, + address: 10078, + size: 234, kind: Object, section: Some( 4, @@ -2258,10 +2388,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.267", + name: ".dwarf_type.225", demangled_name: None, - address: 12403, - size: 55, + normalized_name: None, + address: 10312, + size: 197, kind: Object, section: Some( 4, @@ -2271,10 +2402,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.268", + name: ".dwarf_type.226", demangled_name: None, - address: 12472, - size: 17, + normalized_name: None, + address: 10509, + size: 6, kind: Object, section: Some( 4, @@ -2284,10 +2416,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.269", + name: ".dwarf_type.227", demangled_name: None, - address: 12489, - size: 75, + normalized_name: None, + address: 10515, + size: 6, kind: Object, section: Some( 4, @@ -2297,10 +2430,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.270", + name: ".dwarf_type.228", demangled_name: None, - address: 12576, - size: 17, + normalized_name: None, + address: 10521, + size: 107, kind: Object, section: Some( 4, @@ -2310,23 +2444,25 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.271", + name: ".dwarf_typedef.WAZA_ROB_PARAM", demangled_name: None, - address: 12593, - size: 17, + normalized_name: None, + address: 10628, + size: 21, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.272", + name: ".dwarf_type.229", demangled_name: None, - address: 12610, - size: 145, + normalized_name: None, + address: 10649, + size: 17, kind: Object, section: Some( 4, @@ -2336,9 +2472,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.273", + name: ".dwarf_type.230", demangled_name: None, - address: 12783, + normalized_name: None, + address: 10666, size: 17, kind: Object, section: Some( @@ -2349,9 +2486,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.274", + name: ".dwarf_type.231", demangled_name: None, - address: 12800, + normalized_name: None, + address: 10683, size: 17, kind: Object, section: Some( @@ -2362,10 +2500,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.275", + name: ".dwarf_type.232", demangled_name: None, - address: 12817, - size: 65, + normalized_name: None, + address: 10700, + size: 17, kind: Object, section: Some( 4, @@ -2375,9 +2514,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.276", + name: ".dwarf_type.233", demangled_name: None, - address: 12903, + normalized_name: None, + address: 10717, size: 17, kind: Object, section: Some( @@ -2388,10 +2528,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.277", + name: ".dwarf_type.234", demangled_name: None, - address: 12920, - size: 17, + normalized_name: None, + address: 10734, + size: 66, kind: Object, section: Some( 4, @@ -2401,22 +2542,24 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.278", + name: ".dwarf_typedef.CLIENTID_REC", demangled_name: None, - address: 12937, - size: 33, + normalized_name: None, + address: 10800, + size: 19, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.279", + name: ".dwarf_type.235", demangled_name: None, - address: 12986, + normalized_name: None, + address: 10819, size: 17, kind: Object, section: Some( @@ -2427,10 +2570,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.280", + name: ".dwarf_type.236", demangled_name: None, - address: 13003, - size: 17, + normalized_name: None, + address: 10836, + size: 25, kind: Object, section: Some( 4, @@ -2440,22 +2584,24 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.281", + name: ".dwarf_typedef.ROTATION_HANDLER_WORK_BACKUP", demangled_name: None, - address: 13020, - size: 174, + normalized_name: None, + address: 10861, + size: 35, kind: Object, section: Some( 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.282", + name: ".dwarf_type.237", demangled_name: None, - address: 13211, + normalized_name: None, + address: 10896, size: 17, kind: Object, section: Some( @@ -2466,9 +2612,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.283", + name: ".dwarf_type.238", demangled_name: None, - address: 13228, + normalized_name: None, + address: 10913, size: 17, kind: Object, section: Some( @@ -2479,9 +2626,10 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.284", + name: ".dwarf_type.239", demangled_name: None, - address: 13245, + normalized_name: None, + address: 10930, size: 17, kind: Object, section: Some( @@ -2492,10 +2640,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.285", + name: ".dwarf_type.240", demangled_name: None, - address: 13262, - size: 6, + normalized_name: None, + address: 10947, + size: 17, kind: Object, section: Some( 4, @@ -2505,10 +2654,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.286", + name: ".dwarf_type.241", demangled_name: None, - address: 13268, - size: 183, + normalized_name: None, + address: 10964, + size: 17, kind: Object, section: Some( 4, @@ -2518,10 +2668,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.287", + name: ".dwarf_type.242", demangled_name: None, - address: 13468, - size: 6, + normalized_name: None, + address: 10981, + size: 17, kind: Object, section: Some( 4, @@ -2531,10 +2682,11 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.288", + name: ".dwarf_type.243", demangled_name: None, - address: 13474, - size: 6, + normalized_name: None, + address: 10998, + size: 17, kind: Object, section: Some( 4, @@ -2544,176 +2696,207 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_line.THUMB_BRANCH_ServerDisplay_UncategorizedMove", + name: ".dwarf_type.244", demangled_name: None, - address: 91, - size: 89, + normalized_name: None, + address: 11015, + size: 17, kind: Object, section: Some( - 9, + 4, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "THUMB_BRANCH_ServerDisplay_UncategorizedMove", + name: ".dwarf_type.245", demangled_name: None, - address: 0, - size: 244, - kind: Function, + normalized_name: None, + address: 11032, + size: 17, + kind: Object, section: Some( - 17, + 4, ), - flags: FlagSet(Global), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "PokeSet_IsRemovedAll", + name: ".dwarf_type.246", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Global), + normalized_name: None, + address: 11049, + size: 149, + kind: Object, + section: Some( + 4, + ), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "ServerDisplay_SkillSwap", + name: ".dwarf_typedef.ACTION_ORDER_WORK", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Global), + normalized_name: None, + address: 11198, + size: 24, + kind: Object, + section: Some( + 4, + ), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: "ServerEvent_CreateSubstitute", + name: ".dwarf_type.247", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Global), + normalized_name: None, + address: 11222, + size: 6, + kind: Object, + section: Some( + 4, + ), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "HEManager_PushState", + name: ".dwarf_type.248", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Global), + normalized_name: None, + address: 11228, + size: 83, + kind: Object, + section: Some( + 4, + ), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "BattleHandler_Result", + name: ".dwarf_typedef.BTL_POKEPARAM", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Global), + normalized_name: None, + address: 11311, + size: 20, + kind: Object, + section: Some( + 4, + ), + flags: FlagSet(Global | Weak), align: None, virtual_address: None, }, Symbol { - name: "ServerEvent_UncategorizedMove", + name: ".dwarf_type.249", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Global), + normalized_name: None, + address: 11331, + size: 6, + kind: Object, + section: Some( + 4, + ), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "SCQUE_PUT_MsgImpl", + name: ".dwarf_type.250", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Global), + normalized_name: None, + address: 11337, + size: 6, + kind: Object, + section: Some( + 4, + ), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "HEManager_PopState", + name: ".dwarf_type.251", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Global), + normalized_name: None, + address: 11343, + size: 6, + kind: Object, + section: Some( + 4, + ), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.void", + name: ".dwarf_type.252", demangled_name: None, - address: 70, - size: 12, + normalized_name: None, + address: 11349, + size: 6, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.ServerFlow", + name: ".dwarf_type.253", demangled_name: None, - address: 2011, + normalized_name: None, + address: 11355, size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.BTL_SERVER", + name: ".dwarf_type.254", demangled_name: None, - address: 2700, + normalized_name: None, + address: 11372, size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.int", + name: ".dwarf_type.255", demangled_name: None, - address: 2762, - size: 11, + normalized_name: None, + address: 11389, + size: 243, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.bool", + name: ".dwarf_typedef.POKESET", demangled_name: None, - address: 2773, - size: 11, + normalized_name: None, + address: 11632, + size: 14, kind: Object, section: Some( 4, @@ -2723,113 +2906,122 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_typedef.fx32", + name: ".dwarf_type.256", demangled_name: None, - address: 2784, - size: 11, + normalized_name: None, + address: 11646, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.s32", + name: ".dwarf_type.257", demangled_name: None, - address: 2795, - size: 10, + normalized_name: None, + address: 11663, + size: 6, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.int32_t", + name: ".dwarf_type.258", demangled_name: None, - address: 2805, - size: 14, + normalized_name: None, + address: 11669, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.BTL_MAIN_MODULE", + name: ".dwarf_type.259", demangled_name: None, - address: 4348, - size: 22, + normalized_name: None, + address: 11686, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.BATTLE_SETUP_PARAM", + name: ".dwarf_type.260", demangled_name: None, - address: 5575, - size: 25, + normalized_name: None, + address: 11703, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.unsigned int", + name: ".dwarf_type.261", demangled_name: None, - address: 5600, - size: 20, + normalized_name: None, + address: 11720, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.uint32_t", + name: ".dwarf_type.262", demangled_name: None, - address: 5620, - size: 15, + normalized_name: None, + address: 11737, + size: 6, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.uptr", + name: ".dwarf_type.263", demangled_name: None, - address: 5635, - size: 11, + normalized_name: None, + address: 11743, + size: 355, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.uintptr_t", + name: ".dwarf_typedef.WAZAPARAM", demangled_name: None, - address: 5646, + normalized_name: None, + address: 12098, size: 16, kind: Object, section: Some( @@ -2840,61 +3032,66 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_typedef.u32", + name: ".dwarf_type.264", demangled_name: None, - address: 5662, - size: 10, + normalized_name: None, + address: 12114, + size: 161, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_type.unsigned char", + name: ".dwarf_type.265", demangled_name: None, - address: 5689, - size: 21, + normalized_name: None, + address: 12275, + size: 122, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.BtlPokePos", + name: ".dwarf_type.266", demangled_name: None, - address: 5710, - size: 17, + normalized_name: None, + address: 12397, + size: 6, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.u8", + name: ".dwarf_type.267", demangled_name: None, - address: 5727, - size: 9, + normalized_name: None, + address: 12403, + size: 55, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.uint8_t", + name: ".dwarf_typedef.PosPoke", demangled_name: None, - address: 5736, + normalized_name: None, + address: 12458, size: 14, kind: Object, section: Some( @@ -2905,36 +3102,39 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.unsigned short", + name: ".dwarf_type.268", demangled_name: None, - address: 5750, - size: 22, + normalized_name: None, + address: 12472, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.uint16_t", + name: ".dwarf_type.269", demangled_name: None, - address: 5772, - size: 15, + normalized_name: None, + address: 12489, + size: 75, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.u16", + name: ".dwarf_typedef.State", demangled_name: None, - address: 5787, - size: 10, + normalized_name: None, + address: 12564, + size: 12, kind: Object, section: Some( 4, @@ -2944,49 +3144,53 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.TINYMT32_T", + name: ".dwarf_type.270", demangled_name: None, - address: 5999, - size: 74, + normalized_name: None, + address: 12576, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.tinymt32_t", + name: ".dwarf_type.271", demangled_name: None, - address: 6073, + normalized_name: None, + address: 12593, size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.BATTLE_KENTEI_RESULT", + name: ".dwarf_type.272", demangled_name: None, - address: 6396, - size: 27, + normalized_name: None, + address: 12610, + size: 145, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.TRAINER_DATA", + name: ".dwarf_typedef.BTL_HANDEX_STR_PARAMS", demangled_name: None, - address: 6863, - size: 19, + normalized_name: None, + address: 12755, + size: 28, kind: Object, section: Some( 4, @@ -2996,49 +3200,53 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_typedef.POKECON", + name: ".dwarf_type.273", demangled_name: None, - address: 7067, - size: 14, + normalized_name: None, + address: 12783, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.BTL_PARTY", + name: ".dwarf_type.274", demangled_name: None, - address: 7206, - size: 16, + normalized_name: None, + address: 12800, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.PokeParty", + name: ".dwarf_type.275", demangled_name: None, - address: 7350, - size: 16, + normalized_name: None, + address: 12817, + size: 65, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.Reader", + name: ".dwarf_typedef.EventWorkStack", demangled_name: None, - address: 7504, - size: 13, + normalized_name: None, + address: 12882, + size: 21, kind: Object, section: Some( 4, @@ -3048,49 +3256,53 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_typedef.SERVER_NOTIFY_PARAM", + name: ".dwarf_type.276", demangled_name: None, - address: 7772, - size: 26, + normalized_name: None, + address: 12903, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.EscapeInfo", + name: ".dwarf_type.277", demangled_name: None, - address: 7863, + normalized_name: None, + address: 12920, size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.unk_struct_450", + name: ".dwarf_type.278", demangled_name: None, - address: 7978, - size: 21, + normalized_name: None, + address: 12937, + size: 33, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.struct_unk478", + name: ".dwarf_typedef.HEManager", demangled_name: None, - address: 8183, - size: 20, + normalized_name: None, + address: 12970, + size: 16, kind: Object, section: Some( 4, @@ -3100,49 +3312,53 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_type.signed char", + name: ".dwarf_type.279", demangled_name: None, - address: 8203, - size: 19, + normalized_name: None, + address: 12986, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.s8", + name: ".dwarf_type.280", demangled_name: None, - address: 8222, - size: 9, + normalized_name: None, + address: 13003, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.SVCL_WORK", + name: ".dwarf_type.281", demangled_name: None, - address: 8396, - size: 16, + normalized_name: None, + address: 13020, + size: 174, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.BTL_RESULT_CONTEXT", + name: ".dwarf_typedef.AffCounter", demangled_name: None, - address: 8500, - size: 25, + normalized_name: None, + address: 13194, + size: 17, kind: Object, section: Some( 4, @@ -3152,75 +3368,81 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_typedef.SVCL_ACTION", + name: ".dwarf_type.282", demangled_name: None, - address: 8576, - size: 18, + normalized_name: None, + address: 13211, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.BTL_ACTION_PARAM", + name: ".dwarf_type.283", demangled_name: None, - address: 8748, - size: 23, + normalized_name: None, + address: 13228, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.SCQUE", + name: ".dwarf_type.284", demangled_name: None, - address: 9431, - size: 12, + normalized_name: None, + address: 13245, + size: 17, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.WazaRec", + name: ".dwarf_type.285", demangled_name: None, - address: 9549, - size: 14, + normalized_name: None, + address: 13262, + size: 6, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.DeadRec", + name: ".dwarf_type.286", demangled_name: None, - address: 9702, - size: 14, + normalized_name: None, + address: 13268, + size: 183, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.Unit", + name: ".dwarf_typedef.MOVE_PARAM", demangled_name: None, - address: 9806, - size: 11, + normalized_name: None, + address: 13451, + size: 17, kind: Object, section: Some( 4, @@ -3230,209 +3452,251 @@ Object { virtual_address: None, }, Symbol { - name: ".dwarf_typedef.WAZAEFF_CTRL", + name: ".dwarf_type.287", demangled_name: None, - address: 10059, - size: 19, + normalized_name: None, + address: 13468, + size: 6, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.WAZA_ROB_PARAM", + name: ".dwarf_type.288", demangled_name: None, - address: 10628, - size: 21, + normalized_name: None, + address: 13474, + size: 6, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.CLIENTID_REC", + name: ".dwarf.THUMB_BRANCH_ServerDisplay_UncategorizedMove", demangled_name: None, - address: 10800, - size: 19, + normalized_name: None, + address: 13480, + size: 243, kind: Object, section: Some( 4, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.ROTATION_HANDLER_WORK_BACKUP", + name: "[.debug_line]", demangled_name: None, - address: 10861, - size: 35, - kind: Object, + normalized_name: None, + address: 0, + size: 91, + kind: Section, section: Some( - 4, + 9, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.ACTION_ORDER_WORK", + name: ".dwarf_line.THUMB_BRANCH_ServerDisplay_UncategorizedMove", demangled_name: None, - address: 11198, - size: 24, + normalized_name: None, + address: 91, + size: 89, kind: Object, section: Some( - 4, + 9, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.BTL_POKEPARAM", + name: "[.debug_line]", demangled_name: None, - address: 11311, - size: 20, - kind: Object, + normalized_name: None, + address: 0, + size: 0, + kind: Section, section: Some( - 4, + 11, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.POKESET", + name: "[.debug_pubnames]", demangled_name: None, - address: 11632, - size: 14, - kind: Object, + normalized_name: None, + address: 0, + size: 18, + kind: Section, section: Some( - 4, + 13, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.WAZAPARAM", + name: "[.debug_abbrev]", demangled_name: None, - address: 12098, - size: 16, - kind: Object, + normalized_name: None, + address: 0, + size: 211, + kind: Section, section: Some( - 4, + 16, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.PosPoke", + name: "$t", demangled_name: None, - address: 12458, - size: 14, - kind: Object, + normalized_name: None, + address: 0, + size: 0, + kind: Function, section: Some( - 4, + 17, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local | Hidden), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.State", + name: "THUMB_BRANCH_ServerDisplay_UncategorizedMove", demangled_name: None, - address: 12564, - size: 12, - kind: Object, + normalized_name: None, + address: 0, + size: 244, + kind: Function, section: Some( - 4, + 17, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.BTL_HANDEX_STR_PARAMS", + name: "$d", demangled_name: None, - address: 12755, - size: 28, - kind: Object, + normalized_name: None, + address: 216, + size: 0, + kind: Function, section: Some( - 4, + 17, ), - flags: FlagSet(Global | Weak), + flags: FlagSet(Local | Hidden), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.EventWorkStack", + name: "PokeSet_IsRemovedAll", demangled_name: None, - address: 12882, - size: 21, - kind: Object, - section: Some( - 4, - ), - flags: FlagSet(Global | Weak), + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.HEManager", + name: "ServerDisplay_SkillSwap", demangled_name: None, - address: 12970, - size: 16, - kind: Object, - section: Some( - 4, - ), - flags: FlagSet(Global | Weak), + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.AffCounter", + name: "ServerEvent_CreateSubstitute", demangled_name: None, - address: 13194, - size: 17, - kind: Object, - section: Some( - 4, - ), - flags: FlagSet(Global | Weak), + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: ".dwarf_typedef.MOVE_PARAM", + name: "HEManager_PushState", demangled_name: None, - address: 13451, - size: 17, - kind: Object, - section: Some( - 4, - ), - flags: FlagSet(Global | Weak), + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: ".dwarf.THUMB_BRANCH_ServerDisplay_UncategorizedMove", + name: "BattleHandler_Result", demangled_name: None, - address: 13480, - size: 243, - kind: Object, - section: Some( - 4, - ), + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, + Symbol { + name: "ServerEvent_UncategorizedMove", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, + Symbol { + name: "SCQUE_PUT_MsgImpl", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, + Symbol { + name: "HEManager_PopState", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, flags: FlagSet(Global), align: None, virtual_address: None, @@ -3713,7 +3977,7 @@ Object { 10, ), address: 14, - target_symbol: 196, + target_symbol: 256, addend: -4, }, Relocation { @@ -3721,7 +3985,7 @@ Object { 10, ), address: 40, - target_symbol: 197, + target_symbol: 257, addend: -4, }, Relocation { @@ -3729,7 +3993,7 @@ Object { 10, ), address: 52, - target_symbol: 198, + target_symbol: 258, addend: -4, }, Relocation { @@ -3737,7 +4001,7 @@ Object { 10, ), address: 100, - target_symbol: 199, + target_symbol: 259, addend: -4, }, Relocation { @@ -3745,7 +4009,7 @@ Object { 10, ), address: 108, - target_symbol: 200, + target_symbol: 260, addend: -4, }, Relocation { @@ -3753,7 +4017,7 @@ Object { 10, ), address: 126, - target_symbol: 201, + target_symbol: 261, addend: -4, }, Relocation { @@ -3761,7 +4025,7 @@ Object { 10, ), address: 136, - target_symbol: 200, + target_symbol: 260, addend: -4, }, Relocation { @@ -3769,7 +4033,7 @@ Object { 10, ), address: 196, - target_symbol: 202, + target_symbol: 262, addend: -4, }, Relocation { @@ -3777,7 +4041,7 @@ Object { 10, ), address: 208, - target_symbol: 203, + target_symbol: 263, addend: -4, }, ], diff --git a/objdiff-core/tests/snapshots/arch_mips__filter_non_matching.snap b/objdiff-core/tests/snapshots/arch_mips__filter_non_matching.snap index eca63067..583d28aa 100644 --- a/objdiff-core/tests/snapshots/arch_mips__filter_non_matching.snap +++ b/objdiff-core/tests/snapshots/arch_mips__filter_non_matching.snap @@ -3,20 +3,10 @@ source: objdiff-core/tests/arch_mips.rs expression: obj.symbols --- [ - Symbol { - name: "build/src/bodyprog/view/vw_main.i", - demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, Symbol { name: "[.text]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -28,34 +18,25 @@ expression: obj.symbols virtual_address: None, }, Symbol { - name: "[.data]", + name: "gcc2_compiled.", demangled_name: None, - address: 0, - size: 0, - kind: Section, - section: Some( - 2, + normalized_name: Some( + "gcc2_compiled.0000", ), - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, - Symbol { - name: "[.bss]", - demangled_name: None, address: 0, size: 0, - kind: Section, + kind: Unknown, section: Some( - 3, + 0, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "gcc2_compiled.", + name: "__gnu_compiled_c", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -67,113 +48,122 @@ expression: obj.symbols virtual_address: None, }, Symbol { - name: "__gnu_compiled_c", + name: "vwInitViewInfo", demangled_name: None, + normalized_name: None, address: 0, - size: 0, - kind: Unknown, + size: 88, + kind: Function, section: Some( 0, ), - flags: FlagSet(Local), + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: ".endfunc_80048AF4", + name: "vwGetViewCoord", demangled_name: None, - address: 424, - size: 0, - kind: Unknown, + normalized_name: None, + address: 88, + size: 12, + kind: Function, section: Some( 0, ), - flags: FlagSet(Local), + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: ".endfunc_80048DA8", + name: "vwGetViewPosition", demangled_name: None, - address: 1028, - size: 0, - kind: Unknown, + normalized_name: None, + address: 100, + size: 40, + kind: Function, section: Some( 0, ), - flags: FlagSet(Local), + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: ".endfunc_80048E3C", + name: "vwGetViewAngle", demangled_name: None, - address: 1264, - size: 0, - kind: Unknown, + normalized_name: None, + address: 140, + size: 48, + kind: Function, section: Some( 0, ), - flags: FlagSet(Local), + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: "[.reginfo]", + name: "func_80048AF4", demangled_name: None, - address: 0, - size: 24, - kind: Section, + normalized_name: None, + address: 188, + size: 236, + kind: Function, section: Some( - 4, + 0, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Ignored), align: None, virtual_address: None, }, Symbol { - name: "[.MIPS.abiflags]", + name: "func_80048AF4.NON_MATCHING", demangled_name: None, - address: 0, - size: 24, - kind: Section, + normalized_name: None, + address: 188, + size: 236, + kind: Function, section: Some( - 5, + 0, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Ignored), align: None, virtual_address: None, }, Symbol { - name: "[.pdr]", + name: ".endfunc_80048AF4", demangled_name: None, - address: 0, - size: 320, - kind: Section, + normalized_name: None, + address: 424, + size: 0, + kind: Unknown, section: Some( - 6, + 0, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "[.gnu.attributes]", + name: "vwSetCoordRefAndEntou", demangled_name: None, - address: 0, - size: 16, - kind: Section, + normalized_name: None, + address: 424, + size: 272, + kind: Function, section: Some( - 8, + 0, ), - flags: FlagSet(Local), + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: "vwInitViewInfo", + name: "vwSetViewInfoDirectMatrix", demangled_name: None, - address: 0, + normalized_name: None, + address: 696, size: 88, kind: Function, section: Some( @@ -184,167 +174,203 @@ expression: obj.symbols virtual_address: None, }, Symbol { - name: "vwViewPointInfo", + name: "vwSetViewInfo", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, + normalized_name: None, + address: 784, + size: 96, + kind: Function, + section: Some( + 0, + ), flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: "GsInitCoordinate2", + name: "func_80048DA8", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Global), + normalized_name: None, + address: 880, + size: 148, + kind: Function, + section: Some( + 0, + ), + flags: FlagSet(Global | Ignored), align: None, virtual_address: None, }, Symbol { - name: "vwSetViewInfo", + name: "func_80048DA8.NON_MATCHING", demangled_name: None, - address: 784, - size: 96, + normalized_name: None, + address: 880, + size: 148, kind: Function, section: Some( 0, ), - flags: FlagSet(Global), + flags: FlagSet(Global | Ignored), align: None, virtual_address: None, }, Symbol { - name: "vwGetViewCoord", + name: ".endfunc_80048DA8", demangled_name: None, - address: 88, - size: 12, - kind: Function, + normalized_name: None, + address: 1028, + size: 0, + kind: Unknown, section: Some( 0, ), - flags: FlagSet(Global), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "vwGetViewPosition", + name: "func_80048E3C", demangled_name: None, - address: 100, - size: 40, + normalized_name: None, + address: 1028, + size: 236, kind: Function, section: Some( 0, ), - flags: FlagSet(Global), + flags: FlagSet(Global | Ignored), align: None, virtual_address: None, }, Symbol { - name: "vwGetViewAngle", + name: "func_80048E3C.NON_MATCHING", demangled_name: None, - address: 140, - size: 48, + normalized_name: None, + address: 1028, + size: 236, kind: Function, section: Some( 0, ), - flags: FlagSet(Global), + flags: FlagSet(Global | Ignored), align: None, virtual_address: None, }, Symbol { - name: "func_80048AF4", + name: ".endfunc_80048E3C", demangled_name: None, - address: 188, - size: 236, - kind: Function, + normalized_name: None, + address: 1264, + size: 0, + kind: Unknown, section: Some( 0, ), - flags: FlagSet(Global | Ignored), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "ratan2", + name: "[.data]", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Global), + kind: Section, + section: Some( + 2, + ), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "SquareRoot0", + name: "[.bss]", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Global), + kind: Section, + section: Some( + 3, + ), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "func_80096C94", + name: "[.reginfo]", demangled_name: None, + normalized_name: None, address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Global), + size: 24, + kind: Section, + section: Some( + 4, + ), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "vwSetViewInfoDirectMatrix", + name: "[.MIPS.abiflags]", demangled_name: None, - address: 696, - size: 88, - kind: Function, + normalized_name: None, + address: 0, + size: 24, + kind: Section, section: Some( - 0, + 5, ), - flags: FlagSet(Global), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "func_80048AF4.NON_MATCHING", + name: "[.pdr]", demangled_name: None, - address: 188, - size: 236, - kind: Function, + normalized_name: None, + address: 0, + size: 320, + kind: Section, section: Some( - 0, + 6, ), - flags: FlagSet(Global | Ignored), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "vwSetCoordRefAndEntou", + name: "[.gnu.attributes]", demangled_name: None, - address: 424, - size: 272, - kind: Function, + normalized_name: None, + address: 0, + size: 16, + kind: Section, section: Some( - 0, + 8, ), + flags: FlagSet(Local), + align: None, + virtual_address: None, + }, + Symbol { + name: "vwViewPointInfo", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: "func_80096E78", + name: "GsInitCoordinate2", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -354,8 +380,9 @@ expression: obj.symbols virtual_address: None, }, Symbol { - name: "shRsin", + name: "ratan2", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -365,8 +392,9 @@ expression: obj.symbols virtual_address: None, }, Symbol { - name: "shRcos", + name: "SquareRoot0", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -376,8 +404,9 @@ expression: obj.symbols virtual_address: None, }, Symbol { - name: "vbSetRefView", + name: "func_80096C94", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -387,8 +416,9 @@ expression: obj.symbols virtual_address: None, }, Symbol { - name: "vwMatrixToAngleYXZ", + name: "func_80096E78", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -398,60 +428,57 @@ expression: obj.symbols virtual_address: None, }, Symbol { - name: "func_80048DA8", + name: "shRsin", demangled_name: None, - address: 880, - size: 148, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global | Ignored), + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: "func_80048DA8.NON_MATCHING", + name: "shRcos", demangled_name: None, - address: 880, - size: 148, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global | Ignored), + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: "func_80048E3C", + name: "vbSetRefView", demangled_name: None, - address: 1028, - size: 236, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global | Ignored), + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: "func_80048E3C.NON_MATCHING", + name: "vwMatrixToAngleYXZ", demangled_name: None, - address: 1028, - size: 236, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global | Ignored), + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { name: "[.data-0]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, diff --git a/objdiff-core/tests/snapshots/arch_mips__read_mips-3.snap b/objdiff-core/tests/snapshots/arch_mips__read_mips-3.snap index d01be527..7c4853c6 100644 --- a/objdiff-core/tests/snapshots/arch_mips__read_mips-3.snap +++ b/objdiff-core/tests/snapshots/arch_mips__read_mips-3.snap @@ -7,42 +7,42 @@ expression: output [(Address(8), Dim, 5), (Spacing(4), Normal, 0), (Opcode("sd", 44), Normal, 10), (Argument(Opaque("$s1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(8)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("$sp")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(12), Dim, 5), (Spacing(4), Normal, 0), (Opcode("sd", 44), Normal, 10), (Argument(Opaque("$s2")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(16)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("$sp")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(16), Dim, 5), (Spacing(4), Normal, 0), (Opcode("sd", 44), Normal, 10), (Argument(Opaque("$ra")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(24)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("$sp")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(20), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglSleep", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(20), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglSleep", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(24), Dim, 5), (Spacing(4), Normal, 0), (Opcode("nop", 113), Normal, 10), (Eol, Normal, 0)] -[(Address(28), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lw", 26), Normal, 10), (Argument(Opaque("$a1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%gp_rel("), Normal, 0), (Symbol(Symbol { name: "WorkEnd", demangled_name: None, address: 64, size: 4, kind: Object, section: Some(8), flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("$gp")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(32), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lui", 20), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%hi("), Normal, 0), (Symbol(Symbol { name: "[.sdata]", demangled_name: None, address: 0, size: 0, kind: Section, section: Some(8), flags: FlagSet(Local), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(28), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lw", 26), Normal, 10), (Argument(Opaque("$a1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%gp_rel("), Normal, 0), (Symbol(Symbol { name: "WorkEnd", demangled_name: None, normalized_name: None, address: 64, size: 4, kind: Object, section: Some(8), flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("$gp")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(32), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lui", 20), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%hi("), Normal, 0), (Symbol(Symbol { name: "[.sdata]", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Section, section: Some(8), flags: FlagSet(Local), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(36), Dim, 5), (Spacing(4), Normal, 0), (Opcode("daddu", 97), Normal, 10), (Argument(Opaque("$a2")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$zero")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$zero")), Normal, 0), (Eol, Normal, 0)] -[(Address(40), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglSoundLoadEffect", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] -[(Address(44), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addiu", 12), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%lo("), Normal, 0), (Symbol(Symbol { name: "[.sdata]", demangled_name: None, address: 0, size: 0, kind: Section, section: Some(8), flags: FlagSet(Local), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(48), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lui", 20), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%hi("), Normal, 0), (Symbol(Symbol { name: "PacketBottomNewVu1DropMicroCode", demangled_name: None, address: 0, size: 12, kind: Object, section: Some(7), flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(52), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lw", 26), Normal, 10), (Argument(Opaque("$a1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%gp_rel("), Normal, 0), (Symbol(Symbol { name: "WorkEnd", demangled_name: None, address: 64, size: 4, kind: Object, section: Some(8), flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("$gp")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(56), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglSoundLoadSwd", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] -[(Address(60), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addiu", 12), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%lo("), Normal, 0), (Symbol(Symbol { name: "PacketBottomNewVu1DropMicroCode", demangled_name: None, address: 0, size: 12, kind: Object, section: Some(7), flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(64), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lw", 26), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%gp_rel("), Normal, 0), (Symbol(Symbol { name: "WorkEnd", demangled_name: None, address: 64, size: 4, kind: Object, section: Some(8), flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("$gp")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(40), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglSoundLoadEffect", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(44), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addiu", 12), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%lo("), Normal, 0), (Symbol(Symbol { name: "[.sdata]", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Section, section: Some(8), flags: FlagSet(Local), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(48), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lui", 20), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%hi("), Normal, 0), (Symbol(Symbol { name: "PacketBottomNewVu1DropMicroCode", demangled_name: None, normalized_name: None, address: 0, size: 12, kind: Object, section: Some(7), flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(52), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lw", 26), Normal, 10), (Argument(Opaque("$a1")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%gp_rel("), Normal, 0), (Symbol(Symbol { name: "WorkEnd", demangled_name: None, normalized_name: None, address: 64, size: 4, kind: Object, section: Some(8), flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("$gp")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(56), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglSoundLoadSwd", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(60), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addiu", 12), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%lo("), Normal, 0), (Symbol(Symbol { name: "PacketBottomNewVu1DropMicroCode", demangled_name: None, normalized_name: None, address: 0, size: 12, kind: Object, section: Some(7), flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(64), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lw", 26), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%gp_rel("), Normal, 0), (Symbol(Symbol { name: "WorkEnd", demangled_name: None, normalized_name: None, address: 64, size: 4, kind: Object, section: Some(8), flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("$gp")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(68), Dim, 5), (Spacing(4), Normal, 0), (Opcode("daddu", 97), Normal, 10), (Argument(Opaque("$a1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$zero")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$zero")), Normal, 0), (Eol, Normal, 0)] -[(Address(72), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "SsdAddWaveData", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(72), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "SsdAddWaveData", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(76), Dim, 5), (Spacing(4), Normal, 0), (Opcode("daddu", 97), Normal, 10), (Argument(Opaque("$a2")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$zero")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$zero")), Normal, 0), (Eol, Normal, 0)] -[(Address(80), Dim, 5), (BranchArrow(22), Rotating(0), 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "SsdSpuDmaCompleted", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(80), Dim, 5), (BranchArrow(22), Rotating(0), 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "SsdSpuDmaCompleted", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(84), Dim, 5), (Spacing(4), Normal, 0), (Opcode("daddu", 97), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$zero")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$zero")), Normal, 0), (Eol, Normal, 0)] [(Address(88), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bnez", 56), Normal, 10), (Argument(Opaque("$v0")), Normal, 0), (Basic(", "), Normal, 0), (BranchDest(80), Normal, 0), (BranchArrow(20), Rotating(0), 0), (Eol, Normal, 0)] [(Address(92), Dim, 5), (Spacing(4), Normal, 0), (Opcode("nop", 113), Normal, 10), (Eol, Normal, 0)] -[(Address(96), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglRenderDispOn", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(96), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglRenderDispOn", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(100), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lui", 20), Normal, 10), (Argument(Opaque("$s1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Unsigned(255)), Normal, 0), (Eol, Normal, 0)] -[(Address(104), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglCdLoadOverlay", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(104), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglCdLoadOverlay", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(108), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addiu", 12), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$zero")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(2)), Normal, 0), (Eol, Normal, 0)] -[(Address(112), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "LogoFirst", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(112), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "LogoFirst", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(116), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ori", 16), Normal, 10), (Argument(Opaque("$s1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$s1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Unsigned(65535)), Normal, 0), (Eol, Normal, 0)] -[(Address(120), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lui", 20), Normal, 10), (Argument(Opaque("$v0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%hi("), Normal, 0), (Symbol(Symbol { name: "Title", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(124), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addiu", 12), Normal, 10), (Argument(Opaque("$s2")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$v0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%lo("), Normal, 0), (Symbol(Symbol { name: "Title", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(128), Dim, 5), (BranchArrow(36), Rotating(1), 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglCdLoadOverlay", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(120), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lui", 20), Normal, 10), (Argument(Opaque("$v0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%hi("), Normal, 0), (Symbol(Symbol { name: "Title", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(124), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addiu", 12), Normal, 10), (Argument(Opaque("$s2")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$v0")), Normal, 0), (Basic(", "), Normal, 0), (Basic("%lo("), Normal, 0), (Symbol(Symbol { name: "Title", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(128), Dim, 5), (BranchArrow(36), Rotating(1), 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglCdLoadOverlay", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(132), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addiu", 12), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$zero")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(2)), Normal, 0), (Eol, Normal, 0)] -[(Address(136), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "Title", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(136), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "Title", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(140), Dim, 5), (Spacing(4), Normal, 0), (Opcode("nop", 113), Normal, 10), (Eol, Normal, 0)] [(Address(144), Dim, 5), (Spacing(4), Normal, 0), (Opcode("beqz", 55), Normal, 10), (Argument(Opaque("$v0")), Normal, 0), (Basic(", "), Normal, 0), (BranchDest(128), Normal, 0), (BranchArrow(32), Rotating(1), 0), (Eol, Normal, 0)] [(Address(148), Dim, 5), (Spacing(4), Normal, 0), (Opcode("and", 90), Normal, 10), (Argument(Opaque("$s0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$v0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$s1")), Normal, 0), (Eol, Normal, 0)] [(Address(152), Dim, 5), (Spacing(4), Normal, 0), (Opcode("beq", 3), Normal, 10), (Argument(Opaque("$s0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$s2")), Normal, 0), (Basic(", "), Normal, 0), (BranchDest(128), Normal, 0), (BranchArrow(32), Rotating(1), 0), (Eol, Normal, 0)] [(Address(156), Dim, 5), (Spacing(4), Normal, 0), (Opcode("nop", 113), Normal, 10), (Eol, Normal, 0)] -[(Address(160), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglCdLoadOverlay", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(160), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jal", 2), Normal, 10), (Symbol(Symbol { name: "xglCdLoadOverlay", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(164), Dim, 5), (Spacing(4), Normal, 0), (Opcode("srl", 60), Normal, 10), (Argument(Opaque("$a0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("$v0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("24")), Normal, 0), (Eol, Normal, 0)] [(Address(168), Dim, 5), (Spacing(4), Normal, 0), (Opcode("jalr", 77), Normal, 10), (Argument(Opaque("$s0")), Normal, 0), (Eol, Normal, 0)] [(Address(172), Dim, 5), (Spacing(4), Normal, 0), (Opcode("nop", 113), Normal, 10), (Eol, Normal, 0)] diff --git a/objdiff-core/tests/snapshots/arch_mips__read_mips.snap b/objdiff-core/tests/snapshots/arch_mips__read_mips.snap index f6fdc199..eb198cc4 100644 --- a/objdiff-core/tests/snapshots/arch_mips__read_mips.snap +++ b/objdiff-core/tests/snapshots/arch_mips__read_mips.snap @@ -1,6 +1,5 @@ --- source: objdiff-core/tests/arch_mips.rs -assertion_line: 12 expression: obj --- Object { @@ -59,6 +58,7 @@ Object { Symbol { name: "[.text]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -70,65 +70,100 @@ Object { virtual_address: None, }, Symbol { - name: "[.data]", + name: "gcc2_compiled.", demangled_name: None, + normalized_name: Some( + "gcc2_compiled.0000", + ), address: 0, size: 0, - kind: Section, + kind: Unknown, section: Some( - 2, + 0, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "[.bss]", + name: "__gnu_compiled_c", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Section, + kind: Unknown, section: Some( - 3, + 0, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "[.mdebug.eabi64]", + name: "ControlEntry", demangled_name: None, + normalized_name: None, address: 0, - size: 0, - kind: Section, + size: 184, + kind: Function, section: Some( - 6, + 0, ), - flags: FlagSet(Local), + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: "[.sdata]", + name: "InitializeSystem", + demangled_name: None, + normalized_name: None, + address: 184, + size: 356, + kind: Function, + section: Some( + 0, + ), + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, + Symbol { + name: "main", + demangled_name: None, + normalized_name: None, + address: 544, + size: 88, + kind: Function, + section: Some( + 0, + ), + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, + Symbol { + name: "[.data]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, section: Some( - 8, + 2, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "[.rodata]", + name: "[.bss]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, section: Some( - 7, + 3, ), flags: FlagSet(Local), align: None, @@ -137,6 +172,7 @@ Object { Symbol { name: "[.reginfo]", demangled_name: None, + normalized_name: None, address: 0, size: 24, kind: Section, @@ -150,6 +186,7 @@ Object { Symbol { name: "[.mdebug]", demangled_name: None, + normalized_name: None, address: 0, size: 1932, kind: Section, @@ -161,26 +198,28 @@ Object { virtual_address: None, }, Symbol { - name: "gcc2_compiled.", + name: "[.mdebug.eabi64]", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Unknown, + kind: Section, section: Some( - 0, + 6, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "__gnu_compiled_c", + name: "[.rodata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Unknown, + kind: Section, section: Some( - 0, + 7, ), flags: FlagSet(Local), align: None, @@ -189,6 +228,7 @@ Object { Symbol { name: "PacketBottomNewVu1DropMicroCode", demangled_name: None, + normalized_name: None, address: 0, size: 12, kind: Object, @@ -200,33 +240,52 @@ Object { virtual_address: None, }, Symbol { - name: "ControlEntry", + name: "[.sdata]", demangled_name: None, + normalized_name: None, address: 0, - size: 184, - kind: Function, + size: 0, + kind: Section, section: Some( - 0, + 8, + ), + flags: FlagSet(Local), + align: None, + virtual_address: None, + }, + Symbol { + name: "WorkEnd", + demangled_name: None, + normalized_name: None, + address: 64, + size: 4, + kind: Object, + section: Some( + 8, ), flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: "xglSleep", + name: "main_param_argc", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, + normalized_name: None, + address: 68, + size: 4, + kind: Object, + section: Some( + 8, + ), flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: "WorkEnd", + name: "main_param_argv", demangled_name: None, - address: 64, + normalized_name: None, + address: 72, size: 4, kind: Object, section: Some( @@ -236,9 +295,22 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "xglSleep", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, Symbol { name: "xglSoundLoadEffect", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -250,6 +322,7 @@ Object { Symbol { name: "xglSoundLoadSwd", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -261,6 +334,7 @@ Object { Symbol { name: "SsdAddWaveData", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -272,6 +346,7 @@ Object { Symbol { name: "SsdSpuDmaCompleted", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -283,6 +358,7 @@ Object { Symbol { name: "xglRenderDispOn", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -294,6 +370,7 @@ Object { Symbol { name: "xglCdLoadOverlay", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -305,6 +382,7 @@ Object { Symbol { name: "LogoFirst", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -316,6 +394,7 @@ Object { Symbol { name: "Title", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -324,22 +403,10 @@ Object { align: None, virtual_address: None, }, - Symbol { - name: "InitializeSystem", - demangled_name: None, - address: 184, - size: 356, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, Symbol { name: "sceSifInitRpc", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -351,6 +418,7 @@ Object { Symbol { name: "sceCdInit", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -362,6 +430,7 @@ Object { Symbol { name: "sceSifRebootIop", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -373,6 +442,7 @@ Object { Symbol { name: "sceSifSyncIop", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -384,6 +454,7 @@ Object { Symbol { name: "sceSifInitIopHeap", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -395,6 +466,7 @@ Object { Symbol { name: "sceSifLoadFileReset", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -406,6 +478,7 @@ Object { Symbol { name: "sceCdMmode", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -417,6 +490,7 @@ Object { Symbol { name: "sceFsReset", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -428,6 +502,7 @@ Object { Symbol { name: "xglCdSifLoadModule", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -439,6 +514,7 @@ Object { Symbol { name: "xglCdPowerOffCB", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -450,6 +526,7 @@ Object { Symbol { name: "sceCdPOffCallback", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -461,6 +538,7 @@ Object { Symbol { name: "xglSoundInitial", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -472,6 +550,7 @@ Object { Symbol { name: "xglCdInitial", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -483,6 +562,7 @@ Object { Symbol { name: "xglPadInitial", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -494,6 +574,7 @@ Object { Symbol { name: "xglMcInitial", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -505,6 +586,7 @@ Object { Symbol { name: "xglTaskInitial", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -516,6 +598,7 @@ Object { Symbol { name: "xglDmaInitial", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -527,6 +610,7 @@ Object { Symbol { name: "xglGeometryInit", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -538,6 +622,7 @@ Object { Symbol { name: "xglPacketInit", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -549,6 +634,7 @@ Object { Symbol { name: "xglRenderInit", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -560,6 +646,7 @@ Object { Symbol { name: "xglFontInitial", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -571,6 +658,7 @@ Object { Symbol { name: "xglMovieInit", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -582,6 +670,7 @@ Object { Symbol { name: "xglMenuInitial", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -590,22 +679,10 @@ Object { align: None, virtual_address: None, }, - Symbol { - name: "main", - demangled_name: None, - address: 544, - size: 88, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, Symbol { name: "__main", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -614,22 +691,10 @@ Object { align: None, virtual_address: None, }, - Symbol { - name: "main_param_argc", - demangled_name: None, - address: 68, - size: 4, - kind: Object, - section: Some( - 8, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, Symbol { name: "BootDisplay", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -638,22 +703,10 @@ Object { align: None, virtual_address: None, }, - Symbol { - name: "main_param_argv", - demangled_name: None, - address: 72, - size: 4, - kind: Object, - section: Some( - 8, - ), - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, Symbol { name: "xglThreadInitial", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -665,6 +718,7 @@ Object { Symbol { name: "xglThreadRotate", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -676,6 +730,7 @@ Object { Symbol { name: "[.data-0]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -689,6 +744,7 @@ Object { Symbol { name: "[.rodata-0]", demangled_name: None, + normalized_name: None, address: 0, size: 12, kind: Section, @@ -702,6 +758,7 @@ Object { Symbol { name: "[.sdata-0]", demangled_name: None, + normalized_name: None, address: 0, size: 76, kind: Section, @@ -733,7 +790,7 @@ Object { 4, ), address: 20, - target_symbol: 12, + target_symbol: 17, addend: 0, }, Relocation { @@ -741,7 +798,7 @@ Object { 7, ), address: 28, - target_symbol: 13, + target_symbol: 14, addend: 0, }, Relocation { @@ -749,7 +806,7 @@ Object { 5, ), address: 32, - target_symbol: 4, + target_symbol: 13, addend: 0, }, Relocation { @@ -757,7 +814,7 @@ Object { 4, ), address: 40, - target_symbol: 14, + target_symbol: 18, addend: 0, }, Relocation { @@ -765,7 +822,7 @@ Object { 6, ), address: 44, - target_symbol: 4, + target_symbol: 13, addend: 0, }, Relocation { @@ -773,7 +830,7 @@ Object { 5, ), address: 48, - target_symbol: 10, + target_symbol: 12, addend: 0, }, Relocation { @@ -781,7 +838,7 @@ Object { 7, ), address: 52, - target_symbol: 13, + target_symbol: 14, addend: 0, }, Relocation { @@ -789,7 +846,7 @@ Object { 4, ), address: 56, - target_symbol: 15, + target_symbol: 19, addend: 0, }, Relocation { @@ -797,7 +854,7 @@ Object { 6, ), address: 60, - target_symbol: 10, + target_symbol: 12, addend: 0, }, Relocation { @@ -805,7 +862,7 @@ Object { 7, ), address: 64, - target_symbol: 13, + target_symbol: 14, addend: 0, }, Relocation { @@ -813,7 +870,7 @@ Object { 4, ), address: 72, - target_symbol: 16, + target_symbol: 20, addend: 0, }, Relocation { @@ -821,7 +878,7 @@ Object { 4, ), address: 80, - target_symbol: 17, + target_symbol: 21, addend: 0, }, Relocation { @@ -829,7 +886,7 @@ Object { 4, ), address: 96, - target_symbol: 18, + target_symbol: 22, addend: 0, }, Relocation { @@ -837,7 +894,7 @@ Object { 4, ), address: 104, - target_symbol: 19, + target_symbol: 23, addend: 0, }, Relocation { @@ -845,7 +902,7 @@ Object { 4, ), address: 112, - target_symbol: 20, + target_symbol: 24, addend: 0, }, Relocation { @@ -853,7 +910,7 @@ Object { 5, ), address: 120, - target_symbol: 21, + target_symbol: 25, addend: 0, }, Relocation { @@ -861,7 +918,7 @@ Object { 6, ), address: 124, - target_symbol: 21, + target_symbol: 25, addend: 0, }, Relocation { @@ -869,7 +926,7 @@ Object { 4, ), address: 128, - target_symbol: 19, + target_symbol: 23, addend: 0, }, Relocation { @@ -877,7 +934,7 @@ Object { 4, ), address: 136, - target_symbol: 21, + target_symbol: 25, addend: 0, }, Relocation { @@ -885,7 +942,7 @@ Object { 4, ), address: 160, - target_symbol: 19, + target_symbol: 23, addend: 0, }, Relocation { @@ -893,7 +950,7 @@ Object { 4, ), address: 200, - target_symbol: 23, + target_symbol: 26, addend: 0, }, Relocation { @@ -901,7 +958,7 @@ Object { 5, ), address: 204, - target_symbol: 5, + target_symbol: 11, addend: 16, }, Relocation { @@ -909,7 +966,7 @@ Object { 4, ), address: 208, - target_symbol: 24, + target_symbol: 27, addend: 0, }, Relocation { @@ -917,7 +974,7 @@ Object { 4, ), address: 216, - target_symbol: 25, + target_symbol: 28, addend: 0, }, Relocation { @@ -925,7 +982,7 @@ Object { 6, ), address: 220, - target_symbol: 5, + target_symbol: 11, addend: 16, }, Relocation { @@ -933,7 +990,7 @@ Object { 4, ), address: 232, - target_symbol: 26, + target_symbol: 29, addend: 0, }, Relocation { @@ -941,7 +998,7 @@ Object { 4, ), address: 248, - target_symbol: 23, + target_symbol: 26, addend: 0, }, Relocation { @@ -949,7 +1006,7 @@ Object { 4, ), address: 256, - target_symbol: 27, + target_symbol: 30, addend: 0, }, Relocation { @@ -957,7 +1014,7 @@ Object { 4, ), address: 264, - target_symbol: 28, + target_symbol: 31, addend: 0, }, Relocation { @@ -965,7 +1022,7 @@ Object { 4, ), address: 272, - target_symbol: 24, + target_symbol: 27, addend: 0, }, Relocation { @@ -973,7 +1030,7 @@ Object { 4, ), address: 280, - target_symbol: 29, + target_symbol: 32, addend: 0, }, Relocation { @@ -981,7 +1038,7 @@ Object { 4, ), address: 288, - target_symbol: 30, + target_symbol: 33, addend: 0, }, Relocation { @@ -989,7 +1046,7 @@ Object { 5, ), address: 296, - target_symbol: 4, + target_symbol: 13, addend: 8, }, Relocation { @@ -997,7 +1054,7 @@ Object { 4, ), address: 304, - target_symbol: 31, + target_symbol: 34, addend: 0, }, Relocation { @@ -1005,7 +1062,7 @@ Object { 6, ), address: 308, - target_symbol: 4, + target_symbol: 13, addend: 8, }, Relocation { @@ -1013,7 +1070,7 @@ Object { 5, ), address: 312, - target_symbol: 4, + target_symbol: 13, addend: 16, }, Relocation { @@ -1021,7 +1078,7 @@ Object { 6, ), address: 316, - target_symbol: 4, + target_symbol: 13, addend: 16, }, Relocation { @@ -1029,7 +1086,7 @@ Object { 4, ), address: 320, - target_symbol: 31, + target_symbol: 34, addend: 0, }, Relocation { @@ -1037,7 +1094,7 @@ Object { 5, ), address: 328, - target_symbol: 4, + target_symbol: 13, addend: 24, }, Relocation { @@ -1045,7 +1102,7 @@ Object { 6, ), address: 332, - target_symbol: 4, + target_symbol: 13, addend: 24, }, Relocation { @@ -1053,7 +1110,7 @@ Object { 4, ), address: 336, - target_symbol: 31, + target_symbol: 34, addend: 0, }, Relocation { @@ -1061,7 +1118,7 @@ Object { 5, ), address: 344, - target_symbol: 4, + target_symbol: 13, addend: 32, }, Relocation { @@ -1069,7 +1126,7 @@ Object { 6, ), address: 348, - target_symbol: 4, + target_symbol: 13, addend: 32, }, Relocation { @@ -1077,7 +1134,7 @@ Object { 4, ), address: 352, - target_symbol: 31, + target_symbol: 34, addend: 0, }, Relocation { @@ -1085,7 +1142,7 @@ Object { 5, ), address: 360, - target_symbol: 4, + target_symbol: 13, addend: 40, }, Relocation { @@ -1093,7 +1150,7 @@ Object { 6, ), address: 364, - target_symbol: 4, + target_symbol: 13, addend: 40, }, Relocation { @@ -1101,7 +1158,7 @@ Object { 4, ), address: 368, - target_symbol: 31, + target_symbol: 34, addend: 0, }, Relocation { @@ -1109,7 +1166,7 @@ Object { 5, ), address: 376, - target_symbol: 4, + target_symbol: 13, addend: 48, }, Relocation { @@ -1117,7 +1174,7 @@ Object { 6, ), address: 380, - target_symbol: 4, + target_symbol: 13, addend: 48, }, Relocation { @@ -1125,7 +1182,7 @@ Object { 4, ), address: 384, - target_symbol: 31, + target_symbol: 34, addend: 0, }, Relocation { @@ -1133,7 +1190,7 @@ Object { 5, ), address: 392, - target_symbol: 4, + target_symbol: 13, addend: 56, }, Relocation { @@ -1141,7 +1198,7 @@ Object { 6, ), address: 396, - target_symbol: 4, + target_symbol: 13, addend: 56, }, Relocation { @@ -1149,7 +1206,7 @@ Object { 4, ), address: 400, - target_symbol: 31, + target_symbol: 34, addend: 0, }, Relocation { @@ -1157,7 +1214,7 @@ Object { 5, ), address: 408, - target_symbol: 32, + target_symbol: 35, addend: 0, }, Relocation { @@ -1165,7 +1222,7 @@ Object { 6, ), address: 412, - target_symbol: 32, + target_symbol: 35, addend: 0, }, Relocation { @@ -1173,7 +1230,7 @@ Object { 4, ), address: 416, - target_symbol: 33, + target_symbol: 36, addend: 0, }, Relocation { @@ -1181,7 +1238,7 @@ Object { 4, ), address: 428, - target_symbol: 34, + target_symbol: 37, addend: 0, }, Relocation { @@ -1189,7 +1246,7 @@ Object { 7, ), address: 432, - target_symbol: 13, + target_symbol: 14, addend: 0, }, Relocation { @@ -1197,7 +1254,7 @@ Object { 4, ), address: 436, - target_symbol: 35, + target_symbol: 38, addend: 0, }, Relocation { @@ -1205,7 +1262,7 @@ Object { 4, ), address: 444, - target_symbol: 36, + target_symbol: 39, addend: 0, }, Relocation { @@ -1213,7 +1270,7 @@ Object { 4, ), address: 452, - target_symbol: 37, + target_symbol: 40, addend: 0, }, Relocation { @@ -1221,7 +1278,7 @@ Object { 4, ), address: 468, - target_symbol: 38, + target_symbol: 41, addend: 0, }, Relocation { @@ -1229,7 +1286,7 @@ Object { 4, ), address: 476, - target_symbol: 39, + target_symbol: 42, addend: 0, }, Relocation { @@ -1237,7 +1294,7 @@ Object { 4, ), address: 484, - target_symbol: 40, + target_symbol: 43, addend: 0, }, Relocation { @@ -1245,7 +1302,7 @@ Object { 4, ), address: 492, - target_symbol: 41, + target_symbol: 44, addend: 0, }, Relocation { @@ -1253,7 +1310,7 @@ Object { 4, ), address: 500, - target_symbol: 42, + target_symbol: 45, addend: 0, }, Relocation { @@ -1261,7 +1318,7 @@ Object { 4, ), address: 508, - target_symbol: 43, + target_symbol: 46, addend: 0, }, Relocation { @@ -1269,7 +1326,7 @@ Object { 4, ), address: 516, - target_symbol: 44, + target_symbol: 47, addend: 0, }, Relocation { @@ -1277,7 +1334,7 @@ Object { 4, ), address: 532, - target_symbol: 45, + target_symbol: 48, addend: 0, }, Relocation { @@ -1285,7 +1342,7 @@ Object { 4, ), address: 564, - target_symbol: 47, + target_symbol: 49, addend: 0, }, Relocation { @@ -1293,7 +1350,7 @@ Object { 7, ), address: 572, - target_symbol: 48, + target_symbol: 15, addend: 0, }, Relocation { @@ -1301,7 +1358,7 @@ Object { 4, ), address: 576, - target_symbol: 49, + target_symbol: 50, addend: 0, }, Relocation { @@ -1309,7 +1366,7 @@ Object { 7, ), address: 580, - target_symbol: 50, + target_symbol: 16, addend: 0, }, Relocation { @@ -1317,7 +1374,7 @@ Object { 4, ), address: 584, - target_symbol: 22, + target_symbol: 4, addend: 0, }, Relocation { diff --git a/objdiff-core/tests/snapshots/arch_ppc__diff_ppc-2.snap b/objdiff-core/tests/snapshots/arch_ppc__diff_ppc-2.snap index d9147d13..65f6082b 100644 --- a/objdiff-core/tests/snapshots/arch_ppc__diff_ppc-2.snap +++ b/objdiff-core/tests/snapshots/arch_ppc__diff_ppc-2.snap @@ -5,7 +5,7 @@ expression: "(target_symbol_diff, base_symbol_diff)" ( SymbolDiff { target_symbol: Some( - 17, + 4, ), match_percent: Some( 98.92086, @@ -2649,7 +2649,7 @@ expression: "(target_symbol_diff, base_symbol_diff)" }, SymbolDiff { target_symbol: Some( - 7, + 4, ), match_percent: Some( 98.92086, diff --git a/objdiff-core/tests/snapshots/arch_ppc__diff_ppc.snap b/objdiff-core/tests/snapshots/arch_ppc__diff_ppc.snap index f91c7eea..8671efe3 100644 --- a/objdiff-core/tests/snapshots/arch_ppc__diff_ppc.snap +++ b/objdiff-core/tests/snapshots/arch_ppc__diff_ppc.snap @@ -37,7 +37,7 @@ expression: sections_display ), symbols: [ SectionDisplaySymbol { - symbol: 16, + symbol: 15, is_mapping_symbol: false, }, ], @@ -52,35 +52,35 @@ expression: sections_display ), symbols: [ SectionDisplaySymbol { - symbol: 3, + symbol: 8, is_mapping_symbol: false, }, SectionDisplaySymbol { - symbol: 10, + symbol: 7, is_mapping_symbol: false, }, SectionDisplaySymbol { - symbol: 9, + symbol: 6, is_mapping_symbol: false, }, SectionDisplaySymbol { - symbol: 8, + symbol: 5, is_mapping_symbol: false, }, SectionDisplaySymbol { - symbol: 7, + symbol: 4, is_mapping_symbol: false, }, SectionDisplaySymbol { - symbol: 6, + symbol: 3, is_mapping_symbol: false, }, SectionDisplaySymbol { - symbol: 5, + symbol: 2, is_mapping_symbol: false, }, SectionDisplaySymbol { - symbol: 4, + symbol: 1, is_mapping_symbol: false, }, ], diff --git a/objdiff-core/tests/snapshots/arch_ppc__read_extab.snap b/objdiff-core/tests/snapshots/arch_ppc__read_extab.snap index e9b4ce9b..8f062162 100644 --- a/objdiff-core/tests/snapshots/arch_ppc__read_extab.snap +++ b/objdiff-core/tests/snapshots/arch_ppc__read_extab.snap @@ -127,61 +127,70 @@ Object { endianness: Big, symbols: [ Symbol { - name: "NMWException.cpp", + name: "[.text]", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Unknown, - section: None, + kind: Section, + section: Some( + 0, + ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "[.text]", + name: "__destroy_arr", demangled_name: None, + normalized_name: None, address: 0, - size: 0, - kind: Section, + size: 120, + kind: Function, section: Some( 0, ), - flags: FlagSet(Local), + flags: FlagSet(Global | HasExtra), align: None, virtual_address: None, }, Symbol { - name: "[extab]", + name: "__construct_array", demangled_name: None, - address: 0, - size: 0, - kind: Section, + normalized_name: None, + address: 120, + size: 248, + kind: Function, section: Some( - 1, + 0, ), - flags: FlagSet(Local), + flags: FlagSet(Global | HasExtra), align: None, virtual_address: None, }, Symbol { - name: "[extabindex]", - demangled_name: None, - address: 0, - size: 0, - kind: Section, + name: "__dt__26__partial_array_destructorFv", + demangled_name: Some( + "__partial_array_destructor::~__partial_array_destructor()", + ), + normalized_name: None, + address: 368, + size: 184, + kind: Function, section: Some( - 2, + 0, ), - flags: FlagSet(Local), + flags: FlagSet(Global | Weak | HasExtra), align: None, virtual_address: None, }, Symbol { - name: "@30", + name: "[extab]", demangled_name: None, + normalized_name: None, address: 0, - size: 8, - kind: Object, + size: 0, + kind: Section, section: Some( 1, ), @@ -190,63 +199,54 @@ Object { virtual_address: None, }, Symbol { - name: "@31", + name: "@30", demangled_name: None, + normalized_name: None, address: 0, - size: 12, + size: 8, kind: Object, section: Some( - 2, + 1, ), - flags: FlagSet(Local), + flags: FlagSet(Local | CompilerGenerated), align: None, virtual_address: None, }, Symbol { name: "@51", demangled_name: None, + normalized_name: None, address: 8, size: 24, kind: Object, section: Some( 1, ), - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, - Symbol { - name: "@52", - demangled_name: None, - address: 12, - size: 12, - kind: Object, - section: Some( - 2, - ), - flags: FlagSet(Local), + flags: FlagSet(Local | CompilerGenerated), align: None, virtual_address: None, }, Symbol { name: "@59", demangled_name: None, + normalized_name: None, address: 32, size: 8, kind: Object, section: Some( 1, ), - flags: FlagSet(Local), + flags: FlagSet(Local | CompilerGenerated), align: None, virtual_address: None, }, Symbol { - name: "@60", + name: "[extabindex]", demangled_name: None, - address: 24, - size: 12, - kind: Object, + normalized_name: None, + address: 0, + size: 0, + kind: Section, section: Some( 2, ), @@ -255,43 +255,44 @@ Object { virtual_address: None, }, Symbol { - name: "__destroy_arr", + name: "@31", demangled_name: None, + normalized_name: None, address: 0, - size: 120, - kind: Function, + size: 12, + kind: Object, section: Some( - 0, + 2, ), - flags: FlagSet(Global | HasExtra), + flags: FlagSet(Local | CompilerGenerated), align: None, virtual_address: None, }, Symbol { - name: "__construct_array", + name: "@52", demangled_name: None, - address: 120, - size: 248, - kind: Function, + normalized_name: None, + address: 12, + size: 12, + kind: Object, section: Some( - 0, + 2, ), - flags: FlagSet(Global | HasExtra), + flags: FlagSet(Local | CompilerGenerated), align: None, virtual_address: None, }, Symbol { - name: "__dt__26__partial_array_destructorFv", - demangled_name: Some( - "__partial_array_destructor::~__partial_array_destructor()", - ), - address: 368, - size: 184, - kind: Function, + name: "@60", + demangled_name: None, + normalized_name: None, + address: 24, + size: 12, + kind: Object, section: Some( - 0, + 2, ), - flags: FlagSet(Global | Weak | HasExtra), + flags: FlagSet(Local | CompilerGenerated), align: None, virtual_address: None, }, @@ -300,6 +301,7 @@ Object { demangled_name: Some( "operator delete(void*)", ), + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -311,6 +313,7 @@ Object { Symbol { name: "[extab-0]", demangled_name: None, + normalized_name: None, address: 0, size: 40, kind: Section, @@ -324,6 +327,7 @@ Object { Symbol { name: "[extabindex-0]", demangled_name: None, + normalized_name: None, address: 0, size: 36, kind: Section, @@ -355,7 +359,7 @@ Object { 10, ), address: 516, - target_symbol: 13, + target_symbol: 12, addend: 0, }, ], @@ -381,7 +385,7 @@ Object { 1, ), address: 28, - target_symbol: 12, + target_symbol: 3, addend: 0, }, ], @@ -407,7 +411,7 @@ Object { 1, ), address: 0, - target_symbol: 10, + target_symbol: 1, addend: 0, }, Relocation { @@ -415,7 +419,7 @@ Object { 1, ), address: 8, - target_symbol: 4, + target_symbol: 5, addend: 0, }, Relocation { @@ -423,7 +427,7 @@ Object { 1, ), address: 12, - target_symbol: 11, + target_symbol: 2, addend: 0, }, Relocation { @@ -439,7 +443,7 @@ Object { 1, ), address: 24, - target_symbol: 12, + target_symbol: 3, addend: 0, }, Relocation { @@ -447,7 +451,7 @@ Object { 1, ), address: 32, - target_symbol: 8, + target_symbol: 7, addend: 0, }, ], diff --git a/objdiff-core/tests/snapshots/arch_ppc__read_ppc-3.snap b/objdiff-core/tests/snapshots/arch_ppc__read_ppc-3.snap index 5a274de2..99e5f38b 100644 --- a/objdiff-core/tests/snapshots/arch_ppc__read_ppc-3.snap +++ b/objdiff-core/tests/snapshots/arch_ppc__read_ppc-3.snap @@ -7,64 +7,64 @@ expression: output [(Address(8), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 265), Normal, 10), (BranchDest(20), Normal, 0), (BranchArrow(5), Rotating(0), 0), (Eol, Normal, 0)] [(Address(12), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(-1)), Normal, 0), (Eol, Normal, 0)] [(Address(16), Dim, 5), (Spacing(4), Normal, 0), (Opcode("b", 267), Normal, 10), (BranchDest(32), Normal, 0), (BranchArrow(8), Rotating(1), 0), (Eol, Normal, 0)] -[(Address(20), Dim, 5), (BranchArrow(2), Rotating(0), 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@ha"), Normal, 0), (Eol, Normal, 0)] -[(Address(24), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] -[(Address(28), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] +[(Address(20), Dim, 5), (BranchArrow(2), Rotating(0), 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@ha"), Normal, 0), (Eol, Normal, 0)] +[(Address(24), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] +[(Address(28), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] [(Address(32), Dim, 5), (BranchArrow(4), Rotating(1), 0), (Opcode("extrwi", 283), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("8")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("8")), Normal, 0), (Eol, Normal, 0)] -[(Address(36), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stb", 445), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "text$52", demangled_name: None, address: 8, size: 5, kind: Object, section: Some(2), flags: FlagSet(Local), align: None, virtual_address: Some(2153420056) }), Bright, 0), (Basic("@sda21"), Normal, 0), (Eol, Normal, 0)] +[(Address(36), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stb", 445), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "text$52", demangled_name: None, normalized_name: Some("text$0000"), address: 8, size: 5, kind: Object, section: Some(2), flags: FlagSet(Local), align: None, virtual_address: Some(2153420056) }), Bright, 0), (Basic("@sda21"), Normal, 0), (Eol, Normal, 0)] [(Address(40), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmpwi", 260), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(-1)), Normal, 0), (Eol, Normal, 0)] [(Address(44), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 265), Normal, 10), (BranchDest(56), Normal, 0), (BranchArrow(14), Rotating(2), 0), (Eol, Normal, 0)] [(Address(48), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(-1)), Normal, 0), (Eol, Normal, 0)] [(Address(52), Dim, 5), (Spacing(4), Normal, 0), (Opcode("b", 267), Normal, 10), (BranchDest(68), Normal, 0), (BranchArrow(17), Rotating(3), 0), (Eol, Normal, 0)] -[(Address(56), Dim, 5), (BranchArrow(11), Rotating(2), 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@ha"), Normal, 0), (Eol, Normal, 0)] -[(Address(60), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] -[(Address(64), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] +[(Address(56), Dim, 5), (BranchArrow(11), Rotating(2), 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@ha"), Normal, 0), (Eol, Normal, 0)] +[(Address(60), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] +[(Address(64), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] [(Address(68), Dim, 5), (BranchArrow(13), Rotating(3), 0), (Opcode("extrwi", 283), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("8")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("16")), Normal, 0), (Eol, Normal, 0)] -[(Address(72), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "text$52", demangled_name: None, address: 8, size: 5, kind: Object, section: Some(2), flags: FlagSet(Local), align: None, virtual_address: Some(2153420056) }), Bright, 0), (Basic("@sda21"), Normal, 0), (Eol, Normal, 0)] +[(Address(72), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "text$52", demangled_name: None, normalized_name: Some("text$0000"), address: 8, size: 5, kind: Object, section: Some(2), flags: FlagSet(Local), align: None, virtual_address: Some(2153420056) }), Bright, 0), (Basic("@sda21"), Normal, 0), (Eol, Normal, 0)] [(Address(76), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmpwi", 260), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(-1)), Normal, 0), (Eol, Normal, 0)] [(Address(80), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stb", 445), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(1)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(84), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 265), Normal, 10), (BranchDest(96), Normal, 0), (BranchArrow(24), Rotating(4), 0), (Eol, Normal, 0)] [(Address(88), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(-1)), Normal, 0), (Eol, Normal, 0)] [(Address(92), Dim, 5), (Spacing(4), Normal, 0), (Opcode("b", 267), Normal, 10), (BranchDest(108), Normal, 0), (BranchArrow(27), Rotating(5), 0), (Eol, Normal, 0)] -[(Address(96), Dim, 5), (BranchArrow(21), Rotating(4), 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@ha"), Normal, 0), (Eol, Normal, 0)] -[(Address(100), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] -[(Address(104), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] +[(Address(96), Dim, 5), (BranchArrow(21), Rotating(4), 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@ha"), Normal, 0), (Eol, Normal, 0)] +[(Address(100), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] +[(Address(104), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] [(Address(108), Dim, 5), (BranchArrow(23), Rotating(5), 0), (Opcode("clrlwi", 283), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("24")), Normal, 0), (Eol, Normal, 0)] -[(Address(112), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "text$52", demangled_name: None, address: 8, size: 5, kind: Object, section: Some(2), flags: FlagSet(Local), align: None, virtual_address: Some(2153420056) }), Bright, 0), (Basic("@sda21"), Normal, 0), (Eol, Normal, 0)] +[(Address(112), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "text$52", demangled_name: None, normalized_name: Some("text$0000"), address: 8, size: 5, kind: Object, section: Some(2), flags: FlagSet(Local), align: None, virtual_address: Some(2153420056) }), Bright, 0), (Basic("@sda21"), Normal, 0), (Eol, Normal, 0)] [(Address(116), Dim, 5), (Spacing(4), Normal, 0), (Opcode("cmpwi", 260), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(-1)), Normal, 0), (Eol, Normal, 0)] [(Address(120), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stb", 445), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(2)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(124), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 265), Normal, 10), (BranchDest(136), Normal, 0), (BranchArrow(34), Rotating(6), 0), (Eol, Normal, 0)] [(Address(128), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(-1)), Normal, 0), (Eol, Normal, 0)] [(Address(132), Dim, 5), (Spacing(4), Normal, 0), (Opcode("b", 267), Normal, 10), (BranchDest(148), Normal, 0), (BranchArrow(37), Rotating(7), 0), (Eol, Normal, 0)] -[(Address(136), Dim, 5), (BranchArrow(31), Rotating(6), 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@ha"), Normal, 0), (Eol, Normal, 0)] -[(Address(140), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] -[(Address(144), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] -[(Address(148), Dim, 5), (BranchArrow(33), Rotating(7), 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "text$52", demangled_name: None, address: 8, size: 5, kind: Object, section: Some(2), flags: FlagSet(Local), align: None, virtual_address: Some(2153420056) }), Bright, 0), (Basic("@sda21"), Normal, 0), (Eol, Normal, 0)] +[(Address(136), Dim, 5), (BranchArrow(31), Rotating(6), 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@ha"), Normal, 0), (Eol, Normal, 0)] +[(Address(140), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] +[(Address(144), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__upper_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] +[(Address(148), Dim, 5), (BranchArrow(33), Rotating(7), 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "text$52", demangled_name: None, normalized_name: Some("text$0000"), address: 8, size: 5, kind: Object, section: Some(2), flags: FlagSet(Local), align: None, virtual_address: Some(2153420056) }), Bright, 0), (Basic("@sda21"), Normal, 0), (Eol, Normal, 0)] [(Address(152), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(0)), Normal, 0), (Eol, Normal, 0)] [(Address(156), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stb", 445), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(3)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(160), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__ctype_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@ha"), Normal, 0), (Eol, Normal, 0)] -[(Address(164), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__ctype_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] +[(Address(160), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__ctype_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@ha"), Normal, 0), (Eol, Normal, 0)] +[(Address(164), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__ctype_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] [(Address(168), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stb", 445), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(4)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(172), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(45)), Normal, 0), (Eol, Normal, 0)] -[(Address(176), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbz", 441), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "text$52", demangled_name: None, address: 8, size: 5, kind: Object, section: Some(2), flags: FlagSet(Local), align: None, virtual_address: Some(2153420056) }), Bright, 0), (Basic("@sda21"), Normal, 0), (Eol, Normal, 0)] -[(Address(180), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__ctype_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] +[(Address(176), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbz", 441), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "text$52", demangled_name: None, normalized_name: Some("text$0000"), address: 8, size: 5, kind: Object, section: Some(2), flags: FlagSet(Local), align: None, virtual_address: Some(2153420056) }), Bright, 0), (Basic("@sda21"), Normal, 0), (Eol, Normal, 0)] +[(Address(180), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__ctype_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] [(Address(184), Dim, 5), (Spacing(4), Normal, 0), (Opcode("andi.", 289), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Unsigned(220)), Normal, 0), (Eol, Normal, 0)] [(Address(188), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 265), Normal, 10), (BranchDest(196), Normal, 0), (BranchArrow(49), Rotating(8), 0), (Eol, Normal, 0)] [(Address(192), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stb", 445), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(0)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(196), Dim, 5), (BranchArrow(47), Rotating(8), 0), (Opcode("lbzu", 442), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(1)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(200), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__ctype_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] +[(Address(200), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__ctype_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] [(Address(204), Dim, 5), (Spacing(4), Normal, 0), (Opcode("andi.", 289), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Unsigned(220)), Normal, 0), (Eol, Normal, 0)] [(Address(208), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 265), Normal, 10), (BranchDest(216), Normal, 0), (BranchArrow(54), Rotating(9), 0), (Eol, Normal, 0)] [(Address(212), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stb", 445), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(0)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(216), Dim, 5), (BranchArrow(52), Rotating(9), 0), (Opcode("lbzu", 442), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(1)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(220), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__ctype_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] +[(Address(220), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__ctype_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] [(Address(224), Dim, 5), (Spacing(4), Normal, 0), (Opcode("andi.", 289), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Unsigned(220)), Normal, 0), (Eol, Normal, 0)] [(Address(228), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 265), Normal, 10), (BranchDest(236), Normal, 0), (BranchArrow(59), Rotating(10), 0), (Eol, Normal, 0)] [(Address(232), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stb", 445), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(0)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(236), Dim, 5), (BranchArrow(57), Rotating(10), 0), (Opcode("lbzu", 442), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(1)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(240), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__ctype_map", demangled_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] +[(Address(240), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lbzx", 323), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(" <"), Normal, 0), (Symbol(Symbol { name: "__ctype_map", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Unknown, section: None, flags: FlagSet(Global), align: None, virtual_address: Some(0) }), Bright, 0), (Basic(">"), Normal, 0), (Eol, Normal, 0)] [(Address(244), Dim, 5), (Spacing(4), Normal, 0), (Opcode("andi.", 289), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Unsigned(220)), Normal, 0), (Eol, Normal, 0)] [(Address(248), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bne", 265), Normal, 10), (BranchDest(256), Normal, 0), (BranchArrow(64), Rotating(11), 0), (Eol, Normal, 0)] [(Address(252), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stb", 445), Normal, 10), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(0)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(256), Dim, 5), (BranchArrow(62), Rotating(11), 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "text$52", demangled_name: None, address: 8, size: 5, kind: Object, section: Some(2), flags: FlagSet(Local), align: None, virtual_address: Some(2153420056) }), Bright, 0), (Basic("@sda21"), Normal, 0), (Eol, Normal, 0)] +[(Address(256), Dim, 5), (BranchArrow(62), Rotating(11), 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "text$52", demangled_name: None, normalized_name: Some("text$0000"), address: 8, size: 5, kind: Object, section: Some(2), flags: FlagSet(Local), align: None, virtual_address: Some(2153420056) }), Bright, 0), (Basic("@sda21"), Normal, 0), (Eol, Normal, 0)] [(Address(260), Dim, 5), (Spacing(4), Normal, 0), (Opcode("blr", 269), Normal, 10), (Eol, Normal, 0)] diff --git a/objdiff-core/tests/snapshots/arch_ppc__read_ppc.snap b/objdiff-core/tests/snapshots/arch_ppc__read_ppc.snap index ebbfcaf4..e876b544 100644 --- a/objdiff-core/tests/snapshots/arch_ppc__read_ppc.snap +++ b/objdiff-core/tests/snapshots/arch_ppc__read_ppc.snap @@ -12,36 +12,59 @@ Object { endianness: Big, symbols: [ Symbol { - name: "IObj.cpp", + name: "[.text]", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Unknown, - section: None, + kind: Section, + section: Some( + 0, + ), flags: FlagSet(Local), align: None, virtual_address: Some( + 2150895620, + ), + }, + Symbol { + name: "Type2Text__10SObjectTagFUi", + demangled_name: Some( + "SObjectTag::Type2Text(unsigned int)", + ), + normalized_name: None, + address: 0, + size: 264, + kind: Function, + section: Some( 0, ), + flags: FlagSet(Global), + align: None, + virtual_address: Some( + 2150895620, + ), }, Symbol { - name: "[.text]", + name: "__sinit_IObj_cpp", demangled_name: None, - address: 0, - size: 0, - kind: Section, + normalized_name: None, + address: 264, + size: 20, + kind: Function, section: Some( 0, ), flags: FlagSet(Local), align: None, virtual_address: Some( - 2150895620, + 2150895884, ), }, Symbol { name: "[.ctors]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -57,6 +80,7 @@ Object { Symbol { name: "[.sbss]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -70,23 +94,27 @@ Object { ), }, Symbol { - name: "__sinit_IObj_cpp", + name: "gkInvalidObjectTag", demangled_name: None, - address: 264, - size: 20, - kind: Function, + normalized_name: None, + address: 0, + size: 8, + kind: Object, section: Some( - 0, + 2, ), - flags: FlagSet(Local), + flags: FlagSet(Global), align: None, virtual_address: Some( - 2150895884, + 2153420048, ), }, Symbol { name: "text$52", demangled_name: None, + normalized_name: Some( + "text$0000", + ), address: 8, size: 5, kind: Object, @@ -99,41 +127,10 @@ Object { 2153420056, ), }, - Symbol { - name: "Type2Text__10SObjectTagFUi", - demangled_name: Some( - "SObjectTag::Type2Text(unsigned int)", - ), - address: 0, - size: 264, - kind: Function, - section: Some( - 0, - ), - flags: FlagSet(Global), - align: None, - virtual_address: Some( - 2150895620, - ), - }, - Symbol { - name: "gkInvalidObjectTag", - demangled_name: None, - address: 0, - size: 8, - kind: Object, - section: Some( - 2, - ), - flags: FlagSet(Global), - align: None, - virtual_address: Some( - 2153420048, - ), - }, Symbol { name: "__upper_map", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -147,6 +144,7 @@ Object { Symbol { name: "__ctype_map", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -160,6 +158,7 @@ Object { Symbol { name: "[.ctors-0]", demangled_name: None, + normalized_name: None, address: 0, size: 4, kind: Section, @@ -191,7 +190,7 @@ Object { 6, ), address: 22, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -199,7 +198,7 @@ Object { 4, ), address: 26, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -207,7 +206,7 @@ Object { 0, ), address: 28, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -215,7 +214,7 @@ Object { 109, ), address: 36, - target_symbol: 5, + target_symbol: 6, addend: 0, }, Relocation { @@ -223,7 +222,7 @@ Object { 6, ), address: 58, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -231,7 +230,7 @@ Object { 4, ), address: 62, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -239,7 +238,7 @@ Object { 0, ), address: 64, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -247,7 +246,7 @@ Object { 109, ), address: 72, - target_symbol: 5, + target_symbol: 6, addend: 0, }, Relocation { @@ -255,7 +254,7 @@ Object { 6, ), address: 98, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -263,7 +262,7 @@ Object { 4, ), address: 102, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -271,7 +270,7 @@ Object { 0, ), address: 104, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -279,7 +278,7 @@ Object { 109, ), address: 112, - target_symbol: 5, + target_symbol: 6, addend: 0, }, Relocation { @@ -287,7 +286,7 @@ Object { 6, ), address: 138, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -295,7 +294,7 @@ Object { 4, ), address: 142, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -303,7 +302,7 @@ Object { 0, ), address: 144, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -311,7 +310,7 @@ Object { 109, ), address: 148, - target_symbol: 5, + target_symbol: 6, addend: 0, }, Relocation { @@ -319,7 +318,7 @@ Object { 6, ), address: 162, - target_symbol: 9, + target_symbol: 8, addend: 0, }, Relocation { @@ -327,7 +326,7 @@ Object { 4, ), address: 166, - target_symbol: 9, + target_symbol: 8, addend: 0, }, Relocation { @@ -335,7 +334,7 @@ Object { 109, ), address: 176, - target_symbol: 5, + target_symbol: 6, addend: 0, }, Relocation { @@ -343,7 +342,7 @@ Object { 0, ), address: 180, - target_symbol: 9, + target_symbol: 8, addend: 0, }, Relocation { @@ -351,7 +350,7 @@ Object { 0, ), address: 200, - target_symbol: 9, + target_symbol: 8, addend: 0, }, Relocation { @@ -359,7 +358,7 @@ Object { 0, ), address: 220, - target_symbol: 9, + target_symbol: 8, addend: 0, }, Relocation { @@ -367,7 +366,7 @@ Object { 0, ), address: 240, - target_symbol: 9, + target_symbol: 8, addend: 0, }, Relocation { @@ -375,7 +374,7 @@ Object { 109, ), address: 256, - target_symbol: 5, + target_symbol: 6, addend: 0, }, Relocation { @@ -383,7 +382,7 @@ Object { 109, ), address: 268, - target_symbol: 7, + target_symbol: 5, addend: 0, }, Relocation { @@ -391,7 +390,7 @@ Object { 109, ), address: 272, - target_symbol: 7, + target_symbol: 5, addend: 0, }, ], @@ -419,7 +418,7 @@ Object { 1, ), address: 0, - target_symbol: 4, + target_symbol: 2, addend: 0, }, ], diff --git a/objdiff-core/tests/snapshots/arch_ppc__read_vmx128_coff-3.snap b/objdiff-core/tests/snapshots/arch_ppc__read_vmx128_coff-3.snap index acfbcbc4..f8b2f583 100644 --- a/objdiff-core/tests/snapshots/arch_ppc__read_vmx128_coff-3.snap +++ b/objdiff-core/tests/snapshots/arch_ppc__read_vmx128_coff-3.snap @@ -5,45 +5,45 @@ expression: output [(Address(0), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mflr", 342), Normal, 10), (Argument(Opaque("r12")), Normal, 0), (Eol, Normal, 0)] [(Address(4), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stw", 443), Normal, 10), (Argument(Opaque("r12")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(-8)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(8), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stwu", 444), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(-336)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(12), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r11")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f800000", demangled_name: None, address: 388, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(16), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f0")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f800000", demangled_name: None, address: 388, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r11")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(12), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r11")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f800000", demangled_name: None, normalized_name: None, address: 388, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(16), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f0")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f800000", demangled_name: None, normalized_name: None, address: 388, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r11")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(20), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stfs", 459), Normal, 10), (Argument(Opaque("f0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(272)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(24), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r10")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40000000", demangled_name: None, address: 384, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(28), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f13")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40000000", demangled_name: None, address: 384, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r10")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(24), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r10")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40000000", demangled_name: None, normalized_name: None, address: 384, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(28), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f13")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40000000", demangled_name: None, normalized_name: None, address: 384, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r10")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(32), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stfs", 459), Normal, 10), (Argument(Opaque("f13")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(276)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(36), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r9")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40400000", demangled_name: None, address: 380, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(40), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f12")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40400000", demangled_name: None, address: 380, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r9")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(36), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r9")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40400000", demangled_name: None, normalized_name: None, address: 380, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(40), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f12")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40400000", demangled_name: None, normalized_name: None, address: 380, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r9")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(44), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stfs", 459), Normal, 10), (Argument(Opaque("f12")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(280)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(48), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r8")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40800000", demangled_name: None, address: 376, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(52), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f11")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40800000", demangled_name: None, address: 376, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r8")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(48), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r8")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40800000", demangled_name: None, normalized_name: None, address: 376, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(52), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f11")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40800000", demangled_name: None, normalized_name: None, address: 376, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r8")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(56), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stfs", 459), Normal, 10), (Argument(Opaque("f11")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(284)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(60), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r7")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40a00000", demangled_name: None, address: 372, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(64), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f10")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40a00000", demangled_name: None, address: 372, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r7")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(60), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r7")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40a00000", demangled_name: None, normalized_name: None, address: 372, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(64), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f10")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40a00000", demangled_name: None, normalized_name: None, address: 372, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r7")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(68), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stfs", 459), Normal, 10), (Argument(Opaque("f10")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(256)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(72), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40c00000", demangled_name: None, address: 368, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(76), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f9")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40c00000", demangled_name: None, address: 368, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(72), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40c00000", demangled_name: None, normalized_name: None, address: 368, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(76), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f9")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40c00000", demangled_name: None, normalized_name: None, address: 368, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(80), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stfs", 459), Normal, 10), (Argument(Opaque("f9")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(260)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(84), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40e00000", demangled_name: None, address: 364, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(88), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f8")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40e00000", demangled_name: None, address: 364, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(84), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40e00000", demangled_name: None, normalized_name: None, address: 364, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(88), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f8")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@40e00000", demangled_name: None, normalized_name: None, address: 364, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(92), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stfs", 459), Normal, 10), (Argument(Opaque("f8")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(264)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(96), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@41000000", demangled_name: None, address: 360, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(100), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f7")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@41000000", demangled_name: None, address: 360, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(96), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@41000000", demangled_name: None, normalized_name: None, address: 360, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(100), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f7")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@41000000", demangled_name: None, normalized_name: None, address: 360, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(104), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stfs", 459), Normal, 10), (Argument(Opaque("f7")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(268)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(108), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(112), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f6")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(108), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, normalized_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(112), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f6")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, normalized_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(116), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stfs", 459), Normal, 10), (Argument(Opaque("f6")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(224)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(120), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r11")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(124), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f5")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r11")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(120), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r11")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, normalized_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(124), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f5")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, normalized_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r11")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(128), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stfs", 459), Normal, 10), (Argument(Opaque("f5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(228)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(132), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r10")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(136), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r10")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(132), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r10")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, normalized_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(136), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, normalized_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r10")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(140), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stfs", 459), Normal, 10), (Argument(Opaque("f4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(232)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] -[(Address(144), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r9")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(148), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r9")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] +[(Address(144), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r9")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, normalized_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(148), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lfs", 455), Normal, 10), (Argument(Opaque("f3")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "__real@3f000000", demangled_name: None, normalized_name: None, address: 356, size: 4, kind: Object, section: Some(4), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r9")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(152), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stfs", 459), Normal, 10), (Argument(Opaque("f3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(236)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(156), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(0)), Normal, 0), (Eol, Normal, 0)] [(Address(160), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(272)), Normal, 0), (Eol, Normal, 0)] -[(Address(164), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "__lvx", demangled_name: None, address: 640, size: 24, kind: Function, section: Some(5), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(164), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "__lvx", demangled_name: None, normalized_name: None, address: 640, size: 24, kind: Function, section: Some(5), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(168), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r8")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(80)), Normal, 0), (Eol, Normal, 0)] [(Address(172), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stvx128", 194), Normal, 10), (Argument(Opaque("v1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r8")), Normal, 0), (Eol, Normal, 0)] [(Address(176), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r7")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(80)), Normal, 0), (Eol, Normal, 0)] @@ -52,7 +52,7 @@ expression: output [(Address(188), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stvx128", 194), Normal, 10), (Argument(Opaque("v0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Eol, Normal, 0)] [(Address(192), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(0)), Normal, 0), (Eol, Normal, 0)] [(Address(196), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(256)), Normal, 0), (Eol, Normal, 0)] -[(Address(200), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "__lvx", demangled_name: None, address: 640, size: 24, kind: Function, section: Some(5), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(200), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "__lvx", demangled_name: None, normalized_name: None, address: 640, size: 24, kind: Function, section: Some(5), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(204), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(96)), Normal, 0), (Eol, Normal, 0)] [(Address(208), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stvx128", 194), Normal, 10), (Argument(Opaque("v1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] [(Address(212), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(96)), Normal, 0), (Eol, Normal, 0)] @@ -61,7 +61,7 @@ expression: output [(Address(224), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stvx128", 194), Normal, 10), (Argument(Opaque("v13")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Eol, Normal, 0)] [(Address(228), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(0)), Normal, 0), (Eol, Normal, 0)] [(Address(232), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(224)), Normal, 0), (Eol, Normal, 0)] -[(Address(236), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "__lvx", demangled_name: None, address: 640, size: 24, kind: Function, section: Some(5), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(236), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "__lvx", demangled_name: None, normalized_name: None, address: 640, size: 24, kind: Function, section: Some(5), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(240), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r11")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(112)), Normal, 0), (Eol, Normal, 0)] [(Address(244), Dim, 5), (Spacing(4), Normal, 0), (Opcode("stvx128", 194), Normal, 10), (Argument(Opaque("v1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r11")), Normal, 0), (Eol, Normal, 0)] [(Address(248), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r10")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(112)), Normal, 0), (Eol, Normal, 0)] @@ -96,38 +96,38 @@ expression: output [(Address(364), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(288)), Normal, 0), (Eol, Normal, 0)] [(Address(368), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(192)), Normal, 0), (Eol, Normal, 0)] [(Address(372), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lvx128", 187), Normal, 10), (Argument(Opaque("v1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Eol, Normal, 0)] -[(Address(376), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "__stvx", demangled_name: None, address: 664, size: 40, kind: Function, section: Some(5), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(376), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "__stvx", demangled_name: None, normalized_name: None, address: 664, size: 40, kind: Function, section: Some(5), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(380), Dim, 5), (Spacing(4), Normal, 0), (Opcode("li", 263), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(0)), Normal, 0), (Eol, Normal, 0)] [(Address(384), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(160)), Normal, 0), (Eol, Normal, 0)] [(Address(388), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(176)), Normal, 0), (Eol, Normal, 0)] [(Address(392), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lvx128", 187), Normal, 10), (Argument(Opaque("v1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Eol, Normal, 0)] -[(Address(396), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "__stvx", demangled_name: None, address: 664, size: 40, kind: Function, section: Some(5), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] -[(Address(400), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4433", demangled_name: None, address: 32, size: 32, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(404), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4433", demangled_name: None, address: 32, size: 32, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] -[(Address(408), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "printf", demangled_name: None, address: 0, size: 0, kind: Function, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(396), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "__stvx", demangled_name: None, normalized_name: None, address: 664, size: 40, kind: Function, section: Some(5), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(400), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4433", demangled_name: None, normalized_name: None, address: 32, size: 32, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(404), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4433", demangled_name: None, normalized_name: None, address: 32, size: 32, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] +[(Address(408), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "printf", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Function, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(412), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(240)), Normal, 0), (Eol, Normal, 0)] [(Address(416), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lvx128", 187), Normal, 10), (Argument(Opaque("v1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r3")), Normal, 0), (Eol, Normal, 0)] -[(Address(420), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r11")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4434", demangled_name: None, address: 64, size: 8, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(424), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r11")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4434", demangled_name: None, address: 64, size: 8, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] -[(Address(428), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "?PrintVector@@YAXPBDU__vector4@@@Z", demangled_name: Some("void __cdecl PrintVector(char const *, struct __vector4)"), address: 0, size: 120, kind: Function, section: Some(5), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(420), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r11")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4434", demangled_name: None, normalized_name: None, address: 64, size: 8, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(424), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r11")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4434", demangled_name: None, normalized_name: None, address: 64, size: 8, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] +[(Address(428), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "?PrintVector@@YAXPBDU__vector4@@@Z", demangled_name: Some("void __cdecl PrintVector(char const *, struct __vector4)"), normalized_name: None, address: 0, size: 120, kind: Function, section: Some(5), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(432), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r10")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(208)), Normal, 0), (Eol, Normal, 0)] [(Address(436), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lvx128", 187), Normal, 10), (Argument(Opaque("v1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r10")), Normal, 0), (Eol, Normal, 0)] -[(Address(440), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r9")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4435", demangled_name: None, address: 72, size: 8, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(444), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r9")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4435", demangled_name: None, address: 72, size: 8, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] -[(Address(448), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "?PrintVector@@YAXPBDU__vector4@@@Z", demangled_name: Some("void __cdecl PrintVector(char const *, struct __vector4)"), address: 0, size: 120, kind: Function, section: Some(5), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(440), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r9")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4435", demangled_name: None, normalized_name: None, address: 72, size: 8, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(444), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r9")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4435", demangled_name: None, normalized_name: None, address: 72, size: 8, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] +[(Address(448), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "?PrintVector@@YAXPBDU__vector4@@@Z", demangled_name: Some("void __cdecl PrintVector(char const *, struct __vector4)"), normalized_name: None, address: 0, size: 120, kind: Function, section: Some(5), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(452), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r8")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(192)), Normal, 0), (Eol, Normal, 0)] [(Address(456), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lvx128", 187), Normal, 10), (Argument(Opaque("v1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r8")), Normal, 0), (Eol, Normal, 0)] -[(Address(460), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r7")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4436", demangled_name: None, address: 80, size: 12, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(464), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r7")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4436", demangled_name: None, address: 80, size: 12, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] -[(Address(468), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "?PrintVector@@YAXPBDU__vector4@@@Z", demangled_name: Some("void __cdecl PrintVector(char const *, struct __vector4)"), address: 0, size: 120, kind: Function, section: Some(5), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(460), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r7")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4436", demangled_name: None, normalized_name: None, address: 80, size: 12, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(464), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r7")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4436", demangled_name: None, normalized_name: None, address: 80, size: 12, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] +[(Address(468), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "?PrintVector@@YAXPBDU__vector4@@@Z", demangled_name: Some("void __cdecl PrintVector(char const *, struct __vector4)"), normalized_name: None, address: 0, size: 120, kind: Function, section: Some(5), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(472), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r6")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(176)), Normal, 0), (Eol, Normal, 0)] [(Address(476), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lvx128", 187), Normal, 10), (Argument(Opaque("v1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r0")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r6")), Normal, 0), (Eol, Normal, 0)] -[(Address(480), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4437", demangled_name: None, address: 92, size: 12, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(484), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4437", demangled_name: None, address: 92, size: 12, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] -[(Address(488), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "?PrintVector@@YAXPBDU__vector4@@@Z", demangled_name: Some("void __cdecl PrintVector(char const *, struct __vector4)"), address: 0, size: 120, kind: Function, section: Some(5), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] -[(Address(492), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4438", demangled_name: None, address: 104, size: 4, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] -[(Address(496), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4438", demangled_name: None, address: 104, size: 4, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] -[(Address(500), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "printf", demangled_name: None, address: 0, size: 0, kind: Function, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(480), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4437", demangled_name: None, normalized_name: None, address: 92, size: 12, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(484), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r5")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4437", demangled_name: None, normalized_name: None, address: 92, size: 12, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] +[(Address(488), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "?PrintVector@@YAXPBDU__vector4@@@Z", demangled_name: Some("void __cdecl PrintVector(char const *, struct __vector4)"), normalized_name: None, address: 0, size: 120, kind: Function, section: Some(5), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(492), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lis", 264), Normal, 10), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4438", demangled_name: None, normalized_name: None, address: 104, size: 4, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@h"), Normal, 0), (Eol, Normal, 0)] +[(Address(496), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r3")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r4")), Normal, 0), (Basic(", "), Normal, 0), (Symbol(Symbol { name: "$SG4438", demangled_name: None, normalized_name: None, address: 104, size: 4, kind: Object, section: Some(4), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Basic("@l"), Normal, 0), (Eol, Normal, 0)] +[(Address(500), Dim, 5), (Spacing(4), Normal, 0), (Opcode("bl", 267), Normal, 10), (Symbol(Symbol { name: "printf", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Function, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(504), Dim, 5), (Spacing(4), Normal, 0), (Opcode("addi", 263), Normal, 10), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(336)), Normal, 0), (Eol, Normal, 0)] [(Address(508), Dim, 5), (Spacing(4), Normal, 0), (Opcode("lwz", 439), Normal, 10), (Argument(Opaque("r12")), Normal, 0), (Basic(", "), Normal, 0), (Argument(Signed(-8)), Normal, 0), (Basic("("), Normal, 0), (Argument(Opaque("r1")), Normal, 0), (Basic(")"), Normal, 0), (Eol, Normal, 0)] [(Address(512), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mtlr", 348), Normal, 10), (Argument(Opaque("r12")), Normal, 0), (Eol, Normal, 0)] diff --git a/objdiff-core/tests/snapshots/arch_ppc__read_vmx128_coff.snap b/objdiff-core/tests/snapshots/arch_ppc__read_vmx128_coff.snap index b8c61064..ca2cc874 100644 --- a/objdiff-core/tests/snapshots/arch_ppc__read_vmx128_coff.snap +++ b/objdiff-core/tests/snapshots/arch_ppc__read_vmx128_coff.snap @@ -11,20 +11,10 @@ Object { }, endianness: Big, symbols: [ - Symbol { - name: "@comp.id", - demangled_name: None, - address: 0, - size: 0, - kind: Object, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, Symbol { name: "[.drectve]", demangled_name: None, + normalized_name: None, address: 0, size: 132, kind: Section, @@ -38,6 +28,7 @@ Object { Symbol { name: "[.debug$S]", demangled_name: None, + normalized_name: None, address: 0, size: 3952, kind: Section, @@ -51,6 +42,7 @@ Object { Symbol { name: "[.XBLD$W]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -64,6 +56,7 @@ Object { Symbol { name: "__C2_11886", demangled_name: None, + normalized_name: None, address: 0, size: 16, kind: Object, @@ -77,6 +70,7 @@ Object { Symbol { name: "[.XBLD$W]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -90,6 +84,7 @@ Object { Symbol { name: "__C1_11886", demangled_name: None, + normalized_name: None, address: 0, size: 16, kind: Object, @@ -103,6 +98,7 @@ Object { Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -116,6 +112,7 @@ Object { Symbol { name: "$SG4415", demangled_name: None, + normalized_name: None, address: 0, size: 32, kind: Object, @@ -129,6 +126,7 @@ Object { Symbol { name: "$SG4433", demangled_name: None, + normalized_name: None, address: 32, size: 32, kind: Object, @@ -142,6 +140,7 @@ Object { Symbol { name: "$SG4434", demangled_name: None, + normalized_name: None, address: 64, size: 8, kind: Object, @@ -155,6 +154,7 @@ Object { Symbol { name: "$SG4435", demangled_name: None, + normalized_name: None, address: 72, size: 8, kind: Object, @@ -168,6 +168,7 @@ Object { Symbol { name: "$SG4436", demangled_name: None, + normalized_name: None, address: 80, size: 12, kind: Object, @@ -181,6 +182,7 @@ Object { Symbol { name: "$SG4437", demangled_name: None, + normalized_name: None, address: 92, size: 12, kind: Object, @@ -194,6 +196,7 @@ Object { Symbol { name: "$SG4438", demangled_name: None, + normalized_name: None, address: 104, size: 4, kind: Object, @@ -207,6 +210,7 @@ Object { Symbol { name: "$SG4456", demangled_name: None, + normalized_name: None, address: 108, size: 40, kind: Object, @@ -220,6 +224,7 @@ Object { Symbol { name: "$SG4457", demangled_name: None, + normalized_name: None, address: 148, size: 8, kind: Object, @@ -233,6 +238,7 @@ Object { Symbol { name: "$SG4458", demangled_name: None, + normalized_name: None, address: 156, size: 8, kind: Object, @@ -246,6 +252,7 @@ Object { Symbol { name: "$SG4459", demangled_name: None, + normalized_name: None, address: 164, size: 24, kind: Object, @@ -259,6 +266,7 @@ Object { Symbol { name: "$SG4460", demangled_name: None, + normalized_name: None, address: 188, size: 20, kind: Object, @@ -272,6 +280,7 @@ Object { Symbol { name: "$SG4461", demangled_name: None, + normalized_name: None, address: 208, size: 24, kind: Object, @@ -285,6 +294,7 @@ Object { Symbol { name: "$SG4462", demangled_name: None, + normalized_name: None, address: 232, size: 4, kind: Object, @@ -298,6 +308,7 @@ Object { Symbol { name: "$SG4476", demangled_name: None, + normalized_name: None, address: 236, size: 36, kind: Object, @@ -311,6 +322,7 @@ Object { Symbol { name: "$SG4477", demangled_name: None, + normalized_name: None, address: 272, size: 20, kind: Object, @@ -324,6 +336,7 @@ Object { Symbol { name: "$SG4478", demangled_name: None, + normalized_name: None, address: 292, size: 4, kind: Object, @@ -337,6 +350,7 @@ Object { Symbol { name: "$SG4481", demangled_name: None, + normalized_name: None, address: 296, size: 40, kind: Object, @@ -350,6 +364,7 @@ Object { Symbol { name: "$SG4482", demangled_name: None, + normalized_name: None, address: 336, size: 20, kind: Object, @@ -363,6 +378,7 @@ Object { Symbol { name: "[.text]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -378,6 +394,7 @@ Object { demangled_name: Some( "void __cdecl PrintVector(char const *, struct __vector4)", ), + normalized_name: None, address: 0, size: 120, kind: Function, @@ -389,9 +406,10 @@ Object { virtual_address: None, }, Symbol { - name: "$M4492", + name: "$M4491", demangled_name: None, - address: 120, + normalized_name: None, + address: 12, size: 0, kind: Unknown, section: Some( @@ -402,20 +420,40 @@ Object { virtual_address: None, }, Symbol { - name: "printf", + name: "$M4492", demangled_name: None, - address: 0, + normalized_name: None, + address: 120, size: 0, + kind: Unknown, + section: Some( + 5, + ), + flags: FlagSet(Local), + align: None, + virtual_address: None, + }, + Symbol { + name: "?FloatingPointExample@@YAXXZ", + demangled_name: Some( + "void __cdecl FloatingPointExample(void)", + ), + normalized_name: None, + address: 120, + size: 520, kind: Function, - section: None, - flags: FlagSet(Global), + section: Some( + 5, + ), + flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "$M4491", + name: "$M4513", demangled_name: None, - address: 12, + normalized_name: None, + address: 132, size: 0, kind: Unknown, section: Some( @@ -426,49 +464,55 @@ Object { virtual_address: None, }, Symbol { - name: "[.pdata]", + name: "$M4514", demangled_name: None, - address: 0, + normalized_name: None, + address: 640, size: 0, - kind: Section, + kind: Unknown, section: Some( - 6, + 5, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "$T4493", + name: "__lvx", demangled_name: None, - address: 0, - size: 8, - kind: Object, + normalized_name: None, + address: 640, + size: 24, + kind: Function, section: Some( - 6, + 5, ), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "_fltused", + name: "__stvx", demangled_name: None, - address: 0, - size: 0, + normalized_name: None, + address: 664, + size: 40, kind: Function, - section: None, - flags: FlagSet(Global), + section: Some( + 5, + ), + flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "?FloatingPointExample@@YAXXZ", + name: "?ControlAndDataFlowExample@@YAXXZ", demangled_name: Some( - "void __cdecl FloatingPointExample(void)", + "void __cdecl ControlAndDataFlowExample(void)", ), - address: 120, - size: 520, + normalized_name: None, + address: 704, + size: 632, kind: Function, section: Some( 5, @@ -478,9 +522,10 @@ Object { virtual_address: None, }, Symbol { - name: "$M4514", + name: "$M4531", demangled_name: None, - address: 640, + normalized_name: None, + address: 716, size: 0, kind: Unknown, section: Some( @@ -491,152 +536,193 @@ Object { virtual_address: None, }, Symbol { - name: "[.rdata]", + name: "$M4532", demangled_name: None, - address: 0, + normalized_name: None, + address: 1336, size: 0, kind: Unknown, - section: None, + section: Some( + 5, + ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "__real@3f000000", - demangled_name: None, - address: 356, - size: 4, - kind: Object, + name: "?ReservedRegisterExample@@YAXXZ", + demangled_name: Some( + "void __cdecl ReservedRegisterExample(void)", + ), + normalized_name: None, + address: 1336, + size: 272, + kind: Function, section: Some( - 4, + 5, ), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "[.rdata]", + name: "$M4535", demangled_name: None, - address: 0, + normalized_name: None, + address: 1348, size: 0, kind: Unknown, - section: None, + section: Some( + 5, + ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "__real@41000000", + name: "$M4536", demangled_name: None, - address: 360, - size: 4, - kind: Object, + normalized_name: None, + address: 1608, + size: 0, + kind: Unknown, section: Some( - 4, + 5, + ), + flags: FlagSet(Local), + align: None, + virtual_address: None, + }, + Symbol { + name: "main", + demangled_name: None, + normalized_name: None, + address: 1608, + size: 68, + kind: Function, + section: Some( + 5, ), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "[.rdata]", + name: "$M4539", demangled_name: None, - address: 0, + normalized_name: None, + address: 1620, size: 0, kind: Unknown, - section: None, + section: Some( + 5, + ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "__real@40e00000", + name: "$M4540", demangled_name: None, - address: 364, - size: 4, - kind: Object, + normalized_name: None, + address: 1676, + size: 0, + kind: Unknown, section: Some( - 4, + 5, ), - flags: FlagSet(Global | SizeInferred), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "[.rdata]", + name: "[.pdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Unknown, - section: None, + kind: Section, + section: Some( + 6, + ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "__real@40c00000", + name: "$T4493", demangled_name: None, - address: 368, - size: 4, + normalized_name: None, + address: 0, + size: 8, kind: Object, section: Some( - 4, + 6, ), - flags: FlagSet(Global | SizeInferred), + flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "[.rdata]", + name: "$T4515", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Local), + normalized_name: None, + address: 8, + size: 8, + kind: Object, + section: Some( + 6, + ), + flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "__real@40a00000", + name: "$T4533", demangled_name: None, - address: 372, - size: 4, + normalized_name: None, + address: 16, + size: 8, kind: Object, section: Some( - 4, + 6, ), - flags: FlagSet(Global | SizeInferred), + flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "[.rdata]", + name: "$T4537", demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Local), + normalized_name: None, + address: 24, + size: 8, + kind: Object, + section: Some( + 6, + ), + flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "__real@40800000", + name: "$T4541", demangled_name: None, - address: 376, - size: 4, + normalized_name: None, + address: 32, + size: 8, kind: Object, section: Some( - 4, + 6, ), - flags: FlagSet(Global | SizeInferred), + flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None, }, Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -646,9 +732,10 @@ Object { virtual_address: None, }, Symbol { - name: "__real@40400000", + name: "__real@3f000000", demangled_name: None, - address: 380, + normalized_name: None, + address: 356, size: 4, kind: Object, section: Some( @@ -661,6 +748,7 @@ Object { Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -670,9 +758,10 @@ Object { virtual_address: None, }, Symbol { - name: "__real@40000000", + name: "__real@41000000", demangled_name: None, - address: 384, + normalized_name: None, + address: 360, size: 4, kind: Object, section: Some( @@ -685,6 +774,7 @@ Object { Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -694,9 +784,10 @@ Object { virtual_address: None, }, Symbol { - name: "__real@3f800000", + name: "__real@40e00000", demangled_name: None, - address: 388, + normalized_name: None, + address: 364, size: 4, kind: Object, section: Some( @@ -707,88 +798,61 @@ Object { virtual_address: None, }, Symbol { - name: "$M4513", + name: "[.rdata]", demangled_name: None, - address: 132, + normalized_name: None, + address: 0, size: 0, kind: Unknown, - section: Some( - 5, - ), + section: None, flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "$T4515", + name: "__real@40c00000", demangled_name: None, - address: 8, - size: 8, + normalized_name: None, + address: 368, + size: 4, kind: Object, section: Some( - 6, + 4, ), - flags: FlagSet(Local | SizeInferred), + flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "__lvx", + name: "[.rdata]", demangled_name: None, - address: 640, - size: 24, - kind: Function, - section: Some( - 5, - ), - flags: FlagSet(Local | SizeInferred), + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "__stvx", + name: "__real@40a00000", demangled_name: None, - address: 664, - size: 40, - kind: Function, - section: Some( - 5, - ), - flags: FlagSet(Local | SizeInferred), - align: None, - virtual_address: None, - }, - Symbol { - name: "?ControlAndDataFlowExample@@YAXXZ", - demangled_name: Some( - "void __cdecl ControlAndDataFlowExample(void)", - ), - address: 704, - size: 632, - kind: Function, + normalized_name: None, + address: 372, + size: 4, + kind: Object, section: Some( - 5, + 4, ), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, - Symbol { - name: "$M4532", - demangled_name: None, - address: 1336, - size: 0, - kind: Unknown, - section: Some( - 5, - ), - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -798,9 +862,10 @@ Object { virtual_address: None, }, Symbol { - name: "__real@c2480000", + name: "__real@40800000", demangled_name: None, - address: 392, + normalized_name: None, + address: 376, size: 4, kind: Object, section: Some( @@ -813,6 +878,7 @@ Object { Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -822,9 +888,10 @@ Object { virtual_address: None, }, Symbol { - name: "__real@41a00000", + name: "__real@40400000", demangled_name: None, - address: 396, + normalized_name: None, + address: 380, size: 4, kind: Object, section: Some( @@ -837,6 +904,7 @@ Object { Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -846,9 +914,10 @@ Object { virtual_address: None, }, Symbol { - name: "__real@00000000", + name: "__real@40000000", demangled_name: None, - address: 400, + normalized_name: None, + address: 384, size: 4, kind: Object, section: Some( @@ -861,6 +930,7 @@ Object { Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -870,9 +940,10 @@ Object { virtual_address: None, }, Symbol { - name: "__real@42c80000", + name: "__real@3f800000", demangled_name: None, - address: 404, + normalized_name: None, + address: 388, size: 4, kind: Object, section: Some( @@ -885,6 +956,7 @@ Object { Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -894,9 +966,10 @@ Object { virtual_address: None, }, Symbol { - name: "__real@c0a00000", + name: "__real@c2480000", demangled_name: None, - address: 408, + normalized_name: None, + address: 392, size: 4, kind: Object, section: Some( @@ -909,6 +982,7 @@ Object { Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, @@ -918,9 +992,10 @@ Object { virtual_address: None, }, Symbol { - name: "__real@41200000", + name: "__real@41a00000", demangled_name: None, - address: 412, + normalized_name: None, + address: 396, size: 4, kind: Object, section: Some( @@ -931,140 +1006,113 @@ Object { virtual_address: None, }, Symbol { - name: "$M4531", + name: "[.rdata]", demangled_name: None, - address: 716, + normalized_name: None, + address: 0, size: 0, kind: Unknown, - section: Some( - 5, - ), + section: None, flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "$T4533", + name: "__real@00000000", demangled_name: None, - address: 16, - size: 8, + normalized_name: None, + address: 400, + size: 4, kind: Object, section: Some( - 6, - ), - flags: FlagSet(Local | SizeInferred), - align: None, - virtual_address: None, - }, - Symbol { - name: "?ReservedRegisterExample@@YAXXZ", - demangled_name: Some( - "void __cdecl ReservedRegisterExample(void)", - ), - address: 1336, - size: 272, - kind: Function, - section: Some( - 5, + 4, ), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "$M4536", - demangled_name: None, - address: 1608, - size: 0, - kind: Unknown, - section: Some( - 5, - ), - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, - Symbol { - name: "$M4535", + name: "[.rdata]", demangled_name: None, - address: 1348, + normalized_name: None, + address: 0, size: 0, kind: Unknown, - section: Some( - 5, - ), + section: None, flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "$T4537", + name: "__real@42c80000", demangled_name: None, - address: 24, - size: 8, + normalized_name: None, + address: 404, + size: 4, kind: Object, section: Some( - 6, + 4, ), - flags: FlagSet(Local | SizeInferred), + flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "main", + name: "[.rdata]", demangled_name: None, - address: 1608, - size: 68, - kind: Function, - section: Some( - 5, - ), - flags: FlagSet(Global | SizeInferred), + normalized_name: None, + address: 0, + size: 0, + kind: Unknown, + section: None, + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "$M4540", + name: "__real@c0a00000", demangled_name: None, - address: 1676, - size: 0, - kind: Unknown, + normalized_name: None, + address: 408, + size: 4, + kind: Object, section: Some( - 5, + 4, ), - flags: FlagSet(Local), + flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "$M4539", + name: "[.rdata]", demangled_name: None, - address: 1620, + normalized_name: None, + address: 0, size: 0, kind: Unknown, - section: Some( - 5, - ), + section: None, flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "$T4541", + name: "__real@41200000", demangled_name: None, - address: 32, - size: 8, + normalized_name: None, + address: 412, + size: 4, kind: Object, section: Some( - 6, + 4, ), - flags: FlagSet(Local | SizeInferred), + flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { name: "[.debug$S]", demangled_name: None, + normalized_name: None, address: 0, size: 40, kind: Section, @@ -1078,6 +1126,7 @@ Object { Symbol { name: "[.debug$S]", demangled_name: None, + normalized_name: None, address: 0, size: 40, kind: Section, @@ -1091,6 +1140,7 @@ Object { Symbol { name: "[.debug$T]", demangled_name: None, + normalized_name: None, address: 0, size: 48, kind: Section, @@ -1101,9 +1151,46 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "@comp.id", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Object, + section: None, + flags: FlagSet(Local), + align: None, + virtual_address: None, + }, + Symbol { + name: "printf", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Function, + section: None, + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, + Symbol { + name: "_fltused", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Function, + section: None, + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, Symbol { name: "[.XBLD$W-0]", demangled_name: None, + normalized_name: None, address: 0, size: 16, kind: Section, @@ -1117,6 +1204,7 @@ Object { Symbol { name: "[.rdata-0]", demangled_name: None, + normalized_name: None, address: 0, size: 416, kind: Section, @@ -1130,6 +1218,7 @@ Object { Symbol { name: "[.pdata-0]", demangled_name: None, + normalized_name: None, address: 0, size: 40, kind: Section, @@ -1246,7 +1335,7 @@ Object { 16, ), address: 92, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -1254,7 +1343,7 @@ Object { 17, ), address: 96, - target_symbol: 8, + target_symbol: 7, addend: 0, }, Relocation { @@ -1262,7 +1351,7 @@ Object { 6, ), address: 100, - target_symbol: 30, + target_symbol: 84, addend: 0, }, Relocation { @@ -1270,7 +1359,7 @@ Object { 16, ), address: 132, - target_symbol: 54, + target_symbol: 67, addend: 0, }, Relocation { @@ -1278,7 +1367,7 @@ Object { 17, ), address: 136, - target_symbol: 54, + target_symbol: 67, addend: 0, }, Relocation { @@ -1286,7 +1375,7 @@ Object { 16, ), address: 144, - target_symbol: 52, + target_symbol: 65, addend: 0, }, Relocation { @@ -1294,7 +1383,7 @@ Object { 17, ), address: 148, - target_symbol: 52, + target_symbol: 65, addend: 0, }, Relocation { @@ -1302,7 +1391,7 @@ Object { 16, ), address: 156, - target_symbol: 50, + target_symbol: 63, addend: 0, }, Relocation { @@ -1310,7 +1399,7 @@ Object { 17, ), address: 160, - target_symbol: 50, + target_symbol: 63, addend: 0, }, Relocation { @@ -1318,7 +1407,7 @@ Object { 16, ), address: 168, - target_symbol: 48, + target_symbol: 61, addend: 0, }, Relocation { @@ -1326,7 +1415,7 @@ Object { 17, ), address: 172, - target_symbol: 48, + target_symbol: 61, addend: 0, }, Relocation { @@ -1334,7 +1423,7 @@ Object { 16, ), address: 180, - target_symbol: 46, + target_symbol: 59, addend: 0, }, Relocation { @@ -1342,7 +1431,7 @@ Object { 17, ), address: 184, - target_symbol: 46, + target_symbol: 59, addend: 0, }, Relocation { @@ -1350,7 +1439,7 @@ Object { 16, ), address: 192, - target_symbol: 44, + target_symbol: 57, addend: 0, }, Relocation { @@ -1358,7 +1447,7 @@ Object { 17, ), address: 196, - target_symbol: 44, + target_symbol: 57, addend: 0, }, Relocation { @@ -1366,7 +1455,7 @@ Object { 16, ), address: 204, - target_symbol: 42, + target_symbol: 55, addend: 0, }, Relocation { @@ -1374,7 +1463,7 @@ Object { 17, ), address: 208, - target_symbol: 42, + target_symbol: 55, addend: 0, }, Relocation { @@ -1382,7 +1471,7 @@ Object { 16, ), address: 216, - target_symbol: 40, + target_symbol: 53, addend: 0, }, Relocation { @@ -1390,7 +1479,7 @@ Object { 17, ), address: 220, - target_symbol: 40, + target_symbol: 53, addend: 0, }, Relocation { @@ -1398,7 +1487,7 @@ Object { 16, ), address: 228, - target_symbol: 38, + target_symbol: 51, addend: 0, }, Relocation { @@ -1406,7 +1495,7 @@ Object { 17, ), address: 232, - target_symbol: 38, + target_symbol: 51, addend: 0, }, Relocation { @@ -1414,7 +1503,7 @@ Object { 16, ), address: 240, - target_symbol: 38, + target_symbol: 51, addend: 0, }, Relocation { @@ -1422,7 +1511,7 @@ Object { 17, ), address: 244, - target_symbol: 38, + target_symbol: 51, addend: 0, }, Relocation { @@ -1430,7 +1519,7 @@ Object { 16, ), address: 252, - target_symbol: 38, + target_symbol: 51, addend: 0, }, Relocation { @@ -1438,7 +1527,7 @@ Object { 17, ), address: 256, - target_symbol: 38, + target_symbol: 51, addend: 0, }, Relocation { @@ -1446,7 +1535,7 @@ Object { 16, ), address: 264, - target_symbol: 38, + target_symbol: 51, addend: 0, }, Relocation { @@ -1454,7 +1543,7 @@ Object { 17, ), address: 268, - target_symbol: 38, + target_symbol: 51, addend: 0, }, Relocation { @@ -1462,7 +1551,7 @@ Object { 6, ), address: 284, - target_symbol: 57, + target_symbol: 33, addend: 0, }, Relocation { @@ -1470,7 +1559,7 @@ Object { 6, ), address: 320, - target_symbol: 57, + target_symbol: 33, addend: 0, }, Relocation { @@ -1478,7 +1567,7 @@ Object { 6, ), address: 356, - target_symbol: 57, + target_symbol: 33, addend: 0, }, Relocation { @@ -1486,7 +1575,7 @@ Object { 6, ), address: 496, - target_symbol: 58, + target_symbol: 34, addend: 0, }, Relocation { @@ -1494,7 +1583,7 @@ Object { 6, ), address: 516, - target_symbol: 58, + target_symbol: 34, addend: 0, }, Relocation { @@ -1502,7 +1591,7 @@ Object { 16, ), address: 520, - target_symbol: 9, + target_symbol: 8, addend: 0, }, Relocation { @@ -1510,7 +1599,7 @@ Object { 17, ), address: 524, - target_symbol: 9, + target_symbol: 8, addend: 0, }, Relocation { @@ -1518,7 +1607,7 @@ Object { 6, ), address: 528, - target_symbol: 30, + target_symbol: 84, addend: 0, }, Relocation { @@ -1526,7 +1615,7 @@ Object { 16, ), address: 540, - target_symbol: 10, + target_symbol: 9, addend: 0, }, Relocation { @@ -1534,7 +1623,7 @@ Object { 17, ), address: 544, - target_symbol: 10, + target_symbol: 9, addend: 0, }, Relocation { @@ -1542,7 +1631,7 @@ Object { 6, ), address: 548, - target_symbol: 28, + target_symbol: 27, addend: 0, }, Relocation { @@ -1550,7 +1639,7 @@ Object { 16, ), address: 560, - target_symbol: 11, + target_symbol: 10, addend: 0, }, Relocation { @@ -1558,7 +1647,7 @@ Object { 17, ), address: 564, - target_symbol: 11, + target_symbol: 10, addend: 0, }, Relocation { @@ -1566,7 +1655,7 @@ Object { 6, ), address: 568, - target_symbol: 28, + target_symbol: 27, addend: 0, }, Relocation { @@ -1574,7 +1663,7 @@ Object { 16, ), address: 580, - target_symbol: 12, + target_symbol: 11, addend: 0, }, Relocation { @@ -1582,7 +1671,7 @@ Object { 17, ), address: 584, - target_symbol: 12, + target_symbol: 11, addend: 0, }, Relocation { @@ -1590,7 +1679,7 @@ Object { 6, ), address: 588, - target_symbol: 28, + target_symbol: 27, addend: 0, }, Relocation { @@ -1598,7 +1687,7 @@ Object { 16, ), address: 600, - target_symbol: 13, + target_symbol: 12, addend: 0, }, Relocation { @@ -1606,7 +1695,7 @@ Object { 17, ), address: 604, - target_symbol: 13, + target_symbol: 12, addend: 0, }, Relocation { @@ -1614,7 +1703,7 @@ Object { 6, ), address: 608, - target_symbol: 28, + target_symbol: 27, addend: 0, }, Relocation { @@ -1622,7 +1711,7 @@ Object { 16, ), address: 612, - target_symbol: 14, + target_symbol: 13, addend: 0, }, Relocation { @@ -1630,7 +1719,7 @@ Object { 17, ), address: 616, - target_symbol: 14, + target_symbol: 13, addend: 0, }, Relocation { @@ -1638,7 +1727,7 @@ Object { 6, ), address: 620, - target_symbol: 30, + target_symbol: 84, addend: 0, }, Relocation { @@ -1646,7 +1735,7 @@ Object { 16, ), address: 716, - target_symbol: 72, + target_symbol: 79, addend: 0, }, Relocation { @@ -1654,7 +1743,7 @@ Object { 17, ), address: 720, - target_symbol: 72, + target_symbol: 79, addend: 0, }, Relocation { @@ -1662,7 +1751,7 @@ Object { 16, ), address: 728, - target_symbol: 70, + target_symbol: 77, addend: 0, }, Relocation { @@ -1670,7 +1759,7 @@ Object { 17, ), address: 732, - target_symbol: 70, + target_symbol: 77, addend: 0, }, Relocation { @@ -1678,7 +1767,7 @@ Object { 16, ), address: 740, - target_symbol: 68, + target_symbol: 75, addend: 0, }, Relocation { @@ -1686,7 +1775,7 @@ Object { 17, ), address: 744, - target_symbol: 68, + target_symbol: 75, addend: 0, }, Relocation { @@ -1694,7 +1783,7 @@ Object { 16, ), address: 752, - target_symbol: 66, + target_symbol: 73, addend: 0, }, Relocation { @@ -1702,7 +1791,7 @@ Object { 17, ), address: 756, - target_symbol: 66, + target_symbol: 73, addend: 0, }, Relocation { @@ -1710,7 +1799,7 @@ Object { 16, ), address: 764, - target_symbol: 54, + target_symbol: 67, addend: 0, }, Relocation { @@ -1718,7 +1807,7 @@ Object { 17, ), address: 768, - target_symbol: 54, + target_symbol: 67, addend: 0, }, Relocation { @@ -1726,7 +1815,7 @@ Object { 16, ), address: 776, - target_symbol: 64, + target_symbol: 71, addend: 0, }, Relocation { @@ -1734,7 +1823,7 @@ Object { 17, ), address: 780, - target_symbol: 64, + target_symbol: 71, addend: 0, }, Relocation { @@ -1742,7 +1831,7 @@ Object { 16, ), address: 788, - target_symbol: 62, + target_symbol: 69, addend: 0, }, Relocation { @@ -1750,7 +1839,7 @@ Object { 17, ), address: 792, - target_symbol: 62, + target_symbol: 69, addend: 0, }, Relocation { @@ -1758,7 +1847,7 @@ Object { 16, ), address: 800, - target_symbol: 66, + target_symbol: 73, addend: 0, }, Relocation { @@ -1766,7 +1855,7 @@ Object { 17, ), address: 804, - target_symbol: 66, + target_symbol: 73, addend: 0, }, Relocation { @@ -1774,7 +1863,7 @@ Object { 6, ), address: 948, - target_symbol: 57, + target_symbol: 33, addend: 0, }, Relocation { @@ -1782,7 +1871,7 @@ Object { 6, ), address: 984, - target_symbol: 57, + target_symbol: 33, addend: 0, }, Relocation { @@ -1790,7 +1879,7 @@ Object { 6, ), address: 1020, - target_symbol: 57, + target_symbol: 33, addend: 0, }, Relocation { @@ -1798,7 +1887,7 @@ Object { 16, ), address: 1196, - target_symbol: 15, + target_symbol: 14, addend: 0, }, Relocation { @@ -1806,7 +1895,7 @@ Object { 17, ), address: 1200, - target_symbol: 15, + target_symbol: 14, addend: 0, }, Relocation { @@ -1814,7 +1903,7 @@ Object { 6, ), address: 1204, - target_symbol: 30, + target_symbol: 84, addend: 0, }, Relocation { @@ -1822,7 +1911,7 @@ Object { 16, ), address: 1216, - target_symbol: 16, + target_symbol: 15, addend: 0, }, Relocation { @@ -1830,7 +1919,7 @@ Object { 17, ), address: 1220, - target_symbol: 16, + target_symbol: 15, addend: 0, }, Relocation { @@ -1838,7 +1927,7 @@ Object { 6, ), address: 1224, - target_symbol: 28, + target_symbol: 27, addend: 0, }, Relocation { @@ -1846,7 +1935,7 @@ Object { 16, ), address: 1236, - target_symbol: 17, + target_symbol: 16, addend: 0, }, Relocation { @@ -1854,7 +1943,7 @@ Object { 17, ), address: 1240, - target_symbol: 17, + target_symbol: 16, addend: 0, }, Relocation { @@ -1862,7 +1951,7 @@ Object { 6, ), address: 1244, - target_symbol: 28, + target_symbol: 27, addend: 0, }, Relocation { @@ -1870,7 +1959,7 @@ Object { 16, ), address: 1256, - target_symbol: 18, + target_symbol: 17, addend: 0, }, Relocation { @@ -1878,7 +1967,7 @@ Object { 17, ), address: 1260, - target_symbol: 18, + target_symbol: 17, addend: 0, }, Relocation { @@ -1886,7 +1975,7 @@ Object { 6, ), address: 1264, - target_symbol: 28, + target_symbol: 27, addend: 0, }, Relocation { @@ -1894,7 +1983,7 @@ Object { 16, ), address: 1276, - target_symbol: 19, + target_symbol: 18, addend: 0, }, Relocation { @@ -1902,7 +1991,7 @@ Object { 17, ), address: 1280, - target_symbol: 19, + target_symbol: 18, addend: 0, }, Relocation { @@ -1910,7 +1999,7 @@ Object { 6, ), address: 1284, - target_symbol: 28, + target_symbol: 27, addend: 0, }, Relocation { @@ -1918,7 +2007,7 @@ Object { 16, ), address: 1296, - target_symbol: 20, + target_symbol: 19, addend: 0, }, Relocation { @@ -1926,7 +2015,7 @@ Object { 17, ), address: 1300, - target_symbol: 20, + target_symbol: 19, addend: 0, }, Relocation { @@ -1934,7 +2023,7 @@ Object { 6, ), address: 1304, - target_symbol: 28, + target_symbol: 27, addend: 0, }, Relocation { @@ -1942,7 +2031,7 @@ Object { 16, ), address: 1308, - target_symbol: 21, + target_symbol: 20, addend: 0, }, Relocation { @@ -1950,7 +2039,7 @@ Object { 17, ), address: 1312, - target_symbol: 21, + target_symbol: 20, addend: 0, }, Relocation { @@ -1958,7 +2047,7 @@ Object { 6, ), address: 1316, - target_symbol: 30, + target_symbol: 84, addend: 0, }, Relocation { @@ -1966,7 +2055,7 @@ Object { 16, ), address: 1548, - target_symbol: 22, + target_symbol: 21, addend: 0, }, Relocation { @@ -1974,7 +2063,7 @@ Object { 17, ), address: 1552, - target_symbol: 22, + target_symbol: 21, addend: 0, }, Relocation { @@ -1982,7 +2071,7 @@ Object { 6, ), address: 1556, - target_symbol: 30, + target_symbol: 84, addend: 0, }, Relocation { @@ -1990,7 +2079,7 @@ Object { 16, ), address: 1568, - target_symbol: 23, + target_symbol: 22, addend: 0, }, Relocation { @@ -1998,7 +2087,7 @@ Object { 17, ), address: 1572, - target_symbol: 23, + target_symbol: 22, addend: 0, }, Relocation { @@ -2006,7 +2095,7 @@ Object { 6, ), address: 1576, - target_symbol: 28, + target_symbol: 27, addend: 0, }, Relocation { @@ -2014,7 +2103,7 @@ Object { 16, ), address: 1580, - target_symbol: 24, + target_symbol: 23, addend: 0, }, Relocation { @@ -2022,7 +2111,7 @@ Object { 17, ), address: 1584, - target_symbol: 24, + target_symbol: 23, addend: 0, }, Relocation { @@ -2030,7 +2119,7 @@ Object { 6, ), address: 1588, - target_symbol: 30, + target_symbol: 84, addend: 0, }, Relocation { @@ -2038,7 +2127,7 @@ Object { 16, ), address: 1620, - target_symbol: 25, + target_symbol: 24, addend: 0, }, Relocation { @@ -2046,7 +2135,7 @@ Object { 17, ), address: 1624, - target_symbol: 25, + target_symbol: 24, addend: 0, }, Relocation { @@ -2054,7 +2143,7 @@ Object { 6, ), address: 1628, - target_symbol: 30, + target_symbol: 84, addend: 0, }, Relocation { @@ -2062,7 +2151,7 @@ Object { 6, ), address: 1632, - target_symbol: 35, + target_symbol: 30, addend: 0, }, Relocation { @@ -2070,7 +2159,7 @@ Object { 6, ), address: 1636, - target_symbol: 59, + target_symbol: 35, addend: 0, }, Relocation { @@ -2078,7 +2167,7 @@ Object { 6, ), address: 1640, - target_symbol: 75, + target_symbol: 38, addend: 0, }, Relocation { @@ -2086,7 +2175,7 @@ Object { 16, ), address: 1644, - target_symbol: 26, + target_symbol: 25, addend: 0, }, Relocation { @@ -2094,7 +2183,7 @@ Object { 17, ), address: 1648, - target_symbol: 26, + target_symbol: 25, addend: 0, }, Relocation { @@ -2102,7 +2191,7 @@ Object { 6, ), address: 1652, - target_symbol: 30, + target_symbol: 84, addend: 0, }, ], @@ -2128,7 +2217,7 @@ Object { 2, ), address: 0, - target_symbol: 28, + target_symbol: 27, addend: 0, }, Relocation { @@ -2136,7 +2225,7 @@ Object { 2, ), address: 8, - target_symbol: 35, + target_symbol: 30, addend: 0, }, Relocation { @@ -2144,7 +2233,7 @@ Object { 2, ), address: 16, - target_symbol: 59, + target_symbol: 35, addend: 0, }, Relocation { @@ -2152,7 +2241,7 @@ Object { 2, ), address: 24, - target_symbol: 75, + target_symbol: 38, addend: 0, }, Relocation { @@ -2160,7 +2249,7 @@ Object { 2, ), address: 32, - target_symbol: 79, + target_symbol: 41, addend: 0, }, ], diff --git a/objdiff-core/tests/snapshots/arch_x86__display_section_ordering.snap b/objdiff-core/tests/snapshots/arch_x86__display_section_ordering.snap index 008863ef..d6747677 100644 --- a/objdiff-core/tests/snapshots/arch_x86__display_section_ordering.snap +++ b/objdiff-core/tests/snapshots/arch_x86__display_section_ordering.snap @@ -10,7 +10,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 28, + symbol: 2, is_mapping_symbol: false, }, ], @@ -23,7 +23,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 29, + symbol: 4, is_mapping_symbol: false, }, ], @@ -36,7 +36,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 30, + symbol: 6, is_mapping_symbol: false, }, ], @@ -49,7 +49,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 31, + symbol: 8, is_mapping_symbol: false, }, ], @@ -62,7 +62,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 34, + symbol: 10, is_mapping_symbol: false, }, ], @@ -75,7 +75,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 37, + symbol: 12, is_mapping_symbol: false, }, ], @@ -88,7 +88,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 38, + symbol: 14, is_mapping_symbol: false, }, ], @@ -101,7 +101,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 39, + symbol: 16, is_mapping_symbol: false, }, ], @@ -114,7 +114,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 40, + symbol: 18, is_mapping_symbol: false, }, ], @@ -127,7 +127,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 41, + symbol: 20, is_mapping_symbol: false, }, ], @@ -140,7 +140,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 42, + symbol: 22, is_mapping_symbol: false, }, ], @@ -153,7 +153,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 43, + symbol: 24, is_mapping_symbol: false, }, ], @@ -166,7 +166,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 50, + symbol: 26, is_mapping_symbol: false, }, ], @@ -179,7 +179,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 53, + symbol: 28, is_mapping_symbol: false, }, ], @@ -192,7 +192,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 56, + symbol: 30, is_mapping_symbol: false, }, ], @@ -205,7 +205,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 57, + symbol: 32, is_mapping_symbol: false, }, ], @@ -218,7 +218,7 @@ expression: section_display match_percent: None, symbols: [ SectionDisplaySymbol { - symbol: 60, + symbol: 34, is_mapping_symbol: false, }, ], diff --git a/objdiff-core/tests/snapshots/arch_x86__read_x86-3.snap b/objdiff-core/tests/snapshots/arch_x86__read_x86-3.snap index 46f30c72..8f0bac41 100644 --- a/objdiff-core/tests/snapshots/arch_x86__read_x86-3.snap +++ b/objdiff-core/tests/snapshots/arch_x86__read_x86-3.snap @@ -4,8 +4,8 @@ expression: output --- [(Address(0), Dim, 5), (Spacing(4), Normal, 0), (Opcode("push", 640), Normal, 10), (Argument(Opaque("ebp")), Normal, 0), (Eol, Normal, 0)] [(Address(1), Dim, 5), (Spacing(4), Normal, 0), (Opcode("mov", 414), Normal, 10), (Argument(Opaque("ebp")), Normal, 0), (Basic(","), Normal, 0), (Spacing(1), Normal, 0), (Argument(Opaque("esp")), Normal, 0), (Eol, Normal, 0)] -[(Address(3), Dim, 5), (Spacing(4), Normal, 0), (Opcode("push", 640), Normal, 10), (Symbol(Symbol { name: "$SG526", demangled_name: None, address: 4, size: 6, kind: Object, section: Some(1), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] -[(Address(8), Dim, 5), (Spacing(4), Normal, 0), (Opcode("call", 59), Normal, 10), (Symbol(Symbol { name: "_printf", demangled_name: None, address: 0, size: 0, kind: Function, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(3), Dim, 5), (Spacing(4), Normal, 0), (Opcode("push", 640), Normal, 10), (Symbol(Symbol { name: "$SG526", demangled_name: None, normalized_name: None, address: 4, size: 6, kind: Object, section: Some(1), flags: FlagSet(Local | SizeInferred), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] +[(Address(8), Dim, 5), (Spacing(4), Normal, 0), (Opcode("call", 59), Normal, 10), (Symbol(Symbol { name: "_printf", demangled_name: None, normalized_name: None, address: 0, size: 0, kind: Function, section: None, flags: FlagSet(Global), align: None, virtual_address: None }), Bright, 0), (Eol, Normal, 0)] [(Address(13), Dim, 5), (Spacing(4), Normal, 0), (Opcode("add", 7), Normal, 10), (Argument(Opaque("esp")), Normal, 0), (Basic(","), Normal, 0), (Spacing(1), Normal, 0), (Argument(Unsigned(4)), Normal, 0), (Eol, Normal, 0)] [(Address(16), Dim, 5), (Spacing(4), Normal, 0), (Opcode("pop", 590), Normal, 10), (Argument(Opaque("ebp")), Normal, 0), (Eol, Normal, 0)] [(Address(17), Dim, 5), (Spacing(4), Normal, 0), (Opcode("ret", 662), Normal, 10), (Eol, Normal, 0)] diff --git a/objdiff-core/tests/snapshots/arch_x86__read_x86.snap b/objdiff-core/tests/snapshots/arch_x86__read_x86.snap index 1b3484dc..f95f13a7 100644 --- a/objdiff-core/tests/snapshots/arch_x86__read_x86.snap +++ b/objdiff-core/tests/snapshots/arch_x86__read_x86.snap @@ -9,31 +9,10 @@ Object { }, endianness: Little, symbols: [ - Symbol { - name: "objdiffstaticdebug.cpp", - demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, - Symbol { - name: "@comp.id", - demangled_name: None, - address: 0, - size: 0, - kind: Object, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, Symbol { name: "[.drectve]", demangled_name: None, + normalized_name: None, address: 0, size: 38, kind: Section, @@ -47,6 +26,7 @@ Object { Symbol { name: "[.data]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -62,6 +42,7 @@ Object { demangled_name: Some( "void *a", ), + normalized_name: None, address: 0, size: 4, kind: Object, @@ -72,9 +53,24 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "$SG526", + demangled_name: None, + normalized_name: None, + address: 4, + size: 6, + kind: Object, + section: Some( + 1, + ), + flags: FlagSet(Local | SizeInferred), + align: None, + virtual_address: None, + }, Symbol { name: "[.text]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -90,6 +86,7 @@ Object { demangled_name: Some( "void __cdecl PrintThing(void)", ), + normalized_name: None, address: 0, size: 18, kind: Function, @@ -101,32 +98,33 @@ Object { virtual_address: None, }, Symbol { - name: "_printf", + name: "@comp.id", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Function, + kind: Object, section: None, - flags: FlagSet(Global), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "$SG526", + name: "_printf", demangled_name: None, - address: 4, - size: 6, - kind: Object, - section: Some( - 1, - ), - flags: FlagSet(Local | SizeInferred), + normalized_name: None, + address: 0, + size: 0, + kind: Function, + section: None, + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { name: "[.data-0]", demangled_name: None, + normalized_name: None, address: 0, size: 10, kind: Section, @@ -175,7 +173,7 @@ Object { 6, ), address: 0, - target_symbol: 6, + target_symbol: 5, addend: 0, }, ], @@ -201,7 +199,7 @@ Object { 6, ), address: 4, - target_symbol: 8, + target_symbol: 3, addend: 0, }, Relocation { diff --git a/objdiff-core/tests/snapshots/arch_x86__read_x86_64.snap b/objdiff-core/tests/snapshots/arch_x86__read_x86_64.snap index 3eeca80a..726a7ec7 100644 --- a/objdiff-core/tests/snapshots/arch_x86__read_x86_64.snap +++ b/objdiff-core/tests/snapshots/arch_x86__read_x86_64.snap @@ -9,42 +9,10 @@ Object { }, endianness: Little, symbols: [ - Symbol { - name: "@comp.id", - demangled_name: None, - address: 0, - size: 0, - kind: Object, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, - Symbol { - name: "@feat.00", - demangled_name: None, - address: 0, - size: 0, - kind: Object, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, - Symbol { - name: "@vol.md", - demangled_name: None, - address: 0, - size: 0, - kind: Object, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, Symbol { name: "[.drectve]", demangled_name: None, + normalized_name: None, address: 0, size: 47, kind: Section, @@ -58,6 +26,7 @@ Object { Symbol { name: "[.debug$S]", demangled_name: None, + normalized_name: None, address: 0, size: 156, kind: Section, @@ -71,6 +40,7 @@ Object { Symbol { name: "[.text$mn]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -82,39 +52,30 @@ Object { virtual_address: None, }, Symbol { - name: "[.text$mn]", - demangled_name: None, - address: 0, - size: 0, - kind: Section, - section: Some( - 3, + name: "?Tools_CapsuleTestMagSq@@YA_NPEAUVector@@00M@Z", + demangled_name: Some( + "bool __cdecl Tools_CapsuleTestMagSq(struct Vector *, struct Vector *, struct Vector *, float)", ), - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, - Symbol { - name: "[.text$mn]", - demangled_name: None, + normalized_name: None, address: 0, - size: 0, - kind: Section, + size: 429, + kind: Function, section: Some( - 4, + 2, ), - flags: FlagSet(Local), + flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "[.text$mn]", + name: "$LN8", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Section, + kind: Unknown, section: Some( - 5, + 2, ), flags: FlagSet(Local), align: None, @@ -123,49 +84,23 @@ Object { Symbol { name: "[.text$mn]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, section: Some( - 6, + 3, ), flags: FlagSet(Local), align: None, virtual_address: None, }, - Symbol { - name: "?InterpolateLinear@Vector@@QEAAXPEAU1@0M@Z", - demangled_name: Some( - "public: void __cdecl Vector::InterpolateLinear(struct Vector *, struct Vector *, float)", - ), - address: 0, - size: 0, - kind: Function, - section: None, - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, - Symbol { - name: "?Dot@Vector@@QEAAMPEAU1@@Z", - demangled_name: Some( - "public: float __cdecl Vector::Dot(struct Vector *)", - ), - address: 0, - size: 87, - kind: Function, - section: Some( - 4, - ), - flags: FlagSet(Global | SizeInferred), - align: None, - virtual_address: None, - }, Symbol { name: "?DistSq@Vector@@QEAAMPEAU1@@Z", demangled_name: Some( "public: float __cdecl Vector::DistSq(struct Vector *)", ), + normalized_name: None, address: 0, size: 141, kind: Function, @@ -177,165 +112,146 @@ Object { virtual_address: None, }, Symbol { - name: "?Sub@Vector@@QEAAXPEAU1@0@Z", - demangled_name: Some( - "public: void __cdecl Vector::Sub(struct Vector *, struct Vector *)", - ), + name: "$LN3", + demangled_name: None, + normalized_name: None, address: 0, - size: 105, - kind: Function, + size: 0, + kind: Unknown, section: Some( - 5, + 3, ), - flags: FlagSet(Global | SizeInferred), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "?Vector_MagSquared@@YAMPEAUVector@@@Z", - demangled_name: Some( - "float __cdecl Vector_MagSquared(struct Vector *)", - ), + name: "[.text$mn]", + demangled_name: None, + normalized_name: None, address: 0, - size: 82, - kind: Function, + size: 0, + kind: Section, section: Some( - 6, + 4, ), - flags: FlagSet(Global | SizeInferred), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "?Tools_CapsuleTestMagSq@@YA_NPEAUVector@@00M@Z", + name: "?Dot@Vector@@QEAAMPEAU1@@Z", demangled_name: Some( - "bool __cdecl Tools_CapsuleTestMagSq(struct Vector *, struct Vector *, struct Vector *, float)", + "public: float __cdecl Vector::Dot(struct Vector *)", ), + normalized_name: None, address: 0, - size: 429, + size: 87, kind: Function, section: Some( - 2, + 4, ), flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "_RTC_CheckStackVars", - demangled_name: None, - address: 0, - size: 0, - kind: Function, - section: None, - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, - Symbol { - name: "_RTC_InitBase", - demangled_name: None, - address: 0, - size: 0, - kind: Function, - section: None, - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, - Symbol { - name: "_RTC_Shutdown", + name: "$LN3", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Function, - section: None, - flags: FlagSet(Global), + kind: Unknown, + section: Some( + 4, + ), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "__GSHandlerCheck", + name: "[.text$mn]", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Function, - section: None, - flags: FlagSet(Global), + kind: Section, + section: Some( + 5, + ), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "__security_check_cookie", - demangled_name: None, + name: "?Sub@Vector@@QEAAXPEAU1@0@Z", + demangled_name: Some( + "public: void __cdecl Vector::Sub(struct Vector *, struct Vector *)", + ), + normalized_name: None, address: 0, - size: 0, + size: 105, kind: Function, - section: None, - flags: FlagSet(Global), - align: None, - virtual_address: None, - }, - Symbol { - name: "$LN3", - demangled_name: None, - address: 0, - size: 0, - kind: Unknown, section: Some( - 4, + 5, ), - flags: FlagSet(Local), + flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { name: "$LN3", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, section: Some( - 3, + 5, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "$LN3", + name: "[.text$mn]", demangled_name: None, + normalized_name: None, address: 0, size: 0, - kind: Unknown, + kind: Section, section: Some( - 5, + 6, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "$LN3", - demangled_name: None, + name: "?Vector_MagSquared@@YAMPEAUVector@@@Z", + demangled_name: Some( + "float __cdecl Vector_MagSquared(struct Vector *)", + ), + normalized_name: None, address: 0, - size: 0, - kind: Unknown, + size: 82, + kind: Function, section: Some( 6, ), - flags: FlagSet(Local), + flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "$LN8", + name: "$LN3", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, section: Some( - 2, + 6, ), flags: FlagSet(Local), align: None, @@ -344,6 +260,7 @@ Object { Symbol { name: "[.xdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -357,6 +274,7 @@ Object { Symbol { name: "$unwind$?Dot@Vector@@QEAAMPEAU1@@Z", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Object, @@ -370,6 +288,7 @@ Object { Symbol { name: "[.pdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -383,6 +302,7 @@ Object { Symbol { name: "$pdata$?Dot@Vector@@QEAAMPEAU1@@Z", demangled_name: None, + normalized_name: None, address: 0, size: 12, kind: Object, @@ -396,6 +316,7 @@ Object { Symbol { name: "[.xdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -409,6 +330,7 @@ Object { Symbol { name: "$unwind$?DistSq@Vector@@QEAAMPEAU1@@Z", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Object, @@ -422,6 +344,7 @@ Object { Symbol { name: "[.pdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -435,6 +358,7 @@ Object { Symbol { name: "$pdata$?DistSq@Vector@@QEAAMPEAU1@@Z", demangled_name: None, + normalized_name: None, address: 0, size: 12, kind: Object, @@ -448,6 +372,7 @@ Object { Symbol { name: "[.xdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -461,6 +386,7 @@ Object { Symbol { name: "$unwind$?Sub@Vector@@QEAAXPEAU1@0@Z", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Object, @@ -474,6 +400,7 @@ Object { Symbol { name: "[.pdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -487,6 +414,7 @@ Object { Symbol { name: "$pdata$?Sub@Vector@@QEAAXPEAU1@0@Z", demangled_name: None, + normalized_name: None, address: 0, size: 12, kind: Object, @@ -500,6 +428,7 @@ Object { Symbol { name: "[.xdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -513,6 +442,7 @@ Object { Symbol { name: "$unwind$?Vector_MagSquared@@YAMPEAUVector@@@Z", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Object, @@ -526,6 +456,7 @@ Object { Symbol { name: "[.pdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -539,6 +470,7 @@ Object { Symbol { name: "$pdata$?Vector_MagSquared@@YAMPEAUVector@@@Z", demangled_name: None, + normalized_name: None, address: 0, size: 12, kind: Object, @@ -552,6 +484,7 @@ Object { Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -567,6 +500,7 @@ Object { demangled_name: Some( "bool __cdecl Tools_CapsuleTestMagSq(struct Vector *, struct Vector *, struct Vector *, float)", ), + normalized_name: None, address: 0, size: 16, kind: Object, @@ -582,6 +516,7 @@ Object { demangled_name: Some( "bool __cdecl Tools_CapsuleTestMagSq(struct Vector *, struct Vector *, struct Vector *, float)", ), + normalized_name: None, address: 16, size: 12, kind: Object, @@ -597,6 +532,7 @@ Object { demangled_name: Some( "bool __cdecl Tools_CapsuleTestMagSq(struct Vector *, struct Vector *, struct Vector *, float)", ), + normalized_name: None, address: 28, size: 20, kind: Object, @@ -612,6 +548,7 @@ Object { demangled_name: Some( "bool __cdecl Tools_CapsuleTestMagSq(struct Vector *, struct Vector *, struct Vector *, float)", ), + normalized_name: None, address: 48, size: 192, kind: Object, @@ -627,6 +564,7 @@ Object { demangled_name: Some( "bool __cdecl Tools_CapsuleTestMagSq(struct Vector *, struct Vector *, struct Vector *, float)", ), + normalized_name: None, address: 240, size: 16, kind: Object, @@ -640,6 +578,7 @@ Object { Symbol { name: "[.xdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -653,6 +592,7 @@ Object { Symbol { name: "$unwind$?Tools_CapsuleTestMagSq@@YA_NPEAUVector@@00M@Z", demangled_name: None, + normalized_name: None, address: 0, size: 20, kind: Object, @@ -666,6 +606,7 @@ Object { Symbol { name: "[.pdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -679,6 +620,7 @@ Object { Symbol { name: "$pdata$?Tools_CapsuleTestMagSq@@YA_NPEAUVector@@00M@Z", demangled_name: None, + normalized_name: None, address: 0, size: 12, kind: Object, @@ -692,6 +634,7 @@ Object { Symbol { name: "[.voltbl]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -705,6 +648,7 @@ Object { Symbol { name: "_volmd", demangled_name: None, + normalized_name: None, address: 0, size: 16, kind: Object, @@ -718,6 +662,7 @@ Object { Symbol { name: "[.rtc$IMZ]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -731,6 +676,7 @@ Object { Symbol { name: "_RTC_InitBase.rtc$IMZ", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Object, @@ -744,6 +690,7 @@ Object { Symbol { name: "[.rtc$TMZ]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -757,6 +704,7 @@ Object { Symbol { name: "_RTC_Shutdown.rtc$TMZ", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Object, @@ -770,6 +718,7 @@ Object { Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -783,6 +732,7 @@ Object { Symbol { name: "__real@00000000", demangled_name: None, + normalized_name: None, address: 0, size: 4, kind: Object, @@ -796,6 +746,7 @@ Object { Symbol { name: "[.rdata]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -809,6 +760,7 @@ Object { Symbol { name: "__real@3f800000", demangled_name: None, + normalized_name: None, address: 0, size: 4, kind: Object, @@ -820,19 +772,135 @@ Object { virtual_address: None, }, Symbol { - name: "__security_cookie", + name: "[.chks64]", + demangled_name: None, + normalized_name: None, + address: 0, + size: 192, + kind: Section, + section: Some( + 23, + ), + flags: FlagSet(Local), + align: None, + virtual_address: None, + }, + Symbol { + name: "@comp.id", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Object, + section: None, + flags: FlagSet(Local), + align: None, + virtual_address: None, + }, + Symbol { + name: "@feat.00", + demangled_name: None, + normalized_name: Some( + "@feat.0000", + ), + address: 0, + size: 0, + kind: Object, + section: None, + flags: FlagSet(Local), + align: None, + virtual_address: None, + }, + Symbol { + name: "@vol.md", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Object, section: None, + flags: FlagSet(Local), + align: None, + virtual_address: None, + }, + Symbol { + name: "?InterpolateLinear@Vector@@QEAAXPEAU1@0M@Z", + demangled_name: Some( + "public: void __cdecl Vector::InterpolateLinear(struct Vector *, struct Vector *, float)", + ), + normalized_name: None, + address: 0, + size: 0, + kind: Function, + section: None, flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: "_fltused", + name: "_RTC_CheckStackVars", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Function, + section: None, + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, + Symbol { + name: "_RTC_InitBase", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Function, + section: None, + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, + Symbol { + name: "_RTC_Shutdown", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Function, + section: None, + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, + Symbol { + name: "__GSHandlerCheck", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Function, + section: None, + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, + Symbol { + name: "__security_check_cookie", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Function, + section: None, + flags: FlagSet(Global), + align: None, + virtual_address: None, + }, + Symbol { + name: "__security_cookie", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Object, @@ -842,21 +910,21 @@ Object { virtual_address: None, }, Symbol { - name: "[.chks64]", + name: "_fltused", demangled_name: None, + normalized_name: None, address: 0, - size: 192, - kind: Section, - section: Some( - 23, - ), - flags: FlagSet(Local), + size: 0, + kind: Object, + section: None, + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { name: "[.xdata-0]", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Section, @@ -870,6 +938,7 @@ Object { Symbol { name: "[.pdata-0]", demangled_name: None, + normalized_name: None, address: 0, size: 12, kind: Section, @@ -883,6 +952,7 @@ Object { Symbol { name: "[.xdata-1]", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Section, @@ -896,6 +966,7 @@ Object { Symbol { name: "[.pdata-1]", demangled_name: None, + normalized_name: None, address: 0, size: 12, kind: Section, @@ -909,6 +980,7 @@ Object { Symbol { name: "[.xdata-2]", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Section, @@ -922,6 +994,7 @@ Object { Symbol { name: "[.pdata-2]", demangled_name: None, + normalized_name: None, address: 0, size: 12, kind: Section, @@ -935,6 +1008,7 @@ Object { Symbol { name: "[.xdata-3]", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Section, @@ -948,6 +1022,7 @@ Object { Symbol { name: "[.pdata-3]", demangled_name: None, + normalized_name: None, address: 0, size: 12, kind: Section, @@ -961,6 +1036,7 @@ Object { Symbol { name: "[.rdata-0]", demangled_name: None, + normalized_name: None, address: 0, size: 256, kind: Section, @@ -974,6 +1050,7 @@ Object { Symbol { name: "[.xdata-4]", demangled_name: None, + normalized_name: None, address: 0, size: 20, kind: Section, @@ -987,6 +1064,7 @@ Object { Symbol { name: "[.pdata-4]", demangled_name: None, + normalized_name: None, address: 0, size: 12, kind: Section, @@ -1000,6 +1078,7 @@ Object { Symbol { name: "[.rtc$IMZ-0]", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Section, @@ -1013,6 +1092,7 @@ Object { Symbol { name: "[.rtc$TMZ-0]", demangled_name: None, + normalized_name: None, address: 0, size: 8, kind: Section, @@ -1026,6 +1106,7 @@ Object { Symbol { name: "[.rdata-1]", demangled_name: None, + normalized_name: None, address: 0, size: 4, kind: Section, @@ -1039,6 +1120,7 @@ Object { Symbol { name: "[.rdata-2]", demangled_name: None, + normalized_name: None, address: 0, size: 4, kind: Section, @@ -1104,7 +1186,7 @@ Object { 4, ), address: 57, - target_symbol: 62, + target_symbol: 63, addend: 0, }, Relocation { @@ -1112,7 +1194,7 @@ Object { 4, ), address: 89, - target_symbol: 12, + target_symbol: 6, addend: 0, }, Relocation { @@ -1120,7 +1202,7 @@ Object { 4, ), address: 124, - target_symbol: 12, + target_symbol: 6, addend: 0, }, Relocation { @@ -1128,7 +1210,7 @@ Object { 4, ), address: 171, - target_symbol: 13, + target_symbol: 12, addend: 0, }, Relocation { @@ -1136,7 +1218,7 @@ Object { 4, ), address: 197, - target_symbol: 13, + target_symbol: 12, addend: 0, }, Relocation { @@ -1144,7 +1226,7 @@ Object { 4, ), address: 212, - target_symbol: 11, + target_symbol: 9, addend: 0, }, Relocation { @@ -1152,7 +1234,7 @@ Object { 4, ), address: 228, - target_symbol: 14, + target_symbol: 15, addend: 0, }, Relocation { @@ -1160,7 +1242,7 @@ Object { 4, ), address: 247, - target_symbol: 59, + target_symbol: 50, addend: 0, }, Relocation { @@ -1168,7 +1250,7 @@ Object { 4, ), address: 286, - target_symbol: 59, + target_symbol: 50, addend: 0, }, Relocation { @@ -1176,7 +1258,7 @@ Object { 4, ), address: 296, - target_symbol: 61, + target_symbol: 52, addend: 0, }, Relocation { @@ -1184,7 +1266,7 @@ Object { 4, ), address: 338, - target_symbol: 10, + target_symbol: 57, addend: 0, }, Relocation { @@ -1192,7 +1274,7 @@ Object { 4, ), address: 359, - target_symbol: 12, + target_symbol: 6, addend: 0, }, Relocation { @@ -1200,7 +1282,7 @@ Object { 4, ), address: 392, - target_symbol: 47, + target_symbol: 38, addend: 0, }, Relocation { @@ -1208,7 +1290,7 @@ Object { 4, ), address: 397, - target_symbol: 16, + target_symbol: 58, addend: 0, }, Relocation { @@ -1216,7 +1298,7 @@ Object { 4, ), address: 416, - target_symbol: 20, + target_symbol: 62, addend: 0, }, ], @@ -1327,7 +1409,7 @@ Object { 3, ), address: 0, - target_symbol: 21, + target_symbol: 10, addend: 0, }, Relocation { @@ -1335,7 +1417,7 @@ Object { 3, ), address: 4, - target_symbol: 21, + target_symbol: 10, addend: 87, }, Relocation { @@ -1343,7 +1425,7 @@ Object { 3, ), address: 8, - target_symbol: 27, + target_symbol: 18, addend: 0, }, ], @@ -1386,7 +1468,7 @@ Object { 3, ), address: 0, - target_symbol: 22, + target_symbol: 7, addend: 0, }, Relocation { @@ -1394,7 +1476,7 @@ Object { 3, ), address: 4, - target_symbol: 22, + target_symbol: 7, addend: 141, }, Relocation { @@ -1402,7 +1484,7 @@ Object { 3, ), address: 8, - target_symbol: 31, + target_symbol: 22, addend: 0, }, ], @@ -1445,7 +1527,7 @@ Object { 3, ), address: 0, - target_symbol: 23, + target_symbol: 13, addend: 0, }, Relocation { @@ -1453,7 +1535,7 @@ Object { 3, ), address: 4, - target_symbol: 23, + target_symbol: 13, addend: 105, }, Relocation { @@ -1461,7 +1543,7 @@ Object { 3, ), address: 8, - target_symbol: 35, + target_symbol: 26, addend: 0, }, ], @@ -1504,7 +1586,7 @@ Object { 3, ), address: 0, - target_symbol: 24, + target_symbol: 16, addend: 0, }, Relocation { @@ -1512,7 +1594,7 @@ Object { 3, ), address: 4, - target_symbol: 24, + target_symbol: 16, addend: 82, }, Relocation { @@ -1520,7 +1602,7 @@ Object { 3, ), address: 8, - target_symbol: 39, + target_symbol: 30, addend: 0, }, ], @@ -1546,7 +1628,7 @@ Object { 1, ), address: 56, - target_symbol: 45, + target_symbol: 36, addend: 0, }, Relocation { @@ -1554,7 +1636,7 @@ Object { 1, ), address: 72, - target_symbol: 44, + target_symbol: 35, addend: 0, }, Relocation { @@ -1562,7 +1644,7 @@ Object { 1, ), address: 88, - target_symbol: 43, + target_symbol: 34, addend: 0, }, Relocation { @@ -1570,7 +1652,7 @@ Object { 1, ), address: 248, - target_symbol: 46, + target_symbol: 37, addend: 0, }, ], @@ -1596,7 +1678,7 @@ Object { 3, ), address: 12, - target_symbol: 19, + target_symbol: 61, addend: 0, }, ], @@ -1622,7 +1704,7 @@ Object { 3, ), address: 0, - target_symbol: 25, + target_symbol: 4, addend: 0, }, Relocation { @@ -1630,7 +1712,7 @@ Object { 3, ), address: 4, - target_symbol: 25, + target_symbol: 4, addend: 429, }, Relocation { @@ -1638,7 +1720,7 @@ Object { 3, ), address: 8, - target_symbol: 49, + target_symbol: 40, addend: 0, }, ], @@ -1681,7 +1763,7 @@ Object { 1, ), address: 0, - target_symbol: 17, + target_symbol: 59, addend: 0, }, ], @@ -1707,7 +1789,7 @@ Object { 1, ), address: 0, - target_symbol: 18, + target_symbol: 60, addend: 0, }, ], diff --git a/objdiff-core/tests/snapshots/arch_x86__read_x86_combine_sections.snap b/objdiff-core/tests/snapshots/arch_x86__read_x86_combine_sections.snap index a2a6ba39..2db35939 100644 --- a/objdiff-core/tests/snapshots/arch_x86__read_x86_combine_sections.snap +++ b/objdiff-core/tests/snapshots/arch_x86__read_x86_combine_sections.snap @@ -107,7 +107,7 @@ expression: obj.sections 6, ), address: 0, - target_symbol: 44, + target_symbol: 71, addend: 0, }, Relocation { @@ -115,7 +115,7 @@ expression: obj.sections 6, ), address: 16, - target_symbol: 44, + target_symbol: 71, addend: 0, }, Relocation { @@ -123,7 +123,7 @@ expression: obj.sections 6, ), address: 32, - target_symbol: 44, + target_symbol: 71, addend: 0, }, Relocation { @@ -131,7 +131,7 @@ expression: obj.sections 6, ), address: 48, - target_symbol: 6, + target_symbol: 3, addend: 0, }, Relocation { @@ -139,7 +139,7 @@ expression: obj.sections 6, ), address: 52, - target_symbol: 8, + target_symbol: 5, addend: 0, }, ], @@ -165,7 +165,7 @@ expression: obj.sections 6, ), address: 12, - target_symbol: 17, + target_symbol: 13, addend: 0, }, Relocation { @@ -173,7 +173,7 @@ expression: obj.sections 6, ), address: 16, - target_symbol: 19, + target_symbol: 15, addend: 0, }, Relocation { @@ -181,7 +181,7 @@ expression: obj.sections 6, ), address: 24, - target_symbol: 13, + target_symbol: 9, addend: 0, }, Relocation { @@ -189,7 +189,7 @@ expression: obj.sections 6, ), address: 48, - target_symbol: 15, + target_symbol: 11, addend: 0, }, Relocation { @@ -197,7 +197,7 @@ expression: obj.sections 6, ), address: 64, - target_symbol: 25, + target_symbol: 21, addend: 0, }, Relocation { @@ -205,7 +205,7 @@ expression: obj.sections 6, ), address: 68, - target_symbol: 27, + target_symbol: 23, addend: 0, }, Relocation { @@ -213,7 +213,7 @@ expression: obj.sections 6, ), address: 76, - target_symbol: 21, + target_symbol: 17, addend: 0, }, Relocation { @@ -221,7 +221,7 @@ expression: obj.sections 6, ), address: 100, - target_symbol: 23, + target_symbol: 19, addend: 0, }, Relocation { @@ -229,7 +229,7 @@ expression: obj.sections 6, ), address: 116, - target_symbol: 31, + target_symbol: 27, addend: 0, }, Relocation { @@ -237,7 +237,7 @@ expression: obj.sections 6, ), address: 120, - target_symbol: 33, + target_symbol: 29, addend: 0, }, Relocation { @@ -245,7 +245,7 @@ expression: obj.sections 6, ), address: 136, - target_symbol: 35, + target_symbol: 31, addend: 0, }, Relocation { @@ -253,7 +253,7 @@ expression: obj.sections 6, ), address: 140, - target_symbol: 37, + target_symbol: 33, addend: 0, }, Relocation { @@ -261,7 +261,7 @@ expression: obj.sections 6, ), address: 144, - target_symbol: 19, + target_symbol: 15, addend: 0, }, Relocation { @@ -269,7 +269,7 @@ expression: obj.sections 6, ), address: 148, - target_symbol: 39, + target_symbol: 35, addend: 0, }, Relocation { @@ -277,7 +277,7 @@ expression: obj.sections 6, ), address: 156, - target_symbol: 31, + target_symbol: 27, addend: 0, }, Relocation { @@ -285,7 +285,7 @@ expression: obj.sections 6, ), address: 180, - target_symbol: 33, + target_symbol: 29, addend: 0, }, Relocation { @@ -293,7 +293,7 @@ expression: obj.sections 6, ), address: 184, - target_symbol: 21, + target_symbol: 17, addend: 0, }, Relocation { @@ -301,7 +301,7 @@ expression: obj.sections 6, ), address: 208, - target_symbol: 23, + target_symbol: 19, addend: 0, }, Relocation { @@ -309,7 +309,7 @@ expression: obj.sections 6, ), address: 224, - target_symbol: 31, + target_symbol: 27, addend: 0, }, Relocation { @@ -317,7 +317,7 @@ expression: obj.sections 6, ), address: 228, - target_symbol: 33, + target_symbol: 29, addend: 0, }, Relocation { @@ -325,7 +325,7 @@ expression: obj.sections 6, ), address: 244, - target_symbol: 13, + target_symbol: 9, addend: 0, }, Relocation { @@ -333,7 +333,7 @@ expression: obj.sections 6, ), address: 248, - target_symbol: 15, + target_symbol: 11, addend: 0, }, Relocation { @@ -341,7 +341,7 @@ expression: obj.sections 6, ), address: 264, - target_symbol: 21, + target_symbol: 17, addend: 0, }, Relocation { @@ -349,7 +349,7 @@ expression: obj.sections 6, ), address: 268, - target_symbol: 23, + target_symbol: 19, addend: 0, }, Relocation { @@ -357,7 +357,7 @@ expression: obj.sections 6, ), address: 272, - target_symbol: 29, + target_symbol: 25, addend: 0, }, Relocation { @@ -365,7 +365,7 @@ expression: obj.sections 6, ), address: 276, - target_symbol: 11, + target_symbol: 70, addend: 0, }, Relocation { @@ -373,7 +373,7 @@ expression: obj.sections 6, ), address: 280, - target_symbol: 43, + target_symbol: 39, addend: 0, }, Relocation { @@ -381,7 +381,7 @@ expression: obj.sections 6, ), address: 284, - target_symbol: 41, + target_symbol: 37, addend: 0, }, Relocation { @@ -389,7 +389,7 @@ expression: obj.sections 6, ), address: 288, - target_symbol: 70, + target_symbol: 61, addend: 0, }, Relocation { @@ -397,7 +397,7 @@ expression: obj.sections 6, ), address: 292, - target_symbol: 56, + target_symbol: 74, addend: 0, }, Relocation { @@ -405,7 +405,7 @@ expression: obj.sections 6, ), address: 296, - target_symbol: 72, + target_symbol: 63, addend: 0, }, Relocation { @@ -413,7 +413,7 @@ expression: obj.sections 6, ), address: 300, - target_symbol: 59, + target_symbol: 75, addend: 0, }, ], @@ -762,7 +762,7 @@ expression: obj.sections 6, ), address: 4, - target_symbol: 62, + target_symbol: 53, addend: 0, }, Relocation { @@ -770,7 +770,7 @@ expression: obj.sections 20, ), address: 9, - target_symbol: 53, + target_symbol: 73, addend: 0, }, Relocation { @@ -778,7 +778,7 @@ expression: obj.sections 20, ), address: 43, - target_symbol: 60, + target_symbol: 45, addend: 0, }, Relocation { @@ -786,7 +786,7 @@ expression: obj.sections 20, ), address: 62, - target_symbol: 52, + target_symbol: 72, addend: 0, }, Relocation { @@ -794,7 +794,7 @@ expression: obj.sections 20, ), address: 84, - target_symbol: 11, + target_symbol: 70, addend: 0, }, Relocation { @@ -802,7 +802,7 @@ expression: obj.sections 6, ), address: 100, - target_symbol: 64, + target_symbol: 55, addend: 0, }, Relocation { @@ -810,7 +810,7 @@ expression: obj.sections 6, ), address: 124, - target_symbol: 66, + target_symbol: 57, addend: 0, }, Relocation { @@ -818,7 +818,7 @@ expression: obj.sections 6, ), address: 156, - target_symbol: 6, + target_symbol: 3, addend: 0, }, Relocation { @@ -826,7 +826,7 @@ expression: obj.sections 6, ), address: 166, - target_symbol: 8, + target_symbol: 5, addend: 0, }, Relocation { @@ -834,7 +834,7 @@ expression: obj.sections 20, ), address: 177, - target_symbol: 57, + target_symbol: 43, addend: 0, }, Relocation { @@ -842,7 +842,7 @@ expression: obj.sections 20, ), address: 185, - target_symbol: 54, + target_symbol: 41, addend: 0, }, Relocation { @@ -850,7 +850,7 @@ expression: obj.sections 20, ), address: 219, - target_symbol: 54, + target_symbol: 41, addend: 0, }, Relocation { @@ -858,7 +858,7 @@ expression: obj.sections 20, ), address: 238, - target_symbol: 52, + target_symbol: 72, addend: 0, }, Relocation { @@ -866,7 +866,7 @@ expression: obj.sections 20, ), address: 267, - target_symbol: 57, + target_symbol: 43, addend: 0, }, Relocation { @@ -874,7 +874,7 @@ expression: obj.sections 20, ), address: 286, - target_symbol: 52, + target_symbol: 72, addend: 0, }, Relocation { @@ -882,7 +882,7 @@ expression: obj.sections 6, ), address: 308, - target_symbol: 68, + target_symbol: 59, addend: 0, }, Relocation { @@ -890,7 +890,7 @@ expression: obj.sections 20, ), address: 313, - target_symbol: 60, + target_symbol: 45, addend: 0, }, ], @@ -1018,7 +1018,7 @@ expression: obj.sections 6, ), address: 0, - target_symbol: 61, + target_symbol: 51, addend: 0, }, ], diff --git a/objdiff-core/tests/snapshots/arch_x86__read_x86_indirect_table.snap b/objdiff-core/tests/snapshots/arch_x86__read_x86_indirect_table.snap index da39710b..c8cfc296 100644 --- a/objdiff-core/tests/snapshots/arch_x86__read_x86_indirect_table.snap +++ b/objdiff-core/tests/snapshots/arch_x86__read_x86_indirect_table.snap @@ -9,31 +9,10 @@ Object { }, endianness: Little, symbols: [ - Symbol { - name: "C:\\Dev\\Projects\\calineva-legacy\\src\\game\\control\\bridge.cpp", - demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, - Symbol { - name: "@comp.id", - demangled_name: None, - address: 0, - size: 0, - kind: Object, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, Symbol { name: "[.drectve]", demangled_name: None, + normalized_name: None, address: 0, size: 44, kind: Section, @@ -47,6 +26,7 @@ Object { Symbol { name: "[.debug$S]", demangled_name: None, + normalized_name: None, address: 0, size: 271, kind: Section, @@ -60,6 +40,7 @@ Object { Symbol { name: "[.text]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -71,48 +52,38 @@ Object { virtual_address: None, }, Symbol { - name: "[.debug$S]", + name: ".bf", demangled_name: None, + normalized_name: None, address: 0, - size: 620, - kind: Section, + size: 0, + kind: Unknown, section: Some( - 3, + 2, ), flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "c:\\dev\\projects\\calineva-legacy\\src\\game\\control\\bridge.cpp", + name: ".lf", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Unknown, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, - Symbol { - name: "?process@@YAHHHH@Z", - demangled_name: Some( - "int __cdecl process(int, int, int)", - ), - address: 0, - size: 1329, - kind: Function, section: Some( 2, ), - flags: FlagSet(Global), + flags: FlagSet(Local), align: None, virtual_address: None, }, Symbol { - name: "$L296", + name: ".ef", demangled_name: None, - address: 418, + normalized_name: None, + address: 0, size: 0, kind: Unknown, section: Some( @@ -123,22 +94,26 @@ Object { virtual_address: None, }, Symbol { - name: "$L312", - demangled_name: None, - address: 217, - size: 0, - kind: Unknown, + name: "?process@@YAHHHH@Z", + demangled_name: Some( + "int __cdecl process(int, int, int)", + ), + normalized_name: None, + address: 0, + size: 1329, + kind: Function, section: Some( 2, ), - flags: FlagSet(Local), + flags: FlagSet(Global), align: None, virtual_address: None, }, Symbol { - name: "$L294", + name: "$L302", demangled_name: None, - address: 406, + normalized_name: None, + address: 70, size: 0, kind: Unknown, section: Some( @@ -149,9 +124,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L293", + name: "$L304", demangled_name: None, - address: 389, + normalized_name: None, + address: 79, size: 0, kind: Unknown, section: Some( @@ -162,9 +138,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L292", + name: "$L305", demangled_name: None, - address: 369, + normalized_name: None, + address: 88, size: 0, kind: Unknown, section: Some( @@ -175,9 +152,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L291", + name: "$L306", demangled_name: None, - address: 360, + normalized_name: None, + address: 102, size: 0, kind: Unknown, section: Some( @@ -188,11 +166,12 @@ Object { virtual_address: None, }, Symbol { - name: "$L332", + name: "$L308", demangled_name: None, - address: 1104, + normalized_name: None, + address: 165, size: 0, - kind: Object, + kind: Unknown, section: Some( 2, ), @@ -201,11 +180,12 @@ Object { virtual_address: None, }, Symbol { - name: "$L327", + name: "$L309", demangled_name: None, - address: 1128, + normalized_name: None, + address: 175, size: 0, - kind: Object, + kind: Unknown, section: Some( 2, ), @@ -214,9 +194,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L289", + name: "$L310", demangled_name: None, - address: 311, + normalized_name: None, + address: 185, size: 0, kind: Unknown, section: Some( @@ -227,9 +208,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L288", + name: "$L311", demangled_name: None, - address: 300, + normalized_name: None, + address: 205, size: 0, kind: Unknown, section: Some( @@ -240,9 +222,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L287", + name: "$L312", demangled_name: None, - address: 291, + normalized_name: None, + address: 217, size: 0, kind: Unknown, section: Some( @@ -253,9 +236,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L286", + name: "$L284", demangled_name: None, - address: 282, + normalized_name: None, + address: 264, size: 0, kind: Unknown, section: Some( @@ -268,6 +252,7 @@ Object { Symbol { name: "$L285", demangled_name: None, + normalized_name: None, address: 273, size: 0, kind: Unknown, @@ -279,9 +264,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L284", + name: "$L286", demangled_name: None, - address: 264, + normalized_name: None, + address: 282, size: 0, kind: Unknown, section: Some( @@ -292,11 +278,12 @@ Object { virtual_address: None, }, Symbol { - name: "$L331", + name: "$L287", demangled_name: None, - address: 824, + normalized_name: None, + address: 291, size: 0, - kind: Object, + kind: Unknown, section: Some( 2, ), @@ -305,11 +292,12 @@ Object { virtual_address: None, }, Symbol { - name: "$L326", + name: "$L288", demangled_name: None, - address: 852, + normalized_name: None, + address: 300, size: 0, - kind: Object, + kind: Unknown, section: Some( 2, ), @@ -318,9 +306,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L311", + name: "$L289", demangled_name: None, - address: 205, + normalized_name: None, + address: 311, size: 0, kind: Unknown, section: Some( @@ -331,9 +320,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L310", + name: "$L291", demangled_name: None, - address: 185, + normalized_name: None, + address: 360, size: 0, kind: Unknown, section: Some( @@ -344,9 +334,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L309", + name: "$L292", demangled_name: None, - address: 175, + normalized_name: None, + address: 369, size: 0, kind: Unknown, section: Some( @@ -357,9 +348,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L308", + name: "$L293", demangled_name: None, - address: 165, + normalized_name: None, + address: 389, size: 0, kind: Unknown, section: Some( @@ -370,11 +362,12 @@ Object { virtual_address: None, }, Symbol { - name: "$L330", + name: "$L294", demangled_name: None, - address: 652, + normalized_name: None, + address: 406, size: 0, - kind: Object, + kind: Unknown, section: Some( 2, ), @@ -383,11 +376,12 @@ Object { virtual_address: None, }, Symbol { - name: "$L325", + name: "$L296", demangled_name: None, - address: 672, + normalized_name: None, + address: 418, size: 0, - kind: Object, + kind: Unknown, section: Some( 2, ), @@ -396,11 +390,12 @@ Object { virtual_address: None, }, Symbol { - name: "$L306", + name: "$L329", demangled_name: None, - address: 102, + normalized_name: None, + address: 424, size: 0, - kind: Unknown, + kind: Object, section: Some( 2, ), @@ -409,11 +404,12 @@ Object { virtual_address: None, }, Symbol { - name: "$L305", + name: "$L324", demangled_name: None, - address: 88, + normalized_name: None, + address: 448, size: 0, - kind: Unknown, + kind: Object, section: Some( 2, ), @@ -422,11 +418,12 @@ Object { virtual_address: None, }, Symbol { - name: "$L304", + name: "$L330", demangled_name: None, - address: 79, + normalized_name: None, + address: 652, size: 0, - kind: Unknown, + kind: Object, section: Some( 2, ), @@ -435,11 +432,12 @@ Object { virtual_address: None, }, Symbol { - name: "$L302", + name: "$L325", demangled_name: None, - address: 70, + normalized_name: None, + address: 672, size: 0, - kind: Unknown, + kind: Object, section: Some( 2, ), @@ -448,9 +446,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L329", + name: "$L331", demangled_name: None, - address: 424, + normalized_name: None, + address: 824, size: 0, kind: Object, section: Some( @@ -461,9 +460,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L324", + name: "$L326", demangled_name: None, - address: 448, + normalized_name: None, + address: 852, size: 0, kind: Object, section: Some( @@ -474,11 +474,12 @@ Object { virtual_address: None, }, Symbol { - name: ".bf", + name: "$L332", demangled_name: None, - address: 0, + normalized_name: None, + address: 1104, size: 0, - kind: Unknown, + kind: Object, section: Some( 2, ), @@ -487,11 +488,12 @@ Object { virtual_address: None, }, Symbol { - name: ".lf", + name: "$L327", demangled_name: None, - address: 0, + normalized_name: None, + address: 1128, size: 0, - kind: Unknown, + kind: Object, section: Some( 2, ), @@ -500,13 +502,14 @@ Object { virtual_address: None, }, Symbol { - name: ".ef", + name: "[.debug$S]", demangled_name: None, + normalized_name: None, address: 0, - size: 0, - kind: Unknown, + size: 620, + kind: Section, section: Some( - 2, + 3, ), flags: FlagSet(Local), align: None, @@ -515,6 +518,7 @@ Object { Symbol { name: "[.debug$F]", demangled_name: None, + normalized_name: None, address: 0, size: 16, kind: Section, @@ -528,6 +532,7 @@ Object { Symbol { name: "[.debug$T]", demangled_name: None, + normalized_name: None, address: 0, size: 104, kind: Section, @@ -538,6 +543,18 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "@comp.id", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Object, + section: None, + flags: FlagSet(Local), + align: None, + virtual_address: None, + }, ], sections: [ Section { @@ -593,7 +610,7 @@ Object { 6, ), address: 59, - target_symbol: 35, + target_symbol: 28, addend: 0, }, Relocation { @@ -601,7 +618,7 @@ Object { 6, ), address: 66, - target_symbol: 34, + target_symbol: 27, addend: 0, }, Relocation { @@ -609,7 +626,7 @@ Object { 6, ), address: 154, - target_symbol: 29, + target_symbol: 30, addend: 0, }, Relocation { @@ -617,7 +634,7 @@ Object { 6, ), address: 161, - target_symbol: 28, + target_symbol: 29, addend: 0, }, Relocation { @@ -625,7 +642,7 @@ Object { 6, ), address: 253, - target_symbol: 23, + target_symbol: 32, addend: 0, }, Relocation { @@ -633,7 +650,7 @@ Object { 6, ), address: 260, - target_symbol: 22, + target_symbol: 31, addend: 0, }, Relocation { @@ -641,7 +658,7 @@ Object { 6, ), address: 349, - target_symbol: 15, + target_symbol: 34, addend: 0, }, Relocation { @@ -649,7 +666,7 @@ Object { 6, ), address: 356, - target_symbol: 14, + target_symbol: 33, addend: 0, }, Relocation { @@ -657,7 +674,7 @@ Object { 6, ), address: 424, - target_symbol: 33, + target_symbol: 7, addend: 0, }, Relocation { @@ -665,7 +682,7 @@ Object { 6, ), address: 428, - target_symbol: 13, + target_symbol: 22, addend: 0, }, Relocation { @@ -673,7 +690,7 @@ Object { 6, ), address: 432, - target_symbol: 32, + target_symbol: 8, addend: 0, }, Relocation { @@ -681,7 +698,7 @@ Object { 6, ), address: 436, - target_symbol: 31, + target_symbol: 9, addend: 0, }, Relocation { @@ -689,7 +706,7 @@ Object { 6, ), address: 440, - target_symbol: 30, + target_symbol: 10, addend: 0, }, Relocation { @@ -697,7 +714,7 @@ Object { 6, ), address: 444, - target_symbol: 9, + target_symbol: 15, addend: 0, }, Relocation { @@ -705,7 +722,7 @@ Object { 6, ), address: 652, - target_symbol: 27, + target_symbol: 11, addend: 0, }, Relocation { @@ -713,7 +730,7 @@ Object { 6, ), address: 656, - target_symbol: 26, + target_symbol: 12, addend: 0, }, Relocation { @@ -721,7 +738,7 @@ Object { 6, ), address: 660, - target_symbol: 25, + target_symbol: 13, addend: 0, }, Relocation { @@ -729,7 +746,7 @@ Object { 6, ), address: 664, - target_symbol: 24, + target_symbol: 14, addend: 0, }, Relocation { @@ -737,7 +754,7 @@ Object { 6, ), address: 668, - target_symbol: 9, + target_symbol: 15, addend: 0, }, Relocation { @@ -745,7 +762,7 @@ Object { 6, ), address: 824, - target_symbol: 21, + target_symbol: 16, addend: 0, }, Relocation { @@ -753,7 +770,7 @@ Object { 6, ), address: 828, - target_symbol: 20, + target_symbol: 17, addend: 0, }, Relocation { @@ -761,7 +778,7 @@ Object { 6, ), address: 832, - target_symbol: 19, + target_symbol: 18, addend: 0, }, Relocation { @@ -769,7 +786,7 @@ Object { 6, ), address: 836, - target_symbol: 18, + target_symbol: 19, addend: 0, }, Relocation { @@ -777,7 +794,7 @@ Object { 6, ), address: 840, - target_symbol: 17, + target_symbol: 20, addend: 0, }, Relocation { @@ -785,7 +802,7 @@ Object { 6, ), address: 844, - target_symbol: 16, + target_symbol: 21, addend: 0, }, Relocation { @@ -793,7 +810,7 @@ Object { 6, ), address: 848, - target_symbol: 8, + target_symbol: 26, addend: 0, }, Relocation { @@ -801,7 +818,7 @@ Object { 6, ), address: 1104, - target_symbol: 13, + target_symbol: 22, addend: 0, }, Relocation { @@ -809,7 +826,7 @@ Object { 6, ), address: 1108, - target_symbol: 12, + target_symbol: 23, addend: 0, }, Relocation { @@ -817,7 +834,7 @@ Object { 6, ), address: 1112, - target_symbol: 11, + target_symbol: 24, addend: 0, }, Relocation { @@ -825,7 +842,7 @@ Object { 6, ), address: 1116, - target_symbol: 10, + target_symbol: 25, addend: 0, }, Relocation { @@ -833,7 +850,7 @@ Object { 6, ), address: 1120, - target_symbol: 33, + target_symbol: 7, addend: 0, }, Relocation { @@ -841,7 +858,7 @@ Object { 6, ), address: 1124, - target_symbol: 8, + target_symbol: 26, addend: 0, }, ], diff --git a/objdiff-core/tests/snapshots/arch_x86__read_x86_jumptable.snap b/objdiff-core/tests/snapshots/arch_x86__read_x86_jumptable.snap index ab3f2f17..6d692bd3 100644 --- a/objdiff-core/tests/snapshots/arch_x86__read_x86_jumptable.snap +++ b/objdiff-core/tests/snapshots/arch_x86__read_x86_jumptable.snap @@ -9,31 +9,10 @@ Object { }, endianness: Little, symbols: [ - Symbol { - name: "Z:/tmp/code.c", - demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, - Symbol { - name: "@comp.id", - demangled_name: None, - address: 0, - size: 0, - kind: Object, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, Symbol { name: "[.drectve]", demangled_name: None, + normalized_name: None, address: 0, size: 38, kind: Section, @@ -47,6 +26,7 @@ Object { Symbol { name: "[.text]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -62,6 +42,7 @@ Object { demangled_name: Some( "int __cdecl test(int)", ), + normalized_name: None, address: 0, size: 88, kind: Function, @@ -73,9 +54,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L278", + name: "$L272", demangled_name: None, - address: 53, + normalized_name: None, + address: 17, size: 0, kind: Unknown, section: Some( @@ -86,9 +68,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L277", + name: "$L273", demangled_name: None, - address: 47, + normalized_name: None, + address: 23, size: 0, kind: Unknown, section: Some( @@ -99,9 +82,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L276", + name: "$L274", demangled_name: None, - address: 41, + normalized_name: None, + address: 29, size: 0, kind: Unknown, section: Some( @@ -114,6 +98,7 @@ Object { Symbol { name: "$L275", demangled_name: None, + normalized_name: None, address: 35, size: 0, kind: Unknown, @@ -125,9 +110,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L274", + name: "$L276", demangled_name: None, - address: 29, + normalized_name: None, + address: 41, size: 0, kind: Unknown, section: Some( @@ -138,9 +124,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L273", + name: "$L277", demangled_name: None, - address: 23, + normalized_name: None, + address: 47, size: 0, kind: Unknown, section: Some( @@ -151,9 +138,10 @@ Object { virtual_address: None, }, Symbol { - name: "$L272", + name: "$L278", demangled_name: None, - address: 17, + normalized_name: None, + address: 53, size: 0, kind: Unknown, section: Some( @@ -166,6 +154,7 @@ Object { Symbol { name: "$L282", demangled_name: None, + normalized_name: None, address: 60, size: 0, kind: Unknown, @@ -179,6 +168,7 @@ Object { Symbol { name: "[.debug$F]", demangled_name: None, + normalized_name: None, address: 0, size: 16, kind: Section, @@ -189,6 +179,18 @@ Object { align: None, virtual_address: None, }, + Symbol { + name: "@comp.id", + demangled_name: None, + normalized_name: None, + address: 0, + size: 0, + kind: Object, + section: None, + flags: FlagSet(Local), + align: None, + virtual_address: None, + }, ], sections: [ Section { @@ -227,7 +229,7 @@ Object { 6, ), address: 13, - target_symbol: 12, + target_symbol: 10, addend: 0, }, Relocation { @@ -235,7 +237,7 @@ Object { 6, ), address: 60, - target_symbol: 11, + target_symbol: 3, addend: 0, }, Relocation { @@ -243,7 +245,7 @@ Object { 6, ), address: 64, - target_symbol: 10, + target_symbol: 4, addend: 0, }, Relocation { @@ -251,7 +253,7 @@ Object { 6, ), address: 68, - target_symbol: 9, + target_symbol: 5, addend: 0, }, Relocation { @@ -259,7 +261,7 @@ Object { 6, ), address: 72, - target_symbol: 8, + target_symbol: 6, addend: 0, }, Relocation { @@ -275,7 +277,7 @@ Object { 6, ), address: 80, - target_symbol: 6, + target_symbol: 8, addend: 0, }, Relocation { @@ -283,7 +285,7 @@ Object { 6, ), address: 84, - target_symbol: 5, + target_symbol: 9, addend: 0, }, ], diff --git a/objdiff-core/tests/snapshots/arch_x86__read_x86_local_labels.snap b/objdiff-core/tests/snapshots/arch_x86__read_x86_local_labels.snap index 3e5131fe..fc8e816a 100644 --- a/objdiff-core/tests/snapshots/arch_x86__read_x86_local_labels.snap +++ b/objdiff-core/tests/snapshots/arch_x86__read_x86_local_labels.snap @@ -9,20 +9,10 @@ Object { }, endianness: Little, symbols: [ - Symbol { - name: "42b830_convertToUppercaseShiftJIS.obj", - demangled_name: None, - address: 0, - size: 0, - kind: Unknown, - section: None, - flags: FlagSet(Local), - align: None, - virtual_address: None, - }, Symbol { name: "[.text]", demangled_name: None, + normalized_name: None, address: 0, size: 0, kind: Section, @@ -34,22 +24,24 @@ Object { virtual_address: None, }, Symbol { - name: "LAB_0042b850", + name: "ConvertToUppercaseShiftJIS", demangled_name: None, - address: 32, - size: 0, - kind: Object, + normalized_name: None, + address: 0, + size: 92, + kind: Function, section: Some( 0, ), - flags: FlagSet(Local), + flags: FlagSet(Global | SizeInferred), align: None, virtual_address: None, }, Symbol { - name: "LAB_0042b883", + name: "LAB_0042b845", demangled_name: None, - address: 83, + normalized_name: None, + address: 21, size: 0, kind: Object, section: Some( @@ -60,9 +52,10 @@ Object { virtual_address: None, }, Symbol { - name: "LAB_0042b87c", + name: "LAB_0042b850", demangled_name: None, - address: 76, + normalized_name: None, + address: 32, size: 0, kind: Object, section: Some( @@ -73,9 +66,10 @@ Object { virtual_address: None, }, Symbol { - name: "LAB_0042b884", + name: "LAB_0042b869", demangled_name: None, - address: 84, + normalized_name: None, + address: 57, size: 0, kind: Object, section: Some( @@ -86,9 +80,10 @@ Object { virtual_address: None, }, Symbol { - name: "LAB_0042b889", + name: "LAB_0042b87c", demangled_name: None, - address: 89, + normalized_name: None, + address: 76, size: 0, kind: Object, section: Some( @@ -99,9 +94,10 @@ Object { virtual_address: None, }, Symbol { - name: "LAB_0042b845", + name: "LAB_0042b883", demangled_name: None, - address: 21, + normalized_name: None, + address: 83, size: 0, kind: Object, section: Some( @@ -112,9 +108,10 @@ Object { virtual_address: None, }, Symbol { - name: "LAB_0042b869", + name: "LAB_0042b884", demangled_name: None, - address: 57, + normalized_name: None, + address: 84, size: 0, kind: Object, section: Some( @@ -125,15 +122,16 @@ Object { virtual_address: None, }, Symbol { - name: "ConvertToUppercaseShiftJIS", + name: "LAB_0042b889", demangled_name: None, - address: 0, - size: 92, - kind: Function, + normalized_name: None, + address: 89, + size: 0, + kind: Object, section: Some( 0, ), - flags: FlagSet(Global | SizeInferred), + flags: FlagSet(Local), align: None, virtual_address: None, }, diff --git a/objdiff-wasm/src/api.rs b/objdiff-wasm/src/api.rs index e9b5498b..9e58e0bc 100644 --- a/objdiff-wasm/src/api.rs +++ b/objdiff-wasm/src/api.rs @@ -481,6 +481,7 @@ impl From for SymbolFlags { obj::SymbolFlag::HasExtra => SymbolFlags::HAS_EXTRA, obj::SymbolFlag::SizeInferred => SymbolFlags::SIZE_INFERRED, obj::SymbolFlag::Ignored => SymbolFlags::IGNORED, + obj::SymbolFlag::CompilerGenerated => SymbolFlags::COMPILER_GENERATED, }; } out diff --git a/objdiff-wasm/wit/objdiff.wit b/objdiff-wasm/wit/objdiff.wit index 11e4cbdd..7856f4ab 100644 --- a/objdiff-wasm/wit/objdiff.wit +++ b/objdiff-wasm/wit/objdiff.wit @@ -43,6 +43,7 @@ interface diff { has-extra, size-inferred, ignored, + compiler-generated, } record symbol-info {