furnace-avm2 0.9.2 → 1.0.0

data/.gitignore

@@ -1,3 +1,4 @@
 .rbx/
 pkg/
 *.abc
+Gemfile.lock

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
-gemspec
+gemspec
+
+gem "pry"

data/bin/furnace-avm2

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
 
 require "rubygems"
+begin
+  require "bundler/setup"
+rescue LoadError
+end
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 
@@ -30,7 +34,7 @@ EOS
   opt :grep,          "Search <s> in method names",                 :type => :string, :short => '-G'
 
   opt :collect,       "Collect failed methods instead of exiting",  :default => false
-  opt :smallest,      "Find method with smallest body",             :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'
@@ -66,7 +70,7 @@ disasm = lambda do |body, after|
     puts "Exceptions"
     body.exceptions.each do |exception|
       puts "  #{exception.from_offset} -> #{exception.to_offset}: " <<
-           "catch(#{exception.exc_type} #{exception.var_name}) #{exception.target_offset}"
+           "catch(#{exception.exception.to_s} #{exception.variable.to_s}) #{exception.target_offset}"
     end
   end
 
@@ -75,7 +79,7 @@ end
 
 failed = []
 dced = []
-smallest = nil
+by_body_size = {}
 
 if opts[:fix_names]
   abc.fix_names!
@@ -127,10 +131,8 @@ opts[:threads].times do
       begin
         disasm[body, false] if opts[:disasm_before]
 
-        if opts[:smallest]
-          if smallest.nil? || smallest.code_length > body.code_length
-            smallest = body
-          end
+        if opts[:sort_by_size]
+          by_body_size[body] = body.code_length
         end
 
         if opts[:dce]
@@ -140,14 +142,14 @@ opts[:threads].times do
         disasm[body, true] if opts[:disasm_after]
 
         if opts[:ast]
-          ast = body.code_to_ast
+          ast, = body.code_to_ast
           puts "Method #{body.method_idx}; AST"
           puts ast.to_sexp
           puts
         end
 
         if opts[:cfg]
-          cfg = body.code_to_cfg
+          cfg, = body.code_to_cfg
           File.open("method-#{body.method_idx}.dot", "w") do |dot|
             dot.write cfg.to_graphviz
           end
@@ -158,7 +160,14 @@ opts[:threads].times do
                  "#{dominating.map(&:label).map(&:inspect).join(", ")}"
           end
           puts
-
+=begin
+          puts "Method #{body.method_idx}; postdominators"
+          cfg.postdominators.each do |node, dominating|
+            puts "#{node.label.inspect} => " +
+                 "#{dominating.map(&:label).map(&:inspect).join(", ")}"
+          end
+          puts
+=end
           puts "Method #{body.method_idx}; loops"
           cfg.identify_loops.each do |header, body|
             puts "#{header.label.inspect} => " +
@@ -168,7 +177,7 @@ opts[:threads].times do
         end
 
         if opts[:nf]
-          ast = body.code_to_nf
+          ast, = body.code_to_nf
           puts "Method #{body.method_idx}; NF-AST"
           puts ast.to_sexp
           puts
@@ -200,8 +209,13 @@ if opts[:verbose]
   end
 end
 
-if opts[:smallest]
-  puts "Smallest method is #{smallest.method_idx} with #{smallest.code_length} bytes"
+if opts[:sort_by_size]
+  puts "Methods by body size:"
+  by_body_size.
+      sort_by { |(body, size)| size }.
+      each do |(body, size)|
+    puts "#{size}\tmethod ##{body.method_idx}"
+  end
 end
 
 if opts[:collect] && failed.any?

data/bin/furnace-avm2-decompiler

@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
 
 require "rubygems"
-require "bundler/setup"
+begin
+  require "bundler/setup"
+rescue LoadError
+end
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 
@@ -102,7 +105,7 @@ start_time = Time.now
 mutex = Mutex.new
 
 roots      = {}
-workqueue  = abc.instances.dup + abc.scripts.select(&:any_code?)
+workqueue  = abc.instances + abc.scripts
 total_size = workqueue.size
 
 last_percentage = 0
@@ -148,8 +151,14 @@ opts[:threads].times.map do
         name = what.name
         ns   = name.ns
       else # ScriptInfo
-        name = what.traits[0].name.ns
-        ns   = name.to_s.sub(/(^|\.)[^.]+$/, '')
+        if what.has_name?
+          name = what.package_name.ns
+          ns   = name.to_s.sub(/(^|\.)[^.]+$/, '')
+        else
+          index = abc.scripts.index(what)
+          name  = "__global_name_#{index}"
+          ns    = "__global_ns_#{index}"
+        end
       end
       next if shound_skip.(name)
 
@@ -164,6 +173,7 @@ opts[:threads].times.map do
 
       source = what.decompile(options)
       next unless source
+      next unless source.children.any?
 
       text = source.to_text
 

data/bin/furnace-avm2-shell

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
 
 require "rubygems"
+begin
+  require "bundler/setup"
+rescue LoadError
+end
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 

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.1.1'
+  s.add_runtime_dependency "furnace", '= 0.2.3'
   s.add_runtime_dependency "trollop"
 end

data/lib/furnace-avm2.rb

@@ -1,7 +1,7 @@
 require "furnace/cfg"
 require "furnace/ast"
 require "furnace/code"
-require "furnace/transform"
+require "furnace/transform/pipeline"
 
 require "furnace/graphviz"
 

data/lib/furnace-avm2/abc.rb

@@ -16,7 +16,10 @@ require_relative "abc/opcodes/load_store_opcode"
 require_relative "abc/opcodes/push_literal_opcode"
 require_relative "abc/opcodes/control_transfer_opcode"
 require_relative "abc/opcodes/function_invocation_opcode"
+require_relative "abc/opcodes/function_return_opcode"
 require_relative "abc/opcodes/property_opcode"
+require_relative "abc/opcodes/type_conversion_opcode"
+require_relative "abc/opcodes/arithmetic_opcode"
 
 Dir[File.join(File.dirname(__FILE__), "abc", "opcodes", "*", "*.rb")].each do |file|
   require file

data/lib/furnace-avm2/abc/metadata/exception_info.rb

@@ -3,8 +3,9 @@ module Furnace::AVM2::ABC
     vuint30   :from_offset
     vuint30   :to_offset
     vuint30   :target_offset
-    const_ref :exc_type, :string
-    const_ref :var_name, :string
+
+    const_ref :exception, :multiname
+    const_ref :variable,  :multiname
 
     attr_reader :from, :to, :target
 
@@ -25,5 +26,9 @@ module Furnace::AVM2::ABC
       self.to_offset     = @to.offset
       self.target_offset = @target.offset
     end
+
+    def range
+      from_offset..to_offset
+    end
   end
 end

data/lib/furnace-avm2/abc/metadata/method_body_info.rb

@@ -21,10 +21,11 @@ module Furnace::AVM2::ABC
       end
     end
 
-    def code_to_ast(options={ eliminate_nops: true })
+    def code_to_ast(options={})
       pipeline = Furnace::Transform::Pipeline.new([
         Furnace::AVM2::Transform::ASTBuild.new(options),
-        Furnace::AVM2::Transform::ASTNormalize.new(options)
+        Furnace::AVM2::Transform::ASTNormalize.new(options),
+        Furnace::AVM2::Transform::PropagateConstants.new,
       ])
 
       pipeline.run(code, self)
@@ -32,6 +33,7 @@ module Furnace::AVM2::ABC
 
     def code_to_cfg
       pipeline = Furnace::Transform::Pipeline.new([
+        Furnace::AVM2::Transform::PropagateLabels.new,
         Furnace::AVM2::Transform::CFGBuild.new
       ])
 

data/lib/furnace-avm2/abc/metadata/script_info.rb

@@ -8,7 +8,8 @@ module Furnace::AVM2::ABC
     abc_array_of :trait, :nested, :class => TraitInfo
 
     def collect_ns
-      options = { ns: Set.new([ non_init_traits[0].name.ns ]), no_ns: Set.new, names: {} }
+      options = { ns: Set.new, no_ns: Set.new, names: {} }
+      options[:ns].add package_name.ns if has_name?
 
       initializer.collect_ns(options) if initializer
       traits.each { |trait| trait.collect_ns(options) }
@@ -20,14 +21,18 @@ module Furnace::AVM2::ABC
       Furnace::AVM2::Tokens::PackageToken.new(self,
             options.merge(collect_ns).merge(
               package_type: :script,
-              package_name: non_init_traits[0].name)
+              package_name: package_name)
             )
     end
 
-    def any_code?
+    def has_name?
       non_init_traits.any?
     end
 
+    def package_name
+      non_init_traits[0].name if non_init_traits.any?
+    end
+
     def non_init_traits
       traits.reject { |trait| trait.kind == :Class }
     end

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

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

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

@@ -1,10 +1,11 @@
 module Furnace::AVM2::ABC
-  class AS3AddI < Opcode
+  class AS3AddI < ArithmeticOpcode
     instruction 0xc5
 
     consume 2
     produce 1
 
     type :integer
+    ast_type :add
   end
 end

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

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3DecLocal < Opcode
+  class AS3DecLocal < ArithmeticOpcode
     instruction 0x94
 
     body do

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

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3DecLocalI < Opcode
+  class AS3DecLocalI < ArithmeticOpcode
     instruction 0xc3
 
     body do
@@ -10,5 +10,6 @@ module Furnace::AVM2::ABC
     produce 0
 
     type :integer
+    ast_type :dec_local
   end
 end

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

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Decrement < Opcode
+  class AS3Decrement < ArithmeticOpcode
     instruction 0x93
 
     consume 1

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

@@ -1,10 +1,11 @@
 module Furnace::AVM2::ABC
-  class AS3DecrementI < Opcode
+  class AS3DecrementI < ArithmeticOpcode
     instruction 0xc1
 
     consume 1
     produce 1
 
     type :integer
+    ast_type :decrement
   end
 end

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

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

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

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

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

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3GreaterEquals < Opcode
+  class AS3GreaterEquals < ArithmeticOpcode
     instruction 0xb0
     ast_type :>=
 

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

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3GreaterThan < Opcode
+  class AS3GreaterThan < ArithmeticOpcode
     instruction 0xaf
     ast_type :>
 

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

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3IncLocal < Opcode
+  class AS3IncLocal < ArithmeticOpcode
     instruction 0x92
 
     body do

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

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3IncLocalI < Opcode
+  class AS3IncLocalI < ArithmeticOpcode
     instruction 0xc2
 
     body do
@@ -10,6 +10,7 @@ module Furnace::AVM2::ABC
     produce 0
 
     type :integer
+    ast_type :inc_local
 
     def parameters
       [ body.reg_index ]

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

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Increment < Opcode
+  class AS3Increment < ArithmeticOpcode
     instruction 0x91
 
     consume 1

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

@@ -1,10 +1,11 @@
 module Furnace::AVM2::ABC
-  class AS3IncrementI < Opcode
+  class AS3IncrementI < ArithmeticOpcode
     instruction 0xc0
 
     consume 1
     produce 1
 
     type :integer
+    ast_type :increment
   end
 end

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

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

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

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3LessThan < Opcode
+  class AS3LessThan < ArithmeticOpcode
     instruction 0xad
     ast_type :<
 

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

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