metasm 1.0.2 → 1.0.3

data/misc/objdiff.rb

@@ -22,7 +22,10 @@ def Object.diff(o1, o2)
 				h["[#{k.inspect}]"] = d if not d.empty?
 			}
 		else
-			a = (@@diff_accessor_cache ||= {})[o1.class] ||= (im = o1.class.public_instance_methods.grep(/^[a-z]/) ; (im & im.map { |m| m + '=' }).map { |m| m.chop }.find_all { |m| o1.instance_variable_get('@'+m) })
+			a = ($diff_accessor_cache ||= {})[o1.class] ||= (
+				im = o1.class.public_instance_methods.map { |m| m.to_s }.grep(/^[a-z]/)
+				(im & im.map { |m| m+'=' }).map { |m| m.chop }.find_all { |m| o1.instance_variable_get('@'+m) }
+			)
 			if a.empty?
 				return o1 == o2 ? h : [o1, o2]
 			end

data/misc/objscan.rb

@@ -26,7 +26,7 @@ class Object
 		end
 		scan_iter { |v, p|
 			case v
-			when Fixnum, Symbol; next
+			when Integer, Symbol; next
 			end
 			p = path+p
 			if done[v.object_id]

data/samples/dasm-plugins/bindiff.rb

@@ -8,7 +8,7 @@
 
 require File.join(Metasm::Metasmdir, 'samples', 'bindiff.rb')
 
-Gui::DasmWindow.new("bindiff target").promptopen("chose bindiff target") { |w|
+Gui::DasmWindow.new("bindiff target").promptopen("choose bindiff target") { |w|
 	w.title = "#{w.widget.dasm.program.filename} - metasm bindiff"
 	@bindiff_win = BinDiffWindow.new(self, w.widget.dasm)
 }

data/samples/dasm-plugins/scanxrefs.rb

@@ -7,11 +7,12 @@
 # metasm dasm plugin: scan for xrefs to the target address, incl. relative offsets (eg near call/jmp)
 def scanxrefs(target)
 	ans = []
+	msk = (1 << cpu.size) - 1
 	sections.sort.each { |s_addr, edata|
 		raw = edata.data.to_str
 		(0..raw.length-4).each { |off|
 			r = raw[off, 4].unpack('V').first
-			ans << (s_addr + off) if (r + off+4 + s_addr)&0xffffffff == target or r == target
+			ans << (s_addr + off) if (r + off+4 + s_addr) & msk == target or r == target
 		}
 	}
 	ans

data/samples/dynamic_ruby.rb

@@ -452,8 +452,8 @@ EOS
 	end
 
 	# compile a case/when
-	# create a real C switch() for Fixnums, and put the others === in the default case
-	# XXX will get the wrong order for "case x; when 1; when Fixnum; when 3;" ...
+	# create a real C switch() for Integers, and put the others === in the default case
+	# XXX will get the wrong order for "case x; when 1; when Integer; when 3;" ...
 	def compile_case(ast, scope, want_value)
 		# this generates
 		# var = stuff_to_test()
@@ -472,7 +472,7 @@ EOS
 		#   else {
 		#      default();
 		#   }
-		#      
+		#
 		if want_value == true
 			ret = get_new_tmp_var('case', want_value)
 			want_value = ret
@@ -498,7 +498,7 @@ EOS
 				raise Fail if cs[1][0] != :array
 
 				# numeric case, add a case to body_int
-				if cs[1][1..-1].all? { |cd| cd[0] == :lit and (cd[1].kind_of? Fixnum or cd[1].kind_of? Range) }
+				if cs[1][1..-1].all? { |cd| cd[0] == :lit and (cd[1].kind_of? Integer or cd[1].kind_of? Range) }
 					cs[1][1..-1].each { |cd|
 						if cd[1].kind_of? Range
 							b = cd[1].begin
@@ -520,7 +520,7 @@ EOS
 				else
 					cnd = nil
 					cs[1][1..-1].each { |cd|
-						if (cd[0] == :lit and (cd[1].kind_of?(Fixnum) or cd[1].kind_of?(Symbol))) or
+						if (cd[0] == :lit and (cd[1].kind_of?(Integer) or cd[1].kind_of?(Symbol))) or
 							[:nil, :true, :false].include?(cd[0])
 							# true C equality
 							cd = C::CExpression[var, :==, ast_to_c(cd, scope)]
@@ -541,7 +541,7 @@ EOS
 					cb = C::Block.new(scope)
 					v = ast_to_c(cs[2], cb, want_value)
 					cb.statements << C::CExpression[ret, :'=', v] if want_value and v != ret
-					
+
 					fu = C::If.new(cnd, cb, nil)
 
 					if body_other
@@ -659,7 +659,7 @@ EOS
 	end
 
 	# retrieve the current class, from self->klass
-	# XXX will segfault with self.kind_of? Fixnum/true/false/nil/sym
+	# XXX will segfault with self.kind_of? Integer/true/false/nil/sym
 	def rb_selfclass
 		rb_cast_pvalue(rb_self, 1)
 	end
@@ -810,7 +810,7 @@ EOS
 	# if want_value is a C::Variable, the statements should try to populate this var instead of some random tmp var
 	# eg to simplify :if encoding unless we have 'foo = if 42;..'
 	def ast_to_c(ast, scope, want_value = true)
-		ret = 
+		ret =
 		case ast.to_a[0]
 		when :block
 			if ast[1]
@@ -1085,13 +1085,13 @@ EOS
 			case ast[1][0]
 			when :ivar
 				fcall('rb_ivar_defined', rb_self, rb_intern(ast[1][1]))
-			else 
+			else
 				raise Fail, "unsupported #{ast.inspect}"
 			end
 		when :masgn
 			# parallel assignment: put everything in an Array, then pop everything back?
 			rb_masgn(ast, scope, want_value)
-			
+
 		when :evstr
 			fcall('rb_obj_as_string', ast_to_c(ast[1], scope))
 		when :dot2, :dot3
@@ -1138,7 +1138,7 @@ EOS
 		args = ast[3][1..-1] if ast[3] and ast[3][0] == :array
 		arg0 = args[0] if args and args[0]
 
-		if arg0 and arg0[0] == :lit and arg0[1].kind_of?(Fixnum) and %w[== > < >= <= + -].include?(op)
+		if arg0 and arg0[0] == :lit and arg0[1].kind_of?(Integer) and %w[== > < >= <= + -].include?(op)
 			# TODO or @optim_hint[ast[1]] == 'fixnum'
 			# optimize 'x==42', 'x+42', 'x-42'
 			o2 = arg0[1]
@@ -1146,7 +1146,7 @@ EOS
 				# need o2 >= 0 for overflow detection
 				op = {'+' => '-', '-' => '+'}[op]
 				o2 = -o2
-				return if not o2.kind_of? Fixnum	# -0x40000000
+				return if not o2.kind_of? Integer	# -0x40000000
 			end
 
 			int_v = o2.object_id
@@ -1159,11 +1159,11 @@ EOS
 
 			case op
 			when '=='
-				# XXX assume == only return true for full equality: if not Fixnum, then always false
+				# XXX assume == only return true for full equality: if not Integer, then always false
 				# which breaks 1.0 == 1 and maybe others, but its ok
 				scope.statements << C::If.new(ce[recv, :'==', [int_v]], ce[tmp, :'=', rb_true], ce[tmp, :'=', rb_false])
 			when '>', '<', '>=', '<='
-				# do the actual comparison on signed >>1 if both Fixnum
+				# do the actual comparison on signed >>1 if both Integer
 				t = C::If.new(
 					ce[[[[recv], int], :>>, [1]], op.to_sym, [[[int_v], int], :>>, [1]]],
 					ce[tmp, :'=', rb_true],
@@ -1194,7 +1194,7 @@ EOS
 				end
 			end
 			tmp
-		
+
 		# Symbol#==
 		elsif arg0 and arg0[0] == :lit and arg0[1].kind_of? Symbol and op == '=='
 			s_v = ast_to_c(arg0, scope)
@@ -1244,13 +1244,13 @@ EOS
 
 			ar = C::Block.new(scope)
 			ar.statements << ce[idx, :'=', [[[arg], int], :>>, [1]]]
-			ar.statements << C::If.new(ce[idx, :<, [0]], ce[idx, :'=', [idx, :+, rb_ary_len(recv)]], nil) 
+			ar.statements << C::If.new(ce[idx, :<, [0]], ce[idx, :'=', [idx, :+, rb_ary_len(recv)]], nil)
 			ar.statements << C::If.new(ce[[idx, :<, [0]], :'||', [idx, :>=, [[rb_ary_len(recv)], int]]],
 					ce[tmp, :'=', rb_nil],
 					ce[tmp, :'=', rb_ary_ptr(recv, idx)])
 			st = C::Block.new(scope)
 			st.statements << ce[idx, :'=', [[[arg], int], :>>, [1]]]
-			st.statements << C::If.new(ce[idx, :<, [0]], ce[idx, :'=', [idx, :+, rb_str_len(recv)]], nil) 
+			st.statements << C::If.new(ce[idx, :<, [0]], ce[idx, :'=', [idx, :+, rb_str_len(recv)]], nil)
 			st.statements << C::If.new(ce[[idx, :<, [0]], :'||', [idx, :>=, [[rb_str_len(recv)], int]]],
 					ce[tmp, :'=', rb_nil],
 					ce[tmp, :'=', [[[[rb_str_ptr(recv, idx), :&, [0xff]], :<<, [1]], :|, [1]], value]])
@@ -1304,8 +1304,7 @@ EOS
 			when 'Symbol'
 				tmp = get_new_tmp_var('kindof', want_value)
 				ce[[ast_to_c(ast[1], scope, tmp), :'&', [0xf]], :'==', [0xe]]
-			#when 'Numeric', 'Integer'
-			when 'Fixnum'
+			when 'Integer'
 				tmp = get_new_tmp_var('kindof', want_value)
 				ce[ast_to_c(ast[1], scope, tmp), :'&', [0x1]]
 			when 'Array'
@@ -1503,7 +1502,7 @@ puts "shortcut may be incorrect for #{ast.inspect}" if arg0[0] == :const
 		elsif b_recv[0] == :call and not b_recv[3] and b_recv[2] == 'times'
 			limit = get_new_tmp_var('limit')
 			recv = ast_to_c(b_recv[1], scope, limit)
-			scope.statements << C::If.new(C::CExpression[:'!', [recv, :&, 1]], rb_raise('only Fixnum#times handled'), nil)
+			scope.statements << C::If.new(C::CExpression[:'!', [recv, :&, 1]], rb_raise('only Integer#times handled'), nil)
 			if want_value
 				scope.statements << C::CExpression[@iter_break, :'=', recv]
 			end
@@ -1553,7 +1552,7 @@ puts "shortcut may be incorrect for #{ast.inspect}" if arg0[0] == :const
 				body.statements << C::CExpression[dvar(b_args[1]), :'=', [rb_ary_ptr(ary), :'[]', [cntr]]]
 			end
 			# same as #each up to this point (except default retval), now add a 'if (body_value) break ary[cntr];'
-			# XXX 'find { next true }' 
+			# XXX 'find { next true }'
 
 			found = ast_to_c(b_body, body)
 			t = C::Block.new(body)
@@ -1580,7 +1579,7 @@ puts "shortcut may be incorrect for #{ast.inspect}" if arg0[0] == :const
 				body.statements << C::CExpression[dvar(b_args[1]), :'=', [rb_ary_ptr(ary), :'[]', [cntr]]]
 			end
 			# same as #each up to this point (except default retval), now add a '@iter_break << body_value'
-			# XXX 'next' unhandled 
+			# XXX 'next' unhandled
 
 			val = ast_to_c(b_body, body)
 			body.statements << fcall('rb_ary_push', @iter_break, val)
@@ -1642,7 +1641,7 @@ static void do_init_once(void) {
 	// rb_define_method(const_Lol, "method", method, 2);
 }
 
-int Init_compiledruby(void) __attribute__((export)) { 
+int Init_compiledruby(void) __attribute__((export)) {
 	// use a separate func to avoid having to append statements before the 'return'
 	do_init_once();
 	return 0;
@@ -1664,7 +1663,7 @@ EOS
 		@compiled_func_cache[[klass, method.to_s, singleton]] = @cur_cfunc
 
 		cls = rb_const(nil, klass)
-		
+
 		init.statements << fcall("rb_define#{'_singleton' if singleton}_method", cls, method.to_s, @cur_cfunc, method_arity)
 
 		mname
@@ -1699,7 +1698,7 @@ EOS
 		@cp.toplevel.symbol[n] || declare_newtopvar(n, fcall('rb_intern', sym.to_s), C::BaseType.new(:int, :unsigned))
 	end
 
-	# rb_const 'FOO', Bar::Baz  ==> 
+	# rb_const 'FOO', Bar::Baz  ==>
 	#  const_Bar = rb_const_get(rb_cObject, rb_intern("Bar"));
 	#  const_Bar_Baz = rb_const_get(const_Bar, rb_intern("Baz"));
 	#  const_Bar_Baz_FOO = rb_const_get(const_Bar_Baz, rb_intern("FOO"));

data/samples/elfencode.rb

@@ -14,12 +14,27 @@ __END__
 // .nointerp    // to disable the dynamic section, eg for stuff with int80 only
 .text
 .entrypoint
+#if defined __i386__
 push bla
 push fmt
 call printf
+
 push 0
 call exit
 
+#elif defined __amd64__
+lea rsi, [rip+bla-$_]
+lea rdi, [rip+fmt-$_]
+xor rax, rax
+call printf
+
+mov rdi, 0
+call exit
+
+#else
+unsupported architecture!
+#endif
+
 .data
 bla db "world", 0
 fmt db "Hello, %s !\n", 0

data/samples/exeencode.rb

@@ -94,7 +94,7 @@ if $opts[:to_string]
 	end
 
 	if of = $opts[:outfilename]
-		abort "Error: target file #{of.inspect} exists !" if File.exists?(of) and $opts[:nooverwrite_outfile]
+		abort "Error: target file #{of.inspect} exists !" if File.exist?(of) and $opts[:nooverwrite_outfile]
 		File.open(of, 'w') { |fd| fd.puts str }
 		puts "saved to file #{of.inspect}"
 	else
@@ -102,7 +102,7 @@ if $opts[:to_string]
 	end
 else
 	of = $opts[:outfilename] ||= 'a.out'
-	abort "Error: target file #{of.inspect} exists !" if File.exists?(of) and $opts[:nooverwrite_outfile]
+	abort "Error: target file #{of.inspect} exists !" if File.exist?(of) and $opts[:nooverwrite_outfile]
 	Metasm::DynLdr.compile_binary_module_hack(exe) if $opts[:dldrhack]
 	exe.encode_file(of, $opts[:exetype])
 	puts "saved to file #{of.inspect}"

data/samples/metasm-shell.rb

@@ -18,73 +18,85 @@
 # > exit
 
 require 'metasm'
+require 'readline'
 
 class String
-	@@cpu = Metasm::Ia32.new
-	class << self
-		def cpu()   @@cpu   end
-		def cpu=(c)
-			c = Metasm.const_get(c).new if c.kind_of? String
-			@@cpu=c
-		end
-	end
+  @@cpu = Metasm::Ia32.new
+  class << self
+    def cpu()   @@cpu   end
+    def cpu=(c)
+      c = Metasm.const_get(c).new if c.kind_of? String
+      @@cpu=c
+    end
+  end
 
-	# encodes the current string as a Shellcode, returns the resulting EncodedData
-	def encode_edata
-		Metasm::Shellcode.assemble(@@cpu, self).encode.encoded
-	end
+  # encodes the current string as a Shellcode, returns the resulting EncodedData
+  def encode_edata
+    Metasm::Shellcode.assemble(@@cpu, self).encode.encoded
+  end
 
-	# encodes the current string as a Shellcode, returns the resulting binary String
-	# outputs warnings on unresolved relocations
-	def encode
-		ed = encode_edata
-		if not ed.reloc.empty?
-			puts 'W: encoded string has unresolved relocations: ' + ed.reloc.map { |o, r| r.target.inspect }.join(', ')
-		end
-		ed.fill
-		ed.data
-	end
+  # encodes the current string as a Shellcode, returns the resulting binary String
+  # outputs warnings on unresolved relocations
+  def encode
+    ed = encode_edata
+    if not ed.reloc.empty?
+      puts 'W: encoded string has unresolved relocations: ' + ed.reloc.map { |o, r| r.target.inspect }.join(', ')
+    end
+    ed.fill
+    ed.data
+  end
 
-	# decodes the current string as a Shellcode, with specified base address
-	# returns the resulting Disassembler
-	def decode_blocks(base_addr=0, eip=base_addr)
-		sc = Metasm::Shellcode.decode(self, @@cpu)
-		sc.base_addr = base_addr
-		sc.disassemble(eip)
-	end
+  # decodes the current string as a Shellcode, with specified base address
+  # returns the resulting Disassembler
+  def decode_blocks(base_addr=0, eip=base_addr)
+    sc = Metasm::Shellcode.decode(self, @@cpu)
+    sc.base_addr = base_addr
+    sc.disassemble(eip)
+  end
 
-	# decodes the current string as a Shellcode, with specified base address
-	# returns the asm source equivallent
-	def decode(base_addr=0, eip=base_addr)
-		decode_blocks(base_addr, eip).to_s
-	end
+  # decodes the current string as a Shellcode, with specified base address
+  # returns the asm source equivallent
+  def decode(base_addr=0, eip=base_addr)
+    decode_blocks(base_addr, eip).to_s
+  end
 end
 
 # get in interactive assembler mode
 def asm
-	puts 'type "exit" or "quit" to quit', 'use ";" for newline', ''
-	while (print "asm> " ; $stdout.flush ; l = gets)
-		break if %w[quit exit].include? l.chomp
-		if l.chomp == 'help'
-			puts "Metasm assembly shell: type in opcodes to see their binary form",
-				"You can use ';' to type multi-line stuff",
-				"e.g. 'nop nop' will display \"\\x90\\x90\""
-			next
-		end
-	
-		begin
-			data = l.gsub(';', "\n")
-			next if data.strip.empty?
-			data = data.encode
-			puts '"' + data.unpack('C*').map { |c| '\\x%02x' % c }.join + '"'
-		rescue Metasm::Exception => e
-			puts "Error: #{e.class} #{e.message}"
-		end
-	end
+  puts "[+] Metasm assembly shell"
+  puts "type help for usage..\n\n"
 
-	puts
+  Readline.completion_proc = lambda { |line| %w[help exit quit].find_all { |w| line.downcase == w[0, line.length] } }
+  Readline.completion_append_character = ' '
+
+  while line = Readline.readline('asm> ', true)
+    case line
+    when /^help(\W|$)/
+      puts "",
+           "Type in opcodes to see their binary form",
+           "You can use ';' to type multi-line stuff",
+           "e.g. 'nop nop' will display \"\\x90\\x90\"",
+           "",
+           "exit/quit    Quit the console",
+           "help         Show this screen",
+           ""
+    when /^(quit|exit)(\W|$)/
+      break
+    else
+      begin
+        data = line.gsub(';', "\n")
+        next if data.strip.empty?
+        e_data = data.encode
+        puts '"' + e_data.unpack('C*').map { |c| '\\x%02x' % c }.join + '"'
+      rescue Metasm::Exception => e
+        puts "Error: #{e.class} #{e.message}"
+      end
+    end
+  end
+
+  puts
 end
 
 if __FILE__ == $0
-	asm
+  asm
 end

data/tests/mcs51.rb

@@ -0,0 +1,27 @@
+#    This file is part of Metasm, the Ruby assembly manipulation suite
+#    Copyright (C) 2015 Google
+#
+#    Licence is LGPL, see LICENCE in the top-level directory
+
+require 'test/unit'
+require 'metasm'
+
+
+class TestMCS51 < Test::Unit::TestCase
+	def test_mcs51_dec
+		hex_stream =  "\x09\x00\x1F" # inc; nop; dec
+		hex_stream += "\x58\xF9\xEC\x32\x36\xc4\xa5\x24\x02\x45\x03"
+		hex_stream += "\x84\xa4\xc5\xa5\x70\xfe"
+		hex_stream += "\xba\x04\x08"
+		hex_stream += "\xc0\x04"
+		hex_stream += "\x11\x23"
+		hex_stream += "\xa1\x88"
+		hex_stream += "\x62\x88"
+		hex_stream += "\x53\x79\x66"
+		hex_stream += "\x02\x12\x34"
+
+		dasm = Metasm::Shellcode.disassemble(Metasm::MCS51.new, hex_stream)
+		#puts dasm
+		assert_equal(23, dasm.decoded.length)
+	end
+end