disasm 0.0.1 → 0.0.3

data/ext/disasm_ext/disasm_ext.c

@@ -8,7 +8,13 @@ static VALUE t_init(VALUE self)
     return INT2FIX(x86_init(opt_none, NULL, NULL));
 }
 
-static VALUE t_disassemble2yield(VALUE self, VALUE _data, VALUE _rva, VALUE _offset, VALUE _syntax)
+static VALUE t_disassemble2yield( 
+        VALUE self, 
+        VALUE _data, 
+        VALUE _rva, 
+        VALUE _offset, 
+        VALUE _syntax,
+        VALUE _allow_invalid)
 {
     x86_insn_t insn;
     int size, line_len;
@@ -22,6 +28,7 @@ static VALUE t_disassemble2yield(VALUE self, VALUE _data, VALUE _rva, VALUE _off
     unsigned int offset  = FIX2INT(_offset);
     int syntax           = FIX2INT(_syntax);
     int n_ok             = 0; // number of successfully disassembled instructions
+    int allow_invalid    = (_allow_invalid == Qtrue);
 
     if(!buf || !bufsize) return INT2FIX(0);
 
@@ -46,10 +53,15 @@ static VALUE t_disassemble2yield(VALUE self, VALUE _data, VALUE _rva, VALUE _off
             rb_yield_values(2, rb_str_new(line, line_len), INT2FIX(offset+rva));
             offset += size;
             n_ok++;
+        } else if( allow_invalid ) {
+            // invalid instruction : allowed
+            line_len = x86_format_insn(&insn, line, LINE_SIZE, syntax);
+            rb_yield_values(2, rb_str_new(line, line_len), INT2FIX(offset+rva));
+            offset += 1;
         } else {
-            // invalid instruction
+            // invalid instruction : raise exception
             char err_buf[1024];
-            sprintf(err_buf, "raise InvalidInstruction.new(0x%x, 0x%x)", offset, offset+rva);
+            sprintf(err_buf, "raise InvalidOpcode.new(0x%x, 0x%x)", offset, offset+rva);
             rb_eval_string(err_buf);
             //rb_raise(ex,"invalid instruction at offset 0x%x (VA 0x%x)", offset, offset+rva);
             break;
@@ -65,5 +77,5 @@ void Init_disasm_ext() {
     x86_init(opt_none, NULL, NULL);
     mDisasm = rb_define_module("Disasm");
     rb_define_singleton_method(mDisasm, "init", t_init, 0);
-    rb_define_singleton_method(mDisasm, "disassemble2yield", t_disassemble2yield, 4);
+    rb_define_singleton_method(mDisasm, "disassemble2yield", t_disassemble2yield, 5);
 }

data/ext/disasm_ext/extconf.rb

@@ -1,3 +1,11 @@
 require 'mkmf'
-have_library 'disasm'
+
+unless have_library('disasm')
+  abort "libdisasm is missing, please install from http://bastard.sourceforge.net/libdisasm.html"
+end
+
+unless have_header('libdis.h')
+  abort "libdis.h is missing, please install libdisasm from http://bastard.sourceforge.net/libdisasm.html"
+end
+
 create_makefile 'disasm_ext'

data/lib/disasm.rb

@@ -3,7 +3,7 @@ require 'disasm_ext'
 module Disasm
 
   class Exception < ::Exception; end
-  class InvalidInstruction < Exception
+  class InvalidOpcode < Exception
     attr_accessor :offset, :va
 
     def initialize offset, va
@@ -31,13 +31,15 @@ module Disasm
         else 1          # default to native syntax
         end
 
+      allow_invalid = params[:allow_invalid] ? true : false
+
       if block_given?
-        disassemble2yield(data, rva, offset, syntax) do |x,va|
+        disassemble2yield(data, rva, offset, syntax, allow_invalid) do |x,va|
           yield x,va
         end
       else
         r = []
-        disassemble2yield(data, rva, offset, syntax) do |x|
+        disassemble2yield(data, rva, offset, syntax, allow_invalid) do |x|
           r << x
         end
         r

data/lib/disasm/version.rb

@@ -1,3 +1,3 @@
 module Disasm
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disasm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies: []
 description: x86 disassembler
 email: