ytljit 0.0.3 → 0.0.4

data/lib/ytljit/vm_trans.rb

@@ -43,6 +43,15 @@ module YTLJit
       attr          :local_label_tab
 
       attr_accessor :not_reached_pos
+
+      def import_object(klass, name, value)
+        ctn = ClassTopNode.get_class_top_node(klass)
+        if ctn == nil then
+          ctn = ClassTopNode.new(@the_top, klass, klass.name)
+        end
+        valnode = LiteralNode.new(ctn, value)
+        ctn.get_constant_tab[name] = valnode
+      end
     end
 
     class YARVTranslatorBase
@@ -164,16 +173,30 @@ module YTLJit
 
       def visit_getdynamic(code, ins, context)
         # + 3 mean prtv_env/pointer to block function/self
-        offset = code.header['misc'][:local_size] + 3 - ins[1]
-        node = LocalVarRefNode.new(context.current_node, offset, ins[2])
+        dep = ins[2]
+        curcode = code
+        dep.times do
+          curcode = curcode.parent
+        end
+        offset = curcode.header['misc'][:local_size] + 3 - ins[1]
+        node = LocalVarRefNode.new(context.current_node, offset, dep)
         context.expstack.push node
       end
 
       def visit_setdynamic(code, ins, context)
+        dep = ins[2]
+        curcode = code
+        dep.times do
+          curcode = curcode.parent
+        end
         val = context.expstack.pop
         curnode = context.current_node
-        offset = code.header['misc'][:local_size] + 3 - ins[1]
-        node = LocalAssignNode.new(curnode, offset, ins[2], val)
+        offset = curcode.header['misc'][:local_size] + 3 - ins[1]
+        node = LocalAssignNode.new(curnode, offset, dep, val)
+        if context.expstack[-1] == val then
+          varref = LocalVarRefNode.new(context.current_node, offset, dep)
+          context.expstack[-1] = varref
+        end
         curnode.body = node
         context.current_node = node
       end
@@ -188,23 +211,35 @@ module YTLJit
 
       # getclassvariable
       # setclassvariable
-      
-      def visit_getconstant(code, ins, context)
+
+      def get_self_object(context)
         klass = context.expstack.pop
         case klass
         when ConstantRefNode
           klass = klass.value_node
 
-
         when LiteralNode
           klass = klass.value
           if klass == nil then
             klass = context.current_class_node
           end
 
+        when SpecialObjectNode
+          if klass.kind == 3 then
+            klass = context.current_class_node
+          else
+            raise "Unkown special object kind = #{klass.kind}"
+          end
+
         else
           raise "Umkonwn node #{klass.class}"
         end
+
+        klass
+      end
+      
+      def visit_getconstant(code, ins, context)
+        klass = get_self_object(context)
         name = ins[1]
         curnode = context.current_node
         node = ConstantRefNode.new(curnode, klass, name)
@@ -212,6 +247,13 @@ module YTLJit
       end
 
       def visit_setconstant(code, ins, context)
+        klass = get_self_object(context)
+        value = context.expstack.pop
+        name = ins[1]
+        curnode = context.current_node
+        node = ConstantAssignNode.new(curnode, klass, name, value)
+        curnode.body = node
+        context.current_node = node
       end
 
       # getglobal
@@ -246,9 +288,9 @@ module YTLJit
         when :block
           mtopnode = BlockTopNode.new(curnode)
         when :method
-          mtopnode = MethodTopNode.new(curnode)
+          mtopnode = MethodTopNode.new(curnode, body.header['name'].to_sym)
         when :class
-          mtopnode = ClassTopNode.new(curnode)
+          mtopnode = ClassTopNode.new(curnode, body.header['name'].to_sym)
         when :top
           raise "Maybe bug not appear top block."
         end
@@ -289,10 +331,17 @@ module YTLJit
 
       def visit_pop(code, ins, context)
         node = context.expstack.pop
+        if node == nil then
+          # Maybe push instruction deleted by optimize
+          node = LiteralNode.new(nil, nil)
+        end
+
         curnode = context.current_node
         node.parent = curnode
         curnode.body = node
-        context.current_node = node
+        if node.is_a?(HaveChildlenMixin) then
+          context.current_node = node
+        end
 
         context
       end
@@ -370,6 +419,7 @@ module YTLJit
         end
         RubyType::define_wraped_class(klassobj, RubyType::RubyTypeBoxed)
         cnode = ClassTopNode.new(context.current_class_node, klassobj, name)
+        context.current_class_node.constant_tab[name] = cnode
         
         body = VMLib::InstSeqTree.new(code, ins[2])
         ncontext = YARVContext.new
@@ -381,7 +431,6 @@ module YTLJit
         tr = self.class.new([body])
         tr.translate(ncontext)
 
-        context.current_class_node.constant_tab[name] = cnode
         curnode = context.current_node
         cvnode = ClassValueNode.new(curnode, cnode)
         context.expstack.push cvnode
@@ -393,6 +442,7 @@ module YTLJit
         blk_iseq = ins[3]
         curnode = context.current_node
         numarg = ins[2]
+        seqno = ins[5]
 
         # regular arguments
         arg = []
@@ -409,7 +459,7 @@ module YTLJit
           body = VMLib::InstSeqTree.new(code, blk_iseq)
           ncontext = YARVContext.new
           ncontext.current_file_name = context.current_file_name
-          ncontext.current_class_node = curnode
+          ncontext.current_class_node = context.current_class_node
           btn = ncontext.current_node = BlockTopNode.new(curnode)
           ncontext.top_nodes.push btn
 
@@ -427,7 +477,7 @@ module YTLJit
 
         func = MethodSelectNode.new(curnode, ins[1])
         op_flag = ins[4]
-        sn = SendNode.make_send_node(curnode, func, arg, op_flag)
+        sn = SendNode.make_send_node(curnode, func, arg, op_flag, seqno)
         func.set_reciever(sn)
         context.expstack.push sn
 
@@ -442,6 +492,7 @@ module YTLJit
         func = YieldNode.new(curnode)
         numarg = ins[1]
         op_flag = ins[2]
+        seqno = ins[3]
 
         # regular arguments
         args = []
@@ -455,17 +506,17 @@ module YTLJit
         framelayout = frameinfo.frame_layout
 
         # self
-        args.push framelayout[roff + 2]
+        args.push LiteralNode.new(curnode, nil)
 
         # block
-        args.push framelayout[roff + 1]
+        args.push LiteralNode.new(curnode, nil)
         
         # perv env
-        args.push framelayout[roff]
+        args.push LiteralNode.new(curnode, nil)
 
         args = args.reverse
 
-        nnode = SendNode.new(curnode, func, args, op_flag)
+        nnode = SendNode.new(curnode, func, args, op_flag, seqno)
         func.parent = nnode
         context.expstack.push nnode
 
@@ -473,9 +524,17 @@ module YTLJit
       end
 
       def visit_leave(code, ins, context)
-        curnode = context.current_node 
+        curnode = nil
+        vnode = nil
+        if context.top_nodes.last.name == :initialize then
+          visit_pop(code, ins, context)
+          curnode = context.current_node 
+          vnode = SelfRefNode.new(curnode)
+        else
+          curnode = context.current_node 
+          vnode = context.expstack.pop
+        end
 
-        vnode = context.expstack.pop
         srnode = SetResultNode.new(curnode, vnode)
         curnode.body = srnode
 
@@ -504,6 +563,7 @@ module YTLJit
         nllab = get_vmnode_from_label(context, ins[1])
 
         jpnode = JumpNode.new(curnode, nllab) 
+        jpnode.body = nllab
 
         val = context.expstack.pop
         nllab.come_from[jpnode] = val

data/lib/ytljit/vm_type.rb

@@ -1,13 +1,12 @@
 module YTLJit
   module TypeUtil
     class KlassTree
-      def initialize(defkey = [], defval = [])
+      def initialize(defkey = [], defval = [[], []])
         @node = KlassTreeNode.new(defkey, defval)
       end
 
       def add(key, value)
         cnode = @node
-        snode = @node
         ocnode = nil
         while cnode
           ocnode = cnode
@@ -15,13 +14,11 @@ module YTLJit
             return cnode
           end
           
-          if key.zip(cnode.key).all? {|k, n| k.is_a?(n.class)}  then
+          if key.zip(cnode.key).all? {|k, n| k.is_a?(n.class)} and false then
             cnode = cnode.same_klass
             if cnode == nil then
               ocnode.same_klass = KlassTreeNode.new(key, value)
               return ocnode.same_klass
-            else
-              snode = cnode
             end
           else
             cnode = cnode.next_klass
@@ -35,13 +32,13 @@ module YTLJit
 
       def search(key)
         cnode = @node
-
+        
         while cnode
           if key == cnode.key then
             return cnode
           end
 
-          if key.zip(cnode.key).all? {|a, b| 
+          if key.zip(cnode.key).all? {|a, b|
               if a then
                 atype = a.ruby_type
 
@@ -52,9 +49,10 @@ module YTLJit
                   nil
                 end
               else
+                raise "foo"
                 return !b
               end
-            } then
+            } and false then
             cnode = cnode.same_klass
           else
             cnode = cnode.next_klass
@@ -77,7 +75,7 @@ module YTLJit
       attr_accessor :same_klass
       attr_accessor :next_klass
       attr          :key
-      attr_accessor :value
+      attr          :value
     end
 
     class TypeContainer
@@ -93,16 +91,16 @@ module YTLJit
         @types_tree.search(key)
       end
 
-      def add_type(key, type)
+      def add_type(key, type, pos)
         tvs = @types_tree.search(key)
         if tvs then
-          tvsv = tvs.value
+          tvsv = tvs.value[pos]
           if !tvsv.include? type then
             tvsv.push type
           end
         else
           # inherit types of most similar signature 
-          ival = []
+          ival = [[], []]
           simnode = @types_tree.add(key, ival)
 =begin
           simnode.value.each do |ele|
@@ -111,14 +109,14 @@ module YTLJit
 =end
 
           if !ival.include? type then
-            ival.push type
+            ival[pos].push type
           end
         end
       end
 
       def add_node(key)
         # inherit types of most similar signature 
-        ival = []
+        ival = [[], []]
         simnode = @types_tree.add(key, ival)
 =begin
         simnode.value.each do |ele|
@@ -134,7 +132,7 @@ module YTLJit
         if res == nil then
           res = add_node(key)
         end
-        
+
         res
       end
     end
@@ -173,6 +171,11 @@ module YTLJit
       end
 
       def self.related_ruby_class(klass, base)
+        if @@base_type_tab[klass] then
+          return [@@base_type_tab[klass], 
+                  @@boxed_type_tab[klass], 
+                  @@unboxed_type_tab[klass]]
+        end
         baseslf = base.new(klass)
         boxslf = RubyTypeBoxed.new(klass)
         unboxslf = RubyTypeUnboxed.new(klass)
@@ -205,7 +208,7 @@ module YTLJit
         @@boxed_type_tab[klass] = boxslf
         @@unboxed_type_tab[klass] = unboxslf
 
-        [boxslf, unboxslf]
+        [baseslf, boxslf, unboxslf]
       end
 
       def self.from_object(obj)
@@ -215,7 +218,9 @@ module YTLJit
       def self.from_ruby_class(rcls)
         tobj =  @@base_type_tab[rcls]
         if tobj == nil then
-          DefaultType0.new
+          RubyType::define_wraped_class(rcls, RubyTypeBoxed)
+          tobj =  @@base_type_tab[rcls]
+          tobj.instance
         else
           tobj.instance
         end
@@ -242,11 +247,11 @@ module YTLJit
       end
 
       def to_unbox
-        self
+        @@unboxed_type_tab[@ruby_type].instance
       end
 
       def to_box
-        self
+        @@boxed_type_tab[@ruby_type].instance
       end
 
       def ==(other)
@@ -304,5 +309,6 @@ module YTLJit
     define_wraped_class(Hash, RubyTypeBoxed)
     define_wraped_class(Module, RubyTypeBoxed)
     define_wraped_class(Class, RubyTypeBoxed)
+    define_wraped_class(Object, RubyTypeBoxed)
   end
 end

data/lib/ytljit/vm_type_gen.rb

@@ -86,7 +86,13 @@ module YTLJit
         end
 
         def gen_unboxing(context)
-          p "inboxing"
+          asm = context.assembler
+          fobj = TypedData.new(InternalRubyType::RFloat, context.ret_reg)
+          asm.with_retry do
+            asm.movsd(XMM0, fobj[:float_value])
+          end
+
+          context.ret_reg = XMM0
           context
         end
       end
@@ -98,6 +104,8 @@ module YTLJit
           asm = context.assembler
           val = context.ret_reg
           vnode = context.ret_node
+          context.start_using_reg(TMPR2)
+          context.start_using_reg(TMPR3)
           context.start_using_reg(FUNC_FLOAT_ARG[0])
           rbfloatnew = OpMemAddress.new(address_of("rb_float_new"))
           asm.with_retry do
@@ -105,6 +113,8 @@ module YTLJit
             asm.call_with_arg(rbfloatnew, 1)
           end
           context.end_using_reg(FUNC_FLOAT_ARG[0])
+          context.end_using_reg(TMPR3)
+          context.end_using_reg(TMPR2)
           context.ret_reg = RETR
           context
         end
@@ -135,7 +145,21 @@ module YTLJit
         end
 
         def gen_copy(context)
-          p "copy"
+          asm = context.assembler
+          val = context.ret_reg
+          context.start_using_reg(TMPR2)
+          context.start_using_reg(TMPR3)
+          context.start_using_reg(FUNC_ARG[0])
+          rbarydup = OpMemAddress.new(address_of("rb_ary_dup"))
+          asm.with_retry do
+            asm.mov(FUNC_ARG[0], val)
+            asm.call_with_arg(rbarydup, 1)
+          end
+          context.end_using_reg(FUNC_ARG[0])
+          context.end_using_reg(TMPR3)
+          context.end_using_reg(TMPR2)
+          context.ret_reg = RETR
+
           context
         end
 
@@ -144,6 +168,35 @@ module YTLJit
           self.class == other.class and
           @element_type == other.element_type
         end
+
+        def eql?(other)
+          other.is_a?(self.class) and
+          self.class == other.class and
+          @element_type == other.element_type
+        end
+      end
+
+      module StringTypeBoxedCodeGen
+        include AbsArch
+
+        def gen_copy(context)
+          asm = context.assembler
+          val = context.ret_reg
+          context.start_using_reg(TMPR2)
+          context.start_using_reg(TMPR3)
+          context.start_using_reg(FUNC_ARG[0])
+          rbstrresurrect = OpMemAddress.new(address_of("rb_str_resurrect"))
+          asm.with_retry do
+            asm.mov(FUNC_ARG[0], val)
+            asm.call_with_arg(rbstrresurrect, 1)
+          end
+          context.end_using_reg(FUNC_ARG[0])
+          context.end_using_reg(TMPR3)
+          context.end_using_reg(TMPR2)
+          context.ret_reg = RETR
+
+          context
+        end
       end
 
       module ArrayTypeUnboxedCodeGen