cast_off 0.2.1 → 0.2.3

data/lib/cast_off/compile/basicblock.rb

@@ -136,7 +136,9 @@ module CastOff::Compiler
       end
 
       def to_s()
-        "(#{@labels.join(", ")})BB#{@number}"
+        pstr = "#{@pre.map{|b|  "BB#{b.number}"}.join(", ")}"
+        nstr = "#{@next.map{|b| "BB#{b.number}"}.join(", ")}"
+        "(#{pstr})BB#{@number}-#{@iseq}(#{nstr})"
       end
     end
   end

data/lib/cast_off/compile/cfg.rb

@@ -357,8 +357,6 @@ module CastOff::Compiler
             case d
             when Literal
               bug()
-            when Self
-              ir.add_sampling_variable(d)
             when SubIR
               d.add_sampling_variable(d.src)
               #ir.add_sampling_variable(d.src)

data/lib/cast_off/compile/code_manager.rb

@@ -14,6 +14,8 @@ module CastOff
 
       CastOffDir = "#{ENV["HOME"]}/.CastOff"
       FileUtils.mkdir(CastOffDir) unless File.exist?(CastOffDir)
+      BaseDir = "#{CastOffDir}/#{File.expand_path(__FILE__).gsub(/\.|\/|-|:/, "_")}"
+      FileUtils.mkdir(BaseDir) unless File.exist?(BaseDir)
 
       @@program_name = File.expand_path($PROGRAM_NAME)
       CastOff::Compiler.class_eval do
@@ -23,7 +25,7 @@ module CastOff
       end
 
       def self.program_dir()
-        dir = "#{CastOffDir}/#{@@program_name.gsub(/\.|\/|-|:/, "_")}"
+        dir = "#{BaseDir}/#{@@program_name.gsub(/\.|\/|-|:/, "_")}"
         FileUtils.mkdir(dir) unless File.exist?(dir)
         dir
       end
@@ -35,14 +37,35 @@ module CastOff
         dir
       end
 
+      def self.delete_from_compiled(entry)
+        compiled = load_autocompiled()
+        return false unless compiled
+        return false unless compiled.delete(entry)
+        dump_auto_compiled(compiled)
+        return true
+      end
+
+      @@compiled_methods_fetch_str = nil
+      @@compiled_methods_load_str  = nil
       def self.load_autocompiled()
         begin
           dir = program_dir()
-          path = "#{dir}/auto_compiled.dump"
+          # fetch classes
+          path = "#{dir}/.compiled_methods"
+          return nil unless File.exist?(path)
+          if !@@compiled_methods_fetch_str
+            @@compiled_methods_fetch_str = File.open(path, 'rb:us-ascii').read() 
+            @@compiled_methods_fetch_str.untaint # FIXME
+          end
+          Marshal.load(@@compiled_methods_fetch_str)
+          # load compiled methods information
+          path = "#{dir}/compiled_methods"
           return nil unless File.exist?(path)
-          str = File.open(path, 'rb:us-ascii').read()
-          str.untaint # FIXME
-          Marshal.load(str)
+          if !@@compiled_methods_load_str
+            @@compiled_methods_load_str = File.open(path, 'rb:us-ascii').read() 
+            @@compiled_methods_load_str.untaint # FIXME
+          end
+          Marshal.load(@@compiled_methods_load_str)
         rescue ArgumentError, NameError
           false
         end
@@ -50,10 +73,16 @@ module CastOff
 
       def self.dump_auto_compiled(compiled)
         dir = program_dir()
-        path = "#{dir}/auto_compiled.dump"
+        path = "#{dir}/.compiled_methods"
+        File.open("#{path}", 'wb:us-ascii') do |f|
+          Marshal.dump(compiled.map{|c| c.first}, f) # dump only classes
+        end
+        @@compiled_methods_fetch_str = nil
+        path = "#{dir}/compiled_methods"
         File.open("#{path}", 'wb:us-ascii') do |f|
           Marshal.dump(compiled, f)
         end
+        @@compiled_methods_load_str = nil
         load_autocompiled()
       end
 
@@ -97,7 +126,7 @@ module CastOff
         @depfile = "#{@signiture}.mdep"
         @deppath = "#{@dstdir}/#{@depfile}"
         @conffile = "#{@signiture}.conf"
-        @base_configuration_path = "#{@dstdir}/#{@signiture}.base.conf"
+        @base_configuration_path = "#{@dstdir}/#{base_sign}.base.conf"
         @annotation_path = "#{@dstdir}/#{@signiture}.ann"
         @development_mark_file = "development"
         @development_mark_path = "#{@dstdir}/#{@development_mark_file}"

data/lib/cast_off/compile/configuration.rb

@@ -110,7 +110,7 @@ o = Object
       end
 
       def hash()
-        bug()
+        BindingWrapper.hash
       end
     end
 
@@ -2157,19 +2157,24 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
       [Float, :phase, :class],
     ]
     DIRECT_CALL_TARGETS.map! do |(obj, mid, t)|
-      case t
-      when :class
-        bug() unless obj.instance_of?(Class)
-        MethodWrapper.new(ClassWrapper.new(obj, true), mid)
-      when :module
-        bug() unless obj.instance_of?(Module)
-        MethodWrapper.new(ModuleWrapper.new(obj), mid)
-      when :singleton
-        MethodWrapper.new(ClassWrapper.new(obj, false), mid)
-      else
-        bug()
+      begin
+        case t
+        when :class
+          bug() unless obj.instance_of?(Class)
+          MethodWrapper.new(ClassWrapper.new(obj, true), mid)
+        when :module
+          bug() unless obj.instance_of?(Module)
+          MethodWrapper.new(ModuleWrapper.new(obj), mid)
+        when :singleton
+          MethodWrapper.new(ClassWrapper.new(obj, false), mid)
+        else
+          bug()
+        end
+      rescue CompileError # method not found
+        vlog("method not found #{obj} #{mid}")
       end
     end
+    DIRECT_CALL_TARGETS.compact!
 
     def should_be_call_directly?(klass, mid)
       bug() unless klass.is_a?(ClassWrapper)
@@ -2237,7 +2242,7 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
       :@@enable_inline_api                       => [true,  true,  false],
       :@@inject_guard                            => [true,  true,  false],
       :@@array_conservative                      => [true,  true,  false],
-      :@@reuse_compiled_binary                   => [true,  false, true],
+      :@@reuse_compiled_code                     => [true,  false, true],
       :@@allow_builtin_variable_incompatibility  => [false, true,  false],
       :@@prefetch_constant                       => [true,  true,  false],
       :@@deoptimize                              => [false, true,  false],

data/lib/cast_off/compile/dependency.rb

@@ -81,7 +81,13 @@ module CastOff
         dep = @@singleton_method_dependency[obj]
         return false unless dep
         return false unless dep.include?(mid)
-        bug() unless @@singleton_method_dependency_initializers[[obj, mid]]
+        unless @@singleton_method_dependency_initializers[[obj, mid]]
+          if mid == :method_added || mid == :singleton_method_added
+            return []
+          else
+            bug()
+          end
+        end
         @@singleton_method_dependency_initializers[[obj, mid]]
       end
 
@@ -121,19 +127,20 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
       end
 
       def add(klass, mid, strong_p)
-        # TODO klass から、対象メソッドを定義しているクラスまでのメソッドの検索対象を全てフック
+        # TODO include で継承関係が変わったのを検出
         bug() unless klass.instance_of?(ClassWrapper)
         targets = [klass]
         if not klass.singleton?
-          c = klass.contain_class
-          cm = CastOff.override_target(c, mid)
-          case cm
-          when Class
-            targets << ClassWrapper.new(cm, true) if cm != c
-          when Module
-            targets << ModuleWrapper.new(cm)
-          else
-            bug()
+          klass.each_method_search_target(mid) do |cm|
+            next if cm == klass.contain_class
+            case cm
+            when Class
+              targets << ClassWrapper.new(cm, true)
+            when Module
+              targets << ModuleWrapper.new(cm)
+            else
+              bug()
+            end
           end
         end
         targets.each do |t|
@@ -186,17 +193,31 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
             end
           end
 
+          begin
+            singleton_method_added = o.method(:singleton_method_added)
+          rescue NameError
+            singleton_method_added = nil
+          end
+          begin
+            method_added = o.method(:method_added)
+          rescue NameError
+            method_added = nil
+          end
           define_method(:method_added) do |mid|
             if self == o && !Dependency.ignore_overridden?(self, mid)
               if Dependency.singleton_method_added?
                 CastOff.dlog("singleton method added #{o}.#{mid}")
                 CastOff.delete_original_singleton_method_iseq(self, mid)
                 override_singleton_method(o, mid, :added) 
+                singleton_method_added.call(mid) if singleton_method_added
               else
                 CastOff.dlog("method added #{o}##{mid}")
                 CastOff.delete_original_instance_method_iseq(self, mid)
                 override_method(o, mid, :added)
+                method_added.call(mid) if method_added
               end
+            elsif o == BasicObject && method_added && !Dependency.singleton_method_added?
+              method_added.call(mid)
             end
             super(mid) rescue NoMethodError
           end

data/lib/cast_off/compile/information.rb

@@ -165,6 +165,8 @@ module CastOff::Compiler
             ret |= var.is_dynamic()
           when Pointer, Argument
             ret |= var.is_dynamic()
+          when Self
+            bug() if var.undefined?
           else
             bug(var)
           end
@@ -181,7 +183,7 @@ module CastOff::Compiler
         ds = @variable_definition.select{|d| var == d.result_variable }
         if @undefs.include?(var) || ds.empty?
           case var
-          when TmpBuffer, Pointer, Argument
+          when TmpBuffer, Pointer, Argument, Self
             return false
           else
             bug(var)
@@ -739,22 +741,24 @@ module CastOff::Compiler
         @guards.freeze()
         @variable_definition.freeze()
       end
+
+      def to_s()
+        @guards.map{|g| "#{g.to_debug_string()}"}.join(", ")
+      end
     end
 
     def inject_guards()
       vars = all_variable()
       ptrs = all_pointer()
-      guards = []
+      vars.freeze()
+      ptrs.freeze()
       @blocks.each do |b|
         b.irs.map! do |ir|
           g = ir.generate_guard(vars)
-          guards << g
           g ? [g, ir] : ir
         end
         b.irs.flatten!
       end
-      guards.compact()
-      guards.freeze()
 
       bug() if @blocks.find{|b| not b.information.frozen?}
       @blocks.each{|b| b.in_guards = Guards.new(b, b.information, [], ptrs)}
@@ -763,7 +767,7 @@ module CastOff::Compiler
         change = false
         @blocks.each do |b0|
           next if b0.entry_point?
-          in_guards = b0.pre.inject(Guards.new(b0, b0.information, guards, ptrs)){|in_g, b1| in_g & b1.in_guards.final_state()}
+          in_guards = b0.pre.inject(Guards.new(b0, b0.information, vars, ptrs)){|in_g, b1| in_g & b1.in_guards.final_state()}
           change = true if b0.in_guards != in_guards
           b0.in_guards = in_guards
         end

data/lib/cast_off/compile/instruction.rb

@@ -13,17 +13,6 @@ module CastOff::Compiler
     VM_CALL_SUPER_BIT          = (0x01 << 7)
     VM_CALL_OPT_SEND_BIT       = (0x01 << 8)
 
-    DEFINED_IVAR    = 1
-    DEFINED_IVAR2   = 2
-    DEFINED_GVAR    = 3
-    DEFINED_CVAR    = 4
-    DEFINED_CONST   = 5
-    DEFINED_METHOD  = 6
-    DEFINED_YIELD   = 7
-    DEFINED_REF     = 8
-    DEFINED_ZSUPER  = 9
-    DEFINED_FUNC    = 10
-
     SupportInstruction = [
       :trace, :nop, :putnil, :getdynamic, :send, :leave, :putobject, :putself, :putstring, :newrange,
       :newarray, :duparray, :tostring, :concatstrings, :setdynamic, :newhash, :branchunless, :branchif, :toregexp,

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

@@ -1104,6 +1104,14 @@ If you want to use these variables, use CastOff.allow_builtin_variable_incompati
     #{@return_value} = #{@needstr ? 'rb_str_new2("method")' : 'Qtrue'};
   } else {
     #{@return_value} = Qnil;
+  }
+          EOS
+        when DEFINED_CONST
+          ret << <<-EOS
+  if (cast_off_const_defined(#{val}, #{@id})) {
+    #{@return_value} = #{@needstr ? 'rb_str_new2("constant")' : 'Qtrue'};
+  } else {
+    #{@return_value} = Qnil;
   }
           EOS
         else
@@ -1405,7 +1413,8 @@ Call site is (#{@insn}).
 %bug() unless param.size > 0
   {
     int argc = <%= @argc - 1 %>;
-    VALUE argv[<%= SPLATCALL_LIMIT %>]; /* FIXME */
+    VALUE buf[<%= SPLATCALL_LIMIT %>]; /* FIXME */
+    VALUE *argv = buf;
 %splat_param  = param.last()
 %normal_param = param.slice(0, param.size() - 1)
     VALUE ary = <%= splat_param %>;
@@ -1432,7 +1441,11 @@ Call site is (#{@insn}).
       ptr = RARRAY_PTR(tmp);
       argc += len;
       if (UNLIKELY(argc > <%= SPLATCALL_LIMIT %>)) {
-        rb_raise(rb_eCastOffExecutionError, "Too large array(limit = <%= SPLATCALL_LIMIT %>)");
+        VALUE *newbuf = ALLOCA_N(VALUE, argc);
+%normal_param.size.times do |i|
+        newbuf[i] = argv[i];
+%end
+        argv = newbuf;
       }
       for (i = 0; i < len; i++) {
         argv[<%= normal_param.size %> + i] = ptr[i];
@@ -1615,7 +1628,8 @@ You should not use #{@method_id} method in compilation target of CastOff.
 %bug() unless param.size > 0
   {
     int argc = <%= argc - 2 %>;
-    VALUE argv[<%= SPLATCALL_LIMIT %>];
+    VALUE buf[<%= SPLATCALL_LIMIT %>];
+    VALUE *argv = buf;
 %splat_param  = param.last()
 %normal_param = param.slice(0, param.size() - 1)
     VALUE ary = <%= splat_param %>;
@@ -1642,7 +1656,11 @@ You should not use #{@method_id} method in compilation target of CastOff.
       ptr = RARRAY_PTR(tmp);
       argc += len;
       if (UNLIKELY(argc > <%= SPLATCALL_LIMIT %>)) {
-        rb_raise(rb_eCastOffExecutionError, "Too large array(limit = <%= SPLATCALL_LIMIT %>)");
+        VALUE *newbuf = ALLOCA_N(VALUE, argc);
+%normal_param.size.times do |i|
+        newbuf[i] = argv[i];
+%end
+        argv = newbuf;
       }
       for (i = 0; i < len; i++) {
         argv[<%= normal_param.size %> + i] = ptr[i];
@@ -1919,7 +1937,11 @@ You should not use #{@method_id} method in compilation target of CastOff.
         if @translator.reciever_class && @translator.reciever_class.size() == 1
           same_class = true if recv.is_just?(@translator.reciever_class[0])
         end
-        same_class = true if recv.is_a?(Self) && (@translator.inline_block? || @insn.iseq.root?)
+        recv_defn = param_irs.first.get_definition(recv)
+        if recv_defn.size == 1 && (@translator.inline_block? || @insn.iseq.root?)
+          recv_defn = recv_defn.first
+          same_class |= recv_defn.is_a?(SubIR) && recv_defn.src.is_a?(Self)
+        end
         if same_class && mid == @translator.mid
           true
         else

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

@@ -161,18 +161,7 @@ module CastOff::Compiler
       end
 
       def reset()
-        @ignore.clear()
-        case @state
-        when :undefined
-          bug()
-        when :initialized, :dynamic
-          @types = []
-          @state = :undefined
-        when :static
-          # nothing to do
-        else
-          bug()
-        end
+        bug()
       end
 
       def not_initialized()
@@ -563,11 +552,55 @@ module CastOff::Compiler
       end
     end
 
-    class Self < TypeContainer
+    class Variable < TypeContainer
+      def initialize()
+        super()
+        @isclassexact = false
+      end
+
+      def class_exact?
+        @isclassexact
+      end
+
+      def is_class_exact()
+        bug() if @isclassexact
+        @isclassexact = true
+      end
+
+      def has_undefined_path()
+        # nothing to do
+      end
+
+      def declare?
+        self.is_a?(LocalVariable) || self.is_a?(TmpVariable) || self.is_a?(Pointer)
+      end
+
+      def reset()
+        @ignore.clear()
+        case @state
+        when :undefined
+          bug()
+        when :initialized, :dynamic
+          @types = []
+          @state = :undefined
+        when :static
+          # nothing to do
+        else
+          bug()
+        end
+      end
+    end
+
+    class Self < Variable
       include CastOff::Util
 
-      def initialize(translator)
+      attr_reader :iseq
+
+      def initialize(translator, iseq)
         super()
+        @iseq = iseq
+        @translator = translator
+        bug() unless @iseq.is_a?(Iseq)
         reciever_class = translator.reciever_class
         if reciever_class
           #is_static(reciever_class)
@@ -591,7 +624,10 @@ module CastOff::Compiler
       end
 
       def eql?(v)
-        v.is_a?(Self)
+        #v.is_a?(Self)
+        return false unless v.is_a?(Self)
+        return true if @translator.inline_block?
+        @iseq == v.iseq
       end
 
       def ==(v)
@@ -601,30 +637,14 @@ module CastOff::Compiler
       def hash
         self.to_name.hash
       end
-    end
 
-    class Variable < TypeContainer
-      def initialize()
-        super()
-        @isclassexact = false
-      end
-
-      def class_exact?
-        @isclassexact
-      end
-
-      def is_class_exact()
-        bug() if @isclassexact
-        @isclassexact = true
+      def to_debug_string
+        "#{super}(#{@iseq})"
       end
 
-      def has_undefined_path()
+      def reset()
         # nothing to do
       end
-
-      def declare?
-        self.is_a?(LocalVariable) || self.is_a?(TmpVariable) || self.is_a?(Pointer)
-      end
     end
 
     class TmpVariable < Variable