Bump IDB import to use idb-rs 0.1.10

Author: emesare

Cargo.lock

@@ -9,5 +9,5 @@ license = "Apache-2.0"
 binaryninja.workspace = true
 binaryninjacore-sys.workspace = true
 gimli = "0.31"
-zstd = "0.13.2"
+zstd = "0.13.3"
 thiserror = "2.0"

plugins/dwarf/shared/Cargo.toml

@@ -12,5 +12,5 @@ crate-type = ["cdylib"]
 anyhow = { version = "1.0.86", features = ["backtrace"] }
 binaryninja.workspace = true
 binaryninjacore-sys.workspace = true
-idb-rs = { git = "https://github.com/Vector35/idb-rs", tag = "0.1.9" }
+idb-rs = { git = "https://github.com/Vector35/idb-rs", tag = "0.1.10" }
 log = "0.4"

plugins/idb_import/Cargo.toml

@@ -1,21 +1,22 @@
+use std::borrow::Cow;
 use std::collections::HashMap;
 
 use anyhow::Result;
 
 use idb_rs::id0::ID0Section;
-use idb_rs::til;
+use idb_rs::{til, IDAKind};
 
 #[derive(Default)]
 pub struct AddrInfo<'a> {
     // TODO does binja diferenciate comments types on the API?
     pub comments: Vec<&'a [u8]>,
-    pub label: Option<&'a str>,
+    pub label: Option<Cow<'a, str>>,
     // TODO make this a ref
     pub ty: Option<til::Type>,
 }
 
-pub fn get_info(id0: &ID0Section, version: u16) -> Result<HashMap<u64, AddrInfo<'_>>> {
-    let mut addr_info: HashMap<u64, AddrInfo> = HashMap::new();
+pub fn get_info<K: IDAKind>(id0: &ID0Section<K>, version: u16) -> Result<HashMap<K::Usize, AddrInfo<'_>>> {
+    let mut addr_info: HashMap<K::Usize, AddrInfo> = HashMap::new();
 
     // the old style comments, most likely empty on new versions
     let old_comments = id0.functions_and_comments()?.filter_map(|fc| {
@@ -49,6 +50,7 @@ pub fn get_info(id0: &ID0Section, version: u16) -> Result<HashMap<u64, AddrInfo<
                     panic!("Duplicated type for an address should be impossible this is most likelly a programing error")
                 }
             }
+            DefinedStruct(_) => {}
             Other { .. } => {}
         }
     }

plugins/idb_import/src/addr_info.rs

@@ -8,13 +8,14 @@ use binaryninja::debuginfo::{
     CustomDebugInfoParser, DebugFunctionInfo, DebugInfo, DebugInfoParser,
 };
 
-use idb_rs::id0::{ID0Section, IDBParam1, IDBParam2};
+use idb_rs::id0::{ID0Section, ID0SectionVariants, IDBParam1, IDBParam2};
 use idb_rs::til::section::TILSection;
 use idb_rs::til::TypeVariant as TILTypeVariant;
 
 use log::{error, trace, warn, LevelFilter};
 
 use anyhow::Result;
+use idb_rs::{IDAKind, IDAUsize};
 use binaryninja::logger::Logger;
 
 struct IDBDebugInfoParser;
@@ -118,7 +119,7 @@ fn parse_idb_info(
     };
     trace!("Parsing a IDB file");
     let file = std::io::BufReader::new(file);
-    let mut parser = idb_rs::IDBParser::new(file)?;
+    let mut parser = idb_rs::IDAVariants::new(file)?;
     if let Some(til_section) = parser.til_section_offset() {
         trace!("Parsing the TIL section");
         let til = parser.read_til_section(til_section)?;
@@ -128,9 +129,16 @@ fn parse_idb_info(
 
     if let Some(id0_section) = parser.id0_section_offset() {
         trace!("Parsing the ID0 section");
-        let id0 = parser.read_id0_section(id0_section)?;
+        let id0_variant = parser.read_id0_section(id0_section)?;
         // progress 50%-100%
-        parse_id0_section_info(debug_info, bv, debug_file, &id0)?;
+        match id0_variant {
+            ID0SectionVariants::IDA32(id0) => {
+                parse_id0_section_info(debug_info, bv, debug_file, &id0)?;
+            }
+            ID0SectionVariants::IDA64(id0) => {
+                parse_id0_section_info(debug_info, bv, debug_file, &id0)?;
+            }
+        }
     }
 
     Ok(())
@@ -148,7 +156,7 @@ fn parse_til_info(
     };
     let mut file = std::io::BufReader::new(file);
     trace!("Parsing the TIL section");
-    let til = TILSection::read(&mut file, idb_rs::IDBSectionCompression::None)?;
+    let til = TILSection::read(&mut file)?;
     import_til_section(debug_info, debug_file, &til, progress)
 }
 
@@ -218,18 +226,19 @@ pub fn import_til_section(
     Ok(())
 }
 
-fn parse_id0_section_info(
+fn parse_id0_section_info<K: IDAKind>(
     debug_info: &mut DebugInfo,
     bv: &BinaryView,
     debug_file: &BinaryView,
-    id0: &ID0Section,
+    id0: &ID0Section<K>,
 ) -> Result<()> {
     let version = match id0.ida_info()? {
         idb_rs::id0::IDBParam::V1(IDBParam1 { version, .. })
         | idb_rs::id0::IDBParam::V2(IDBParam2 { version, .. }) => version,
     };
 
     for (addr, info) in get_info(id0, version)? {
+        let addr = addr.into_u64();
         // just in case we change this struct in the future, this line will for us to review this code
         // TODO merge this data with folder locations
         let AddrInfo {
@@ -264,15 +273,15 @@ fn parse_id0_section_info(
                 }
             });
 
-        match (label, &ty, bnty) {
+        match (&label, &ty, bnty) {
             (_, Some(ty), bnty) if matches!(&ty.type_variant, TILTypeVariant::Function(_)) => {
                 if bnty.is_none() {
                     error!("Unable to convert the function type at {addr:#x}",)
                 }
                 if !debug_info.add_function(&DebugFunctionInfo::new(
                     None,
                     None,
-                    label.map(str::to_string),
+                    label.as_deref().map(str::to_string),
                     bnty,
                     Some(addr),
                     None,
@@ -283,15 +292,15 @@ fn parse_id0_section_info(
                 }
             }
             (_, Some(_ty), Some(bnty)) => {
-                if !debug_info.add_data_variable(addr, &bnty, label, &[]) {
+                if !debug_info.add_data_variable(addr, &bnty, label.as_deref(), &[]) {
                     error!("Unable to add the type at {addr:#x}")
                 }
             }
             (_, Some(_ty), None) => {
                 // TODO types come from the TIL sections, can we make all types be just NamedTypes?
                 error!("Unable to convert type {addr:#x}");
                 // TODO how to add a label without a type associacted with it?
-                if let Some(name) = label {
+                if let Some(name) = label.as_deref() {
                     if !debug_info.add_data_variable(
                         addr,
                         &binaryninja::types::Type::void(),