Merge pull request #83 from matts1/master

Add missing tags for relative relocations

Author: nrc

src/dynamic.rs

@@ -1,10 +1,13 @@
 use core::fmt;
-use {P32, P64};
 use zero::Pod;
+use {P32, P64};
 
 #[derive(Debug)]
 #[repr(C)]
-pub struct Dynamic<P> where Tag_<P>: fmt::Debug {
+pub struct Dynamic<P>
+where
+    Tag_<P>: fmt::Debug,
+{
     tag: Tag_<P>,
     un: P,
 }
@@ -50,6 +53,9 @@ pub enum Tag<P> {
     PreInitArray,
     PreInitArraySize,
     SymTabShIndex,
+    RelrSize,
+    Relr,
+    RelrEnt,
     Flags1,
     OsSpecific(P),
     ProcessorSpecific(P),
@@ -64,22 +70,51 @@ macro_rules! impls {
 
             pub fn get_val(&self) -> Result<$p, &'static str> {
                 match self.get_tag()? {
-                    Tag::Needed | Tag::PltRelSize | Tag::RelaSize | Tag::RelaEnt | Tag::StrSize |
-                    Tag::SymEnt | Tag::SoName | Tag::RPath | Tag::RelSize | Tag::RelEnt | Tag::PltRel |
-                    Tag::InitArraySize | Tag::FiniArraySize | Tag::RunPath | Tag::Flags |
-                    Tag::PreInitArraySize | Tag::Flags1 | Tag::OsSpecific(_) |
-                    Tag::ProcessorSpecific(_) => Ok(self.un),
+                    Tag::Needed
+                    | Tag::PltRelSize
+                    | Tag::RelaSize
+                    | Tag::RelaEnt
+                    | Tag::StrSize
+                    | Tag::SymEnt
+                    | Tag::SoName
+                    | Tag::RPath
+                    | Tag::RelSize
+                    | Tag::RelEnt
+                    | Tag::PltRel
+                    | Tag::InitArraySize
+                    | Tag::FiniArraySize
+                    | Tag::RunPath
+                    | Tag::Flags
+                    | Tag::PreInitArraySize
+                    | Tag::RelrSize
+                    | Tag::RelrEnt
+                    | Tag::Flags1
+                    | Tag::OsSpecific(_)
+                    | Tag::ProcessorSpecific(_) => Ok(self.un),
                     _ => Err("Invalid value"),
                 }
             }
 
             pub fn get_ptr(&self) -> Result<$p, &'static str> {
                 match self.get_tag()? {
-                    Tag::Pltgot | Tag::Hash | Tag::StrTab | Tag::SymTab | Tag::Rela | Tag::Init | Tag::Fini |
-                    Tag::Rel | Tag::Debug | Tag::JmpRel | Tag::InitArray | Tag::FiniArray |
-                    Tag::PreInitArray | Tag::SymTabShIndex  | Tag::OsSpecific(_) | Tag::ProcessorSpecific(_)
-                    => Ok(self.un),
-                     _ => Err("Invalid ptr"),
+                    Tag::Pltgot
+                    | Tag::Hash
+                    | Tag::StrTab
+                    | Tag::SymTab
+                    | Tag::Rela
+                    | Tag::Init
+                    | Tag::Fini
+                    | Tag::Rel
+                    | Tag::Debug
+                    | Tag::JmpRel
+                    | Tag::InitArray
+                    | Tag::FiniArray
+                    | Tag::PreInitArray
+                    | Tag::SymTabShIndex
+                    | Tag::Relr
+                    | Tag::OsSpecific(_)
+                    | Tag::ProcessorSpecific(_) => Ok(self.un),
+                    _ => Err("Invalid ptr"),
                 }
             }
         }
@@ -121,6 +156,9 @@ macro_rules! impls {
                     32 => Ok(Tag::PreInitArray),
                     33 => Ok(Tag::PreInitArraySize),
                     34 => Ok(Tag::SymTabShIndex),
+                    35 => Ok(Tag::RelrSize),
+                    36 => Ok(Tag::Relr),
+                    37 => Ok(Tag::RelrEnt),
                     0x6ffffffb => Ok(Tag::Flags1),
                     t if (0x6000000D..0x70000000).contains(&t) => Ok(Tag::OsSpecific(t)),
                     t if (0x70000000..0x80000000).contains(&t) => Ok(Tag::ProcessorSpecific(t)),
@@ -134,7 +172,7 @@ macro_rules! impls {
                 self.as_tag().fmt(f)
             }
         }
-    }
+    };
 }
 
 impls!(P32);