Add ElfType enum and accompanying test

fjeremic · Dec 19, 2019 · 81d376d · 81d376d
1 parent 98e9709
commit 81d376d
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 3 deletions.
diff --git a/BinaryTools.Elf.Tests/TestElfHeader.cs b/BinaryTools.Elf.Tests/TestElfHeader.cs
@@ -85,5 +85,15 @@ public void CorrectFlags()
 
             Assert.Equal(0U, elfFile.Header.Flags);
         }
+
+        [Fact]
+        public void CorrectType()
+        {
+            var stream = new FileStream("Binaries/base32", FileMode.Open, FileAccess.Read);
+            var reader = new EndianBinaryReader(stream, EndianBitConverter.NativeEndianness);
+            ElfFile elfFile = ElfFile.ReadElfFile(reader);
+
+            Assert.Equal(ElfType.Executable, elfFile.Header.Type);
+        }
     }
 }
diff --git a/BinaryTools.Elf/Bit32/ElfHeader.cs b/BinaryTools.Elf/Bit32/ElfHeader.cs
@@ -72,7 +72,7 @@ internal ElfHeader(BinaryReader reader, Int64 position)
             reader.BaseStream.Position += 1;
 
             // Represents Elf32_Ehdr.e_type
-            Type = reader.ReadUInt16();
+            Type = (ElfType)reader.ReadUInt16();
 
             // Represents Elf32_Ehdr.e_machine
             Machine = reader.ReadUInt16();

diff --git a/BinaryTools.Elf/Bit64/ElfHeader.cs b/BinaryTools.Elf/Bit64/ElfHeader.cs
@@ -72,7 +72,7 @@ internal ElfHeader(BinaryReader reader, Int64 position)
             reader.BaseStream.Position += 1;
 
             // Represents Elf64_Ehdr.e_type
-            Type = reader.ReadUInt16();
+            Type = (ElfType)reader.ReadUInt16();
 
             // Represents Elf64_Ehdr.e_machine
             Machine = reader.ReadUInt16();

diff --git a/BinaryTools.Elf/ElfHeader.cs b/BinaryTools.Elf/ElfHeader.cs
@@ -155,7 +155,7 @@ public UInt32 Flags
         /// <summary>
         /// Gets the ELF file type.
         /// </summary>
-        public UInt16 Type
+        public ElfType Type
         {
             get; protected set;
         }

diff --git a/BinaryTools.Elf/ElfType.cs b/BinaryTools.Elf/ElfType.cs
@@ -0,0 +1,40 @@
+using System.ComponentModel;
+
+namespace BinaryTools.Elf
+{
+    /// <summary>
+    /// Enumerates the object file type.
+    /// </summary>
+    public enum ElfType : ushort
+    {
+        /// <summary>
+        /// No file type
+        /// </summary>
+        [Description("No file type")]
+        None,
+
+        /// <summary>
+        /// Relocatable file
+        /// </summary>
+        [Description("Relocatable file")]
+        Relocatable,
+
+        /// <summary>
+        /// Executable file
+        /// </summary>
+        [Description("Executable file")]
+        Executable,
+
+        /// <summary>
+        /// Shared object file
+        /// </summary>
+        [Description("Shared object file")]
+        Shared,
+
+        /// <summary>
+        /// Core file
+        /// </summary>
+        [Description("Core file")]
+        Core,
+    }
+}