ytljit 0.0.7 → 0.0.8

data/lib/ytljit/vm.rb

@@ -177,7 +177,7 @@ LocalVarNode
           @my_element_node = nil
           @type_inference_proc = cs
           @decided_signature = nil
-          @is_escape = false
+          @is_escape = nil
 
           @ti_observer = {}
           @ti_observee = []
@@ -265,28 +265,34 @@ LocalVarNode
           end
         end
 
+        def marge_element_node(dst, src)
+          res = dst
+          regnode = dst[0]
+          src.each do |sele|
+            if !res.include?(sele) then
+              res.push sele
+            end
+          end
+
+          res
+        end
+
         def marge_type(dst, src)
           res = dst
           src.each do |sele|
-            if sele.is_a?(Array) then
-              if !res.include?(sele) then
-                res.push sele
-              end
-            else
-              if res.all? {|e| e.ruby_type != sele.ruby_type or 
-                                 e.boxed != sele.boxed } then
-                res.push sele
-              elsif sele.have_element? and sele.element_type then
-                # Replace type object which have more collect element type
-                res.each_with_index do |rele, i|
-                  if rele == sele and rele.element_type == nil then
-                    res[i] = sele
-                  end
+            if res.all? {|e| e.ruby_type != sele.ruby_type or 
+                e.boxed != sele.boxed } then
+              res.push sele
+            elsif sele.have_element? and sele.element_type then
+              # Replace type object which have more collect element type
+              res.each_with_index do |rele, i|
+                if rele == sele and rele.element_type == nil then
+                  res[i] = sele
                 end
               end
             end
           end
-
+          
           res
         end
 
@@ -314,18 +320,15 @@ LocalVarNode
 
           dtlist = dst.element_node_list
           stlist = src.element_node_list
+
           orgsize = dtlist.size
-          dst.element_node_list = marge_type(dtlist, stlist)
+          dst.element_node_list = marge_element_node(dtlist, stlist)
           if orgsize != dtlist.size then
             dst.ti_changed
             context.convergent = false
           end
-
-          if src.is_escape then
-            if dst.is_escape != true then
-              dst.is_escape = src.is_escape
-            end
-          end
+          
+          dst.set_escape_node(src.is_escape)
         end
 
         def same_type(dst, src, dsig, ssig, context)
@@ -361,14 +364,26 @@ LocalVarNode
           end
         end
 
-        def set_escape_node_backward(value = true, visitnode = {})
+        ESCAPE_LEVEL = {
+          nil => -1, 
+          :not_export => 5, 
+          :local_export => 6,
+          :global_export => 10
+        }
+          
+        def set_escape_node(value)
+          if ESCAPE_LEVEL[@is_escape] < ESCAPE_LEVEL[value] then
+            @is_escape = value
+          end
+        end
+
+        def set_escape_node_backward(value, visitnode = {})
           if visitnode[self] then
             return
           end
 
-          if @is_escape != true then
-            @is_escape = value
-          end
+          set_escape_node(value)
+
           visitnode[self] = true
           @ti_observee.each do |rec|
             rec.set_escape_node_backward(value, visitnode)
@@ -389,10 +404,11 @@ LocalVarNode
               same_type(orgnode, enode, orgsig, encsig, context)
             end
             if index != nil then
-              @element_node_list.each do |sig, orgsig, orgnode, orgindex|
-                if orgindex == index and
+              @element_node_list.each do |orgslf, orgsig, orgnode, orgindex|
+                if orgslf == curslf and
+                    orgindex == index and
                     orgnode != enode then
-                  # same_type(orgnode, enode, orgsig, sig, context)
+                  same_type(orgnode, enode, orgsig, encsig, context)
                 end
               end
             end
@@ -421,7 +437,7 @@ LocalVarNode
 
           case tlist.size
           when 0
-            RubyType::DefaultType0.new
+            RubyType::DefaultType0.new # .to_unbox
             
           when 1
             tlist[0]
@@ -506,17 +522,20 @@ LocalVarNode
               (@type.element_type == nil or
                @type.element_type == {}) then
             local_cache[self] = @type
-            etype = {}
+            etype2 = {}
+            etype = nil
             @element_node_list.each do |ele|
               sig = ele[1]
               slf = ele[0]
               if sig == cursig then
                 node = ele[2]
+                node.type = nil
                 tt = node.decide_type_once(sig, local_cache)
-                etype[ele[3]] ||= []
-                curidx = etype[ele[3]]
-                if !curidx.include?(tt) then
+                etype2[ele[3]] ||= []
+                curidx = etype2[ele[3]]
+                if tt.ruby_type != Object and !curidx.include?(tt) then
                   curidx.push tt
+                  etype = etype2
                 end
               end
             end
@@ -620,9 +639,10 @@ LocalVarNode
           # eval 1st arg(self)
           slfnode = @arguments[2]
           context = slfnode.compile(context)
-          
-          context.ret_node.decide_type_once(context.to_signature)
-          rtype = context.ret_node.type
+
+          rnode = context.ret_node
+#          rnode.type = nil
+          rtype = rnode.decide_type_once(context.to_signature)
           if !rtype.boxed then
             context = rtype.gen_unboxing(context)
           end
@@ -641,7 +661,9 @@ LocalVarNode
             res.push args[1].decide_type_once(ynode.signature(context))
             context.pop_signature
           else
+#            args[1].type = nil
             res.push args[1].decide_type_once(cursig)
+#            args[2].type = nil
             slf = args[2].decide_type_once(cursig)
           end
           res.push slf
@@ -667,7 +689,7 @@ LocalVarNode
               casm.mov(FUNC_ARG[0], rarg.size) # argc
               casm.mov(FUNC_ARG[1], TMPR2)     # argv
             end
-            context.set_reg_content(FUNC_ARG[0].dst_opecode, nil)
+            context.set_reg_content(FUNC_ARG[0].dst_opecode, true)
             context.set_reg_content(FUNC_ARG[1].dst_opecode, TMPR2)
 
             # Method Select
@@ -732,12 +754,11 @@ LocalVarNode
             else
               # other arg.
               context = arg.compile(context)
-              context.ret_node.decide_type_once(sig)
               rnode = context.ret_node
-              rtype = rnode.type
-              if rnode.is_escape != true then
+              rtype = rnode.decide_type_once(sig)
+#              if rnode.is_escape != :global_export then
                 context = rtype.gen_boxing(context)
-              end
+#              end
               casm = context.assembler
               casm.with_retry do 
                 casm.mov(FUNC_ARG[argpos], context.ret_reg)
@@ -797,7 +818,7 @@ LocalVarNode
               casm.mov(TMPR, fstentry)
               casm.mov(handoff, TMPR)
             end
-            context.set_reg_content(handoff, nil)
+            context.set_reg_content(handoff, true)
           end
 
           # push prev env
@@ -841,7 +862,7 @@ LocalVarNode
             entry = @arguments[1].code_space.var_base_immidiate_address
             casm.mov(FUNC_ARG_YTL[1], entry)
           end
-          context.set_reg_content(FUNC_ARG_YTL[1].dst_opecode, nil)
+          context.set_reg_content(FUNC_ARG_YTL[1].dst_opecode, true)
 
           # self
           # Method Select
@@ -1385,10 +1406,13 @@ LocalVarNode
           context.pop_signature
 
           if @klassclass_node then
-            @klassclass_node.collect_candidate_type(context, signode, sig)
-          else
-            context
+            context = @klassclass_node.collect_candidate_type(context, 
+                                                              signode, sig)
           end
+
+          set_escape_node(:not_export)
+
+          context
         end
 
         def compile(context)
@@ -1414,7 +1438,7 @@ LocalVarNode
               asm.mov(FUNC_ARG_YTL[2], var_klassclass)
             end
             context.set_reg_content(FUNC_ARG_YTL[0].dst_opecode, BPR)
-            context.set_reg_content(FUNC_ARG_YTL[1].dst_opecode, nil)
+            context.set_reg_content(FUNC_ARG_YTL[1].dst_opecode, true)
             context.set_reg_content(FUNC_ARG_YTL[2].dst_opecode, self)
             add = cs.var_base_address
             context = gen_call(context, add, 3)
@@ -1433,6 +1457,7 @@ LocalVarNode
         include MethodTopCodeGen
         @@frame_struct_tab = {}
         @@local_object_area = Runtime::Arena.new
+        @@global_object_area = Runtime::Arena.new
         @@unwind_proc = CodeSpace.new
         @@nothing_proc = CodeSpace.new
 
@@ -1461,6 +1486,8 @@ LocalVarNode
 
           # Dummy for marshal
           @op_var_value_instaces = nil
+
+          @modified_global_var = nil
         end
 
         attr_accessor :init_node
@@ -1520,7 +1547,9 @@ LocalVarNode
             init_unwind_proc
             add_code_space(nil, @@unwind_proc)
           end
-          super(context)
+          context = super(context)
+          @modified_global_var = context.modified_global_var
+          context
         end
 
         def collect_candidate_type(context, signode, sig)
@@ -1538,20 +1567,29 @@ LocalVarNode
           super(context, signode, sig)
         end
 
-        def get_arena_address
+        def get_global_arena_address
+          ar = @@global_object_area
+          ar.raw_address
+        end
+
+        def get_global_arena_end_address
+          ar = @@global_object_area
+          ar.body_address + ar.size
+        end
+
+        def get_local_arena_address
           ar = @@local_object_area
-          # 2 means used and size
           ar.raw_address
         end
 
-        def get_arena_end_address
+        def get_local_arena_end_address
           ar = @@local_object_area
           (ar.body_address + ar.size) & (~0xf)
         end
 
         def compile_init(context)
           addr = lambda {
-            get_arena_end_address
+            get_local_arena_end_address
           }
           aa = OpVarImmidiateAddress.new(addr) 
           asm = context.assembler
@@ -1565,6 +1603,13 @@ LocalVarNode
           if @init_node then
             context = @init_node.compile(context)
           end
+          @modified_global_var.each_with_index do |dmy, i|
+            @@global_object_area[i + 1] = 4
+=begin
+            p @@global_object_area
+            p dmy[0]
+=end
+          end
           super(context)
         end
 
@@ -1880,11 +1925,13 @@ LocalVarNode
 
       # Set result of method/block
       class SetResultNode<BaseNode
+        include NodeUtil
         include HaveChildlenMixin
 
         def initialize(parent, valnode)
           super(parent)
           @value_node = valnode
+          @class_top_node = search_class_top
         end
 
         attr :value_node
@@ -1900,10 +1947,11 @@ LocalVarNode
           same_type(self, @value_node, cursig, cursig, context)
           same_type(@value_node, self, cursig, cursig, context)
 
+#          @type = nil
           rtype = decide_type_once(cursig)
           rrtype = rtype.ruby_type
           if !rtype.boxed and rrtype != Fixnum and rrtype != Float then
-            set_escape_node_backward(:export_object)
+            set_escape_node_backward(:local_export)
           else
             set_escape_node_backward(:not_export)
           end
@@ -1952,9 +2000,9 @@ LocalVarNode
         end
         
         def collect_candidate_type(context)
+          cursig = context.to_signature
           @local_label.come_from.values.each do |vnode|
             if vnode then
-              cursig = context.to_signature
               same_type(self, vnode, cursig, cursig, context)
             end
           end
@@ -2362,6 +2410,7 @@ LocalVarNode
 
       # Literal
       class LiteralNode<BaseNode
+        include NodeUtil
         include TypeListWithoutSignature
 
         def initialize(parent, val)
@@ -2374,10 +2423,12 @@ LocalVarNode
 
         def collect_candidate_type(context)
           sig = context.to_signature
-          if @type_list != [[], []] then
-            @type = decide_type_once(sig)
-          elsif @type == nil then 
-            @type = RubyType::BaseType.from_object(@value) 
+          if @type == nil then
+            if @type_list != [[], []] then
+              @type = decide_type_once(sig)
+            else
+              @type = RubyType::BaseType.from_object(@value) 
+            end
           end
 
           case @value
@@ -2388,6 +2439,13 @@ LocalVarNode
               @element_node_list[0][2].add_type(sig, etype)
             end
 
+          when Hash
+            add_type(sig, @type)
+            @value.each do |key, value|
+              vtype = RubyType::BaseType.from_object(value)
+              @element_node_list[0][2].add_type(sig, vtype)
+            end
+
           when Range
             @type = @type.to_box
             add_type(sig, @type)
@@ -2466,6 +2524,10 @@ LocalVarNode
         def get_constant_value
           [@value]
         end
+
+#        def type=(val)
+#          val
+#        end
       end
 
       class ClassValueNode<BaseNode
@@ -2572,7 +2634,7 @@ LocalVarNode
             asm.mov(PTMPR, prevenv)
             asm.mov(PTMPR, slfarg)
           end
-          context.set_reg_content(PTMPR, nil)
+          context.set_reg_content(PTMPR, true)
           context.ret_reg2 = PTMPR
           
           context.ret_reg = @frame_info.offset_arg(1, BPR)
@@ -2610,7 +2672,9 @@ LocalVarNode
         def compile(context)
           context = super(context)
           addr = lambda { 
-            address_of(@name) 
+            a = address_of(@name) 
+            $symbol_table[a] = @name
+            a
           }
           context.ret_reg = OpVarMemAddress.new(addr)
           context.ret_node = self
@@ -2690,6 +2754,7 @@ LocalVarNode
               end
               if recobj then
                 addr = recobj.method_address_of(@name)
+                $symbol_table[addr] = @name
                 if addr then
                   if variable_argument?(recobj.method(@name).parameters) then
                     @calling_convention = :c_vararg
@@ -2742,17 +2807,20 @@ LocalVarNode
                   mth = rklass.instance_method(@name)
                   @ruby_reciever = rtype.ruby_type_raw
                 rescue NameError
+#=begin
                   p @parent.debug_info
                   p sig
                   p @name
                   p @reciever.class
-                  p @reciever.instance_eval {@type_list }
+#                  p @reciever.instance_eval {@type_list }
+                  p type_list(sig)
 =begin
                   mc = @reciever.get_send_method_node(context.to_signature)[0]
                   iv = mc.end_nodes[0].parent.value_node
                   p iv.instance_eval {@name}
                   p iv.instance_eval {@type_list}
 =end
+                  return :c_fixarg
                   raise
                 end
               end
@@ -2776,6 +2844,7 @@ LocalVarNode
             asm.with_retry do
               asm.mov(PTMPR, slfop)
             end
+            context.set_reg_content(PTMPR, true)
             context.ret_reg2 = PTMPR
             mtop = @reciever.search_method_with_super(@name)[0]
             if mtop then
@@ -2798,7 +2867,9 @@ LocalVarNode
               end
               if recobj then
                 addr = lambda {
-                  recobj.method_address_of(@name)
+                  a = recobj.method_address_of(@name)
+                  $symbol_table[a] = @name
+                  a
                 }
                 if addr.call then
                   context.ret_reg = OpVarMemAddress.new(addr)
@@ -2818,9 +2889,9 @@ LocalVarNode
             rnode = context.ret_node
             rtype = rnode.decide_type_once(context.to_signature)
             if @calling_convention != :ytl then
-              if rnode.is_escape != true then
+#              if rnode.is_escape != :global_export then
                 context = rtype.gen_boxing(context)
-              end
+#              end
               rtype = rtype.to_box
             elsif !rtype.boxed then
               context = rtype.gen_unboxing(context)
@@ -2834,11 +2905,15 @@ LocalVarNode
               # Can't type inference. Dynamic method search
               mnval = @name.address
               addr = lambda {
-                address_of("rb_obj_class")
+                a = address_of("rb_obj_class")
+                $symbol_table[a] = "rb_obj_class"
+                a
               }
               objclass = OpVarMemAddress.new(addr)
               addr = lambda {
-                address_of("ytl_method_address_of_raw")
+                a = address_of("ytl_method_address_of_raw")
+                $symbol_table[a] = "ytl_method_address_of_raw"
+                a
               }
               addrof = OpVarMemAddress.new(addr)
 
@@ -2853,23 +2928,24 @@ LocalVarNode
                 asm.mov(FUNC_ARG[0], RETR)
                 asm.mov(FUNC_ARG[1], mnval)
               end
-              context.set_reg_content(FUNC_ARG[0], nil)
-              context.set_reg_content(FUNC_ARG[1], nil)
+              context.set_reg_content(FUNC_ARG[0], true)
+              context.set_reg_content(FUNC_ARG[1], true)
               context = gen_save_thepr(context)
               asm.with_retry do
                 asm.call_with_arg(addrof, 2)
                 asm.mov(TMPR2, RETR)
                 asm.pop(PTMPR)
               end
-              context.set_reg_content(FUNC_ARG_YTL[0].dst_opecode, nil)
+              context.set_reg_content(PTMPR, true)
+              context.set_reg_content(FUNC_ARG_YTL[0].dst_opecode, true)
               context.set_reg_content(FUNC_ARG_YTL[1].dst_opecode, self)
               context.ret_reg2 = PTMPR
               
               context.end_arg_reg
               
               context.ret_node = self
-              context.set_reg_content(RETR, nil)
-              context.set_reg_content(TMPR2, nil)
+              context.set_reg_content(RETR, true)
+              context.set_reg_content(TMPR2, true)
               context.set_reg_content(PTMPR, @reciever)
               context.ret_reg = TMPR2
 
@@ -2882,11 +2958,13 @@ LocalVarNode
                     asm.mov(XMM0, recval)
                   end
                 end
+                context.set_reg_content(XMM0, true)
                 context.ret_reg2 = XMM0
               else
                 asm.with_retry do
                   asm.mov(PTMPR, recval)
                 end
+                context.set_reg_content(PTMPR, @reciever)
                 context.ret_reg2 = PTMPR
               end
 
@@ -2909,6 +2987,7 @@ LocalVarNode
                 asm.with_retry do
                   asm.mov(PTMPR, recval)
                 end
+                context.set_reg_content(TMPR2, @reciever)
                 context.ret_reg2 = PTMPR
               end
 
@@ -2918,10 +2997,15 @@ LocalVarNode
                   rrec = rrec.value
                 end
                 if rrec.class == Module then
-                  name = @name
-                  rrec.send(:method_address_of, name)
+                  a = rrec.send(:method_address_of, @name)
+                  $symbol_table[a] = @name
+                  a
+                elsif rrec then
+                  a = rrec.method_address_of(@name)
+                  $symbol_table[a] = @name
+                  a
                 else
-                  rrec.method_address_of(@name)
+                  4
                 end
               }
               if addr.call then
@@ -3117,9 +3201,9 @@ LocalVarNode
           decide_type_once(sig)
           rtype = @val.decide_type_once(context.to_signature)
           if @type.boxed then
-            if @val.is_escape != true then
+#            if @val.is_escape != :global_export then
               context = rtype.gen_boxing(context)
-            end
+#            end
           else
             context = rtype.gen_unboxing(context)
           end
@@ -3238,10 +3322,16 @@ LocalVarNode
           cursig = context.to_signature
           same_type(self, @val, cursig, cursig, context)
 #          same_type(@val, self, cursig, cursig, context)
+          @val.type = nil
           rtype = @val.decide_type_once(cursig)
           rrtype = rtype.ruby_type
-          if cursig[2].boxed and rrtype != Fixnum and rrtype != Float then
-            @val.set_escape_node_backward(true)
+          if rrtype != Fixnum and rrtype != Float then
+            if cursig[2].boxed then
+              @val.set_escape_node_backward(:global_export)
+#              @class_top.set_escape_node(:global_export)
+            else
+              @val.set_escape_node_backward(:local_export)
+            end
           end
           @body.collect_candidate_type(context)
         end
@@ -3256,6 +3346,108 @@ LocalVarNode
         end
       end
 
+      # Global Variable
+      class GlobalVarRefNode<VariableRefCommonNode
+        include NodeUtil
+        include TypeListWithoutSignature
+        include UnboxedArrayUtil
+        def initialize(parent, name)
+          super(parent)
+          @name = name
+          @assign_nodes = nil
+          @offset = nil
+        end
+
+        def collect_info(context)
+          @assign_nodes = context.modified_global_var[@name]
+          context
+        end
+
+        def collect_candidate_type(context)
+          @offset = @assign_nodes[0].offset
+          sig = context.to_signature
+          same_type(self, @assign_nodes[0], sig, sig, context)
+          context
+        end
+
+        def compile(context)
+          sig = context.to_signature
+          asm = context.assembler
+          context.start_using_reg(TMPR2)
+          asm.with_retry do
+            asm.mov(TMPR2, context.top_node.get_global_arena_end_address)
+          end
+          context.set_reg_content(TMPR2, true)
+          context = gen_ref_element(context, nil, -@offset)
+          context.end_using_reg(TMPR2)
+          rtype = decide_type_once(sig)
+          if rtype.ruby_type == Float and !rtype.boxed then
+            asm.with_retry do
+              asm.mov(XMM0, context.ret_reg)
+            end
+            context.ret_reg = XMM0
+          else
+            asm.with_retry do
+              asm.mov(RETR, context.ret_reg)
+            end
+            context.ret_reg = RETR
+          end
+          context
+        end
+      end
+
+      class GlobalVarAssignNode<VariableRefCommonNode
+        include NodeUtil
+        include HaveChildlenMixin
+        include TypeListWithoutSignature
+        include UnboxedArrayUtil
+        def initialize(parent, name, value)
+          super(parent)
+          @name = name
+          @value = value
+          @assign_nodes = nil
+          @offset = nil
+        end
+
+        attr :offset
+
+        def collect_info(context)
+          context = @value.collect_info(context)
+          if context.modified_global_var[@name] == nil then
+            context.modified_global_var[@name] = []
+            @offset = context.modified_global_var.keys.size - 1
+          end
+          @assign_nodes = context.modified_global_var[@name]
+          @assign_nodes.push self
+          @body.collect_info(context)
+        end
+
+        def collect_candidate_type(context)
+          sig = context.to_signature
+          context = @value.collect_candidate_type(context)
+          same_type(@assign_nodes[0], @value, sig, sig, context)
+          same_type(self, @assign_nodes[0], sig, sig, context)
+          if @offset == nil then
+            @offset = @assign_nodes[0].offset
+          end
+          @body.collect_candidate_type(context)
+        end
+
+        def compile(context)
+          sig = context.to_signature
+          asm = context.assembler
+          context.start_using_reg(TMPR2)
+          asm.with_retry do
+            asm.mov(TMPR2, context.top_node.get_global_arena_end_address)
+          end
+          context.set_reg_content(TMPR2, :foo)
+          contet = gen_set_element(context, nil, -@offset, @value)
+          context.end_using_reg(TMPR2)
+          @body.compile(context)
+        end
+      end
+      
+      # Constant
       class ConstantRefNode<VariableRefCommonNode
         include NodeUtil
         include TypeListWithoutSignature