write: add EhFrame and DebugFrame to sections

examples/dwarf-validate.rs

@@ -107,9 +107,9 @@ where
         'a: 'file,
     {
         let data = match file.section_by_name(S::section_name()) {
-            Some(ref section) => {
-                section.uncompressed_data().unwrap_or(Cow::Borrowed(&[][..]))
-            }
+            Some(ref section) => section
+                .uncompressed_data()
+                .unwrap_or(Cow::Borrowed(&[][..])),
             None => Cow::Borrowed(&[][..]),
         };
         let data_ref = (*arena.alloc(data)).borrow();

examples/dwarfdump.rs

@@ -46,7 +46,8 @@ fn writeln_error<W: Write, R: Reader>(
         msg,
         match err {
             Error::GimliError(err) => dwarf.format_error(err),
-            Error::ObjectError(err) => format!("{}:{:?}", "An object error occurred while reading", err),
+            Error::ObjectError(err) =>
+                format!("{}:{:?}", "An object error occurred while reading", err),
             Error::IoError => "An I/O error occurred while writing.".to_string(),
         }
     )
@@ -65,9 +66,9 @@ impl From<io::Error> for Error {
 }
 
 impl From<object::read::Error> for Error {
-  fn from(err: object::read::Error) -> Self {
-    Error::ObjectError(err)
-  }
+    fn from(err: object::read::Error) -> Self {
+        Error::ObjectError(err)
+    }
 }
 
 pub type Result<T> = result::Result<T, Error>;
@@ -171,7 +172,8 @@ fn add_relocations(
                     object::RelocationTarget::Symbol(symbol_idx) => {
                         match file.symbol_by_index(symbol_idx) {
                             Ok(symbol) => {
-                                let addend = symbol.address().wrapping_add(relocation.addend() as u64);
+                                let addend =
+                                    symbol.address().wrapping_add(relocation.addend() as u64);
                                 relocation.set_addend(addend as i64);
                             }
                             Err(_) => {

examples/simple.rs

@@ -21,9 +21,9 @@ fn dump_file(object: &object::File, endian: gimli::RunTimeEndian) -> Result<(),
     // Load a section and return as `Cow<[u8]>`.
     let load_section = |id: gimli::SectionId| -> Result<borrow::Cow<[u8]>, gimli::Error> {
         match object.section_by_name(id.name()) {
-            Some(ref section) => {
-                Ok(section.uncompressed_data().unwrap_or(borrow::Cow::Borrowed(&[][..])))
-            }
+            Some(ref section) => Ok(section
+                .uncompressed_data()
+                .unwrap_or(borrow::Cow::Borrowed(&[][..]))),
             None => Ok(borrow::Cow::Borrowed(&[][..])),
         }
     };

examples/simple_line.rs

@@ -21,11 +21,11 @@ fn dump_file(object: &object::File, endian: gimli::RunTimeEndian) -> Result<(),
     // Load a section and return as `Cow<[u8]>`.
     let load_section = |id: gimli::SectionId| -> Result<borrow::Cow<[u8]>, gimli::Error> {
         match object.section_by_name(id.name()) {
-            Some(ref section) => {
-                Ok(section.uncompressed_data().unwrap_or(borrow::Cow::Borrowed(&[][..])))
-            }  
+            Some(ref section) => Ok(section
+                .uncompressed_data()
+                .unwrap_or(borrow::Cow::Borrowed(&[][..]))),
             None => Ok(borrow::Cow::Borrowed(&[][..])),
-        }   
+        }
     };
     // Load a supplementary section. We don't have a supplementary object file,
     // so always return an empty slice.

src/write/section.rs

@@ -4,8 +4,8 @@ use std::vec::Vec;
 
 use crate::common::SectionId;
 use crate::write::{
-    DebugAbbrev, DebugInfo, DebugInfoReference, DebugLine, DebugLineStr, DebugLoc, DebugLocLists,
-    DebugRanges, DebugRngLists, DebugStr, Writer,
+    DebugAbbrev, DebugFrame, DebugInfo, DebugInfoReference, DebugLine, DebugLineStr, DebugLoc,
+    DebugLocLists, DebugRanges, DebugRngLists, DebugStr, EhFrame, Writer,
 };
 
 macro_rules! define_section {
@@ -85,6 +85,10 @@ pub struct Sections<W: Writer> {
     pub debug_loclists: DebugLocLists<W>,
     /// The `.debug_str` section.
     pub debug_str: DebugStr<W>,
+    /// The `.debug_frame` section.
+    pub debug_frame: DebugFrame<W>,
+    /// The `.eh_frame` section.
+    pub eh_frame: EhFrame<W>,
     /// Unresolved references in the `.debug_info` section.
     pub(crate) debug_info_refs: Vec<DebugInfoReference>,
     /// Unresolved references in the `.debug_loc` section.
@@ -106,6 +110,8 @@ impl<W: Writer + Clone> Sections<W> {
             debug_loc: DebugLoc(section.clone()),
             debug_loclists: DebugLocLists(section.clone()),
             debug_str: DebugStr(section.clone()),
+            debug_frame: DebugFrame(section.clone()),
+            eh_frame: EhFrame(section.clone()),
             debug_info_refs: Vec::new(),
             debug_loc_refs: Vec::new(),
             debug_loclists_refs: Vec::new(),
@@ -134,6 +140,8 @@ impl<W: Writer> Sections<W> {
         f!(self.debug_loc)?;
         f!(self.debug_loclists)?;
         f!(self.debug_info)?;
+        f!(self.debug_frame)?;
+        f!(self.eh_frame)?;
         Ok(())
     }
 
@@ -157,6 +165,8 @@ impl<W: Writer> Sections<W> {
         f!(self.debug_loc)?;
         f!(self.debug_loclists)?;
         f!(self.debug_info)?;
+        f!(self.debug_frame)?;
+        f!(self.eh_frame)?;
         Ok(())
     }
 }

src/write/unit.rs

@@ -4,7 +4,7 @@ use std::{slice, usize};
 
 use crate::common::{
     DebugAbbrevOffset, DebugInfoOffset, DebugLineOffset, DebugMacinfoOffset, DebugMacroOffset,
-    DebugStrOffset, DebugTypeSignature, Encoding, Format, SectionId, UnitSectionOffset,
+    DebugStrOffset, DebugTypeSignature, Encoding, Format, SectionId,
 };
 use crate::constants;
 use crate::leb128::write::{sleb128_size, uleb128_size};
@@ -1471,6 +1471,7 @@ pub(crate) struct DebugInfoReference {
 #[cfg(feature = "read")]
 pub(crate) mod convert {
     use super::*;
+    use crate::common::UnitSectionOffset;
     use crate::read::{self, Reader};
     use crate::write::{self, ConvertError, ConvertResult, LocationList, RangeList};
     use std::collections::HashMap;
@@ -1911,6 +1912,7 @@ mod tests {
     use super::*;
     use crate::common::{
         DebugAddrBase, DebugLocListsBase, DebugRngListsBase, DebugStrOffsetsBase, LineEncoding,
+        UnitSectionOffset,
     };
     use crate::constants;
     use crate::read;