furnace-avm2 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    furnace-avm2 (0.0.4)
-      furnace (>= 0.0.4)
+    furnace-avm2 (0.0.8)
+      furnace (>= 0.0.5)
       trollop
 
 GEM

data/bin/furnace-avm2

@@ -24,6 +24,8 @@ EOS
   opt :output,        "Output file",                                :type => :string
   opt :verbose,       "Be verbose",                                 :default => false
 
+  opt :threads,       "Use <i> threads for processing",             :default => 1
+
   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'
@@ -104,7 +106,7 @@ threads = []
 bodies  = abc.method_bodies.dup
 mutex   = Mutex.new
 
-5.times do
+opts[:threads].times do
   threads << Thread.new do
     loop do
       body = mutex.synchronize { bodies.pop }
@@ -129,8 +131,10 @@ mutex   = Mutex.new
         end
 
         if opts[:ast]
-          ast, = body.build_ast
+          ast, = body.code_to_ast
+          puts "Method #{body.method_idx}"
           puts ast.to_sexp
+          puts
         end
 
         if opts[:cfg]
@@ -143,7 +147,7 @@ mutex   = Mutex.new
         disasm[body, true] if opts[:disasm_after]
       rescue Exception => e
         if opts[:collect]
-          #puts "Failure at method body idx=#{body.method_idx}: #{e.class} (#{e.message}) at #{e.backtrace.first}."
+          puts "Failure at method body idx=#{body.method_idx}: #{e.class} (#{e.message}) at #{e.backtrace.first}."
           failed << body.method_idx
         else
           raise e
@@ -169,7 +173,9 @@ end
 if opts[:collect] && failed.any?
   puts "To skip #{failed.count} failed methods, append this command-line argument:"
   puts "  --except #{failed.join " "}"
-elsif opts[:output]
+end
+
+if opts[:output]
   File.open(opts[:output], "w") do |file|
     abc.write(file)
   end

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

@@ -15,15 +15,15 @@ module Furnace::AVM2::ABC
     def resolve!
       sequence = @parent.code
 
-      @from   = sequence.opcode_at(@from_offset)
-      @to     = sequence.opcode_at(@to_offset)
-      @target = sequence.opcode_at(@target_offset)
+      @from   = sequence.opcode_at(from_offset)
+      @to     = sequence.opcode_at(to_offset)
+      @target = sequence.opcode_at(target_offset)
     end
 
     def lookup!
-      @from_offset   = @from.offset
-      @to_offset     = @to.offset
-      @target_offset = @target.offset
+      self.from_offset   = @from.offset
+      self.to_offset     = @to.offset
+      self.target_offset = @target.offset
     end
   end
 end

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

@@ -28,6 +28,10 @@ module Furnace::AVM2::ABC
       root.klasses[root.instances.index(self)]
     end
 
+    def initializer_body
+      root.method_bodies.find { |body| body.method_idx == initializer_idx }
+    end
+
     def to_astlet
       if interface?
         root = AST::Node.new(:interface)

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

@@ -6,6 +6,10 @@ module Furnace::AVM2::ABC
 
     abc_array_of :trait, :nested, :class => TraitInfo
 
+    def initializer_body
+      root.method_bodies.find { |body| body.method_idx == initializer_idx }
+    end
+
     def to_astlet
       root = AST::Node.new(:klass)
 

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

@@ -38,9 +38,9 @@ module Furnace::AVM2::ABC
         when :UInt
           AST::Node.new(:integer, [ root.constant_pool.uints[value_idx - 1] ])
         when :Double
-          AST::Node.new(:integer, [ root.constant_pool.doubles[value_idx - 1] ])
+          AST::Node.new(:double, [ root.constant_pool.doubles[value_idx - 1] ])
         when :Utf8
-          AST::Node.new(:integer, [ root.constant_pool.strings[value_idx - 1] ])
+          AST::Node.new(:string, [ root.constant_pool.strings[value_idx - 1] ])
         when :True
           AST::Node.new(:true)
         when :False

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

@@ -26,7 +26,13 @@ module Furnace::AVM2::ABC
       end
     end
 
-    def each(&block)
+    def each
+      parse if @raw_code
+
+      super
+    end
+
+    def map
       parse if @raw_code
 
       super
@@ -176,6 +182,10 @@ module Furnace::AVM2::ABC
       each do |element|
         element.resolve! if element.respond_to? :resolve!
       end
+
+      exceptions.each do |exception|
+        exception.resolve!
+      end
     end
 
     def lookup!

data/lib/furnace-avm2/version.rb

@@ -1,3 +1,3 @@
 module Furnace::AVM2
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furnace-avm2
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-04 00:00:00.000000000 Z
+date: 2012-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: furnace
-  requirement: &76444700 !ruby/object:Gem::Requirement
+  requirement: &79381650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *76444700
+  version_requirements: *79381650
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &76444490 !ruby/object:Gem::Requirement
+  requirement: &79380920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76444490
+  version_requirements: *79380920
 description: furnace-avm2 allows one to load, modify and write back Flash ActionScript3
   bytecode. It can also decompile it.
 email: