metasm 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a5dcb50d2a38105adee7c8249698e2f675af544
-  data.tar.gz: 0476236904d2bc2b8d45013446a58d053f0f24aa
+  metadata.gz: 474c2cb9b50af29f462619d47eb2c5ed062770ad
+  data.tar.gz: 9c82c356ea5d83f49c46a124289dd6d8c48a775e
 SHA512:
-  metadata.gz: ad41d74f97fab2567509acddb90ea7124c317519e84af509c6e68d07839ff1015a2c4512286e76eb16db22efa481aa60531beeb66e5ec9c0677727ba6cf81571
-  data.tar.gz: 333a45fd258674ead5f2b036e56e8e87ad06b4aa74b5f655495d05b902394527dad0abf78e614c7d6f715caa3d92c05b322166bfed74fb611ad3ddabbd4f7a1c
+  metadata.gz: 13d4f03ef8be7f1b793fb5e8fcc9e555894c6341042e996dd4bf11caaf1c9da4984a019d7244ea6df4137f7a790f5894b73a5e5d8b26915a6e027664debda1ce
+  data.tar.gz: ffc8f18dd425e81eff43f08a03d89590c4705fd27db3fd43f3b5ea956063436003aa423bf7ae92c400dbf068509173cf8ce3068f83a971bf2934a2c28a4a35ff

checksums.yaml.gz.sig

@@ -0,0 +1,3 @@
+��=���^
��	8�W�
+��*�O?2�!�O�)��}�e���-��ǹ��@s$�9�F`lo���ՙ�3�.O�o9S�����1b���~6����G���p(�
+V���F�4��G9a-H()s�ٌ�<�>SyHLSY�7�@�w�}38QP�Z��Bl�5��8�t�����0��Q�P�=�pfj\p���>芉�?�ḡ��POţ�ι7Ա���RQD(mi�1.K5»K��P��
y��i.h\:�a�>

data/Gemfile

@@ -1,2 +1,3 @@
-source 'https://rubygems.org'
-gemspec
+source 'https://rubygems.org' do
+  gemspec
+end

data/metasm.gemspec

@@ -4,7 +4,7 @@ require 'metasm'
 
 Gem::Specification.new do |s|
   s.name          = 'metasm'
-  s.version       = '1.0.3'
+  s.version       = '1.0.4'
   s.summary       =
     "Metasm is a cross-architecture assembler, disassembler, linker, and debugger."
   s.description   = ""
@@ -14,9 +14,10 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^tests/})
   s.require_paths = ["."]
   s.homepage      = 'http://metasm.cr0.org'
-  s.license       = 'LGPL'
+  s.license       = 'LGPL-2.1'
 
   s.add_development_dependency "bundler", "~> 1.7"
   s.add_development_dependency "rake"
+  s.add_development_dependency "test-unit"
 end
 

data/metasm.rb

@@ -36,8 +36,9 @@ module Metasm
 	Const_autorequire = {
 		'Ia32' => 'cpu/ia32', 'MIPS' => 'cpu/mips', 'PowerPC' => 'cpu/ppc', 'ARM' => 'cpu/arm',
 		'X86_64' => 'cpu/x86_64', 'Sh4' => 'cpu/sh4', 'Dalvik' => 'cpu/dalvik', 'ARC' => 'cpu/arc',
-		'Python' => 'cpu/python', 'Z80' => 'cpu/z80', 'CY16' => 'cpu/cy16', 'BPF' => 'cpu/bpf',
+		'Python' => 'cpu/python', 'Z80' => 'cpu/z80', 'CY16' => 'cpu/cy16', 'BPF' => 'cpu/bpf', 'EBPF' => 'cpu/ebpf',
 		'MSP430' => 'cpu/msp430', 'ARM64' => 'cpu/arm64', 'ST20' => 'cpu/st20', 'MCS51' => 'cpu/mcs51',
+		'OpenRisc' => 'cpu/openrisc', 'WebAsm' => 'cpu/webasm',
 		'C' => 'compile_c',
 		'MZ' => 'exe_format/mz', 'PE' => 'exe_format/pe',
 		'ELF' => 'exe_format/elf', 'COFF' => 'exe_format/coff',
@@ -49,6 +50,7 @@ module Metasm
 		'Bflt' => 'exe_format/bflt', 'Dol' => 'exe_format/dol',
 		'PYC' => 'exe_format/pyc', 'JavaClass' => 'exe_format/javaclass',
 		'SWF' => 'exe_format/swf', 'ZIP' => 'exe_format/zip',
+		'WasmFile' => 'exe_format/wasm',
 		'Shellcode_RWX' => 'exe_format/shellcode_rwx',
 		'Gui' => 'gui',
 		'WindowsExports' => 'os/windows_exports',
@@ -56,6 +58,7 @@ module Metasm
 		'Debugger' => 'debug',
 		'LinOS' => 'os/linux', 'WinOS' => 'os/windows',
 		'GdbClient' => 'os/gdbremote',
+		'EmuDebugger' => 'os/emulator',
 		'Disassembler' => 'disassemble',
 		'Decompiler' => 'decompile',
 		'DynLdr' => 'dynldr',

data/metasm/compile_c.rb

@@ -864,7 +864,7 @@ module C
 				blk.statements.each_with_index { |s, i|
 					case s
 					when Case
-						label = compiler.new_label('case')
+						label = compiler.new_label("case_#{s.expr}")
 						if s.expr == 'default'
 							default = label
 						elsif s.exprup
@@ -1063,7 +1063,7 @@ module C
 				@lexpr = nil
 				precompile_inner(compiler, scope)
 			when :'?:'
-				# cannot precompile in place, a conditionnal expression may have a coma: must turn into If
+				# cannot precompile in place, a conditional expression may have a coma: must turn into If
 				if @lexpr.kind_of? CExpression
 					@lexpr = @lexpr.precompile_inner(compiler, scope)
 					if not @lexpr.lexpr and not @lexpr.op and @lexpr.rexpr.kind_of? ::Numeric

data/metasm/cpu/arc/decode.rb

@@ -313,10 +313,6 @@ class ARC
 		REG_SYMS
 	end
 
-	def backtrace_binding
-		@backtrace_binding ||= init_backtrace_binding
-	end
-
 	def opshift(op)
 		op[/\d/].to_i
 	end
@@ -382,23 +378,6 @@ class ARC
 		@backtrace_binding
 	end
 
-	def get_backtrace_binding(di)
-		a = di.instruction.args.map { |arg|
-			case arg
-			when GPR; arg.symbolic
-			when Memref; arg.symbolic(di.address)
-			else arg
-			end
-		}
-
-		if binding = backtrace_binding[di.opcode.basename]
-			binding[di, *a]
-		else
-			puts "unhandled instruction to backtrace: #{di}" if $VERBOSE
-			{ :incomplete_binding => Expression[1] }
-		end
-	end
-
 	def get_xrefs_x(dasm, di)
 		return [] if not di.opcode.props[:setip]
 

data/metasm/cpu/arc/main.rb

@@ -40,7 +40,7 @@ class ARC < CPU
 	# Branch Link Register R31 (BLINK)
 	class GPR < Reg
 		Sym = (0..64).map { |i| "r#{i}".to_sym }
-		def symbolic; Sym[@i] end
+		def symbolic(di=nil); Sym[@i] end
 
 		Render = {
 			26 => 'gp', # global pointer, used to point to small sets of shared data throughout execution of a program
@@ -69,7 +69,7 @@ class ARC < CPU
 	end
 
 	class AUX < Reg
-		def symbolic; "aux#{i}".to_sym end
+		def symbolic(di=nil); "aux#{i}".to_sym end
 
 		Render = {
 			0x00  => 'status',                # Status register (Original ARCtangent-A4 processor format)
@@ -162,7 +162,7 @@ class ARC < CPU
 			@base, @disp, @size = base, disp, sz
 		end
 
-		def symbolic(orig)
+		def symbolic(di=nil)
 			b = @base
 			b = b.symbolic if b.kind_of? Reg
 
@@ -174,7 +174,7 @@ class ARC < CPU
 				e = Expression[b].reduce
 			end
 
-			Indirection[e, @size, orig]
+			Indirection[e, @size, (di.address if di)]
 		end
 
 		include Renderable

data/metasm/cpu/arm/decode.rb

@@ -125,10 +125,6 @@ class ARM
 		di
 	end
 
-	def backtrace_binding
-		@backtrace_binding ||= init_backtrace_binding
-	end
-
 	def init_backtrace_binding
 		@backtrace_binding ||= {}
 	end
@@ -137,7 +133,7 @@ class ARM
 		a = di.instruction.args.map { |arg|
 			case arg
 			when Reg; arg.symbolic
-			when Memref; arg.symbolic(di.address)
+			when Memref; arg.symbolic(di)
 			else arg
 			end
 		}

data/metasm/cpu/arm/main.rb

@@ -25,7 +25,7 @@ class ARM < CPU
 			@shift = shift
 		end
 
-		def symbolic
+		def symbolic(di=nil)
 			r = self.class.i_to_s[@i].to_sym
 			if @stype == :lsl and @shift == 0
 				r
@@ -41,11 +41,11 @@ class ARM < CPU
 			@base, @offset, @sign, @incr = base, offset, sign, incr
 		end
 
-		def symbolic(len=4, orig=nil)
+		def symbolic(di=nil)
 			o = @offset
 			o = o.symbolic if o.kind_of? Reg
 			p = Expression[@base.symbolic, @sign, o].reduce
-			Indirection[p, len, orig]
+			Indirection[p, 4, (di.address if di)]
 		end
 	end
 

data/metasm/cpu/arm64/decode.rb

@@ -165,10 +165,6 @@ class ARM64
 		di
 	end
 
-	def backtrace_binding
-		@backtrace_binding ||= init_backtrace_binding
-	end
-
 	def init_backtrace_binding
 		@backtrace_binding ||= {}
 
@@ -211,7 +207,7 @@ class ARM64
 		a = di.instruction.args.map { |arg|
 			case arg
 			when Reg, RegShift, RegCC; arg.symbolic
-			when Memref; arg.symbolic(di.address)
+			when Memref; arg.symbolic(di)
 			else arg
 			end
 		}
@@ -269,7 +265,7 @@ class ARM64
 				raise 'internal error: no jmp target' if di.opcode.name != 'ret'
 				tg = :x30
 			when Expression
-			else tg = tg.symbolic
+			else tg = tg.symbolic(di)
 			end
 			[tg]
 		else

data/metasm/cpu/arm64/main.rb

@@ -24,7 +24,7 @@ class ARM64 < CPU
 
 		Sym = @i_to_s[64].inject({}) { |h, (k, v)| h.update k => v.to_sym }
 
-		def symbolic
+		def symbolic(di=nil)
 			if @sz == 64
 				Sym[@i]
 			else
@@ -41,7 +41,7 @@ class ARM64 < CPU
 			@shift = shift
 		end
 
-		def symbolic
+		def symbolic(di=nil)
 			sym = @reg.symbolic
 			if shift != 0
 				case @mode
@@ -59,7 +59,7 @@ class ARM64 < CPU
 		def initialize(cc)
 			@cc = cc
 		end
-		def symbolic
+		def symbolic(di=nil)
 			0
 		end
 	end
@@ -70,7 +70,7 @@ class ARM64 < CPU
 			@base, @index, @scale, @offset, @sz, @incr = base, index, scale, offset, sz, incr
 		end
 
-		def symbolic(orig=nil)
+		def symbolic(di=nil)
 			o = Expression[@base.symbolic]
 			if @index
 				si = @index.symbolic
@@ -78,7 +78,7 @@ class ARM64 < CPU
 				o = Expression[o, :+, si]
 			end
 			o = Expression[o, :+, @offset] if @offset and @incr != :post
-			Indirection[o.reduce, @sz, orig]
+			Indirection[o.reduce, @sz, (di.address if di)]
 		end
 	end
 

data/metasm/cpu/bpf/decode.rb

@@ -33,9 +33,9 @@ class BPF
 			when :x;    Reg.new(:x)
 			when :a;    Reg.new(:a)
 			when :len;  Reg.new(:len)
-			when :p_k;  PktRef.new(nil, Expression[k], op.props[:msz])
-			when :p_xk; PktRef.new(Reg.new(:x), Expression[k], op.props[:msz])
-			when :m_k;  MemRef.new(nil, Expression[4*k], 4)
+			when :p_k;  Pktref.new(nil, Expression[k], op.props[:msz])
+			when :p_xk; Pktref.new(Reg.new(:x), Expression[k], op.props[:msz])
+			when :m_k;  Memref.new(nil, Expression[4*k], 4)
 			when :jt;   Expression[jt]
 			when :jf;   Expression[jf]
 			else raise "unhandled arg #{a}"
@@ -74,12 +74,6 @@ class BPF
 		di
 	end
 
-	# hash opcode_name => lambda { |dasm, di, *symbolic_args| instr_binding }
-	def backtrace_binding
-		@backtrace_binding ||= init_backtrace_binding
-	end
-	def backtrace_binding=(b) @backtrace_binding = b end
-
 	# populate the @backtrace_binding hash with default values
 	def init_backtrace_binding
 		@backtrace_binding ||= {}
@@ -103,22 +97,6 @@ class BPF
 		@backtrace_binding
 	end
 
-	def get_backtrace_binding(di)
-		a = di.instruction.args.map { |arg|
-			case arg
-			when PktRef, MemRef, Reg; arg.symbolic(di)
-			else arg
-			end
-		}
-
-		if binding = backtrace_binding[di.opcode.name]
-			binding[di, *a]
-		else
-			puts "unhandled instruction to backtrace: #{di}" if $VERBOSE
-			{:incomplete_binding => Expression[1]}
-		end
-	end
-
 	def get_xrefs_x(dasm, di)
 		return [] if not di.opcode.props[:setip]
 
@@ -128,15 +106,5 @@ class BPF
 			di.instruction.args[-1, 1]
 		end
 	end
-
-	# updates an instruction's argument replacing an expression with another (eg label renamed)
-	def replace_instr_arg_immediate(i, old, new)
-		i.args.map! { |a|
-			case a
-			when Expression; a == old ? new : Expression[a.bind(old => new).reduce]
-			else a
-			end
-		}
-	end
 end
 end

data/metasm/cpu/bpf/main.rb

@@ -14,10 +14,10 @@ class BPF < CPU
 			@v = v
 		end
 
-		def symbolic(orig=nil) ; @v ; end
+		def symbolic(di=nil) ; @v ; end
 	end
 
-	class MemRef
+	class Memref
 		attr_accessor :base, :offset, :msz
 
 		def memtype
@@ -30,15 +30,15 @@ class BPF < CPU
 			@msz = msz
 		end
 
-		def symbolic(orig)
+		def symbolic(di=nil)
 			p = Expression[memtype]
 			p = Expression[p, :+, @base.symbolic] if base
 			p = Expression[p, :+, @offset] if offset
-			Indirection[p, @msz, orig]
+			Indirection[p, @msz, (di.address if di)]
 		end
 	end
 
-	class PktRef < MemRef
+	class Pktref < Memref
 		def memtype
 			:pkt
 		end

data/metasm/cpu/bpf/render.rb

@@ -13,7 +13,7 @@ class BPF
 		include Renderable
 		def render ; [@v.to_s] end
 	end
-	class MemRef
+	class Memref
 		include Renderable
 		def render
 			r = []
@@ -26,16 +26,5 @@ class BPF
 			r << ']'
 		end
 	end
-
-	def render_instruction(i)
-		r = []
-		r << i.opname
-		if not i.args.empty?
-			r << ' '
-			i.args.each { |a_| r << a_ << ', ' }
-			r.pop
-		end
-		r
-	end
 end
 end

data/metasm/cpu/cy16/decode.rb

@@ -107,12 +107,6 @@ class CY16
 		di
 	end
 
-	# hash opcode_name => lambda { |dasm, di, *symbolic_args| instr_binding }
-	def backtrace_binding
-		@backtrace_binding ||= init_backtrace_binding
-	end
-	def backtrace_binding=(b) @backtrace_binding = b end
-
 	# populate the @backtrace_binding hash with default values
 	def init_backtrace_binding
 		@backtrace_binding ||= {}

data/metasm/cpu/cy16/main.rb

@@ -21,7 +21,7 @@ class CY16 < CPU
 			@i = i
 		end
 
-		def symbolic(orig=nil) ; to_s.to_sym ; end
+		def symbolic(di=nil) ; to_s.to_sym ; end
 
 		def self.from_str(s)
 			raise "Bad name #{s.inspect}" if not x = @s_to_i[s]
@@ -39,11 +39,11 @@ class CY16 < CPU
 			@autoincr = autoincr
 		end
 
-		def symbolic(orig)
+		def symbolic(di=nil)
 			p = nil
 			p = Expression[p, :+, @base.symbolic] if base
 			p = Expression[p, :+, @offset] if offset
-			Indirection[p.reduce, @sz, orig]
+			Indirection[p.reduce, @sz, (di.address if di)]
 		end
 	end
 

data/metasm/cpu/cy16/render.rb

@@ -26,16 +26,5 @@ class CY16
 			r << ']'
 		end
 	end
-
-	def render_instruction(i)
-		r = []
-		r << i.opname
-		if not i.args.empty?
-			r << ' '
-			i.args.each { |a_| r << a_ << ', ' }
-			r.pop
-		end
-		r
-	end
 end
 end