Unify context menu / hover tooltip code + UI improvements

Author: encounter

Cargo.lock

@@ -239,7 +239,12 @@ allow-git = []
 
 [sources.allow-org]
 # github.com organizations to allow git sources for
-github = ["encounter"]
+github = [
+    "CelestialAmber", # cwextab, rlwinmdec
+    "Decompollaborate", # rabbitizer
+    "enarx", # flagset
+    "encounter",
+]
 # gitlab.com organizations to allow git sources for
 gitlab = []
 # bitbucket.org organizations to allow git sources for

deny.toml

@@ -30,7 +30,6 @@ all = [
 ]
 # Implicit, used to check if any arch is enabled
 any-arch = [
-    "dep:byteorder",
     "dep:flagset",
     "dep:heck",
     "dep:log",
@@ -40,7 +39,6 @@ any-arch = [
     "dep:quote",
     "dep:regex",
     "dep:similar",
-    "dep:strum",
     "dep:syn",
 ]
 bindings = [
@@ -71,14 +69,12 @@ serde = [
 ]
 std = [
     "anyhow/std",
-    "byteorder?/std",
     "flagset?/std",
     "log?/std",
     "num-traits?/std",
     "object/std",
     "prost?/std",
     "serde?/std",
-    "strum?/std",
     "typed-path?/std",
     "dep:filetime",
     "dep:memmap2",
@@ -92,6 +88,7 @@ ppc = [
     "dep:cwdemangle",
     "dep:cwextab",
     "dep:ppc750cl",
+    "dep:rlwinmdec",
 ]
 x86 = [
     "any-arch",
@@ -117,21 +114,19 @@ features = ["all"]
 
 [dependencies]
 anyhow = { version = "1.0", default-features = false }
-byteorder = { version = "1.5", default-features = false, optional = true }
 filetime = { version = "0.2", optional = true }
-flagset = { version = "0.4", default-features = false, optional = true }
+flagset = { version = "0.4", default-features = false, optional = true, git = "https://github.com/enarx/flagset.git", rev = "a1fe9369b3741e43fec45da1998e83b9d78966a2" }
+itertools = { version = "0.14", default-features = false, features = ["use_alloc"] }
 log = { version = "0.4", default-features = false, optional = true }
 memmap2 = { version = "0.9", optional = true }
 num-traits = { version = "0.2", default-features = false, optional = true }
 object = { version = "0.36", default-features = false, features = ["read_core", "elf", "pe"] }
 pbjson = { version = "0.7", default-features = false, optional = true }
 prost = { version = "0.13", default-features = false, features = ["prost-derive"], optional = true }
+regex = { version = "1.11", default-features = false, features = [], optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
 similar = { version = "2.7", default-features = false, optional = true, git = "https://github.com/encounter/similar.git", branch = "no_std" }
-strum = { version = "0.26", default-features = false, features = ["derive"], optional = true }
 typed-path = { version = "0.10", default-features = false, optional = true }
-regex = { version = "1.11", default-features = false, features = [], optional = true }
-itertools = { version = "0.14", default-features = false, features = ["use_alloc"] }
 
 # config
 globset = { version = "0.4", default-features = false, optional = true }
@@ -143,8 +138,9 @@ gimli = { version = "0.31", default-features = false, features = ["read"], optio
 
 # ppc
 cwdemangle = { version = "1.0", optional = true }
-cwextab = { version = "1.0", optional = true, git = "https://github.com/encounter/cwextab.git" }
+cwextab = { version = "1.0", optional = true, git = "https://github.com/CelestialAmber/cwextab.git" }
 ppc750cl = { version = "0.3", optional = true }
+rlwinmdec = { version = "1.1", optional = true, git = "https://github.com/CelestialAmber/rlwinmdec.git" }
 
 # mips
 rabbitizer = { git = "https://github.com/Decompollaborate/rabbitizer.git", branch = "🦀", default-features = false, optional = true }
@@ -196,4 +192,4 @@ syn = { version = "2.0", optional = true }
 [dev-dependencies]
 # Enable all features for tests
 objdiff-core = { path = ".", features = ["all"] }
-insta = "1.42.1"
+insta = "1.42"

objdiff-core/Cargo.toml

@@ -1,11 +1,9 @@
 use alloc::{
-    borrow::Cow,
     collections::BTreeMap,
     format,
     string::{String, ToString},
     vec::Vec,
 };
-use core::ops::Range;
 
 use anyhow::{bail, Result};
 use arm_attr::{enums::CpuArch, tag::Tag, BuildAttrs};
@@ -16,8 +14,8 @@ use crate::{
     arch::Arch,
     diff::{display::InstructionPart, ArmArchVersion, ArmR9Usage, DiffObjConfig},
     obj::{
-        InstructionRef, RelocationFlags, ResolvedRelocation, ScannedInstruction, SymbolFlag,
-        SymbolFlagSet, SymbolKind,
+        InstructionRef, RelocationFlags, ResolvedInstructionRef, ResolvedRelocation,
+        ScannedInstruction, SymbolFlag, SymbolFlagSet, SymbolKind,
     },
 };
 
@@ -252,23 +250,19 @@ impl Arch for ArchArm {
 
     fn display_instruction(
         &self,
-        ins_ref: InstructionRef,
-        code: &[u8],
-        relocation: Option<ResolvedRelocation>,
-        _function_range: Range<u64>,
-        _section_index: usize,
+        resolved: ResolvedInstructionRef,
         diff_config: &DiffObjConfig,
         cb: &mut dyn FnMut(InstructionPart) -> Result<()>,
     ) -> Result<()> {
-        let (ins, parsed_ins) = self.parse_ins_ref(ins_ref, code, diff_config)?;
-        cb(InstructionPart::opcode(parsed_ins.mnemonic, ins_ref.opcode))?;
-        if ins == unarm::Ins::Data && relocation.is_some() {
+        let (ins, parsed_ins) = self.parse_ins_ref(resolved.ins_ref, resolved.code, diff_config)?;
+        cb(InstructionPart::opcode(parsed_ins.mnemonic, resolved.ins_ref.opcode))?;
+        if ins == unarm::Ins::Data && resolved.relocation.is_some() {
             cb(InstructionPart::reloc())?;
         } else {
             push_args(
                 &parsed_ins,
-                relocation,
-                ins_ref.address as u32,
+                resolved.relocation,
+                resolved.ins_ref.address as u32,
                 self.display_options(diff_config),
                 cb,
             )?;
@@ -325,17 +319,38 @@ impl Arch for ArchArm {
             .and_then(|s| s.demangle(&cpp_demangle::DemangleOptions::default()).ok())
     }
 
-    fn display_reloc(&self, flags: RelocationFlags) -> Cow<'static, str> {
-        Cow::Owned(format!("<{flags:?}>"))
+    fn reloc_name(&self, flags: RelocationFlags) -> Option<&'static str> {
+        match flags {
+            RelocationFlags::Elf(r_type) => match r_type {
+                elf::R_ARM_NONE => Some("R_ARM_NONE"),
+                elf::R_ARM_ABS32 => Some("R_ARM_ABS32"),
+                elf::R_ARM_REL32 => Some("R_ARM_REL32"),
+                elf::R_ARM_ABS16 => Some("R_ARM_ABS16"),
+                elf::R_ARM_ABS8 => Some("R_ARM_ABS8"),
+                elf::R_ARM_THM_PC22 => Some("R_ARM_THM_PC22"),
+                elf::R_ARM_THM_XPC22 => Some("R_ARM_THM_XPC22"),
+                elf::R_ARM_PC24 => Some("R_ARM_PC24"),
+                elf::R_ARM_XPC25 => Some("R_ARM_XPC25"),
+                elf::R_ARM_CALL => Some("R_ARM_CALL"),
+                _ => None,
+            },
+            _ => None,
+        }
     }
 
-    fn get_reloc_byte_size(&self, flags: RelocationFlags) -> usize {
+    fn data_reloc_size(&self, flags: RelocationFlags) -> usize {
         match flags {
             RelocationFlags::Elf(r_type) => match r_type {
+                elf::R_ARM_NONE => 0,
                 elf::R_ARM_ABS32 => 4,
                 elf::R_ARM_REL32 => 4,
                 elf::R_ARM_ABS16 => 2,
                 elf::R_ARM_ABS8 => 1,
+                elf::R_ARM_THM_PC22 => 4,
+                elf::R_ARM_THM_XPC22 => 4,
+                elf::R_ARM_PC24 => 4,
+                elf::R_ARM_XPC25 => 4,
+                elf::R_ARM_CALL => 4,
                 _ => 1,
             },
             _ => 1,