furnace-avm2 0.9.0 → 0.9.1

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_strictequals.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3StrictEquals < ArithmeticOpcode
+  class AS3StrictEquals < Opcode
     instruction 0xac
     ast_type :===
 

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_subtract.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Subtract < ArithmeticOpcode
+  class AS3Subtract < Opcode
     instruction 0xa1
 
     consume 2

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_subtract_i.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3SubtractI < ArithmeticOpcode
+  class AS3SubtractI < Opcode
     instruction 0xc6
 
     consume 2

data/lib/furnace-avm2/abc/opcodes/bitwise/as3_bitand.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3BitAnd < BitwiseOpcode
+  class AS3BitAnd < Opcode
     instruction 0xa8
 
     consume 2

data/lib/furnace-avm2/abc/opcodes/bitwise/as3_bitnot.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3BitNot < BitwiseOpcode
+  class AS3BitNot < Opcode
     instruction 0x97
 
     consume 1

data/lib/furnace-avm2/abc/opcodes/bitwise/as3_bitor.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3BitOr < BitwiseOpcode
+  class AS3BitOr < Opcode
     instruction 0xa9
 
     consume 2

data/lib/furnace-avm2/abc/opcodes/bitwise/as3_bitxor.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3BitXor < BitwiseOpcode
+  class AS3BitXor < Opcode
     instruction 0xaa
 
     consume 2

data/lib/furnace-avm2/abc/opcodes/bitwise/as3_lshift.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Lshift < BitwiseOpcode
+  class AS3Lshift < Opcode
     instruction 0xa5
 
     consume 2

data/lib/furnace-avm2/abc/opcodes/bitwise/as3_rshift.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Rshift < BitwiseOpcode
+  class AS3Rshift < Opcode
     instruction 0xa6
 
     consume 2

data/lib/furnace-avm2/abc/opcodes/bitwise/as3_urshift.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Urshift < BitwiseOpcode
+  class AS3Urshift < Opcode
     instruction 0xa7
 
     consume 2

data/lib/furnace-avm2/abc/opcodes/control_transfer/as3_lookupswitch.rb

@@ -14,7 +14,7 @@ module Furnace::AVM2::ABC
     attr_accessor :default_target, :case_targets
 
     def parameters
-      [ body.default_offset ].concat(body.case_offsets)
+      [ @default_target.offset, @case_targets.map(&:offset) ]
     end
 
     def resolve!

data/lib/furnace-avm2/abc/opcodes/control_transfer_opcode.rb

@@ -16,10 +16,6 @@ module Furnace::AVM2::ABC
       body.jump_offset = new_offset - offset - byte_length
     end
 
-    def target_offsets
-      [ target_offset ]
-    end
-
     def resolve!
       @target = @sequence.opcode_at(target_offset)
 

data/lib/furnace-avm2/abc/opcodes/exception/as3_newcatch.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3NewCatch < ExceptionOpcode
+  class AS3NewCatch < Opcode
     instruction 0x5a
 
     body do

data/lib/furnace-avm2/abc/opcodes/function_invocation/as3_callproplex.rb

@@ -17,5 +17,9 @@ module Furnace::AVM2::ABC
     def disassemble_parameters
       "#{body.property.to_s}(#{body.arg_count})"
     end
+
+    def collect_ns(options)
+      body.property.collect_ns(options)
+    end
   end
 end

data/lib/furnace-avm2/abc/opcodes/function_invocation_opcode.rb

@@ -13,5 +13,9 @@ module Furnace::AVM2::ABC
     def disassemble_parameters
       "#{body.property} #{body.arg_count}"
     end
+
+    def collect_ns(options)
+      body.property.collect_ns(options)
+    end
   end
 end

data/lib/furnace-avm2/abc/opcodes/function_return/as3_returnvalue.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3ReturnValue < FunctionReturnOpcode
+  class AS3ReturnValue < Opcode
     instruction 0x48
 
     consume 1

data/lib/furnace-avm2/abc/opcodes/function_return/as3_returnvoid.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3ReturnVoid < FunctionReturnOpcode
+  class AS3ReturnVoid < Opcode
     instruction 0x47
 
     consume 0

data/lib/furnace-avm2/abc/opcodes/generic/as3_escxattr.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3EscXAttr < Opcode
+  class AS3EscXattr < Opcode
     instruction 0x72
 
     consume 1

data/lib/furnace-avm2/abc/opcodes/generic/as3_escxelem.rb

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3EscXelem < Opcode
+    instruction 0x71
+
+    consume 1
+    produce 1
+  end
+end

data/lib/furnace-avm2/abc/opcodes/generic/as3_getlex.rb

@@ -12,5 +12,9 @@ module Furnace::AVM2::ABC
     def parameters
       [ body.property.to_astlet ]
     end
+
+    def collect_ns(options)
+      body.property.collect_ns(options)
+    end
   end
 end

data/lib/furnace-avm2/abc/opcodes/object_manipulation/as3_newfunction.rb

@@ -3,10 +3,14 @@ module Furnace::AVM2::ABC
     instruction 0x40
 
     body do
-      vuint30 :method_index
+      vuint30 :method_idx
     end
 
     consume 0
     produce 1
+
+    def parameters
+      [ body.method_idx ]
+    end
   end
 end

data/lib/furnace-avm2/abc/opcodes/property/as3_constructprop.rb

@@ -16,5 +16,9 @@ module Furnace::AVM2::ABC
     def disassemble_parameters
       "#{body.property} #{body.arg_count}"
     end
+
+    def collect_ns(options)
+      body.property.collect_ns(options)
+    end
   end
 end

data/lib/furnace-avm2/abc/opcodes/property_opcode.rb

@@ -9,5 +9,9 @@ module Furnace::AVM2::ABC
     def disassemble_parameters
       body.property.to_s
     end
+
+    def collect_ns(options)
+      body.property.collect_ns(options)
+    end
   end
 end

data/lib/furnace-avm2/abc/opcodes/push_literal/as3_pushuint.rb

@@ -0,0 +1,11 @@
+module Furnace::AVM2::ABC
+  class AS3PushUint < PushLiteralOpcode
+    instruction 0x2e
+
+    body do
+      const_ref :value, :uint
+    end
+
+    type :integer
+  end
+end

data/lib/furnace-avm2/abc/opcodes/type_conversion/as3_applytype.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3ApplyType < TypeConversionOpcode
+  class AS3ApplyType < Opcode
     instruction 0x53
 
     body do

data/lib/furnace-avm2/abc/opcodes/type_conversion/as3_coerce.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Coerce < TypeConversionOpcode
+  class AS3Coerce < Opcode
     instruction 0x80
 
     body do
@@ -12,5 +12,9 @@ module Furnace::AVM2::ABC
     def parameters
       [ body.type.to_astlet ]
     end
+
+    def collect_ns(options)
+      body.type.collect_ns(options)
+    end
   end
 end

data/lib/furnace-avm2/abc/opcodes/type_conversion/as3_coerce_a.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3CoerceA < TypeConversionOpcode
+  class AS3CoerceA < Opcode
     instruction 0x82
 
     consume 1

data/lib/furnace-avm2/abc/opcodes/type_conversion/as3_coerce_b.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3CoerceB < TypeConversionOpcode
+  class AS3CoerceB < Opcode
     instruction 0x76
 
     consume 1

data/lib/furnace-avm2/abc/opcodes/type_conversion/as3_coerce_s.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3CoerceS < TypeConversionOpcode
+  class AS3CoerceS < Opcode
     instruction 0x85
 
     consume 1

data/lib/furnace-avm2/abc/opcodes/type_conversion/as3_convert_d.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3ConvertD < TypeConversionOpcode
+  class AS3ConvertD < Opcode
     instruction 0x75
 
     consume 1

data/lib/furnace-avm2/abc/opcodes/type_conversion/as3_convert_i.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3ConvertI < TypeConversionOpcode
+  class AS3ConvertI < Opcode
     instruction 0x73
 
     consume 1

data/lib/furnace-avm2/abc/opcodes/type_conversion/as3_convert_o.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3ConvertO < TypeConversionOpcode
+  class AS3ConvertO < Opcode
     instruction 0x77
 
     consume 1

data/lib/furnace-avm2/abc/opcodes/type_conversion/as3_convert_s.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3ConvertS < TypeConversionOpcode
+  class AS3ConvertS < Opcode
     instruction 0x70
 
     consume 1

data/lib/furnace-avm2/abc/opcodes/type_conversion/as3_convert_u.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3ConvertU < TypeConversionOpcode
+  class AS3ConvertU < Opcode
     instruction 0x74
 
     consume 1

data/lib/furnace-avm2/abc/primitives/opcode_sequence.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 module Furnace::AVM2::ABC
   class OpcodeSequence < ::Array
     attr_reader :root, :parent
@@ -91,44 +93,47 @@ module Furnace::AVM2::ABC
         end
       end
 
-      if exceptions.any?
-        exception_node = CFG::Node.new(graph, :exception, [])
-        graph.nodes.add exception_node
+      pending_label = nil
+      pending_queue = []
+
+      cutoff = lambda do |targets|
+        node = CFG::Node.new(graph, pending_label, pending_queue, nil, targets)
 
-        exceptions.each do |exception|
-          targets << exception.target_offset
+        if graph.nodes.empty?
+          graph.entry = node
         end
+
+        graph.nodes.add node
+
+        pending_label = nil
+        pending_queue = []
       end
 
       each do |opcode|
         if targets.include? opcode
-          graph.transfer({ nil => opcode.offset })
+          cutoff.([ opcode.offset ])
         end
 
-        graph.expand opcode.offset, opcode
+        pending_label = opcode.offset if pending_label.nil?
+        pending_queue << opcode
 
         if opcode.is_a? ControlTransferOpcode
           if opcode.conditional
-            graph.transfer({ true  => opcode.target.offset,
-                             false => opcode.offset + opcode.byte_length })
+            cutoff.([ opcode.target.offset, opcode.offset + opcode.byte_length ])
           else
-            graph.transfer({ nil => opcode.target.offset })
+            cutoff.([ opcode.target.offset ])
           end
         elsif opcode.is_a? AS3LookupSwitch
-          map = { nil => opcode.default_target.offset }
-
-          opcode.case_targets.each_with_index do |target, index|
-            map[index] = target.offset
-          end
-
-          graph.transfer map
+          cutoff.(opcode.parameters.flatten)
         end
       end
 
-      graph.transfer({ })
+      cutoff.([])
 
-      exceptions.each do |exception|
-        graph.edges.add CFG::Edge.new(graph, nil, :exception, exception.target_offset)
+      if exceptions.any?
+        exception_node = CFG::Node.new(graph, :exception, [], nil,
+            exceptions.map(&:target_offset))
+        graph.nodes.add exception_node
       end
 
       graph
@@ -138,9 +143,16 @@ module Furnace::AVM2::ABC
       cfg = build_cfg
       dead_opcodes = []
 
-      cfg.nodes.each do |node|
-        if node.label != 0 && node.entering_edges.count == 0
-          dead_opcodes.concat node.operations
+      worklist = cfg.nodes.dup
+      while worklist.any?
+        node = worklist.first
+        worklist.delete node
+
+        next if node == cfg.entry
+
+        if node.sources.count == 0 ||
+              node.sources == [node]
+          dead_opcodes.concat node.insns
         end
       end
 

data/lib/furnace-avm2/abc/primitives/record.rb

@@ -29,6 +29,17 @@ module Furnace::AVM2::ABC
             root.constant_pool.send(array)[index - 1]
           end
         end
+
+        define_method(:"#{name}=") do |value|
+          pool = root.constant_pool.send(array)
+          if value.nil?
+            send(:"#{field}=", 0)
+          elsif index = pool.index(value)
+            send(:"#{field}=", index + 1)
+          else
+            raise "cpool setter: no such object in cpool"
+          end
+        end
       end
     end
 

data/lib/furnace-avm2/binary/record.rb

@@ -161,7 +161,7 @@ module Furnace::AVM2::Binary
     end
 
     def inspect
-      to_hash.inspect
+      "AVM2Record(#{self.class.name.split("::").last})"
     end
 
     def byte_length
@@ -260,7 +260,7 @@ module Furnace::AVM2::Binary
     end
 
     def length_vint32(value, options)
-      length_vint(value)
+      length_vint(value, true)
     end
 
     # vuint32
@@ -270,11 +270,11 @@ module Furnace::AVM2::Binary
     end
 
     def write_vuint32(io, value, options)
-      write_vint(io, value, true)
+      write_vint(io, value, false)
     end
 
     def length_vuint32(value, options)
-      length_vint(value)
+      length_vint(value, false)
     end
 
     # vuint30
@@ -284,11 +284,11 @@ module Furnace::AVM2::Binary
     end
 
     def write_vuint30(io, value, options)
-      write_vint(io, value, true)
+      write_vint(io, value, false)
     end
 
     def length_vuint30(value, options)
-      length_vint(value)
+      length_vint(value, false)
     end
 
     # vstring
@@ -468,7 +468,9 @@ module Furnace::AVM2::Binary
       io.write bytes.pack("C*")
     end
 
-    def length_vint(value)
+    def length_vint(value, signed)
+      value = value & 0xffffffff
+
       length = 0
 
       begin