furnace-avm2 0.9.0 → 0.9.1

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

@@ -0,0 +1,7 @@
+module Furnace::AVM2::Tokens
+  class ClosureNameToken < Furnace::Code::TerminalToken
+    def to_text
+      "function"
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Furnace::AVM2::Tokens
+  class ClosureToken < CalleeToken
+    def initialize(origin, body, options={})
+      super(origin, [
+        ClosureNameToken.new(origin, options)
+      ], body.method, body, options.merge({ closure: true }))
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Furnace::AVM2::Tokens
+  class InstanceOfToken < Furnace::Code::SeparatedToken
+    include IsComplex
+
+    def text_between
+      " instanceof "
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Furnace::AVM2::Tokens
+  class SupplementaryCommentToken < Furnace::Code::SurroundedToken
+    def initialize(origin, content, children, options={})
+      super(origin, children, options)
+      @content = content
+    end
+
+    def text_before
+      if @options[:commented]
+        "* #{@content} * "
+      else
+        "/* #{@content} */ "
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Furnace::AVM2::Tokens
+  class XmlLiteralToken < Furnace::Code::TerminalToken
+    include IsSimple
+
+    def initialize(origin, text, options={})
+      super(origin, options)
+      @text = text
+    end
+
+    def to_text
+      @text
+    end
+  end
+end

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

@@ -102,8 +102,8 @@ module Furnace::AVM2
             puts "opcode: #{opcode.inspect}"
           end
 
-          finalize_complex_expr.(opcode, shortjump, [ :and, :or ], 1)
           finalize_complex_expr.(opcode, ternary, CONDITIONAL_OPERATORS, nil, [:ternary_if, false])
+          finalize_complex_expr.(opcode, shortjump, [ :and, :or ], 1)
 
           if dup == 1 && (opcode.is_a?(ABC::AS3CoerceB) ||
                   opcode.is_a?(ABC::AS3IfTrue) || opcode.is_a?(ABC::AS3IfFalse))
@@ -139,7 +139,8 @@ module Furnace::AVM2
           elsif opcode.is_a?(ABC::AS3Dup)
             node = stack.last
 
-            if CONST_OPERATORS.include? node.type
+            if CONST_OPERATORS.include?(node.type) ||
+                  (node.type == :get_local && node.children.first == 0)
               dup_node = node.dup
               dup_node.metadata[:label] = opcode.offset
               produce.(dup_node)

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

@@ -3,6 +3,10 @@ module Furnace::AVM2
     class ASTNormalize
       include AST::Visitor
 
+      def initialize(options={})
+        @options = options
+      end
+
       def transform(ast)
         visit ast
 
@@ -42,17 +46,36 @@ module Furnace::AVM2
         :lt        => [false, :<],
         :nlt       => [true,  :<],
         :strict_eq => [false, :===],
-        :strict_ne => [false, :"!=="],
+        :strict_ne => [true,  :===], # Why? Because of (lookup-switch ...).
         :true      => [false, :expand],
         :false     => [true,  :expand]
       }
+
+      def transform_conditional(node, comp, reverse)
+        node.update(comp)
+        node.parent.children[0] = !node.parent.children[0] if reverse
+      end
+
       IF_MAPPING.each do |cond, (reverse, comp)|
         define_method :"on_if_#{cond}" do |node|
-          node.update(comp)
-          node.parent.children[0] = !node.parent.children[0] if reverse
-
-          if node.parent.type == :ternary_if && comp == :expand
+          if node.parent.type == :jump_if || comp != :expand
+            # Parent is a conditional, or this is an explicit comparsion.
+            transform_conditional(node, comp, reverse)
+          elsif node.parent.type == :ternary_if && node.index == 1
+            # Parent is a comparsion-less ternary operator, and this
+            # node is in condition position.
+            transform_conditional(node, comp, reverse)
             node.parent.update(:ternary_if_boolean)
+          elsif node.children.count == 2
+            # This is an implicit comparsion, and it is not located in
+            # a condition position of a conditional or a ternary operator.
+            # Turn it into a ternary operator as of itself.
+            node.update(:ternary_if_boolean, [
+              !comp, *node.children
+            ])
+            on_ternary_if_boolean(node)
+          else
+            transform_conditional(node, comp, reverse)
           end
         end
       end
@@ -92,12 +115,21 @@ module Furnace::AVM2
       alias :on_jump_if :fix_boolean
 
       def replace_with_nop(node)
-        node.update(:nop)
+        if @options[:eliminate_nops]
+          node.update(:remove)
+        else
+          node.update(:nop)
+        end
       end
-      alias :on_label       :replace_with_nop
       alias :on_debug       :replace_with_nop
       alias :on_debug_file  :replace_with_nop
       alias :on_debug_line  :replace_with_nop
+
+      def on_nop(node)
+        if @options[:eliminate_nops]
+          node.update(:remove)
+        end
+      end
     end
   end
 end

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

@@ -5,6 +5,9 @@ module Furnace::AVM2
 
       def transform(ast)
         @ast = ast
+
+        @jumps = Set.new
+
         visit @ast
 
         @cfg = CFG::Graph.new
@@ -12,8 +15,6 @@ module Furnace::AVM2
         @pending_label = nil
         @pending_queue = []
 
-        @jumps = []
-
         @ast.children.each_with_index do |node, index|
           @pending_label ||= node.metadata[:label]
           @pending_queue << node if ![:nop, :jump].include? node.type
@@ -22,16 +23,25 @@ module Furnace::AVM2
           next_label = next_node.metadata[:label] if next_node
 
           case node.type
+          when :label
+            @jumps.add node.children.first
+            node.update :nop
+
           when :return_value, :return_void
             cutoff(nil, [nil])
 
           when :jump
-            @jumps << node.children[0]
-            cutoff(nil, [node.children.delete_at(0)])
+            @jumps.add(node.children[0])
+            cutoff(nil, [ node.children.delete_at(0) ])
 
           when :jump_if
-            @jumps << node.children[1]
-            cutoff(node, [node.children.delete_at(1), next_label])
+            @jumps.add(node.children[1])
+            cutoff(node, [ node.children.delete_at(1), next_label ])
+
+          when :lookup_switch
+            jumps_to = [ node.children[0] ] + node.children[1]
+            @jumps.merge(jumps_to)
+            cutoff(node, jumps_to)
 
           else
             if @jumps.include? next_label

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

@@ -54,7 +54,10 @@ module Furnace::AVM2
           end
 
           if block.cti
-            if @loops.include?(block)
+            if block.cti.type == :lookup_switch
+              # this is a switch
+
+            elsif @loops.include?(block)
               # we're trapped in a strange loop
               reverse = !block.cti.children[0]
               in_root, out_root = block.targets
@@ -86,8 +89,6 @@ module Furnace::AVM2
 
               # (while (condition)
               #   (body ...))
-              # (for-in '(var name) # to be done
-              #   (body ...))
               nodes << AST::Node.new(:while, [
                 expr,
                 body

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

@@ -18,6 +18,10 @@ module Furnace::AVM2
         end
       end
 
+      def on_nop(node)
+        node.update(:remove)
+      end
+
       COERCE_MAP = {
         :coerce_a => :any,
         :coerce_b => :bool,
@@ -60,9 +64,12 @@ module Furnace::AVM2
         [:while,
           [:has_next2, capture(:object_reg), capture(:index_reg)],
           [:begin,
-            [:set_local, capture(:value_reg),
-              [either[:coerce, :convert], capture(:value_type),
-                [capture(:iterator),
+            [ either_multi[
+                [ :set_local, capture(:value_reg) ],
+                [ :set_slot, capture(:value_reg), [:get_scope_object, 1] ],
+              ],
+              [ either[:coerce, :convert], capture(:value_type),
+                [ capture(:iterator),
                   [:get_local, backref(:object_reg)],
                   [:get_local, backref(:index_reg)]]]],
             capture_rest(:body)]]
@@ -83,6 +90,11 @@ module Furnace::AVM2
       end
 
       def on_while(node)
+        *whatever, code = node.children
+        if SuperfluousContinueMatcher.match code.children.last
+          code.children.slice! -1
+        end
+
         if captures = ForInMatcher.match(node)
           parent = node.parent
 
@@ -113,10 +125,6 @@ module Furnace::AVM2
           index_node.update(:remove)
           object_node.update(:remove)
 
-          if SuperfluousContinueMatcher.match captures[:body].last
-            captures[:body].slice! -1
-          end
-
           node.update(type, [
             captures[:value_reg],
             captures[:value_type],

data/lib/furnace-avm2/version.rb

@@ -1,5 +1,5 @@
 module Furnace
   module AVM2
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
   end
 end

data/test/basic.as

@@ -207,6 +207,21 @@ package test {
     }
   }
 
+  class Closures {
+    function a() {
+      var a:int = 1;
+      var f = function(param) {
+        var b:int = 10;
+        return a + this.fuga() + hoge() + param;
+      };
+      var q = function() {
+        test123();
+      };
+      q();
+      return f;
+    }
+  }
+
   class Exceptions {
     function c() {
       try {

data/test/global.as

@@ -0,0 +1,11 @@
+package global {
+  var a:int = 0;
+
+  function q() {
+    print("a value is: " + a);
+  }
+
+  a = 10;
+
+  q();
+}

metadata

@@ -1,45 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: furnace-avm2
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.9.0
+  version: 0.9.1
+  prerelease: 
 platform: ruby
 authors:
 - Peter Zotov
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: furnace
-  version_requirements: &2056 !ruby/object:Gem::Requirement
+  requirement: &81548020 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
-    none: false
-  requirement: *2056
-  prerelease: false
+        version: 0.1.1
   type: :runtime
+  prerelease: false
+  version_requirements: *81548020
 - !ruby/object:Gem::Dependency
   name: trollop
-  version_requirements: &2074 !ruby/object:Gem::Requirement
+  requirement: &81547740 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *2074
-  prerelease: false
   type: :runtime
-description: furnace-avm2 allows one to load, modify and write back Flash ActionScript3 bytecode. It can also decompile it.
+  prerelease: false
+  version_requirements: *81547740
+description: furnace-avm2 allows one to load, modify and write back Flash ActionScript3
+  bytecode. It can also decompile it.
 email:
 - whitequark@whitequark.org
 executables:
 - furnace-avm2
-- furnace-avm2-benchmark
 - furnace-avm2-decompiler
+- furnace-avm2-shell
 extensions: []
 extra_rdoc_files: []
 files:
@@ -50,8 +51,8 @@ files:
 - Rakefile
 - abcdump.abc
 - bin/furnace-avm2
-- bin/furnace-avm2-benchmark
 - bin/furnace-avm2-decompiler
+- bin/furnace-avm2-shell
 - furnace-avm2.gemspec
 - lib/furnace-avm2.rb
 - lib/furnace-avm2/abc.rb
@@ -82,6 +83,19 @@ files:
 - lib/furnace-avm2/abc/metadata/trait_info.rb
 - lib/furnace-avm2/abc/metadata/trait_method.rb
 - lib/furnace-avm2/abc/metadata/trait_slot.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_extend_1.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_extend_16.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_extend_8.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_float32.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_float64.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_int16.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_int32.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_int8.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_float32.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_float64.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_int16.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_int32.rb
+- lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_int8.rb
 - lib/furnace-avm2/abc/opcodes/arithmetic/as3_add.rb
 - lib/furnace-avm2/abc/opcodes/arithmetic/as3_add_i.rb
 - lib/furnace-avm2/abc/opcodes/arithmetic/as3_declocal.rb
@@ -107,7 +121,6 @@ files:
 - lib/furnace-avm2/abc/opcodes/arithmetic/as3_strictequals.rb
 - lib/furnace-avm2/abc/opcodes/arithmetic/as3_subtract.rb
 - lib/furnace-avm2/abc/opcodes/arithmetic/as3_subtract_i.rb
-- lib/furnace-avm2/abc/opcodes/arithmetic_opcode.rb
 - lib/furnace-avm2/abc/opcodes/bitwise/as3_bitand.rb
 - lib/furnace-avm2/abc/opcodes/bitwise/as3_bitnot.rb
 - lib/furnace-avm2/abc/opcodes/bitwise/as3_bitor.rb
@@ -115,7 +128,6 @@ files:
 - lib/furnace-avm2/abc/opcodes/bitwise/as3_lshift.rb
 - lib/furnace-avm2/abc/opcodes/bitwise/as3_rshift.rb
 - lib/furnace-avm2/abc/opcodes/bitwise/as3_urshift.rb
-- lib/furnace-avm2/abc/opcodes/bitwise_opcode.rb
 - lib/furnace-avm2/abc/opcodes/contextual_opcode.rb
 - lib/furnace-avm2/abc/opcodes/control_transfer/as3_ifeq.rb
 - lib/furnace-avm2/abc/opcodes/control_transfer/as3_iffalse.rb
@@ -138,7 +150,6 @@ files:
 - lib/furnace-avm2/abc/opcodes/debug/as3_debugfile.rb
 - lib/furnace-avm2/abc/opcodes/debug/as3_debugline.rb
 - lib/furnace-avm2/abc/opcodes/exception/as3_newcatch.rb
-- lib/furnace-avm2/abc/opcodes/exception_opcode.rb
 - lib/furnace-avm2/abc/opcodes/function_invocation/as3_call.rb
 - lib/furnace-avm2/abc/opcodes/function_invocation/as3_callproperty.rb
 - lib/furnace-avm2/abc/opcodes/function_invocation/as3_callproplex.rb
@@ -148,12 +159,12 @@ files:
 - lib/furnace-avm2/abc/opcodes/function_invocation_opcode.rb
 - lib/furnace-avm2/abc/opcodes/function_return/as3_returnvalue.rb
 - lib/furnace-avm2/abc/opcodes/function_return/as3_returnvoid.rb
-- lib/furnace-avm2/abc/opcodes/function_return_opcode.rb
 - lib/furnace-avm2/abc/opcodes/generic/as3_astypelate.rb
 - lib/furnace-avm2/abc/opcodes/generic/as3_checkfilter.rb
 - lib/furnace-avm2/abc/opcodes/generic/as3_dup.rb
 - lib/furnace-avm2/abc/opcodes/generic/as3_dxnslate.rb
 - lib/furnace-avm2/abc/opcodes/generic/as3_escxattr.rb
+- lib/furnace-avm2/abc/opcodes/generic/as3_escxelem.rb
 - lib/furnace-avm2/abc/opcodes/generic/as3_getglobalscope.rb
 - lib/furnace-avm2/abc/opcodes/generic/as3_getlex.rb
 - lib/furnace-avm2/abc/opcodes/generic/as3_getscopeobject.rb
@@ -192,7 +203,6 @@ files:
 - lib/furnace-avm2/abc/opcodes/object_manipulation/as3_newclass.rb
 - lib/furnace-avm2/abc/opcodes/object_manipulation/as3_newfunction.rb
 - lib/furnace-avm2/abc/opcodes/object_manipulation/as3_newobject.rb
-- lib/furnace-avm2/abc/opcodes/object_manipulation_opcode.rb
 - lib/furnace-avm2/abc/opcodes/opcode.rb
 - lib/furnace-avm2/abc/opcodes/property/as3_constructprop.rb
 - lib/furnace-avm2/abc/opcodes/property/as3_deleteproperty.rb
@@ -215,6 +225,7 @@ files:
 - lib/furnace-avm2/abc/opcodes/push_literal/as3_pushshort.rb
 - lib/furnace-avm2/abc/opcodes/push_literal/as3_pushstring.rb
 - lib/furnace-avm2/abc/opcodes/push_literal/as3_pushtrue.rb
+- lib/furnace-avm2/abc/opcodes/push_literal/as3_pushuint.rb
 - lib/furnace-avm2/abc/opcodes/push_literal/as3_pushundefined.rb
 - lib/furnace-avm2/abc/opcodes/push_literal/as3_pushwith.rb
 - lib/furnace-avm2/abc/opcodes/push_literal_opcode.rb
@@ -228,7 +239,6 @@ files:
 - lib/furnace-avm2/abc/opcodes/type_conversion/as3_convert_o.rb
 - lib/furnace-avm2/abc/opcodes/type_conversion/as3_convert_s.rb
 - lib/furnace-avm2/abc/opcodes/type_conversion/as3_convert_u.rb
-- lib/furnace-avm2/abc/opcodes/type_conversion_opcode.rb
 - lib/furnace-avm2/abc/primitives/opcode_sequence.rb
 - lib/furnace-avm2/abc/primitives/record.rb
 - lib/furnace-avm2/binary/choice_definition.rb
@@ -247,6 +257,7 @@ files:
 - lib/furnace-avm2/source/declaration_tokens/function_name_token.rb
 - lib/furnace-avm2/source/declaration_tokens/import_token.rb
 - lib/furnace-avm2/source/declaration_tokens/initialization_token.rb
+- lib/furnace-avm2/source/declaration_tokens/metadata_token.rb
 - lib/furnace-avm2/source/declaration_tokens/method_specifiers_token.rb
 - lib/furnace-avm2/source/declaration_tokens/method_token.rb
 - lib/furnace-avm2/source/declaration_tokens/multiname_token.rb
@@ -269,6 +280,8 @@ files:
 - lib/furnace-avm2/source/implementation_tokens/binary_operator_token.rb
 - lib/furnace-avm2/source/implementation_tokens/break_token.rb
 - lib/furnace-avm2/source/implementation_tokens/call_token.rb
+- lib/furnace-avm2/source/implementation_tokens/closure_name_token.rb
+- lib/furnace-avm2/source/implementation_tokens/closure_token.rb
 - lib/furnace-avm2/source/implementation_tokens/continue_token.rb
 - lib/furnace-avm2/source/implementation_tokens/control_flow_token.rb
 - lib/furnace-avm2/source/implementation_tokens/control_transfer_token.rb
@@ -285,6 +298,7 @@ files:
 - lib/furnace-avm2/source/implementation_tokens/immediate_typename_token.rb
 - lib/furnace-avm2/source/implementation_tokens/in_token.rb
 - lib/furnace-avm2/source/implementation_tokens/index_token.rb
+- lib/furnace-avm2/source/implementation_tokens/instance_of_token.rb
 - lib/furnace-avm2/source/implementation_tokens/is_complex.rb
 - lib/furnace-avm2/source/implementation_tokens/is_simple.rb
 - lib/furnace-avm2/source/implementation_tokens/is_token.rb
@@ -300,6 +314,7 @@ files:
 - lib/furnace-avm2/source/implementation_tokens/rtname_token.rb
 - lib/furnace-avm2/source/implementation_tokens/statement_token.rb
 - lib/furnace-avm2/source/implementation_tokens/super_token.rb
+- lib/furnace-avm2/source/implementation_tokens/supplementary_comment_token.rb
 - lib/furnace-avm2/source/implementation_tokens/switch_token.rb
 - lib/furnace-avm2/source/implementation_tokens/ternary_operator_token.rb
 - lib/furnace-avm2/source/implementation_tokens/throw_token.rb
@@ -308,6 +323,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/xml_literal_token.rb
 - lib/furnace-avm2/transform.rb
 - lib/furnace-avm2/transform/ast_build.rb
 - lib/furnace-avm2/transform/ast_normalize.rb
@@ -316,29 +332,30 @@ files:
 - lib/furnace-avm2/transform/nf_normalize.rb
 - lib/furnace-avm2/version.rb
 - test/basic.as
+- test/global.as
 homepage: http://github.com/whitequark/furnace-avm2
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.15
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.17
+signing_key: 
 specification_version: 3
 summary: AVM2 analysis framework based on Furnace
 test_files: []
-...
+has_rdoc: