indis-core 0.1.3 → 0.1.4

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rbx

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --format progress
+-rspec_helper

data/.travis.yml

@@ -2,4 +2,5 @@ language: ruby
 rvm:
   - 1.9.3
   - jruby-19mode
+  - rbx-19mode
 gemfile: Gemfile.ci

data/lib/indis-core/binary_architecture.rb

@@ -0,0 +1,50 @@
+##############################################################################
+#   Indis framework                                                          #
+#   Copyright (C) 2012 Vladimir "Farcaller" Pouzanov <farcaller@gmail.com>   #
+#                                                                            #
+#   This program is free software: you can redistribute it and/or modify     #
+#   it under the terms of the GNU General Public License as published by     #
+#   the Free Software Foundation, either version 3 of the License, or        #
+#   (at your option) any later version.                                      #
+#                                                                            #
+#   This program is distributed in the hope that it will be useful,          #
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+#   GNU General Public License for more details.                             #
+#                                                                            #
+#   You should have received a copy of the GNU General Public License        #
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+##############################################################################
+
+module Indis
+  
+  # BinaryArchitecture manages all known architectures and provides support
+  # for resolving the correct class for named architecture
+  module BinaryArchitecture
+    
+    def self.known_archs
+      fmt = {}
+      self.constants.each do |c|
+        e = const_get(c)
+        fmt[e.name] = e if e.is_a?(Class) && e.superclass == Architecture
+      end
+      fmt
+    end
+    
+    # Base class for any binary architecture
+    class Architecture
+      # Basic constructor takes care of storing the target
+      def initialize(target)
+        @target = target
+      end
+      
+      # @abstract Returns the format magic bytes.
+      #
+      # @return [Symbol] symbolicated name of the architecture
+      def self.name
+        raise RuntimeError, "#name not implemented in architecture #{self.class}"
+      end
+    end
+    
+  end
+end

data/lib/indis-core/binaryops_fixnum.rb

@@ -0,0 +1,54 @@
+##############################################################################
+#   Indis framework                                                          #
+#   Copyright (C) 2012 Vladimir "Farcaller" Pouzanov <farcaller@gmail.com>   #
+#                                                                            #
+#   This program is free software: you can redistribute it and/or modify     #
+#   it under the terms of the GNU General Public License as published by     #
+#   the Free Software Foundation, either version 3 of the License, or        #
+#   (at your option) any later version.                                      #
+#                                                                            #
+#   This program is distributed in the hope that it will be useful,          #
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+#   GNU General Public License for more details.                             #
+#                                                                            #
+#   You should have received a copy of the GNU General Public License        #
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+##############################################################################
+
+# BinaryopsFixnum is a lightweight BinaryopsString, a few methods extending
+# Fixnum with enough operations so that it's usable in bit calculations.
+class Fixnum
+  def bitlen=(bitlen)
+    @bitlen = bitlen
+  end
+  
+  def bitlen
+    @bitlen ||= self.to_s(2).length
+  end
+  
+  def set_bitlen(i)
+    @bitlen = i
+    self
+  end
+  
+  def msb
+    self >> (self.bitlen-1)
+  end
+  
+  def to_signed
+    if msb == 1
+      - ((1 << @bitlen) - self)
+    else
+      self
+    end
+  end
+  
+  alias :old_range :[]
+  
+  def [](range)
+    return old_range(range) unless range.is_a?(Range)
+    raise ArgumentError, "Only inclusive ranges are supported" if range.exclude_end?
+    (self >> range.begin) & ((1 << (range.end-range.begin+1)) - 1)
+  end
+end

data/lib/indis-core/cstring_entity.rb

@@ -0,0 +1,52 @@
+##############################################################################
+#   Indis framework                                                          #
+#   Copyright (C) 2012 Vladimir "Farcaller" Pouzanov <farcaller@gmail.com>   #
+#                                                                            #
+#   This program is free software: you can redistribute it and/or modify     #
+#   it under the terms of the GNU General Public License as published by     #
+#   the Free Software Foundation, either version 3 of the License, or        #
+#   (at your option) any later version.                                      #
+#                                                                            #
+#   This program is distributed in the hope that it will be useful,          #
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+#   GNU General Public License for more details.                             #
+#                                                                            #
+#   You should have received a copy of the GNU General Public License        #
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+##############################################################################
+
+require 'indis-core/entity'
+
+module Indis
+  
+  class CStringEntity < Entity
+    attr_reader :value # @return [String] the value of entity
+    
+    # @param [Fixnum] ofs virtual address
+    # @param [Indus::VMMap] vmmap map of the target to load value from
+    def initialize(ofs, vmmap)
+      super ofs
+      
+      @value = ''
+      addr = ofs
+      begin
+        c = vmmap.byte_at(addr)
+        @value += c.chr
+        addr += 1
+      end while c != 0
+      
+      @size = @value.length
+    end
+    
+    def to_s
+      "DCB\t\"#{@value[0...-1]}\",0"
+    end
+    
+    def to_a
+      ['DCB', "\"#{@value[0...-1]}\",0"]
+    end
+    
+  end
+  
+end

data/lib/indis-core/data_entity.rb

@@ -59,6 +59,10 @@ module Indis
     def to_s
       "#{NAMED_TYPE[kind]}\t#{sprintf("%0#{@size*2}X", @value)}"
     end
+    
+    def to_a
+      [NAMED_TYPE[kind], sprintf("%0#{@size*2}X", @value)]
+    end
   end
   
 end

data/lib/indis-core/section.rb

@@ -34,7 +34,7 @@ module Indis
     end
     
     def to_vmrange
-      @vmaddr..(@vmaddr+@vmsize)
+      @vmaddr...(@vmaddr+@vmsize)
     end
     
     def bytes

data/lib/indis-core/segment.rb

@@ -63,7 +63,7 @@ module Indis
     #
     # @return [Range] the range of all addresses
     def to_vmrange
-      @vmaddr..(@vmaddr+@vmsize)
+      @vmaddr...(@vmaddr+@vmsize)
     end
     
     private

data/lib/indis-core/symbol.rb

@@ -19,18 +19,17 @@
 module Indis
   
   class Symbol
-    attr_reader :name, :section, :format_sym, :image, :vmaddr
+    attr_reader :name, :section, :image, :vmaddr, :type
     
-    def initialize(name, section, image, vmaddr, format_sym)
+    def initialize(name, section, image, vmaddr)
       @name = name
       @section = section
       @image = image
-      @format_sym = format_sym
       @vmaddr = vmaddr
     end
     
     def to_s
-      "#<Indis::Symbol #{@name} at #{@vmaddr.to_s 16}>"
+      "#<#{self.class} #{@name} at #{@vmaddr.to_s 16}>"
     end
   end
   

data/lib/indis-core/target.rb

@@ -18,6 +18,7 @@
 
 require 'stringio'
 require 'indis-core/binary_format'
+require 'indis-core/binary_architecture'
 require 'indis-core/vmmap'
 
 module Indis
@@ -29,6 +30,8 @@ module Indis
     
     attr_reader :format # @return [Indis::BinaryFormat::Format] binary format of the target
     
+    attr_reader :architecture # @return [Indis::BinaryArchitecture::Arcitecture] binary architecture of the target
+    
     attr_reader :vmmap  # @return [Indis::VMMap] virtual memory map
 
     attr_accessor :segments # @return [Array<Indis::Segment>] list of all processed {Indis::Segment segments}
@@ -61,6 +64,10 @@ module Indis
       @format = @format_class.new(self, @io)
       @format_class = nil
       
+      archClass = BinaryArchitecture.known_archs[@format.architecture]
+      raise RuntimeError, "Architecture not defined" unless archClass
+      @architecture = archClass.new(self)
+      
       @vmmap = VMMap.new(self)
 
       @format_load_complete = true
@@ -107,7 +114,9 @@ module Indis
     def resolve_symbol_at_address(vmaddr)
       s = @symbols.find { |sym| sym.vmaddr == vmaddr }
       return s if s
-      return @format.resolve_symbol_at_address(vmaddr) if @format.respond_to?(:resolve_symbol_at_address)
+      s = @format.resolve_symbol_at_address(vmaddr) if @format.respond_to?(:resolve_symbol_at_address)
+      @symbols << s if s
+      s
     end
     
     private

data/lib/indis-core/version.rb

@@ -17,5 +17,5 @@
 ##############################################################################
 
 module Indis
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/indis-core/vmmap.rb

@@ -115,25 +115,27 @@ module Indis
     def [](range)
       return entity_at(range) if range.is_a?(Fixnum)
       
-      raise ArgumentError unless range.is_a?(Range)
+      raise ArgumentError, "Unknown argument type #{range.class}" unless range.is_a?(Range)
       seg = segment_at(range.begin)
-      raise ArgumentError unless seg
-      raise ArgumentError unless seg == segment_at(range.max)
+      raise ArgumentError, "No segment mapped at #{range.begin}" unless seg
+      range_max = range.exclude_end? ? range.last-1 : range.last
+      raise ArgumentError, "Segment #{seg} at #{range.begin}, but segment #{segment_at(range_max)} at #{range.end}" unless seg == segment_at(range_max)
       
-      a = []
+      a = Array.new(range_max - range.begin + 1)
       ofs = range.begin
+      range_begin = range.begin
+      seg_vmaddr = seg.vmaddr
       
       begin
         b = @blocks[ofs]
         if b
-          a << b
-          (b.size-1).times { a << nil }
+          a[ofs-range_begin] = b
           ofs += b.size
         else
-          a << seg.bytes[ofs-seg.vmaddr].ord
+          a[ofs-range_begin] = seg.bytes[ofs-seg_vmaddr].ord
           ofs += 1
         end
-      end while ofs <= range.max
+      end while ofs <= range_max
       a
     end
   end

data/spec/indis-core/cstring_entity_spec.rb

@@ -0,0 +1,12 @@
+require 'indis-core/cstring_entity'
+
+describe Indis::CStringEntity do
+  it "should load its value from vmmap" do
+    str = "hello\0world".unpack('C*')
+    map = double('VMMap')
+    map.should_receive(:byte_at) { |i| str[i] }.exactly(6).times
+    e = Indis::CStringEntity.new(0, map)
+    e.to_s.should == "DCB\t\"hello\",0"
+    e.value.should == "hello\x0"
+  end
+end

data/spec/indis-core/section_spec.rb

@@ -3,7 +3,7 @@ require 'indis-core/section'
 describe Indis::Section do
   it "should provide a correct range for its vm region" do
     sect = Indis::Section.new(double('Segment'), '__text', 0x4096, 120, 0, :undef, [])
-    sect.to_vmrange.should == (0x4096..0x410e)
+    sect.to_vmrange.should == (0x4096...0x410e)
   end
   
   it "should provide bytes value from segment based on io offset" do

data/spec/indis-core/segment_spec.rb

@@ -3,7 +3,7 @@ require 'indis-core/segment'
 describe Indis::Segment do
   it "should provide a correct range for its vm region" do
     seg = Indis::Segment.new(double('Target'), '__TEXT', 0x4096, 120, 0, '')
-    seg.to_vmrange.should == (0x4096..0x410e)
+    seg.to_vmrange.should == (0x4096...0x410e)
   end
   
   it "should provide bytes value based on io offset" do

data/spec/indis-core/target_spec.rb

@@ -1,12 +1,24 @@
 require 'indis-core/target'
 
+def macho_format_cls_double
+  double('MachO Class', magic: 0xfeedface, name: 'Mach-O',
+    new: double('MachO', architecture: :test)
+  )
+end
+
+module Indis; module BinaryArchitecture;
+  class TestArch < Architecture
+    def self.name; :test; end
+  end
+end; end
+
 describe Indis::Target do
   it "should require an existing file to operate" do
     expect { Indis::Target.new("qwerty") }.to raise_error
   end
   
   it "should load file for known format" do
-    fmt = double('MachO Class', magic: 0xfeedface, name: 'Mach-O', new: double('MachO'))
+    fmt = macho_format_cls_double
     Indis::BinaryFormat.stub(:known_formats).and_return([fmt])
     t = Indis::Target.new("spec/fixtures/single-object.o")
     t.load
@@ -14,12 +26,21 @@ describe Indis::Target do
     t.format.should_not be_nil
   end
   
+  it "should have an architecture set up after loading" do
+    fmt = macho_format_cls_double
+    Indis::BinaryFormat.stub(:known_formats).and_return([fmt])
+    t = Indis::Target.new("spec/fixtures/single-object.o")
+    t.architecture.should be_nil
+    t.load
+    t.architecture.should_not be_nil
+  end
+  
   it "should raise if there is no known format to process binary" do
     expect { Indis::Target.new("spec/fixtures/single-object.o") }.to raise_error(RuntimeError)
   end
   
   it "should trigger load event" do
-    fmt = double('MachO Class', magic: 0xfeedface, name: 'Mach-O', new: double('MachO'))
+    fmt = macho_format_cls_double
     Indis::BinaryFormat.stub(:known_formats).and_return([fmt])
     t = Indis::Target.new("spec/fixtures/single-object.o")
     
@@ -32,7 +53,7 @@ describe Indis::Target do
   end
   
   it "should queue up events that happen before load" do
-    fmt = double('MachO Class', magic: 0xfeedface, name: 'Mach-O', new: double('MachO'))
+    fmt = macho_format_cls_double
     Indis::BinaryFormat.stub(:known_formats).and_return([fmt])
     t = Indis::Target.new("spec/fixtures/single-object.o")
     
@@ -48,7 +69,7 @@ describe Indis::Target do
   end
   
   it "should pass arguments to event subscriptions" do
-    fmt = double('MachO Class', magic: 0xfeedface, name: 'Mach-O', new: double('MachO'))
+    fmt = macho_format_cls_double
     Indis::BinaryFormat.stub(:known_formats).and_return([fmt])
     t = Indis::Target.new("spec/fixtures/single-object.o")
     t.load

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indis-core
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,8 +44,11 @@ files:
 - Rakefile
 - indis-core.gemspec
 - lib/indis-core.rb
+- lib/indis-core/binary_architecture.rb
 - lib/indis-core/binary_format.rb
+- lib/indis-core/binaryops_fixnum.rb
 - lib/indis-core/binaryops_string.rb
+- lib/indis-core/cstring_entity.rb
 - lib/indis-core/data_entity.rb
 - lib/indis-core/entity.rb
 - lib/indis-core/section.rb
@@ -57,6 +60,7 @@ files:
 - spec/fixtures/single-object.o
 - spec/indis-core/binary_format_spec.rb
 - spec/indis-core/binaryops_string_spec.rb
+- spec/indis-core/cstring_entity_spec.rb
 - spec/indis-core/data_entity_spec.rb
 - spec/indis-core/section_spec.rb
 - spec/indis-core/segment_spec.rb
@@ -93,6 +97,7 @@ test_files:
 - spec/fixtures/single-object.o
 - spec/indis-core/binary_format_spec.rb
 - spec/indis-core/binaryops_string_spec.rb
+- spec/indis-core/cstring_entity_spec.rb
 - spec/indis-core/data_entity_spec.rb
 - spec/indis-core/section_spec.rb
 - spec/indis-core/segment_spec.rb