metasm/cpu/arm/main.rb in metasm-1.0.3 vs metasm/cpu/arm/main.rb in metasm-1.0.4

@@ -23,11 +23,11 @@
 			@i = i
 			@stype = stype
 			@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
 			else
 				r	# TODO shift/rotate/...
@@ -39,14 +39,14 @@
 		attr_accessor :base, :offset, :sign, :incr
 		def initialize(base, offset, sign=:+, incr=nil)
 			@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
 
 	class RegList
 		attr_accessor :list, :usermoderegs