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

@@ -12,14 +12,14 @@
 		attr_accessor :v
 		def initialize(v)
 			@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
 			:mem
 		end
@@ -28,18 +28,18 @@
 			@base = base
 			@offset = offset
 			@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
 	end