ruby-elf 1.0.4 → 1.0.5

data/bin/elfgrep

@@ -142,7 +142,7 @@ module Elf::Tools
       @regexp = Regexp.union(@patterns.collect { |pattern|
                                if @match == :fixed_strings
                                  pattern.split(/\r?\n/).collect { |string|
-                                   Regexp.new(Regexp.escape(string), regexp_options)
+                                   Regexp.new("^" + Regexp.escape(string) + "$", regexp_options)
                                  }
                                else
                                  Regexp.new(pattern, regexp_options)

data/bin/rbelf-read

@@ -26,6 +26,7 @@ module Elf::Tools
       super
       @options |= [
                    ["--all", "-a", GetoptLong::NO_ARGUMENT],
+                   ["--file-header", "-h", GetoptLong::NO_ARGUMENT],
                    ["--section-headers", "-S", GetoptLong::NO_ARGUMENT],
                    ["--dynamic", "-d", GetoptLong::NO_ARGUMENT],
                   ]
@@ -46,6 +47,7 @@ module Elf::Tools
 
       @output_mutex.synchronize {
         printf("\nFile: %s\n", file) if @targets.size != 1
+        read_file_header(elf) if @file_header
         read_sections(elf) if @section_headers
         read_dynamic(elf) if @dynamic
       }
@@ -107,5 +109,40 @@ module Elf::Tools
         break if entry.type == Elf::Dynamic::Type::Null
       end
     end
+
+    def self.put_header(key, value)
+      printf "  %s %s\n", "#{key}:".ljust(34), value
+    end
+
+    def self.read_file_header(elf)
+      puts "ELF Header:"
+      # put this verbatim, since it never should change
+      puts "  Magic:   7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00"
+
+      put_header("Class", case elf.elf_class
+                          when Elf::Class::Elf32 then "ELF32"
+                          when Elf::Class::Elf64 then "ELF64"
+                          end)
+      put_header("Data", "2's complement, " + case elf.data_encoding
+                                              when Elf::DataEncoding::Lsb then 'little endian'
+                                              when Elf::DataEncoding::Msb then 'big endian'
+                                              end)
+      put_header("Ident Version", elf.version)
+      put_header("OS/ABI", elf.abi)
+      put_header("ABI Version", elf.abi_version)
+      put_header("Type", "#{elf.type.mnemonic.upcase} (#{elf.type})")
+      put_header("Machine", elf.machine)
+      put_header("Version", elf.version)
+      put_header("Entry point address", sprintf("0x%x", elf.entry_address))
+      put_header("Start of program headers", "#{elf.phoff} (bytes into file)")
+      put_header("Start of section headers", "#{elf.shoff} (bytes into file)")
+      put_header("Flags", sprintf("0x%x", elf.flags))
+      put_header("Size of this header", "#{elf.ehsize} (bytes)")
+      put_header("Size of program headers", "#{elf.phentsize} (bytes)")
+      put_header("Number of program headers", elf.phnum);
+      put_header("Size of section headers", "#{elf.shentsize} (bytes)")
+      put_header("Number of section headers", elf.shnum)
+      put_header("Section header string table index", elf.shstrndx)
+    end
   end
 end

data/lib/elf.rb

@@ -29,7 +29,7 @@ require 'elf/file'
 require 'elf/section'
 
 module Elf
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 
   MagicString = "\177ELF"
 
@@ -64,7 +64,7 @@ module Elf
   
   class OsAbi < Value
     fill(
-             0 => [ :SysV, 'UNIX System V ABI' ],
+             0 => [ :SysV, 'UNIX - System V' ],
              1 => [ :HPUX, 'HP-UX' ],
              2 => [ :NetBSD, 'NetBSD' ],
              3 => [ :Linux, 'Linux' ],
@@ -134,7 +134,7 @@ module Elf
             59 => [ :ME16, 'Toyota ME16 processor' ],
             60 => [ :ST100, 'STMicroelectronic ST100 processor' ],
             61 => [ :Tinyj, 'Advanced Logic Corp. Tinyj emb.fam' ],
-            62 => [ :X8664, 'AMD x86-64 architecture' ],
+            62 => [ :X8664, 'AMD x86-64' ],
             63 => [ :PDSP, 'Sony DSP Processor' ],
             64 => [ :PDP10, 'DEC PDP-10' ],
             65 => [ :PDP11, 'DEC PDP-11' ],

data/lib/elf/file.rb

@@ -84,7 +84,9 @@ module Elf
     end
 
     attr_reader :elf_class, :data_encoding, :type, :version, :abi,
-                :abi_version, :machine
+                :abi_version, :machine, :entry_address, :phoff, :shoff,
+                :flags, :ehsize, :phentsize, :phnum, :shentsize, :shnum,
+                :shstrndx
     attr_reader :string_table
 
     # raw data access
@@ -197,7 +199,7 @@ module Elf
         end
 
         @version = read_word
-        @entry = read_addr
+        @entry_address = read_addr
         @phoff = read_off
         @shoff = read_off
         @flags = read_word
@@ -205,15 +207,15 @@ module Elf
         @phentsize = read_half
         @phnum = read_half
         @shentsize = read_half
-        shnum = read_half
-        shstrndx = read_half
+        @shnum = read_half
+        @shstrndx = read_half
 
         elf32 = elf_class == Class::Elf32
         @sections = {}
 
         @sections_data = []
         seek(@shoff)
-        for i in 1..shnum
+        for i in 1..@shnum
           sectdata = {}
           sectdata[:idx]       = i-1
           sectdata[:name_idx]  = read_word
@@ -240,10 +242,10 @@ module Elf
         # to false, that is distinct from nil, and raise
         # MissingStringTable on request. If the string table is not yet
         # loaded raise instead StringTableNotLoaded.
-        if shstrndx == 0 or not self[shstrndx].is_a? StringTable
+        if @shstrndx == 0 or not self[@shstrndx].is_a? StringTable
           @string_table = false
         else
-          @string_table = self[shstrndx]
+          @string_table = self[@shstrndx]
 
           @sections_names = {}
           @sections_data.each do |sectdata|
@@ -382,13 +384,13 @@ module Elf
     def arm_eabi_version
       return nil if machine != Elf::Machine::ARM
 
-      return (flags & ARM::EFlags_EABI_Mask) >> 24
+      return (@flags & ARM::EFlags_EABI_Mask) >> 24
     end
 
     def arm_be8?
       return nil if machine != Elf::Machine::ARM
 
-      return (flags & ARM::EFlags_EB8) == ARM::EFlags_EB8
+      return (@flags & ARM::EFlags_BE8) == ARM::EFlags_BE8
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-elf
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - "Diego Elio Petten\xC3\xB2"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 +02:00
+date: 2011-07-16 00:00:00 +02:00
 default_executable: 
 dependencies: []