Ticket #167: elf_with_sfs.diff

program/elf.py

@@ -5 +5 @@
-Creation date: 08 may 2006
-"""
-
-
-
-
-
-
+Hachoir
+ RootSeekableFieldSet,
+Bit, PaddingBits, 
+RawBytes, 
+, filesizeHandler
-from hachoir_core.endian import LITTLE_ENDIAN, BIG_ENDIAN
-
-class ElfHeader(FieldSet):
@@ -47 +47 @@
-        yield Bytes(self, "signature", 4, r'ELF signature ("\x7fELF")')
-        yield Enum(UInt8(self, "class", "Class"), self.CLASS_NAME)
-        yield Enum(UInt8(self, "endian", "Endian"), self.ENDIAN_NAME)
-
-
-
+
+
-        yield Enum(UInt16(self, "type", "File type"), self.TYPE_NAME)
-        yield Enum(UInt16(self, "machine", "Machine type"), self.MACHINE_NAME)
-
-UInt32(self, "entry", "Number of entries"
+ (1)
+textHandler(UInt32(self, "entry", "Virtual address to entry point"), hexadecimal
-        yield UInt32(self, "phoff", "Program header offset")
-        yield UInt32(self, "shoff", "Section header offset")
-        yield UInt32(self, "flags", "Flags")
@@ -61 +60 @@
-        yield UInt16(self, "phentsize", "Program header entry size")
-        yield UInt16(self, "phnum", "Program header entry count")
-        yield UInt16(self, "shentsize", "Section header entry size")
-e
-tab
+y
+ing table
-
-isValid
+validate
-        if self["signature"].value != "\x7FELF":
-            return "Wrong ELF signature"
-        if self["class"].value not in self.CLASS_NAME:
-            return "Unknown class"
-        if self["endian"].value not in self.ENDIAN_NAME:
-            return "Unknown endian (%s)" % self["endian"].value
-""
+True
-
+class SectionHeader32Flags(UInt32):
+    def createDescription(self):
+        val = self.value
+        desc = []
+        if val & 0x1:
+            desc.append("Writable")
+        else:
+            desc.append("Not writable")
+        if val & 0x2:
+            desc.append("In memory")
+        else:
+            desc.append("Not in memory")
+        if val & 0x4:
+            desc.append("Executable")
+        else:
+            desc.append("Not executable")
+        if val & 0xFFFFFFF8:
+            desc.append("Extra: %08X" % (val & 0xFFFFFFF8))
+        return ", ".join(desc)
+
-class SectionHeader32(FieldSet):
-    static_size = 40*8
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+    TYPE_NAME = TypeNameClass({
+        0: "Inactive",
+        1: "Program bits",
+        2: "Symbol table",
+        3: "String table",
+        4: "Relocation entries (with explicit addends)",
+        5: "Symbol hash table",
+        6: "Dynamic linking information",
+        7: "Note",
+        8: "No bits section",
+        9: "Relocation entries (without explicit addends)",
+        10:"Reserved",
+        11:"Dynamic linking symbol table",
+        0x60000000: 'SHT_LOOS',
+        0x6ffffffb: 'SHT_LOSUNW',
+        0x6ffffffc: 'SHT_SUNW_syminfo',
+        0x6ffffffd: 'SHT_GNU_verdef',
+        0x6ffffffe: 'SHT_GNU_verneed',
+        0x6fffffff: 'SHT_GNU_versym',
+        0x6fffffff: 'SHT_HISUNW',
+        0x6fffffff: 'SHT_HIOS',
+    })
+
-    def createFields(self):
-", "Name
+_offset", "Name (as an offset into the section header string table)
-        yield Enum(UInt32(self, "type", "Type"), self.TYPE_NAME)
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        yield UInt32(self, "addr_align", "Address alignment")
-Entry size
+Size of each entry (if this section is a table of fixed-size entries)
-
-    def createDescription(self):
+        offset = self["/section[%s]"%self["/header/shstrndx"].value].address + (self["name_offset"].value*8)
+        name = ""
+        while 1:
+            c=self.stream.readBytes(offset, 1)
+            if c=="\0":
+                break
+            offset += 8
+            name += c
+            
-        return "Section header (name: %s, type: %s)" % \
-self["name"].valu
+nam
-
-class ProgramHeader32(FieldSet):
-    TYPE_NAME = {
-
+
+
+
+
+
+
+
-    }
-    static_size = 32*8
-
-    def createFields(self):
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-    def createDescription(self):
-        return "Program Header (%s)" % self["type"].display
@@ -131 +208 @@
-#                chunk = self.doRead("section[]", "Section", (FormatChunk, "string[0]"))
-#            chunk.description = "ELF section (in file: %s..%s)" % (ofs, ofs+size)
-
-Parser
+HachoirParser, RootSeekableFieldSet
-    PARSER_TAGS = {
-        "id": "elf",
-        "category": "program",
@@ -147 +224 @@
-        "description": "ELF Unix/BSD program/library"
-    }
-    endian = LITTLE_ENDIAN
+    def __init__(self, stream, **args):
+        RootSeekableFieldSet.__init__(self, None, "root", stream, None, stream.askSize(self))
+        HachoirParser.__init__(self, stream, **args)
-
-    def validate(self):
-
-
-
-
+
-
-    def createFields(self):
-        # Choose the right endian depending on endian specified in header
@@ -174 +251 @@
-            #chunk.description = "Sections (use an evil hack to manage share same data on differents parts)"
-            #assert self.current_size//8 == self["header/shoff"].value
-        else:
-
+)#
-            if raw:
-                yield raw
-
+        position = self["header/shoff"].value
+
-        for index in xrange(self["header/shnum"].value):
-
+
+
+
+
+
+
+
-
-    def createDescription(self):
-        return "ELF Unix/BSD program/library: %s" % (