ytljit 0.0.5 → 0.0.6

data/lib/ytljit/vm_codegen.rb

@@ -233,6 +233,7 @@ LO        |                       |   |  |
       include AbsArch
       def initialize(tnode)
         @top_node = tnode
+        @prev_context = nil
         @code_space = nil
 
         # Signature of current compiling method
@@ -256,6 +257,7 @@ LO        |                       |   |  |
       end
 
       attr          :top_node
+      attr_accessor :prev_context
       attr          :code_space
 
       attr          :current_method_signature
@@ -266,7 +268,7 @@ LO        |                       |   |  |
       attr_accessor :ret_node
 
       attr          :reg_content
-      attr          :stack_content
+      attr_accessor :stack_content
 
       attr_accessor :slf
 
@@ -277,34 +279,57 @@ LO        |                       |   |  |
           dst = dst.dst_opecode
         end
         if dst.is_a?(OpRegistor) then
-          if val.is_a?(OpRegistor)
+          if val.is_a?(OpRegistor) and @reg_content[val] then
             @reg_content[dst] = @reg_content[val]
           else
             @reg_content[dst] = val
           end
-        elsif dst.is_a?(OpIndirect) and dst.reg == SPR then
+        elsif dst.is_a?(OpIndirect) then
           wsiz = AsmType::MACHINE_WORD.size
-          if val.is_a?(OpRegistor)
-            cpustack_setn(dst.disp.value / wsiz, @reg_content[val])
-          else
-            cpustack_setn(dst.disp.value / wsiz, val)
+          if dst.reg == SPR then
+            if val.is_a?(OpRegistor) and @reg_content[val] then
+              cpustack_setn(dst.disp.value / wsiz, @reg_content[val])
+            else
+              cpustack_setn(dst.disp.value / wsiz, val)
+            end
+          end
+          if dst.reg == BPR then
+            if val.is_a?(OpRegistor) and @reg_content[val] then
+              cpustack_setn(-dst.disp.value / wsiz + 3, @reg_content[val])
+            else
+              cpustack_setn(-dst.disp.value / wsiz + 3, val)
+            end
           end
+        elsif dst.is_a?(OpImmidiate) then
+          # do nothing and legal
+
         else
-          pp "foo"
-          pp dst
+#          pp "foo"
+#          pp dst
         end
       end
 
       def cpustack_push(reg)
-        @stack_content.push @reg_content[reg]
+        if @reg_content[reg] then
+          @stack_content.push @reg_content[reg]
+        else
+          @stack_content.push reg
+        end
       end
 
       def cpustack_pop(reg)
-        @reg_content[reg] = @stack_content.pop
+        cont = @stack_content.pop
+        if !cont.is_a?(OpRegistor) then
+          @reg_content[reg] = cont
+        end
       end
 
       def cpustack_setn(offset, val)
-        @stack_content[-offset] = val
+        if offset >= -@stack_content.size then
+          @stack_content[offset] = val
+        else
+          # Modify previous stack (maybe as arguments)
+        end
       end
 
       def cpustack_pushn(num)
@@ -338,7 +363,6 @@ LO        |                       |   |  |
       end
 
       def reset_using_reg
-#        @depth_reg = {}
         @depth_reg = Hash.new(0)
       end
 
@@ -417,6 +441,29 @@ LO        |                       |   |  |
         end
       end
 
+      def start_arg_reg(kind = FUNC_ARG)
+        asm = assembler
+        gen = asm.generator
+        used_arg_tab = gen.funcarg_info.used_arg_tab
+        if used_arg_tab.last then
+#          p "#{used_arg_tab.last.keys} #{caller[0]} #{@name}"
+          used_arg_tab.last.keys.each do |rno|
+            start_using_reg(kind[rno])
+          end
+        end
+      end
+
+      def end_arg_reg(kind = FUNC_ARG)
+        asm = assembler
+        gen = asm.generator
+        used_arg_tab = gen.funcarg_info.used_arg_tab
+        if used_arg_tab.last then
+          used_arg_tab.last.keys.reverse.each do |rno|
+            end_using_reg(kind[rno])
+          end
+        end
+      end
+
       def to_signature(offset = -1)
         @current_method_signature[offset]
       end
@@ -445,9 +492,14 @@ LO        |                       |   |  |
             asm.push(BPR)
             asm.mov(BPR, SPR)
             asm.push(TMPR)
+            asm.push(THEPR)
             asm.push(BPR)
             asm.mov(BPR, SPR)
           end
+          context.cpustack_push(BPR)
+          context.cpustack_push(TMPR)
+          context.cpustack_push(THEPR)
+          context.cpustack_push(SPR)
             
           context
         end
@@ -463,9 +515,11 @@ LO        |                       |   |  |
           asm.with_retry do
             asm.mov(SPR, BPR)
             asm.pop(BPR)
+            asm.pop(THEPR)
             asm.mov(SPR, BPR)
             asm.pop(BPR)
           end
+          context.stack_content = []
 
           context
         end
@@ -500,9 +554,44 @@ LO        |                       |   |  |
       end
     end
 
-    module SendNodeCodeGen
+    module CommonCodeGen
       include AbsArch
 
+      def gen_alloca(context, siz)
+        asm = context.assembler
+        siz = siz * AsmType::MACHINE_WORD.size
+        asm.with_retry do
+          asm.sub(THEPR, siz)
+        end
+        context.ret_reg = THEPR
+        context
+      end
+
+      def gen_call(context, fnc, numarg, slf = nil)
+        casm = context.assembler
+
+        callpos = nil
+        casm.with_retry do 
+          dmy, callpos = casm.call_with_arg(fnc, numarg)
+        end
+        context.end_using_reg(fnc)
+        vretadd = casm.output_stream.var_base_address(callpos)
+        cpuinfo = []
+        if slf then
+          cpuinfo.push slf
+        else
+          cpuinfo.push self
+        end
+        cpuinfo.push context.reg_content.dup
+        cpuinfo.push context.stack_content.dup
+        context.top_node.frame_struct_array.push [vretadd, cpuinfo]
+        
+        if context.options[:dump_context] then
+          dump_context(context)
+        end
+        context
+      end
+
       def dump_context(context)
         print "---- Reg map ----\n"
         context.reg_content.each do |key, value|
@@ -510,6 +599,7 @@ LO        |                       |   |  |
         end
 
         print "---- Stack map ----\n"
+=begin
         @frame_info.frame_layout.each_with_index do |vinf, i|
           ro = @frame_info.real_offset(i)
           if mlv = @modified_local_var.last[0][ro] then
@@ -518,11 +608,17 @@ LO        |                       |   |  |
             print "    #{vinf.class} \n"
           end
         end
+=end
         context.stack_content.each do |value|
           print "    #{value.class} \n"
         end
       end
-      
+    end
+
+    module SendNodeCodeGen
+      include AbsArch
+      include CommonCodeGen
+
       def gen_make_argv(context)
         casm = context.assembler
         rarg = @arguments[3..-1]
@@ -578,21 +674,6 @@ LO        |                       |   |  |
 
         context
       end
-
-      def gen_call(context, fnc, numarg)
-        casm = context.assembler
-
-        callpos = nil
-        casm.with_retry do 
-          dmy, callpos = casm.call_with_arg(fnc, numarg)
-        end
-        context.end_using_reg(fnc)
-        @var_return_address = casm.output_stream.var_base_address(callpos)
-        if context.options[:dump_context] then
-          dump_context(context)
-        end
-        context
-      end
     end
   end
 end

data/lib/ytljit/vm_cruby_obj.rb

@@ -13,19 +13,21 @@ module YTLJit
           slfoff = @current_frame_info.offset_arg(2, BPR)
           ivid = ((@name.object_id << 1) / InternalRubyType::RObject.size)
           ivarget = OpMemAddress.new(address_of("rb_ivar_get"))
-          context.start_using_reg(FUNC_ARG[0])
-          context.start_using_reg(FUNC_ARG[1])
+          context.start_arg_reg
           asm = context.assembler
           asm.with_retry do
             asm.mov(FUNC_ARG[0], slfoff)
             asm.mov(FUNC_ARG[1], ivid)
             asm.call_with_arg(ivarget, 2)
           end
-          context.end_using_reg(FUNC_ARG[1])
-          context.end_using_reg(FUNC_ARG[0])
+          context.end_arg_reg
           
           context.ret_reg = RETR
           context.ret_node = self
+          decide_type_once(context.to_signature)
+          if !@type.boxed then 
+            context = @type.to_box.gen_unboxing(context)
+          end
           context
         end
       end
@@ -46,9 +48,7 @@ module YTLJit
           rtype = @val.decide_type_once(context.to_signature)
           context = rtype.gen_boxing(context)
 
-          context.start_using_reg(FUNC_ARG[0])
-          context.start_using_reg(FUNC_ARG[1])
-          context.start_using_reg(FUNC_ARG[2])
+          context.start_arg_reg
           asm = context.assembler
           asm.with_retry do
             asm.push(TMPR2)
@@ -59,9 +59,7 @@ module YTLJit
             asm.call_with_arg(ivarset, 3)
             asm.pop(TMPR2)
           end
-          context.end_using_reg(FUNC_ARG[2])
-          context.end_using_reg(FUNC_ARG[1])
-          context.end_using_reg(FUNC_ARG[0])
+          context.end_arg_reg
           
           context.ret_reg = RETR
           context.ret_node = self
@@ -74,15 +72,19 @@ module YTLJit
       include Node
 
       def visit_getinstancevariable(code, ins, context)
+        context.macro_method = false
         curnode = context.current_node
         node = CRubyInstanceVarRefNode.new(curnode, ins[1])
+        node.debug_info = context.debug_info
         context.expstack.push node
       end
 
       def visit_setinstancevariable(code, ins, context)
+        context.macro_method = false
         val = context.expstack.pop
         curnode = context.current_node
         node = CRubyInstanceVarAssignNode.new(curnode, ins[1], val)
+        node.debug_info = context.debug_info
         if context.expstack[-1] == val then
           context.expstack[-1] = CRubyInstanceVarRefNode.new(curnode, ins[1])
         end

data/lib/ytljit/vm_inline_method.rb

@@ -2,6 +2,34 @@ module YTLJit
   module VM
     module ArithmeticOperationUtil
       include AbsArch
+      def decide_type_core_local(tlist, sig, local_cache = {})
+        tlist = tlist.select {|e| e.class != RubyType::DefaultType0 }
+        if tlist.size < 2 then
+          return decide_type_core(tlist, local_cache)
+        end
+        aele = @arguments[3].decide_type_once(sig)
+        if tlist.include?(aele) then
+          aele
+        else
+          RubyType::DefaultType0.new
+        end
+      end
+      
+      def decide_type_once(sig, local_cache = {})
+        if local_cache[self] then
+          return local_cache[self] 
+        end
+        
+        if @type.equal?(nil) or @type.is_a?(RubyType::DefaultType0) then
+          tlist = type_list(sig).flatten.uniq
+          @type = decide_type_core_local(tlist, sig, local_cache)
+        else
+          @type
+        end
+        
+        @type
+      end
+
       def gen_arithmetic_operation(context, inst, tempreg, resreg)
         context.start_using_reg(tempreg)
         context = gen_eval_self(context)
@@ -58,9 +86,8 @@ module YTLJit
         context.ret_reg = resreg
         
         decide_type_once(context.to_signature)
-
         if @type.boxed then
-          context = @type.to_unbox.gen_boxing(context)
+          context = @type.gen_boxing(context)
         end
         
         context
@@ -76,6 +103,7 @@ module YTLJit
           asm.mov(tempreg, context.ret_reg)
         end
         context.set_reg_content(tempreg, context.ret_node)
+        context.set_reg_content(tempreg, context.ret_node)
         
         # @arguments[1] is block
         # @arguments[2] is self
@@ -101,8 +129,8 @@ module YTLJit
         context.ret_reg = resreg
         
         decide_type_once(context.to_signature)
-        if type.boxed then
-          context = type.gen_boxing(context)
+        if @type.boxed then
+          context = @type.gen_boxing(context)
         end
         
         context