ytljit 0.0.8 → 0.0.9

data/lib/ytljit/vm_trans.rb

@@ -13,6 +13,8 @@ module YTLJit
         @current_file_name = nil
         @current_class_node = @the_top
         @current_method_node = nil
+        
+        @send_nodes_with_block = []
 
         @enc_label = ""
         @enc_pos_in_source = ""
@@ -41,6 +43,8 @@ module YTLJit
       attr_accessor :current_file_name
       attr_accessor :current_class_node
       attr_accessor :current_method_node
+
+      attr          :send_nodes_with_block
       
       attr_accessor :enc_label
       attr_accessor :enc_pos_in_source
@@ -125,6 +129,7 @@ module YTLJit
         end
         @iseqs.each do |code|
           pos = "#{code.header['filename']}:#{context.current_line_no}"
+          context.current_file_name = code.header['filename']
           context.enc_pos_in_source = pos
           if code.header['type'] == :block then
             lstr = context.enc_label + "+blk+" + 
@@ -232,7 +237,13 @@ module YTLJit
         (arg_size - locals.size).times do 
           locals.push nil
         end
+
         cnode = mtopnode.construct_frame_info(locals, arg_size, args)
+        # Get code space each optional argument label
+        cnode.opt_label.each do |lab|
+          cnode.opt_label_node.push get_vmnode_from_label(context, lab)
+        end
+
         exptab = code.header['exception_table']
         context.exception_table = {}
         if exptab.size != 0 then
@@ -264,14 +275,14 @@ module YTLJit
         top = context.top_nodes.last
         klassnode = context.current_class_node
         top.exception_table = context.exception_table
+        top.send_nodes_with_block = context.send_nodes_with_block
         if top.class == MethodTopNode then
+          SendNode.get_macro_tab[top.name] ||= {}
           if context.macro_method then
-            code = top.to_ruby(ToRubyContext.new).ret_code.last
+            maccontext = ToRubyContext.new
+            code = top.to_ruby(maccontext).ret_code.last
             #            print code
             proc = eval("lambda" + code)
-            if SendNode.get_macro_tab[top.name] == nil then
-              SendNode.get_macro_tab[top.name] = {}
-            end
             SendNode.get_macro_tab[top.name][:last] = proc
           else
             if !SendNode.get_user_defined_method_tab[top.name] then
@@ -279,6 +290,7 @@ module YTLJit
             end
             klassobj = klassnode.klass_object
             SendNode.get_user_defined_method_tab[top.name].push klassobj
+            SendNode.get_macro_tab[top.name][:last] = top
           end
         end
       end
@@ -338,10 +350,34 @@ module YTLJit
         val = context.expstack.pop
         curnode = context.current_node
         offset = curcode.header['misc'][:local_size] + 3 - ins[1]
+
+        prev_var = nil
+        context.expstack.each_with_index do |ele, i|
+          if ele.is_a?(LocalVarRefNode) and 
+              ele.offset == offset and ele.depth == dep then
+            prev_var ||= MultiplexNode.new(curnode, ele)
+            context.expstack[i] = prev_var
+          elsif ele.is_a?(SendNode) then
+            ele.traverse_node do |arg, args, j|
+              if arg.is_a?(LocalVarRefNode) and 
+                  arg.offset == offset and arg.depth == dep then
+                prev_var ||= MultiplexNode.new(ele, arg)
+                args[j] = prev_var
+              end
+            end
+          end
+        end
+
+        if prev_var then
+          mnode = MultiplexHolderNode.new(curnode, prev_var)
+          curnode.body = mnode
+          curnode = mnode
+        end
+
         node = LocalAssignNode.new(curnode, offset, dep, val)
         node.debug_info = context.debug_info
         if context.expstack[-1] == val then
-          varref = LocalVarRefNode.new(context.current_node, offset, dep)
+          varref = LocalVarRefNode.new(node, offset, dep)
           varref.debug_info = context.debug_info
           context.expstack[-1] = varref
         end
@@ -409,7 +445,7 @@ module YTLJit
       def visit_getglobal(code, ins, context)
         name = ins[1]
         curnode = context.current_node
-        node = GlobalVarRefNode.new(curnode, name)
+        node = GlobalVarRefNode.instance(curnode, name)
         curnode.body = node
         context.expstack.push node
       end
@@ -602,7 +638,7 @@ module YTLJit
 
       def visit_dup(code, ins, context)
         orgnode = context.expstack.pop
-        nnode = MultiplexNode.new(orgnode)
+        nnode = MultiplexNode.new(orgnode.parent, orgnode)
         context.expstack.push nnode
         context.expstack.push nnode
       end
@@ -612,7 +648,7 @@ module YTLJit
         n = ins[1]
         n.times do
           orgnode = context.expstack.pop
-          nnode = MultiplexNode.new(orgnode)
+          nnode = MultiplexNode.new(orgnode.parent, orgnode)
           res.push nnode
         end
         res = res.reverse
@@ -642,7 +678,7 @@ module YTLJit
       def visit_setn(code, ins, context)
         n = ins[1] + 1
         orgnode = context.expstack.last
-        nnode = MultiplexNode.new(orgnode)
+        nnode = MultiplexNode.new(orgnode.parent, orgnode)
         context.expstack[-n] = nnode
         context.expstack[-1] = nnode
       end
@@ -691,10 +727,10 @@ module YTLJit
             end
 
             case ins[3]
-            when 0
+            when 0, 3
               klassobj = Class.new(supklass)
               
-            when 2
+            when 2, 5
               klassobj = Module.new
             end
           end
@@ -742,8 +778,9 @@ module YTLJit
         if (op_flag & (0b11 << 3)) != 0 and # fcall, vcall
             slf.is_a?(LiteralNode) and 
             slf.value == nil and 
-            context.current_class_node.name != :top then
+            (context.current_class_node.name != :top or true) then
           slf = SelfRefNode.new(curnode)
+          slf.debug_info = context.debug_info
         end
         arg.push slf
 
@@ -790,13 +827,16 @@ module YTLJit
           sn.debug_info = context.debug_info
           func.set_reciever(sn)
           context.expstack.push sn
+          if blk_iseq then
+            context.send_nodes_with_block.push sn
+          end
         else
           # macro(including eval method). execute in compile time and
           # compile eval strings.
           val, evalstr = sn
           evalstr = evalstr.join("\n")
           is = RubyVM::InstructionSequence.compile(
-                  evalstr, "macro #{ins[1]}", "", 0, YTL::ISEQ_OPTS).to_a
+                  evalstr, "macro #{ins[1]}", "", 1, YTL::ISEQ_OPTS).to_a
           ncode = VMLib::InstSeqTree.new(code, is)
           ncode.body.pop        # Chop leave instruction
           translate_main(ncode, context)
@@ -813,6 +853,7 @@ module YTLJit
         curnode = context.current_node
         func = YieldNode.new(curnode)
         func.debug_info = context.debug_info
+        func.depth = depth_of_block(code)
         numarg = ins[1]
         op_flag = ins[2]
         seqno = ins[3]
@@ -860,8 +901,11 @@ module YTLJit
 
         if context.top_nodes.last.name == :initialize then
           # This is necessary. So it decides type of new method
-          visit_pop(code, ins, context)
+          vnode = context.expstack.pop
           curnode = context.current_node 
+          nnode = SetResultNode.new(curnode, vnode)
+          curnode.body = nnode
+          curnode =nnode
           vnode = SelfRefNode.new(curnode)
         else
           curnode = context.current_node 
@@ -932,7 +976,7 @@ module YTLJit
        
         node = BranchIfNode.new(curnode, cond, nllab)
         node.debug_info = context.debug_info
-        nllab.come_from[node] = nil
+        nllab.come_from[node] = context.expstack.last
 
         curnode.body = node
         context.current_node = node
@@ -946,7 +990,7 @@ module YTLJit
         
         node = BranchUnlessNode.new(curnode, cond, nllab)
         node.debug_info = context.debug_info
-        nllab.come_from[node] = nil
+        nllab.come_from[node] = context.expstack.last
 
         curnode.body = node
         context.current_node = node

data/lib/ytljit/vm_type.rb

@@ -13,8 +13,8 @@ module YTLJit
           if key == cnode.key then
             return cnode
           end
-          
-          if key.zip(cnode.key).all? {|k, n| k.is_a?(n.class)} then
+
+          if false and key.zip(cnode.key).all? {|k, n| k.is_a?(n.class)} then
             cnode = cnode.same_klass
             if cnode == nil then
               ocnode.same_klass = KlassTreeNode.new(key, value)
@@ -38,7 +38,7 @@ module YTLJit
             return cnode
           end
 
-          if key.zip(cnode.key).all? {|a, b|
+          if false and key.zip(cnode.key).all? {|a, b|
               if a then
                 atype = a.ruby_type
 
@@ -61,6 +61,20 @@ module YTLJit
         
         nil
       end
+
+      def search_valid_node
+        cnode = @node
+        
+        while cnode
+          if cnode.value != [[], []] then
+            return cnode
+          end
+
+          cnode = cnode.next_klass
+        end
+        
+        nil
+      end
     end
 
     class KlassTreeNode
@@ -91,13 +105,16 @@ module YTLJit
         @types_tree.search(key)
       end
 
+      def search_valid_node
+        @types_tree.search_valid_node
+      end
+
       def add_type(key, type, pos)
         tvs = @types_tree.search(key)
         if tvs then
           tvsv = tvs.value[pos]
-          if !tvsv.include? type then
-            tvsv.push type
-          end
+          tvsv.delete(type)
+          tvsv.push type
         else
           # inherit types of most similar signature 
           ival = [[], []]
@@ -182,21 +199,22 @@ module YTLJit
 
         klass.ancestors.reverse.each do |curcls|
           box_unbox = base.name.gsub(/.*::Ruby/, "")
-          mixinname = curcls.name + box_unbox + "CodeGen"
+          curclsn = curcls.name.gsub(/:/, '')
+          mixinname = curclsn + box_unbox + "CodeGen"
           begin
             mixin = VM::TypeCodeGen.const_get(mixinname)
             baseslf.extend mixin
           rescue NameError
           end
 
-          mixinname = curcls.name + "TypeBoxedCodeGen"
+          mixinname = curclsn + "TypeBoxedCodeGen"
           begin
             mixin = VM::TypeCodeGen.const_get(mixinname)
             boxslf.extend mixin
           rescue NameError
           end
 
-          mixinname = curcls.name + "TypeUnboxedCodeGen"
+          mixinname = curclsn + "TypeUnboxedCodeGen"
           begin
             mixin = VM::TypeCodeGen.const_get(mixinname)
             unboxslf.extend mixin
@@ -325,6 +343,8 @@ module YTLJit
     define_wraped_class(String, RubyTypeBoxed)
     define_wraped_class(Array, RubyTypeBoxed)
     define_wraped_class(Hash, RubyTypeBoxed)
+    define_wraped_class(IO, RubyTypeBoxed)
+    define_wraped_class(File, RubyTypeBoxed)
     define_wraped_class(Module, RubyTypeBoxed)
     define_wraped_class(Class, RubyTypeBoxed)
     define_wraped_class(Object, RubyTypeBoxed)

data/lib/ytljit/vm_type_gen.rb

@@ -1,7 +1,37 @@
 module YTLJit
   module VM
     module TypeCodeGen
+      module TypeUtil
+        include AbsArch
+        include CommonCodeGen
+
+        def gen_copy_common(context, func)
+          asm = context.assembler
+          val = context.ret_reg
+          vnode = context.ret_node
+          context.start_arg_reg
+          addr = lambda {
+            a = address_of(func)
+            $symbol_table[a] = func
+            a
+          }
+          rbstrdup = OpVarMemAddress.new(addr)
+          asm.with_retry do
+            asm.mov(FUNC_ARG[0], val)
+          end
+          context.set_reg_content(FUNC_ARG[0].dst_opecode, vnode)
+          context = gen_save_thepr(context)
+          context = gen_call(context, rbstrdup, 1, vnode)
+          context.end_arg_reg
+          context.ret_reg = RETR
+          
+          context
+        end
+      end
+
       module DefaultTypeCodeGen
+        include TypeUtil
+
         def instance
           self
         end
@@ -27,7 +57,7 @@ module YTLJit
         end
 
         def gen_copy(context)
-          context
+          gen_copy_common(context, 'rb_obj_dup')
         end
 
         def inspect
@@ -38,9 +68,80 @@ module YTLJit
           # Do not copy. It is immutable
           self
         end
+
+        def ==(other)
+          other and
+            self.ruby_type == other.ruby_type and
+            self.boxed == other.boxed
+        end
+      end
+
+      module NilClassTypeBoxedCodeGen
+        include TypeUtil
+
+        def gen_copy(context)
+          context
+        end
+      end
+
+      module SymbolTypeBoxedCodeGen
+        include TypeUtil
+
+        def gen_copy(context)
+          context
+        end
+      end
+
+      module FalseClassTypeBoxedCodeGen
+        include TypeUtil
+
+        def gen_copy(context)
+          context
+        end
+      end
+
+      module TrueClassTypeBoxedCodeGen
+        include TypeUtil
+
+        def gen_copy(context)
+          context
+        end
+      end
+
+      module ModuleTypeBoxedCodeGen
+        include TypeUtil
+
+        def gen_copy(context)
+          context
+        end
+      end
+
+      module ModuleTypeUnoxedCodeGen
+        include TypeUtil
+
+        def gen_copy(context)
+          context
+        end
+      end
+
+      module ClassTypeBoxedCodeGen
+        include TypeUtil
+
+        def gen_copy(context)
+          context
+        end
+      end
+
+      module ClassTypeUnboxedCodeGen
+        include TypeUtil
+
+        def gen_copy(context)
+          context
+        end
       end
 
       module FixnumTypeUnboxedCodeGen
+        include TypeUtil
         include AbsArch
         include CommonCodeGen
 
@@ -68,9 +169,14 @@ module YTLJit
         def gen_unboxing(context)
           context
         end
+
+        def gen_copy(context)
+          context
+        end
       end
 
       module FixnumTypeBoxedCodeGen
+        include TypeUtil
         include AbsArch
         include CommonCodeGen
 
@@ -93,9 +199,14 @@ module YTLJit
           context.ret_reg = TMPR
           context
         end
+
+        def gen_copy(context)
+          context
+        end
       end
 
       module FloatTypeBoxedCodeGen
+        include TypeUtil
         include AbsArch
         include CommonCodeGen
 
@@ -113,9 +224,14 @@ module YTLJit
           context.ret_reg = XMM0
           context
         end
+
+        def gen_copy(context)
+          context
+        end
       end
 
       module FloatTypeUnboxedCodeGen
+        include TypeUtil
         include AbsArch
         include CommonCodeGen
 
@@ -159,9 +275,15 @@ module YTLJit
         def gen_unboxing(context)
           context
         end
+
+        def gen_copy(context)
+          context
+        end
       end
 
       module ArrayTypeCommonCodeGen
+        include TypeUtil
+
         def init
           @element_type = nil
         end
@@ -180,26 +302,12 @@ module YTLJit
               ((other.element_type == nil and
                @element_type == nil) or
                (other.element_type and @element_type and
-                @element_type[nil] == other.element_type[nil])) and
-              boxed == other.boxed
-          else
-            false
-          end
-        end
-
-=begin
-        def eql?(other)
-          if other then
-            oc = other.ruby_type
-            sc = self.ruby_type
-
-            sc == oc and
+                @element_type[nil][0] == other.element_type[nil][0])) and
               boxed == other.boxed
           else
             false
           end
         end
-=end
 
         def inspect
           etype = @element_type.inspect
@@ -220,26 +328,7 @@ module YTLJit
         end
 
         def gen_copy(context)
-          asm = context.assembler
-          val = context.ret_reg
-          vnode = context.ret_node
-          context.start_arg_reg
-          addr = lambda {
-            a = address_of("rb_ary_dup")
-            $symbol_table[a] = "rb_ary_dup"
-            a
-          }
-          rbarydup = OpVarMemAddress.new(addr)
-          asm.with_retry do
-            asm.mov(FUNC_ARG[0], val)
-          end
-          context.set_reg_content(FUNC_ARG[0].dst_opecode, vnode)
-          context = gen_save_thepr(context)
-          context = gen_call(context, rbarydup, 1, vnode)
-          context.end_arg_reg
-          context.ret_reg = RETR
-
-          context
+          gen_copy_common(context, 'rb_ary_dup')
         end
 
         def copy_type
@@ -333,34 +422,18 @@ module YTLJit
       end
 
       module StringTypeBoxedCodeGen
+        include TypeUtil
         include AbsArch
         include CommonCodeGen
 
         def gen_copy(context)
-          asm = context.assembler
-          val = context.ret_reg
-          vnode = context.ret_node
-          context.start_arg_reg
-          addr = lambda {
-            a = address_of("rb_str_dup")
-            $symbol_table[a] = "rb_str_dup"
-            a
-          }
-          rbstrdup = OpVarMemAddress.new(addr)
-          asm.with_retry do
-            asm.mov(FUNC_ARG[0], val)
-          end
-          context.set_reg_content(FUNC_ARG[0].dst_opecode, vnode)
-          context = gen_save_thepr(context)
-          context = gen_call(context, rbstrdup, 1, vnode)
-          context.end_arg_reg
-          context.ret_reg = RETR
-          
-          context
+          gen_copy_common(context, 'rb_str_dup')
         end
       end
 
       module RangeTypeCommonCodeGen
+        include TypeUtil
+
         def init
           @args = nil
           @element_type = nil
@@ -385,6 +458,7 @@ module YTLJit
       end
 
       module RangeTypeBoxedCodeGen
+        include TypeUtil
         include RangeTypeCommonCodeGen
 
         def instance
@@ -404,6 +478,7 @@ module YTLJit
       end
 
       module RangeTypeUnboxedCodeGen
+        include TypeUtil
         include AbsArch
         include CommonCodeGen
         include RangeTypeCommonCodeGen