furnace-avm2 1.0.1 → 1.0.2

data/README.md

@@ -81,7 +81,7 @@ Contrary to that, `furnace-avm2-decompiler` works on a class level. You can incl
 
 The `-D funids` option adds a comment with method body index for each decompiled method. It can be used for debugging decompiler failures.
 
-You'll notice that some methods probably will not get decompiled. (The file I used in this example is quite complex.) Not every possible bytecode sequence can be directly represented in ActionScript 3, and there are some corner cases yet to be described in the decompiler. For "partially decompiled" (i.e. where there were no control flow uncertainites, but some expressions were impossible to transform to ActionScript) the relevant NF-AST code is automatically emitted. You can look at it manually with `furnace-avm2 -n`. For "failed" methods there is no generated code, but you might try to look at control flow graph (`furnace-avm2 -C`, look for emitted `method-*.dot` file) in [Graphviz](http://en.wikipedia.org/wiki/Graphviz) format to understand the logic.
+You'll notice that some methods probably will not get decompiled. (The file I used in this example is quite complex.) Not every possible bytecode sequence can be directly represented in ActionScript 3, and there are some corner cases yet to be described in the decompiler. For "partially decompiled" (i.e. where there were no control flow uncertainites, but some expressions were impossible to transform to ActionScript) the relevant NF-AST code is automatically emitted. You can look at it manually with `furnace-avm2 -n`. For "failed" methods there is no generated code, but you might try to look at control flow graph (`furnace-avm2 -C graphviz`, look for emitted `method-*.dot` file) in [Graphviz](http://en.wikipedia.org/wiki/Graphviz) format to understand the logic.
 
 Programming interface
 ---------------------

data/bin/furnace-avm2

@@ -15,11 +15,15 @@ require "benchmark"
 
 include Furnace
 
+GRAPH_FORMATS = %w(none graphviz)
+
 opts = Trollop::options do
   version "furnace-avm2 #{AVM2::VERSION}"
   banner <<-EOS
   furnace-avm2 is a processing tool which operates on ActionScript3 bytecode.
 
+  Supported graphing formats: #{GRAPH_FORMATS.join(", ")}.
+
   Usage: #{__FILE__} [options]
 EOS
 
@@ -31,14 +35,14 @@ EOS
 
   opt :only,          "Only operate on methods <i+>",               :type => :ints,   :short => '-O'
   opt :except,        "Operate on all methods except <i+>",         :type => :ints,   :short => '-E'
-  opt :grep,          "Search <s> in method names",                 :type => :string, :short => '-G'
+  opt :grep,          "Search <s> in method names",                 :type => :string, :short => '-g'
 
   opt :collect,       "Collect failed methods instead of exiting",  :default => false
   opt :sort_by_size,  "Sort methods by body size",                  :default => false
 
   opt :disasm_before, "Disassemble methods before transforming",    :default => false, :short => '-B'
   opt :disasm_after,  "Disassemble methods after transforming",     :default => false, :short => '-A'
-  opt :cfg,           "Emit CFG in Graphviz format for methods",    :default => false, :short => '-C'
+  opt :cfg,           "Emit CFG in specified format for methods",   :type => :string,  :short => '-G'
 
   opt :dce,           "Eliminate dead code",                        :default => false
   opt :fix_names,     "Remove invalid characters from names",       :default => true,  :short => '-q'
@@ -49,6 +53,10 @@ end
 
 Trollop::die "Stray arguments: #{ARGV}" unless ARGV.empty?
 
+if opts[:cfg] && !GRAPH_FORMATS.include?(opts[:cfg])
+  Trollop::die "Unsupported graphing format."
+end
+
 abc = nil
 File.open(opts[:input]) do |file|
   abc = AVM2::ABC::File.new
@@ -150,8 +158,11 @@ opts[:threads].times do
 
         if opts[:cfg]
           cfg, = body.code_to_cfg
-          File.open("method-#{body.method_idx}.dot", "w") do |dot|
-            dot.write cfg.to_graphviz
+
+          if opts[:cfg] == 'graphviz'
+            File.open("method-#{body.method_idx}.dot", "w") do |dot|
+              dot.write cfg.to_graphviz
+            end
           end
 
           puts "Method #{body.method_idx}; dominators"

data/furnace-avm2.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "furnace", '= 0.2.4'
+  s.add_runtime_dependency "furnace", '= 0.2.5'
   s.add_runtime_dependency "trollop"
 end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_float32.rb

@@ -1,6 +1,6 @@
 module Furnace::AVM2::ABC
   class AS3AlchemyLoadFloat32 < Opcode
-    instruction 0x3d
+    instruction 0x38
 
     consume 1
     produce 1

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_float64.rb

@@ -1,6 +1,6 @@
 module Furnace::AVM2::ABC
   class AS3AlchemyLoadFloat64 < Opcode
-    instruction 0x3e
+    instruction 0x39
 
     consume 1
     produce 1

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_int16.rb

@@ -1,6 +1,6 @@
 module Furnace::AVM2::ABC
   class AS3AlchemyLoadInt16 < Opcode
-    instruction 0x3b
+    instruction 0x36
 
     consume 1
     produce 1

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_int32.rb

@@ -1,6 +1,6 @@
 module Furnace::AVM2::ABC
   class AS3AlchemyLoadInt32 < Opcode
-    instruction 0x3c
+    instruction 0x37
 
     consume 1
     produce 1

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_int8.rb

@@ -1,6 +1,6 @@
 module Furnace::AVM2::ABC
   class AS3AlchemyLoadInt8 < Opcode
-    instruction 0x3a
+    instruction 0x35
 
     consume 1
     produce 1

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_float32.rb

@@ -1,6 +1,6 @@
 module Furnace::AVM2::ABC
   class AS3AlchemyStoreFloat32 < Opcode
-    instruction 0x38
+    instruction 0x3d
 
     consume 2
     produce 0

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_float64.rb

@@ -1,6 +1,6 @@
 module Furnace::AVM2::ABC
   class AS3AlchemyStoreFloat64 < Opcode
-    instruction 0x39
+    instruction 0x3e
 
     consume 2
     produce 0

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_int16.rb

@@ -1,6 +1,6 @@
 module Furnace::AVM2::ABC
   class AS3AlchemyStoreInt16 < Opcode
-    instruction 0x36
+    instruction 0x3b
 
     consume 2
     produce 0

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_int32.rb

@@ -1,6 +1,6 @@
 module Furnace::AVM2::ABC
   class AS3AlchemyStoreInt32 < Opcode
-    instruction 0x37
+    instruction 0x3c
 
     consume 2
     produce 0

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_int8.rb

@@ -1,6 +1,6 @@
 module Furnace::AVM2::ABC
   class AS3AlchemyStoreInt8 < Opcode
-    instruction 0x35
+    instruction 0x3a
 
     consume 2
     produce 0

data/lib/furnace-avm2/source/declaration_tokens/token_with_traits.rb

@@ -9,8 +9,11 @@ module Furnace::AVM2::Tokens
 
       if options[:environment] == :class && options[:static]
         if origin.initializer_body
-          properties = Furnace::AVM2::Decompiler.new(
-                origin.initializer_body, options).decompose_static_initializer
+          initializer_decompiler = Furnace::AVM2::Decompiler.new(
+                origin.initializer_body, options.merge(global_code: true))
+          properties = initializer_decompiler.decompose_static_initializer
+          static_initialization = initializer_decompiler.decompile
+
           options = options.merge(property_values: properties)
         end
       end
@@ -21,6 +24,11 @@ module Furnace::AVM2::Tokens
         tokens << Furnace::Code::NewlineToken.new(origin, options)
       end
 
+      if static_initialization && static_initialization.children.any?
+        tokens << static_initialization
+        tokens << Furnace::Code::NewlineToken.new(origin, options)
+      end
+
       if options[:environment] == :class && !options[:static]
         tokens << ConstructorToken.new(origin, options)
       end

data/lib/furnace-avm2/source/decompiler.rb

@@ -15,15 +15,15 @@ module Furnace::AVM2
     def initialize(body, options)
       @body, @method, @options = body, body.method, options.dup
       @closure = @options.delete(:closure)
+
+      @scopes       = []
+      @metascopes   = []
+      @catch_scopes = {}
     end
 
     def decompile
       begin
         @locals = Set.new([0]) + (1..@method.param_count).to_a
-        @scopes = []
-        @metascopes = []
-
-        @catch_scopes = {}
 
         @closure_locals = Set.new
 
@@ -34,7 +34,9 @@ module Furnace::AVM2
 
         @global_slots = @options[:global_slots] || {}
 
-        stmt_block @body.code_to_nf,
+        @scopes << :this if @options[:global_code]
+
+        stmt_block (@nf || @body.code_to_nf),
           function: !@options[:global_code],
           closure:  @closure
 
@@ -76,8 +78,13 @@ module Furnace::AVM2
 
     def decompose_static_initializer
       properties = {}
+      matches = []
+
+      @nf = @body.code_to_nf
+
+      StaticProperty.find_all(@nf.children) do |match, captures|
+        matches.push match
 
-      StaticProperty.find_all(@body.code_to_nf.children) do |match, captures|
         begin
           token = handle_expression(captures[:value])
         rescue ExpressionNotRecognized => e
@@ -87,6 +94,8 @@ module Furnace::AVM2
         properties[captures[:property]] = token
       end
 
+      @nf.children -= matches
+
       properties
     end
 
@@ -339,6 +348,17 @@ module Furnace::AVM2
       end
     end
 
+    def stmt_with(opcode, nodes)
+      object, scope = opcode.children
+
+      @scopes << :with
+      nodes << token(WithToken,
+          expr(object),
+          stmt_block(scope))
+    ensure
+      @scopes.pop
+    end
+
     # Expressions
 
     def handle_expression(opcode)
@@ -821,7 +841,7 @@ module Furnace::AVM2
           ],
           [
             either[
-              [:get_scope_object, 0],
+              [:get_scope_object, capture(:scope)],
               [:get_global_scope]
             ],
             capture(:multiname)
@@ -830,6 +850,10 @@ module Furnace::AVM2
         capture_rest(:arguments)]
     end
 
+    def pseudo_global_scope?(scope)
+      [:this, :with].include?(@scopes[scope || 0])
+    end
+
     def expr_get_lex(opcode)
       multiname, = opcode.children
       get_name(nil, multiname)
@@ -837,6 +861,7 @@ module Furnace::AVM2
 
     def expr_get_property(opcode)
       if captures = PropertyGlobal.match(opcode)
+        return if !captures[:multiname] && !pseudo_global_scope?(captures[:scope])
         get_name(nil, captures[:multiname])
       else
         subject, multiname, = opcode.children
@@ -860,6 +885,7 @@ module Furnace::AVM2
 
     def expr_set_property(opcode)
       if captures = PropertyGlobal.match(opcode)
+        return if !captures[:multiname] && !pseudo_global_scope?(captures[:scope])
         token(AssignmentToken, [
           get_name(nil, captures[:multiname]),
           parenthesize(expr(*captures[:arguments]))
@@ -893,6 +919,7 @@ module Furnace::AVM2
 
     def expr_do_property(opcode, klass, has_args)
       if captures = PropertyGlobal.match(opcode)
+        return if !captures[:multiname] && !pseudo_global_scope?(captures[:scope])
         token(klass, [
           get_name(nil, captures[:multiname]),
           (token(ArgumentsToken, exprs(captures[:arguments])) if has_args)
@@ -1118,13 +1145,18 @@ module Furnace::AVM2
       origin = multiname.metadata[:origin]
       case origin.kind
       when :QName, :QNameA, :Multiname, :MultinameA
+        prefix = nil
+        if [:QNameA, :MultinameA].include? origin.kind
+          prefix = '@'
+        end
+
         if subject
           token(AccessToken, [
             parenthesize(subject),
-            token(PropertyNameToken, origin.name)
+            token(PropertyNameToken, "#{prefix}#{origin.name}")
           ])
         else
-          token(PropertyNameToken, origin.name)
+          token(PropertyNameToken, "#{prefix}#{origin.name}")
         end
       when :MultinameL, :MultinameLA
         if subject

data/lib/furnace-avm2/source/implementation_tokens/with_token.rb

@@ -0,0 +1,9 @@
+require_relative 'control_flow_token'
+
+module Furnace::AVM2::Tokens
+  class WithToken < ControlFlowToken
+    def keyword
+      'with'
+    end
+  end
+end

data/lib/furnace-avm2/transform/cfg_reduce.rb

@@ -235,9 +235,9 @@ module Furnace::AVM2
                 log nesting, "exit point (second guess): #{exit_point.inspect}"
               end
 
-              if exit_point.nil?
+              if exit_point.nil? || @dom[exit_point].include?(stopgap)
                 exit_point = stopgap
-                log nesting, "exit point (last restort): stopgap #{stopgap.inspect}"
+                log nesting, "exit point (third guess): stopgap #{stopgap.inspect}"
               end
 
               # Flatten the one-element sets.
@@ -305,7 +305,11 @@ module Furnace::AVM2
                 node
               ])
 
-              block = exit_point
+              if reachable?(exit_point, [ block ])
+                block = exit_point
+              else
+                block = nil
+              end
             elsif @loops.include?(block) && !@postcond_heads.include?(block)
               # we're trapped in a strange loop
               if block.insns.first == block.cti &&
@@ -548,6 +552,37 @@ module Furnace::AVM2
         end
       end
 
+      # Check if a block is reachable from sources.
+      def reachable?(block, sources)
+        worklist = sources.to_set
+        visited  = Set[]
+
+        while worklist.any?
+          node = worklist.first
+          worklist.delete node
+
+          return true if node == block
+
+          visited.add node
+
+          node.targets.each do |target|
+            # Skip visited nodes.
+            if visited.include?(target)
+              next
+            end
+
+            # Skip back edges.
+            if @dom[node].include?(target)
+              next
+            end
+
+            worklist.add target
+          end
+        end
+
+        false
+      end
+
       # Find a set of merge points for a set of partially diverged
       # paths beginning from `heads'.
       # E.g. here:

data/lib/furnace-avm2/transform/nf_normalize.rb

@@ -178,6 +178,117 @@ module Furnace::AVM2
           ])
         end
       end
+
+      def on_begin(node)
+        # Fold (with)'s
+        with_begin = node.children.index do |child|
+          child.type == :push_with
+        end
+        with_end = nil
+
+        if with_begin
+          nesting = 0
+          node.children[with_begin..-1].each_with_index do |child, index|
+            if child.type == :push_with || child.type == :push_scope
+              nesting += 1
+            elsif child.type == :pop_scope
+              nesting -= 1
+              if nesting == 0
+                with_end = with_begin + index
+                break
+              end
+            end
+          end
+
+          if nesting == 0
+            with_scope,  = node.children[with_begin].children
+            with_content = node.children.slice (with_begin + 1)..(with_end - 1)
+
+            with_node = AST::Node.new(:with, [
+              with_scope,
+              AST::Node.new(:begin,
+                with_content
+              )
+            ])
+
+            node.children.slice! with_begin..with_end
+            node.children.insert with_begin, with_node
+          end
+        end
+
+        # Remove obviously dead code
+        first_ctn = node.children.index do |child|
+          [:return_void, :return_value, :break, :continue, :throw].include? child.type
+        end
+        return unless first_ctn
+
+        node.children.slice! (first_ctn + 1)..-1
+      end
+
+      OptimizedSwitchSeed = AST::Matcher.new do
+        [:ternary,
+          [:===, capture(:case_value),
+            [:get_local, capture(:local_index)]],
+          [:integer, capture(:case_index)],
+          capture(:nested)]
+      end
+
+      OptimizedSwitchNested = AST::Matcher.new do
+        either[
+          [:ternary,
+            [:===, capture(:case_value),
+              [:get_local, backref(:local_index)]],
+            [:integer, capture(:case_index)],
+            capture(:nested)],
+          [:integer, capture(:default_index)]
+        ]
+      end
+
+      NumericCase = AST::Matcher.new do
+        [:case, [:integer, capture(:index)]]
+      end
+
+      def on_switch(node)
+        condition, body = node.children
+
+        if captures = OptimizedSwitchSeed.match(condition)
+          mapping = { captures[:case_index] => captures[:case_value] }
+          while captures = OptimizedSwitchNested.match(captures[:nested], captures)
+            break if captures[:default_index]
+            mapping[captures[:case_index]] = captures[:case_value]
+          end
+
+          return if captures.nil?
+
+          case_mapping = {}
+
+          body.children.each do |child|
+            if case_captures = NumericCase.match(child)
+              case_index = case_captures[:index]
+              if captures[:default_index] == case_index
+                case_mapping[child] = nil
+              elsif mapping.has_key?(case_index)
+                case_mapping[child] = mapping[case_index]
+              else
+                # fallback
+                return
+              end
+            end
+          end
+
+          # At this point, we are sure that this switch can be transformed.
+
+          node.children[0] = AST::Node.new(:get_local, [ captures[:local_index] ])
+
+          case_mapping.each do |child, value|
+            if value.nil?
+              body.children.delete child
+            else
+              child.children[0] = value
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/furnace-avm2/version.rb

@@ -1,5 +1,5 @@
 module Furnace
   module AVM2
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furnace-avm2
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: furnace
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -344,6 +344,7 @@ files:
 - lib/furnace-avm2/source/implementation_tokens/unary_post_operator_token.rb
 - lib/furnace-avm2/source/implementation_tokens/variable_name_token.rb
 - lib/furnace-avm2/source/implementation_tokens/while_token.rb
+- lib/furnace-avm2/source/implementation_tokens/with_token.rb
 - lib/furnace-avm2/source/implementation_tokens/xml_literal_token.rb
 - lib/furnace-avm2/transform.rb
 - lib/furnace-avm2/transform/ast_build.rb
@@ -377,9 +378,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: AVM2 analysis framework based on Furnace
 test_files: []
-has_rdoc: