cast_off 0.2.1 → 0.2.3

data/lib/cast_off/compile/ir/simple_ir.rb

@@ -130,7 +130,7 @@ Call site is (#{insn}).
 
           if fcall
             stack.pop();
-            irs << SubIR.new(Self.new(translator), TmpVariable.new(stack.push()), InsnInfo.new([:putself], insn.iseq, -1, -1, true), cfg)
+            irs << SubIR.new(Self.new(translator, insn.iseq), TmpVariable.new(stack.push()), InsnInfo.new([:putself], insn.iseq, -1, -1, true), cfg)
           end
           recv = TmpVariable.new(stack.pop())
           recv.is_also(insn.ic_class) if insn.ic_class
@@ -160,7 +160,7 @@ Call site is (#{insn}).
         when :putnil
           irs << SubIR.new(Literal.new(nil, translator), TmpVariable.new(stack.push()), insn, cfg)
         when :putself
-          irs << SubIR.new(Self.new(translator), TmpVariable.new(stack.push()), insn, cfg)
+          irs << SubIR.new(Self.new(translator, insn.iseq), TmpVariable.new(stack.push()), insn, cfg)
         when :putstring
           obj = argv[0]
           param = []
@@ -468,7 +468,7 @@ Call site is (#{insn}).
 
           if fcall
             stack.pop();
-            irs << SubIR.new(Self.new(translator), TmpVariable.new(stack.push()), InsnInfo.new([:putself], insn.iseq, -1, -1, true), cfg)
+            irs << SubIR.new(Self.new(translator, insn.iseq), TmpVariable.new(stack.push()), InsnInfo.new([:putself], insn.iseq, -1, -1, true), cfg)
           end
           recv = TmpVariable.new(stack.pop())
           param = []
@@ -543,14 +543,12 @@ Call site is (#{insn}).
         when :defined
           t = argv[0]
           case t
-          when DEFINED_IVAR, DEFINED_GVAR, DEFINED_FUNC
+          when DEFINED_IVAR, DEFINED_GVAR, DEFINED_FUNC, DEFINED_CONST
             # ok
           when DEFINED_IVAR2
             bug("unexpected defined instruction")
           when DEFINED_CVAR
             raise(UnsupportedError.new("Currently, CastOff cannot handle defined instruction for class variable"))
-          when DEFINED_CONST
-            raise(UnsupportedError.new("Currently, CastOff cannot handle defined instruction for constant"))
           when DEFINED_METHOD
             raise(UnsupportedError.new("Currently, CastOff cannot handle defined instruction for methods"))
           when DEFINED_YIELD
@@ -744,7 +742,7 @@ Call site is (#{insn}).
 
       def get_definition(target)
         case target
-        when Self, Literal
+        when Literal
           return [target]
         when Variable
           ds = @information.variable_definition_of(target)
@@ -776,7 +774,7 @@ Call site is (#{insn}).
         ary = get_definition(target)
         ary.map {|d|
           case d
-          when Self, Literal
+          when Literal
             d.source
           when SubIR
             d.src.source

data/lib/cast_off/compile/translator.rb

@@ -8,6 +8,15 @@ module CastOff
     include Converter
 
     Template = ERB.new(<<-'end', 0, '%-', 'io')
+%case RUBY_VERSION
+%when "1.9.3"
+#define RUBY_1_9_3 1
+%when "1.9.2"
+#define RUBY_1_9_2 1
+%else
+%  raise(UnsupportedError.new("Unsupported ruby version #{RUBY_VERSION}"))
+%end
+
 #include <ruby.h>
 #include <ruby/encoding.h>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cast_off
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00.000000000 Z
+date: 2011-11-16 00:00:00.000000000 Z
 dependencies: []
 description: ! 'CastOff is a performance improvement tool for Ruby1.9.3
 
@@ -55,27 +55,43 @@ files:
 - ext/cast_off/generated_c_include/iter_api.h
 - ext/cast_off/generated_c_include/unbox_api.h.rb
 - ext/cast_off/generated_c_include/inline_api.h
-- ext/cast_off/cast_off.h
-- ext/cast_off/ruby_source/method.h
-- ext/cast_off/ruby_source/atomic.h
-- ext/cast_off/ruby_source/vm_insnhelper.h
-- ext/cast_off/ruby_source/constant.h
-- ext/cast_off/ruby_source/id.h
-- ext/cast_off/ruby_source/iseq.h
-- ext/cast_off/ruby_source/debug.h
-- ext/cast_off/ruby_source/insns.inc
-- ext/cast_off/ruby_source/node.h
-- ext/cast_off/ruby_source/internal.h
-- ext/cast_off/ruby_source/manual_update.h
-- ext/cast_off/ruby_source/insns_info.inc
-- ext/cast_off/ruby_source/gc.h
-- ext/cast_off/ruby_source/thread_win32.h
-- ext/cast_off/ruby_source/vm_exec.h
-- ext/cast_off/ruby_source/thread_pthread.h
-- ext/cast_off/ruby_source/vm_opts.h
-- ext/cast_off/ruby_source/vm_insnhelper.c
-- ext/cast_off/ruby_source/vm_core.h
-- ext/cast_off/ruby_source/eval_intern.h
+- ext/cast_off/ruby_source/1.9.3/method.h
+- ext/cast_off/ruby_source/1.9.3/atomic.h
+- ext/cast_off/ruby_source/1.9.3/vm_insnhelper.h
+- ext/cast_off/ruby_source/1.9.3/constant.h
+- ext/cast_off/ruby_source/1.9.3/id.h
+- ext/cast_off/ruby_source/1.9.3/iseq.h
+- ext/cast_off/ruby_source/1.9.3/debug.h
+- ext/cast_off/ruby_source/1.9.3/insns.inc
+- ext/cast_off/ruby_source/1.9.3/node.h
+- ext/cast_off/ruby_source/1.9.3/internal.h
+- ext/cast_off/ruby_source/1.9.3/manual_update.h
+- ext/cast_off/ruby_source/1.9.3/insns_info.inc
+- ext/cast_off/ruby_source/1.9.3/gc.h
+- ext/cast_off/ruby_source/1.9.3/thread_win32.h
+- ext/cast_off/ruby_source/1.9.3/vm_exec.h
+- ext/cast_off/ruby_source/1.9.3/thread_pthread.h
+- ext/cast_off/ruby_source/1.9.3/vm_opts.h
+- ext/cast_off/ruby_source/1.9.3/vm_insnhelper.c
+- ext/cast_off/ruby_source/1.9.3/vm_core.h
+- ext/cast_off/ruby_source/1.9.3/eval_intern.h
+- ext/cast_off/ruby_source/1.9.2/method.h
+- ext/cast_off/ruby_source/1.9.2/vm_insnhelper.h
+- ext/cast_off/ruby_source/1.9.2/id.h
+- ext/cast_off/ruby_source/1.9.2/iseq.h
+- ext/cast_off/ruby_source/1.9.2/debug.h
+- ext/cast_off/ruby_source/1.9.2/insns.inc
+- ext/cast_off/ruby_source/1.9.2/node.h
+- ext/cast_off/ruby_source/1.9.2/manual_update.h
+- ext/cast_off/ruby_source/1.9.2/insns_info.inc
+- ext/cast_off/ruby_source/1.9.2/gc.h
+- ext/cast_off/ruby_source/1.9.2/thread_win32.h
+- ext/cast_off/ruby_source/1.9.2/vm_exec.h
+- ext/cast_off/ruby_source/1.9.2/thread_pthread.h
+- ext/cast_off/ruby_source/1.9.2/vm_opts.h
+- ext/cast_off/ruby_source/1.9.2/vm_insnhelper.c
+- ext/cast_off/ruby_source/1.9.2/vm_core.h
+- ext/cast_off/ruby_source/1.9.2/eval_intern.h
 - cast_off.gemspec
 - README
 - README.en
@@ -89,9 +105,9 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - =
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/ext/cast_off/cast_off.h

@@ -1,24 +0,0 @@
-#include <ruby.h>
-
-#include "vm_core.h"
-#include "eval_intern.h"
-#include "iseq.h"
-#include "gc.h"
-#include <ruby/vm.h>
-#include <ruby/encoding.h>
-#include "vm_insnhelper.h"
-#include "vm_insnhelper.c"
-#include "vm_exec.h"
-
-#ifdef  USE_INSN_STACK_INCREASE
-#undef  USE_INSN_STACK_INCREASE
-#endif
-#define USE_INSN_STACK_INCREASE 1
-
-#ifdef USE_INSN_RET_NUM
-#undef USE_INSN_RET_NUM
-#endif
-#define USE_INSN_RET_NUM 1
-
-#include "insns_info.inc"
-#include "manual_update.h"