ytljit 0.0.6 → 0.0.7

data/lib/ytljit/vm_trans.rb

@@ -3,11 +3,15 @@ module YTLJit
     class YARVContext
       include Node
 
-      def initialize
-        @the_top = TopTopNode.new(nil, Object)
+      def initialize(oldcontext = nil)
+        if oldcontext and false then
+          @the_top = oldcontext.the_top
+        else
+          @the_top = TopTopNode.new(nil, Object)
+        end
         @top_nodes = [@the_top]
         @current_file_name = nil
-        @current_class_node = the_top
+        @current_class_node = @the_top
         @current_method_node = nil
 
         @enc_label = ""
@@ -16,10 +20,15 @@ module YTLJit
         @current_local_label = nil
 
         @current_node = @the_top
+
         @vmtab = []
 
         @expstack = []
+
         @local_label_tab = {}
+        @local_label_list = []
+
+        @exception_table = {}
 
         @not_reached_pos = false
 
@@ -39,10 +48,14 @@ module YTLJit
       attr_accessor :current_local_label
 
       attr_accessor :current_node
+
       attr          :vmtab
 
       attr          :expstack
       attr          :local_label_tab
+      attr          :local_label_list
+
+      attr_accessor :exception_table
 
       attr_accessor :not_reached_pos
 
@@ -53,7 +66,19 @@ module YTLJit
         if ctn == nil then
           ctn = ClassTopNode.new(@the_top, klass, klass.name)
         end
-        valnode = LiteralNode.new(ctn, value)
+
+        valnode = nil
+        if value.is_a?(Class) then
+          valnode = ClassTopNode.get_class_top_node(value)
+          if valnode == nil then
+            valnode = ClassTopNode.new(@the_top, value, value.name)
+            klassclass = valnode.klassclass
+            valnode.type = RubyType::BaseType.from_ruby_class(klassclass)
+          end
+        else
+          valnode = LiteralNode.new(ctn, value)
+        end
+
         ctn.get_constant_tab[name] = valnode
       end
 
@@ -71,6 +96,22 @@ module YTLJit
          mname,
          @current_line_no]
       end
+
+      def current_exception_table
+        result = {}
+        @exception_table.each do |kind, lst|
+          lst.each do |st, ed, cnt, body|
+            if @local_label_list.include?(st) and
+                !@local_label_list.include?(ed) and 
+                body then
+              result[kind] = [st, ed, cnt, body]
+              break
+            end
+          end
+        end
+
+        result
+      end
     end
 
     class YARVTranslatorBase
@@ -131,6 +172,7 @@ module YTLJit
         nllab = context.local_label_tab[label]
         if nllab == nil then
           nllab = LocalLabel.new(curnode, label)
+          nllab.value_node = PhiNode.new(nllab)
           nllab.debug_info = context.debug_info
           context.local_label_tab[label] = nllab
         end
@@ -148,23 +190,26 @@ module YTLJit
 
       def visit_symbol(code, ins, context)
         context.current_local_label = ins
+        context.local_label_list.push ins
 
         curnode = context.current_node
         nllab = get_vmnode_from_label(context, ins)
         
-        unless curnode.is_a?(JumpNode)
+        if !(curnode.is_a?(JumpNode) or 
+             curnode.is_a?(MethodEndNode) or
+             curnode.is_a?(ThrowNode)) then
           jmpnode = JumpNode.new(curnode, nllab)
           jmpnode.debug_info = context.debug_info
           nllab.parent = jmpnode
 
           val = context.expstack.pop
           nllab.come_from[jmpnode] = val
-        
+
           curnode.body = jmpnode
           jmpnode.body = nllab
           context.expstack.push nllab.value_node
         end
-        
+
         context.current_node = nllab
       end
 
@@ -187,20 +232,53 @@ module YTLJit
         (arg_size - locals.size).times do 
           locals.push nil
         end
-        
         cnode = mtopnode.construct_frame_info(locals, arg_size, args)
+        exptab = code.header['exception_table']
+        context.exception_table = {}
+        if exptab.size != 0 then
+          exptab.each do |tag, body, st, ed, cont, sp|
+            context.exception_table[tag] ||= []
+            nbody = nil
+            if body then
+              ncontext = YARVContext.new(context)
+              nbody = ExceptionTopNode.new(mtopnode)
+              nbody.debug_info = context.debug_info
+              ncontext.current_node = nbody
+              ncontext.top_nodes.push nbody
+              ncontext.current_file_name = context.current_file_name
+              ncontext.current_class_node = context.current_class_node
+              ncontext.current_method_node = context.current_method_node
+              tr = self.class.new([VMLib::InstSeqTree.new(code, body)])
+              tr.translate(ncontext)
+            end
+            context.exception_table[tag].push [st, ed, cont, nbody]
+          end
+        end
+
+        context.not_reached_pos = false
         context.current_node = cnode
       end
 
       def visit_block_end(code, ins, context)
         curnode = context.current_node
         top = context.top_nodes.last
+        klassnode = context.current_class_node
+        top.exception_table = context.exception_table
         if top.class == MethodTopNode then
           if context.macro_method then
             code = top.to_ruby(ToRubyContext.new).ret_code.last
-#            print code
+            #            print code
             proc = eval("lambda" + code)
-            SendNode.get_macro_tab[top.name] = proc
+            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
+              SendNode.get_user_defined_method_tab[top.name] = []
+            end
+            klassobj = klassnode.klass_object
+            SendNode.get_user_defined_method_tab[top.name].push klassobj
           end
         end
       end
@@ -216,6 +294,9 @@ module YTLJit
         dep
       end
 
+      def visit_nop(code, ins, context)
+      end
+
       def visit_getlocal(code, ins, context)
         dep = depth_of_block(code)
         visit_getdynamic(code, [:getlocal, ins[1], dep], context)
@@ -237,8 +318,14 @@ module YTLJit
           curcode = curcode.parent
         end
         offset = curcode.header['misc'][:local_size] + 3 - ins[1]
-        node = LocalVarRefNode.new(context.current_node, offset, dep)
-        node.debug_info = context.debug_info
+        node = nil
+        if curcode.header['type'] == :ensure and offset == 3 then
+          node = LiteralNode.new(context.current_node, nil)
+          node.debug_info = context.debug_info
+        else
+          node = LocalVarRefNode.new(context.current_node, offset, dep)
+          node.debug_info = context.debug_info
+        end
         context.expstack.push node
       end
 
@@ -348,7 +435,7 @@ module YTLJit
       def visit_putiseq(code, ins, context)
         body = VMLib::InstSeqTree.new(code, ins[1])
         curnode = context.current_node
-        ncontext = YARVContext.new
+        ncontext = YARVContext.new(context)
 
         case body.header['type']
         when :block
@@ -356,7 +443,7 @@ module YTLJit
         when :method
           mtopnode = MethodTopNode.new(curnode, body.header['name'].to_sym)
         when :class
-          mtopnode = ClassTopNode.new(curnode, body.header['name'].to_sym)
+          mtopnode = ClassTopNode.new(curnode, Object, body.header['name'].to_sym)
         when :top
           raise "Maybe bug not appear top block."
         end
@@ -426,7 +513,8 @@ module YTLJit
 
       def visit_newarray(code, ins, context)
         curnode = context.current_node
-        func = FixArgCApiNode.new(curnode, "rb_ary_new3", [:int, :VALUE, :"..."])
+        func = FixArgCApiNode.new(curnode, "rb_ary_new3", 
+                                  [:int, :VALUE, :"..."])
         argnum = ins[1]
         argnumnode = LiteralNode.new(nil, argnum)
         args = []
@@ -453,7 +541,7 @@ module YTLJit
       # newhash
 
       def visit_newrange(code, ins, context)
-        exclflag = LiteralNode.new(nil, ins[1] == 1)
+        exclflag = LiteralNode.new(nil, ins[1] != 0)
         context.expstack.push exclflag
         newinst_to_sendnode(3, Range, code, ins, context)
       end
@@ -483,7 +571,20 @@ module YTLJit
       end
 
       def visit_dupn(code, ins, context)
-        raise "foo"
+        res = []
+        n = ins[1]
+        n.times do
+          orgnode = context.expstack.pop
+          nnode = MultiplexNode.new(orgnode)
+          res.push nnode
+        end
+        res = res.reverse
+        res.each do |ele|
+          context.expstack.push ele
+        end
+        res.each do |ele|
+          context.expstack.push ele
+        end
       end
 
       def visit_swap(code, ins, context)
@@ -568,7 +669,7 @@ module YTLJit
         context.current_class_node.constant_tab[name] = cnode
         
         body = VMLib::InstSeqTree.new(code, ins[2])
-        ncontext = YARVContext.new
+        ncontext = YARVContext.new(context)
         ncontext.current_file_name = context.current_file_name
         ncontext.current_node = cnode
         ncontext.current_class_node = cnode
@@ -612,7 +713,7 @@ module YTLJit
         # block
         if blk_iseq then
           body = VMLib::InstSeqTree.new(code, blk_iseq)
-          ncontext = YARVContext.new
+          ncontext = YARVContext.new(context)
           ncontext.current_file_name = context.current_file_name
           ncontext.current_class_node = context.current_class_node
           ncontext.current_method_node = context.current_method_node
@@ -639,32 +740,30 @@ module YTLJit
         arg = arg.reverse
 
         func = MethodSelectNode.new(curnode, ins[1])
-        sn = SendNode.make_send_node(curnode, func, arg, op_flag, seqno)
-        if sn.is_a?(SendEvalNode) then
-          if context.macro_method == nil then
-            context.macro_method = true
+        sn = SendNode.macro_expand(context, func, arg, op_flag, seqno)
+        if sn == nil then
+          sn = SendNode.make_send_node(curnode, func, arg, op_flag, seqno)
+          sn.current_exception_table = context.current_exception_table
+          if sn.is_a?(SendEvalNode) then
+            if context.macro_method == nil then
+              context.macro_method = true
+            end
           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)
+        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]}", "", 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}"
+          #          context.expstack.push val
         end
 
         context
@@ -710,6 +809,7 @@ module YTLJit
         args = args.reverse
 
         nnode = SendNode.new(curnode, func, args, op_flag, seqno)
+        nnode.current_exception_table = context.current_exception_table
         nnode.debug_info = context.debug_info
         func.parent = nnode
         context.expstack.push nnode
@@ -726,13 +826,16 @@ module YTLJit
           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
 
+        if vnode then
+          vnode.debug_info = context.debug_info
+        else
+          vnode = LiteralNode.new(curnode, nil)
+        end
         srnode = SetResultNode.new(curnode, vnode)
         srnode.debug_info = context.debug_info
         curnode.body = srnode
@@ -748,14 +851,24 @@ module YTLJit
           nnode = ClassEndNode.new(srnode)
         when :top
           nnode = ClassEndNode.new(srnode)
+        else
+          raise "unkown type #{code.header['type']}"
         end
         nnode.debug_info = context.debug_info
 
         context.top_nodes.last.end_nodes.push nnode
         srnode.body = nnode
+        context.current_node = nnode
+        context.not_reached_pos = true
       end
       
       def visit_throw(code, ins, context)
+        curnode = context.current_node
+        exceptobj = context.expstack.pop
+
+        thnode = ThrowNode.new(curnode, ins[1], exceptobj)
+        curnode.body = thnode
+        context.current_node = thnode
       end
 
       def visit_jump(code, ins, context)

data/lib/ytljit/vm_type.rb

@@ -14,7 +14,7 @@ module YTLJit
             return cnode
           end
           
-          if key.zip(cnode.key).all? {|k, n| k.is_a?(n.class)} and false then
+          if 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)
@@ -245,6 +245,10 @@ module YTLJit
         @ruby_type
       end
 
+      def abnormal?
+        @@base_type_tab[ruby_type].boxed != boxed
+      end
+
       attr_writer :ruby_type
     end