opcodes.rb in metasm-1.0.4

- old
+ new

@@ -62,11 +62,11 @@
 
 	def init_dalvik
 		@valid_props[:canthrow] = true
 		[:i16, :i16_32hi, :i16_64hi, :i32, :iaa, :ib, :icc, :u16, :u32, :u64,
 		 :r16, :ra, :raa, :rb, :rbb, :rcc, :rlist16, :rlist4, :rlist5,
-		 :m16, :fld16, :typ16, :str16
+		 :m16, :fld16, :typ16, :str16, :str32
 		].each { |a| @valid_args[a] = true }
 		@opcode_list = []
 
 		OPCODES.each_with_index { |n, b|
 			op = Opcode.new(n, b)
@@ -230,10 +230,11 @@
 		when :fmt23x; op.args << :raa << :rbb << :rcc
 		when :fmt22b; op.args << :raa << :rbb << :icc
 		when :fmt22s, :fmt22t; op.args << :ra << :rb << :i16
 		when :fmt22c, :fmt22cs; op.args << :ra << :rb << :fld16
 		when :fmt30t; op.args << :i32
-		when :fmt31t, :fmt31c; op.args << :raa << :u32
+		when :fmt31c; op.args << :raa << :str32
+		when :fmt31t; op.args << :raa << :u32
 		when :fmt32x; op.args << :r16 << :r16
 		when :fmt31i; op.args << :raa << :i32
 		when :fmt35ca
 			op.args << :r16 << :rlist5
 		when :fmt35c, :fmt35ms