Bump gimli, goblin, scroll, and edition (#556)

Author: mkeeter

.github/workflows/ci.yaml

@@ -28,7 +28,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: "1.82" # must match Cargo.toml
+          toolchain: "1.85" # must match Cargo.toml
           override: true
       - uses: Swatinem/rust-cache@v1
       - uses: actions-rs/cargo@v1

Cargo.lock

@@ -81,7 +81,8 @@ members = [
 resolver = "2"
 
 [workspace.package]
-rust-version = "1.82" # if this changes, edit ci.yaml as well!
+edition = "2024"
+rust-version = "1.85" # if this changes, edit ci.yaml as well!
 
 [workspace.dependencies]
 # `git`-based deps
@@ -204,9 +205,9 @@ crossterm = "0.20.0"
 csv = "1.1.3"
 ctrlc = "3.1.5"
 env_logger = "0.9.0"
-fallible-iterator = "0.2.0"
-gimli = "0.22.0"
-goblin = "0.2"
+fallible-iterator = "0.3.0"
+gimli = "0.32.0"
+goblin = "0.10"
 hubpack = "0.1.1"
 ihex = "3.0"
 indexmap = { version = "1.7", features = ["serde-1"] }
@@ -237,7 +238,7 @@ regex = "1.5.5"
 ron = "0.7"
 rusb = "0.8.1"
 rustc-demangle = "0.1.21"
-scroll = "0.10"
+scroll = "0.13"
 serde = { version = "1.0.126", features = ["derive"] }
 serde_json = "1.0"
 serde-xml-rs = "0.5.1"

Cargo.toml

@@ -280,7 +280,6 @@ enum Subcmd {
         ///
         /// * "json": outputs counters in JSON format, suitable for use with
         ///   other tools.
-
         #[clap(long, short, value_enum, default_value_t = Output::Text)]
         output: Output,
     },

cmd/counters/src/lib.rs

@@ -238,7 +238,7 @@ fn write_req<'a>(
     }
 
     while response_len > 0 {
-        write_request_reg(probe, addr, response_len << 16 | ACK_TOKEN)
+        write_request_reg(probe, addr, (response_len << 16) | ACK_TOKEN)
             .context("ACKing response data")?;
 
         let b = read_return(probe, addr).context("Reading response data")?;

cmd/debugmailbox/src/lib.rs

@@ -1169,8 +1169,8 @@ fn get_pin_states(
     let (open, mask) = match dev {
         SupportedDevice::ISL68224 => (values[0] as u64, values[1] as u64),
         SupportedDevice::RAA229618 => {
-            let open = values[0] as u64 | (values[1] as u64) << 32;
-            let mask = values[2] as u64 | (values[3] as u64) << 32;
+            let open = values[0] as u64 | ((values[1] as u64) << 32);
+            let mask = values[2] as u64 | ((values[3] as u64) << 32);
             (open, mask)
         }
     };

cmd/rendmp/src/lib.rs

@@ -188,7 +188,7 @@ fn cpuid(
         context: &'a mut HiffyContext<'b>,
         thread: u8,
     }
-    impl<'a, 'b> SbrmiWorkspace<'a, 'b> {
+    impl SbrmiWorkspace<'_, '_> {
         fn cpuid2(&mut self, eax: u32, ecx: u32) -> raw_cpuid::CpuIdResult {
             match call_cpuid(
                 self.hubris,
@@ -214,7 +214,7 @@ fn cpuid(
     struct WorkspaceRef<'a, 'b> {
         cell: Rc<RefCell<SbrmiWorkspace<'a, 'b>>>,
     }
-    impl<'a, 'b> raw_cpuid::CpuIdReader for WorkspaceRef<'a, 'b> {
+    impl raw_cpuid::CpuIdReader for WorkspaceRef<'_, '_> {
         fn cpuid2(&self, eax: u32, ecx: u32) -> raw_cpuid::CpuIdResult {
             let mut r = self.cell.borrow_mut();
             r.cpuid2(eax, ecx)

cmd/sbrmi/src/lib.rs

@@ -293,7 +293,7 @@ impl<'a> HiffySensorReader<'a> {
     }
 }
 
-impl<'a> SensorReader for HiffySensorReader<'a> {
+impl SensorReader for HiffySensorReader<'_> {
     fn run(
         &mut self,
         _hubris: &HubrisArchive,

cmd/sensors/src/lib.rs

@@ -2900,7 +2900,7 @@ impl HubrisArchive {
 
         loop {
             let bases = gimli::BaseAddresses::default();
-            let mut ctx = gimli::UninitializedUnwindContext::new();
+            let mut ctx = gimli::UnwindContext::new();
             let pc = *frameregs.get(&ARMRegister::PC).unwrap();
 
             //
@@ -3899,7 +3899,7 @@ impl HubrisObjectLoader {
         }
 
         let text = elf.section_headers.iter().find(|sh| {
-            if let Some(Ok(name)) = elf.shdr_strtab.get(sh.sh_name) {
+            if let Some(name) = elf.shdr_strtab.get_at(sh.sh_name) {
                 name == ".text"
             } else {
                 false
@@ -3933,11 +3933,8 @@ impl HubrisObjectLoader {
                 continue;
             }
 
-            let name = match elf.strtab.get(sym.st_name) {
-                Some(n) => n?,
-                None => {
-                    bail!("bad symbol in {}: {}", object, sym.st_name);
-                }
+            let Some(name) = elf.strtab.get_at(sym.st_name) else {
+                bail!("bad symbol in {}: {}", object, sym.st_name);
             };
 
             //
@@ -4061,7 +4058,7 @@ impl HubrisObjectLoader {
 
         if task == HubrisTask::Kernel {
             let apptable = elf.section_headers.iter().find(|sh| {
-                if let Some(Ok(name)) = elf.shdr_strtab.get(sh.sh_name) {
+                if let Some(name) = elf.shdr_strtab.get_at(sh.sh_name) {
                     name == ".hubris_app_table"
                 } else {
                     false
@@ -4211,32 +4208,28 @@ impl HubrisObjectLoader {
     ) -> Result<()> {
         // Load all of the sections. This "load" operation just gets the data in
         // RAM -- since we've already loaded the Elf file, this can't fail.
-        let dwarf = gimli::Dwarf::<&[u8]>::load(
+        let loader = |id: gimli::SectionId| {
             // Load the normal DWARF section(s) from our Elf image.
-            |id| {
-                let sec_result = elf.section_headers.iter().find(|sh| {
-                    if let Some(Ok(name)) = elf.shdr_strtab.get(sh.sh_name) {
-                        name == id.name()
-                    } else {
-                        false
-                    }
-                });
-                if let Some(sec) = sec_result {
-                    let offset = sec.sh_offset as usize;
-                    let size = sec.sh_size as usize;
-                    buffer.get(offset..offset + size).ok_or_else(|| {
-                        anyhow!("bad offset/size for ELF section {}", id.name())
-                    })
+            let sec_result = elf.section_headers.iter().find(|sh| {
+                if let Some(name) = elf.shdr_strtab.get_at(sh.sh_name) {
+                    name == id.name()
                 } else {
-                    Ok(&[])
+                    false
                 }
-            },
-            // We don't have a supplemental object file.
-            |_| Ok(&[]),
-        )?;
+            });
+            if let Some(sec) = sec_result {
+                let offset = sec.sh_offset as usize;
+                let size = sec.sh_size as usize;
+                buffer.get(offset..offset + size).ok_or_else(|| {
+                    anyhow!("bad offset/size for ELF section {}", id.name())
+                })
+            } else {
+                Ok([].as_slice())
+            }
+        };
 
-        // Borrow all sections wrapped in EndianSlices
-        let dwarf = dwarf.borrow(|section| {
+        let dwarf_sections = gimli::DwarfSections::load(loader)?;
+        let dwarf: gimli::Dwarf<_> = dwarf_sections.borrow(|section| {
             gimli::EndianSlice::new(section, gimli::LittleEndian)
         });
 
@@ -4416,7 +4409,7 @@ impl HubrisObjectLoader {
             .section_headers
             .iter()
             .find(|sh| {
-                if let Some(Ok(name)) = elf.shdr_strtab.get(sh.sh_name) {
+                if let Some(name) = elf.shdr_strtab.get_at(sh.sh_name) {
                     name == id
                 } else {
                     false
@@ -4445,7 +4438,7 @@ impl HubrisObjectLoader {
         // If we have an idolatry definition, load that.
         //
         let idol = elf.section_headers.iter().find(|sh| {
-            if let Some(Ok(name)) = elf.shdr_strtab.get(sh.sh_name) {
+            if let Some(name) = elf.shdr_strtab.get_at(sh.sh_name) {
                 name == ".idolatry"
             } else {
                 false
@@ -5326,7 +5319,10 @@ impl HubrisObjectLoader {
                 gimli::AttributeValue::RangeListsRef(r),
             ) = (attr.name(), attr.value())
             {
-                let raw_ranges = dwarf.ranges.raw_ranges(r, unit.encoding())?;
+                let raw_ranges = dwarf.ranges.raw_ranges(
+                    gimli::RangeListsOffset(r.0),
+                    unit.encoding(),
+                )?;
                 let raw_ranges: Vec<_> = raw_ranges.collect()?;
 
                 for r in raw_ranges {
@@ -6333,7 +6329,7 @@ impl<'a> From<&'a HubrisUnion> for HubrisType<'a> {
     }
 }
 
-impl<'a> std::fmt::Display for HubrisType<'a> {
+impl std::fmt::Display for HubrisType<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
             HubrisType::Struct(ty) => write!(f, "struct {}", ty.name),
@@ -6365,6 +6361,7 @@ pub struct HubrisStackSymbol<'a> {
 
 #[derive(Clone, Debug)]
 pub struct HubrisStackFrame<'a> {
+    /// Canonical frame address
     pub cfa: u32,
     pub sym: Option<HubrisStackSymbol<'a>>,
     pub registers: BTreeMap<ARMRegister, u32>,

humility-core/src/hubris.rs

@@ -59,7 +59,7 @@ impl<'a> HiffyDumpAgent<'a> {
     }
 }
 
-impl<'a> DumpAgent for HiffyDumpAgent<'a> {
+impl DumpAgent for HiffyDumpAgent<'_> {
     fn core(&mut self) -> &mut dyn Core {
         self.core
     }