ytljit 0.0.5 → 0.0.6

data/lib/ytljit/vm_trans.rb

@@ -8,7 +8,7 @@ module YTLJit
         @top_nodes = [@the_top]
         @current_file_name = nil
         @current_class_node = the_top
-        @current_method_name = nil
+        @current_method_node = nil
 
         @enc_label = ""
         @enc_pos_in_source = ""
@@ -22,6 +22,8 @@ module YTLJit
         @local_label_tab = {}
 
         @not_reached_pos = false
+
+        @macro_method = nil
       end
 
       attr_accessor :the_top
@@ -29,7 +31,7 @@ module YTLJit
 
       attr_accessor :current_file_name
       attr_accessor :current_class_node
-      attr_accessor :current_method_name
+      attr_accessor :current_method_node
       
       attr_accessor :enc_label
       attr_accessor :enc_pos_in_source
@@ -44,6 +46,8 @@ module YTLJit
 
       attr_accessor :not_reached_pos
 
+      attr_accessor :macro_method
+
       def import_object(klass, name, value)
         ctn = ClassTopNode.get_class_top_node(klass)
         if ctn == nil then
@@ -52,6 +56,21 @@ module YTLJit
         valnode = LiteralNode.new(ctn, value)
         ctn.get_constant_tab[name] = valnode
       end
+
+      def debug_info
+        mname = nil
+        if @current_method_node then
+          mname = @current_method_node.get_constant_value
+        end
+        if mname then
+          mname = mname[0]
+        end
+
+        [@current_file_name, 
+         @current_class_node.name, 
+         mname,
+         @current_line_no]
+      end
     end
 
     class YARVTranslatorBase
@@ -68,7 +87,7 @@ module YTLJit
           context.enc_pos_in_source = pos
           if code.header['type'] == :block then
             lstr = context.enc_label + "+blk+" + 
-                   context.current_method_name.to_s
+                   context.current_method_node.to_s
             context.enc_label = lstr
           end
           translate_block(code, context)
@@ -77,8 +96,7 @@ module YTLJit
         context.the_top
       end
 
-      def translate_block(code, context)
-        visit_block_start(code, nil, context)
+      def translate_main(code, context)
         code.body.each do |ins|
           pos = "#{code.header['filename']}:#{context.current_line_no}"
           context.enc_pos_in_source = pos
@@ -96,6 +114,11 @@ module YTLJit
             send(("visit_" + opname).to_sym, code, ins, context)
           end
         end
+      end
+
+      def translate_block(code, context)
+        visit_block_start(code, nil, context)
+        translate_main(code, context)
         visit_block_end(code, nil, context)
       end
     end
@@ -108,12 +131,21 @@ module YTLJit
         nllab = context.local_label_tab[label]
         if nllab == nil then
           nllab = LocalLabel.new(curnode, label)
+          nllab.debug_info = context.debug_info
           context.local_label_tab[label] = nllab
         end
         
         nllab
       end
 
+      def gen_arg_node(context, sendnode, func, args)
+        curnode = context.current_node
+        nnode = sendnode.new(curnode, func, args, 0, 0)
+        nnode.debug_info = context.debug_info
+        func.parent = nnode
+        nnode
+      end
+
       def visit_symbol(code, ins, context)
         context.current_local_label = ins
 
@@ -122,6 +154,7 @@ module YTLJit
         
         unless curnode.is_a?(JumpNode)
           jmpnode = JumpNode.new(curnode, nllab)
+          jmpnode.debug_info = context.debug_info
           nllab.parent = jmpnode
 
           val = context.expstack.pop
@@ -140,25 +173,43 @@ module YTLJit
         if !mtopnode.is_a?(TopNode) then
           oldtop = context.the_top
           mtopnode = TopTopNode.new(nil, Object)
+          mtopnode.debug_info = context.debug_info
           context.the_top = mtopnode
           oldtop.parent = mtopnode
           mtopnode.init_node = oldtop
         end
 
-        locals = code.header['locals']
-        args   = code.header['misc'][:arg_size]
+        context.macro_method = nil
 
-        context.current_node = mtopnode.construct_frame_info(locals, args)
+        locals = code.header['locals']
+        arg_size   = code.header['misc'][:arg_size]
+        args   = code.header['args']
+        (arg_size - locals.size).times do 
+          locals.push nil
+        end
+        
+        cnode = mtopnode.construct_frame_info(locals, arg_size, args)
+        context.current_node = cnode
       end
 
       def visit_block_end(code, ins, context)
+        curnode = context.current_node
+        top = context.top_nodes.last
+        if top.class == MethodTopNode then
+          if context.macro_method then
+            code = top.to_ruby(ToRubyContext.new).ret_code.last
+#            print code
+            proc = eval("lambda" + code)
+            SendNode.get_macro_tab[top.name] = proc
+          end
+        end
       end
 
       def depth_of_block(code)
         dep = 0
         ccode = code
         while ccode.header['type'] == :block
-          ccode = code.parent
+          ccode = ccode.parent
           dep += 1
         end
         
@@ -187,6 +238,7 @@ module YTLJit
         end
         offset = curcode.header['misc'][:local_size] + 3 - ins[1]
         node = LocalVarRefNode.new(context.current_node, offset, dep)
+        node.debug_info = context.debug_info
         context.expstack.push node
       end
 
@@ -200,8 +252,10 @@ module YTLJit
         curnode = context.current_node
         offset = curcode.header['misc'][:local_size] + 3 - ins[1]
         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.debug_info = context.debug_info
           context.expstack[-1] = varref
         end
         curnode.body = node
@@ -250,6 +304,7 @@ module YTLJit
         name = ins[1]
         curnode = context.current_node
         node = ConstantRefNode.new(curnode, klass, name)
+        node.debug_info = context.debug_info
         context.expstack.push node
       end
 
@@ -259,6 +314,7 @@ module YTLJit
         name = ins[1]
         curnode = context.current_node
         node = ConstantAssignNode.new(curnode, klass, name, value)
+        node.debug_info = context.debug_info
         curnode.body = node
         context.current_node = node
       end
@@ -268,17 +324,20 @@ module YTLJit
       
       def visit_putnil(code, ins, context)
         nnode = LiteralNode.new(nil, nil)
+        nnode.debug_info = context.debug_info
         context.expstack.push nnode
       end
 
       def visit_putself(code, ins, context)
         curnode = context.current_node
         nnode = SelfRefNode.new(curnode)
+        nnode.debug_info = context.debug_info
         context.expstack.push nnode
       end
       
       def visit_putobject(code, ins, context)
         nnode = LiteralNode.new(nil, ins[1])
+        nnode.debug_info = context.debug_info
         context.expstack.push nnode
       end
 
@@ -301,31 +360,89 @@ module YTLJit
         when :top
           raise "Maybe bug not appear top block."
         end
+        mtopnode.debug_info = context.debug_info
         ncontext.current_node = mtopnode
         ncontext.top_nodes.push mtopnode
 
         ncontext.current_file_name = context.current_file_name
         ncontext.current_class_node = context.current_class_node
         mname = context.expstack.last
-        ncontext.current_method_name = mname
+        ncontext.current_method_node = mname
 
         tr = self.class.new([body])
         tr.translate(ncontext)
+        context.macro_method = ncontext.macro_method
         context.expstack.push mtopnode
       end
 
       def visit_putstring(code, ins, context)
         nnode = LiteralNode.new(nil, ins[1])
+        nnode.debug_info = context.debug_info
+        context.expstack.push nnode
+      end
+
+      def visit_concatstrings(code, ins, context)
+        curnode = context.current_node
+        numarg = ins[1]
+        nnode = context.expstack[-numarg]
+        (numarg - 1).times do |i|
+          func = FixArgCApiNode.new(curnode, "rb_str_append", [:VALUE, :VALUE])
+          args = [nnode, context.expstack[i - numarg + 1]]
+          nnode = gen_arg_node(context, RetStringSendNode, func, args)
+        end
+
+        numarg.times do
+          context.expstack.pop
+        end
+        context.expstack.push nnode
+      end
+
+      def visit_tostring(code, ins, context)
+        curnode = context.current_node
+        func = FixArgCApiNode.new(curnode, "rb_obj_as_string", [:VALUE])
+        args = []
+        argele = context.expstack.pop
+        args.push argele
+        nnode = gen_arg_node(context, RetStringSendNode, func, args)
         context.expstack.push nnode
       end
 
-      # concatstrings
-      # tostring
       # toregexp
-      # newarray
+
+      def newinst_to_sendnode(argnum, klass, code, ins, context)
+        arg = []
+        argnum.times {
+          arg.push context.expstack.pop
+        }
+        curnode = context.current_node
+        arg.push ConstantRefNode.new(curnode, nil, klass.name.to_sym)
+
+        arg.reverse.each do |c|
+          context.expstack.push c
+        end
+
+        visit_send(code, [:send, :new, argnum, nil, 0, nil], context)
+      end
+
+      def visit_newarray(code, ins, context)
+        curnode = context.current_node
+        func = FixArgCApiNode.new(curnode, "rb_ary_new3", [:int, :VALUE, :"..."])
+        argnum = ins[1]
+        argnumnode = LiteralNode.new(nil, argnum)
+        args = []
+        argnum.times do
+          argele = context.expstack.pop
+          args.push argele
+        end
+        args.push argnumnode
+        args = args.reverse
+        nnode = gen_arg_node(context, RetArraySendNode, func, args)
+        context.expstack.push nnode
+      end
 
       def visit_duparray(code, ins, context)
         nnode = LiteralNode.new(nil, ins[1])
+        nnode.debug_info = context.debug_info
         context.expstack.push nnode
       end
 
@@ -334,8 +451,13 @@ module YTLJit
       # splatarray
       # checkincludearray
       # newhash
-      # newrange
 
+      def visit_newrange(code, ins, context)
+        exclflag = LiteralNode.new(nil, ins[1] == 1)
+        context.expstack.push exclflag
+        newinst_to_sendnode(3, Range, code, ins, context)
+      end
+        
       def visit_pop(code, ins, context)
         node = context.expstack.pop
         if node == nil then
@@ -354,21 +476,37 @@ module YTLJit
       end
 
       def visit_dup(code, ins, context)
-        context.expstack.push context.expstack.last
+        orgnode = context.expstack.pop
+        nnode = MultiplexNode.new(orgnode)
+        context.expstack.push nnode
+        context.expstack.push nnode
       end
 
       def visit_dupn(code, ins, context)
+        raise "foo"
       end
 
       def visit_swap(code, ins, context)
+        val0 = context.expstack.pop
+        val1 = context.expstack.pop
+        context.expstack.push val0
+        context.expstack.push val1
       end
 
       # reput
       
       def visit_topn(code, ins, context)
+        raise
+        n = ins[1] + 1
+        context.expstack.push context.expstack[-n]
       end
 
       def visit_setn(code, ins, context)
+        n = ins[1] + 1
+        orgnode = context.expstack.last
+        nnode = MultiplexNode.new(orgnode)
+        context.expstack[-n] = nnode
+        context.expstack[-1] = nnode
       end
 
       # adjuststack
@@ -426,6 +564,7 @@ module YTLJit
         end
         RubyType::define_wraped_class(klassobj, RubyType::RubyTypeBoxed)
         cnode = ClassTopNode.new(context.current_class_node, klassobj, name)
+        cnode.debug_info = context.debug_info
         context.current_class_node.constant_tab[name] = cnode
         
         body = VMLib::InstSeqTree.new(code, ins[2])
@@ -440,15 +579,17 @@ module YTLJit
 
         curnode = context.current_node
         cvnode = ClassValueNode.new(curnode, cnode)
+        cvnode.debug_info = context.debug_info
         context.expstack.push cvnode
 
         context
       end
 
       def visit_send(code, ins, context)
-        blk_iseq = ins[3]
         curnode = context.current_node
         numarg = ins[2]
+        blk_iseq = ins[3]
+        op_flag = ins[4]
         seqno = ins[5]
 
         # regular arguments
@@ -459,7 +600,14 @@ module YTLJit
         end
         
         # self
-        arg.push context.expstack.pop
+        slf = context.expstack.pop
+        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
+          slf = SelfRefNode.new(curnode)
+        end
+        arg.push slf
 
         # block
         if blk_iseq then
@@ -467,26 +615,57 @@ module YTLJit
           ncontext = YARVContext.new
           ncontext.current_file_name = context.current_file_name
           ncontext.current_class_node = context.current_class_node
+          ncontext.current_method_node = context.current_method_node
           btn = ncontext.current_node = BlockTopNode.new(curnode)
           ncontext.top_nodes.push btn
 
           tr = self.class.new([body])
           tr.translate(ncontext)
+          btn.debug_info = context.debug_info
+          context.macro_method = ncontext.macro_method
+
           arg.push btn # block
         else
-          arg.push LiteralNode.new(curnode, nil) # block(dymmy)
+          argnode = LiteralNode.new(curnode, nil)
+          argnode.debug_info = context.debug_info
+          arg.push argnode      # block(dymmy)
         end
 
         # perv env
-        arg.push LiteralNode.new(curnode, nil)
+        argnode = LiteralNode.new(curnode, nil)
+        argnode.debug_info = context.debug_info
+        arg.push argnode
 
         arg = arg.reverse
 
         func = MethodSelectNode.new(curnode, ins[1])
-        op_flag = ins[4]
         sn = SendNode.make_send_node(curnode, func, arg, op_flag, seqno)
-        func.set_reciever(sn)
-        context.expstack.push sn
+        if sn.is_a?(SendEvalNode) then
+          if context.macro_method == nil then
+            context.macro_method = true
+          end
+        end
+
+        if sn.is_a?(SendNode) then
+          sn.debug_info = context.debug_info
+          func.set_reciever(sn)
+          context.expstack.push sn
+
+        elsif sn.is_a?(Array)
+          # 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
+          ncode = VMLib::InstSeqTree.new(code, is)
+          ncode.body.pop        # Chop leave instruction
+          translate_main(ncode, context)
+#          context.expstack.push val
+        else
+          raise "Unexcepted data type #{sn.class}"
+        end
 
         context
       end
@@ -497,6 +676,7 @@ module YTLJit
       def visit_invokeblock(code, ins, context)
         curnode = context.current_node
         func = YieldNode.new(curnode)
+        func.debug_info = context.debug_info
         numarg = ins[1]
         op_flag = ins[2]
         seqno = ins[3]
@@ -513,17 +693,24 @@ module YTLJit
         framelayout = frameinfo.frame_layout
 
         # self
-        args.push LiteralNode.new(curnode, nil)
+        argnode = LiteralNode.new(curnode, nil)
+        argnode.debug_info = context.debug_info
+        args.push argnode
 
         # block
-        args.push LiteralNode.new(curnode, nil)
+        argnode = LiteralNode.new(curnode, nil)
+        argnode.debug_info = context.debug_info
+        args.push argnode
         
         # perv env
-        args.push LiteralNode.new(curnode, nil)
+        argnode = LiteralNode.new(curnode, nil)
+        argnode.debug_info = context.debug_info
+        args.push argnode
 
         args = args.reverse
 
         nnode = SendNode.new(curnode, func, args, op_flag, seqno)
+        nnode.debug_info = context.debug_info
         func.parent = nnode
         context.expstack.push nnode
 
@@ -533,16 +720,21 @@ module YTLJit
       def visit_leave(code, ins, context)
         curnode = nil
         vnode = nil
+
         if context.top_nodes.last.name == :initialize then
+          # This is necessary. So it decides type of new method
           visit_pop(code, ins, context)
           curnode = context.current_node 
           vnode = SelfRefNode.new(curnode)
+          vnode.debug_info = context.debug_info
         else
           curnode = context.current_node 
           vnode = context.expstack.pop
+          vnode.debug_info = context.debug_info
         end
 
         srnode = SetResultNode.new(curnode, vnode)
+        srnode.debug_info = context.debug_info
         curnode.body = srnode
 
         context.current_node = srnode
@@ -557,6 +749,7 @@ module YTLJit
         when :top
           nnode = ClassEndNode.new(srnode)
         end
+        nnode.debug_info = context.debug_info
 
         context.top_nodes.last.end_nodes.push nnode
         srnode.body = nnode
@@ -570,6 +763,7 @@ module YTLJit
         nllab = get_vmnode_from_label(context, ins[1])
 
         jpnode = JumpNode.new(curnode, nllab) 
+        jpnode.debug_info = context.debug_info
         jpnode.body = nllab
 
         val = context.expstack.pop
@@ -587,6 +781,7 @@ module YTLJit
         cond = context.expstack.pop
        
         node = BranchIfNode.new(curnode, cond, nllab)
+        node.debug_info = context.debug_info
         nllab.come_from[node] = nil
 
         curnode.body = node
@@ -600,6 +795,7 @@ module YTLJit
         cond = context.expstack.pop
         
         node = BranchUnlessNode.new(curnode, cond, nllab)
+        node.debug_info = context.debug_info
         nllab.come_from[node] = nil
 
         curnode.body = node

data/lib/ytljit/vm_type.rb

@@ -52,7 +52,7 @@ module YTLJit
                 raise "foo"
                 return !b
               end
-            } and false then
+            } then
             cnode = cnode.same_klass
           else
             cnode = cnode.next_klass
@@ -241,6 +241,10 @@ module YTLJit
         end
       end
 
+      def ruby_type_raw
+        @ruby_type
+      end
+
       attr_writer :ruby_type
     end
 
@@ -310,6 +314,7 @@ module YTLJit
     define_wraped_class(NilClass,  RubyTypeBoxed)
     define_wraped_class(Fixnum, RubyTypeUnboxed)
     define_wraped_class(Float, RubyTypeUnboxed)
+    define_wraped_class(Range, RubyTypeUnboxed)
     define_wraped_class(TrueClass, RubyTypeBoxed)
     define_wraped_class(FalseClass, RubyTypeBoxed)
     define_wraped_class(Symbol, RubyTypeBoxed)