ytljit 0.0.2 → 0.0.3

data/lib/ytljit/vm_codegen.rb

@@ -82,7 +82,7 @@ LO        |                       |   |  |
       end
 
       attr          :top_node
-      attr          :modified_local_var
+      attr_accessor :modified_local_var
       attr_accessor :modified_instance_var
       attr_accessor :yield_node
 
@@ -101,7 +101,7 @@ LO        |                       |   |  |
           end
         end
 
-        @modified_local_var = res
+        @modified_local_var[-1] = res
       end
 
       def merge_instance_var(lvlist)
@@ -128,11 +128,11 @@ LO        |                       |   |  |
         @visited_top_node = {}
       end
 
-      def to_key(offset = -1)
+      def to_signature(offset = -1)
         cursig = @current_method_signature_node[offset]
         res = cursig.map { |enode|
           if enode.is_a?(Node::BaseNode) then
-            enode.decide_type_once(to_key(offset - 1))
+            enode.decide_type_once(to_signature(offset - 1))
             enode.type
           else
             enode
@@ -186,7 +186,7 @@ LO        |                       |   |  |
 
       attr_accessor :slf
 
-      attr          :options
+      attr_accessor :options
 
       def set_reg_content(dst, val)
         if dst.is_a?(FunctionArgument) then
@@ -299,7 +299,7 @@ LO        |                       |   |  |
         else
           raise "Not saved reg #{reg}"
         end
-        if @depth_reg[reg] != 0 then
+        if @depth_reg[reg] != -1 then
           assembler.with_retry do
             assembler.pop(reg)
             cpustack_pop(reg)
@@ -313,7 +313,7 @@ LO        |                       |   |  |
       def end_using_reg(reg)
         case reg
         when OpRegistor
-          if reg != TMPR then
+          if reg != TMPR and reg != XMM0 then
             end_using_reg_aux(reg)
           end
 
@@ -333,7 +333,7 @@ LO        |                       |   |  |
         end
       end
 
-      def to_key(offset = -1)
+      def to_signature(offset = -1)
         @current_method_signature[offset]
       end
     end
@@ -416,7 +416,7 @@ LO        |                       |   |  |
         print "---- Stack map ----\n"
         @frame_info.frame_layout.each_with_index do |vinf, i|
           ro = @frame_info.real_offset(i)
-          if mlv = @modified_local_var[0][ro] then
+          if mlv = @modified_local_var.last[0][ro] then
             print "    #{mlv.class} \n"
           else
             print "    #{vinf.class} \n"
@@ -441,15 +441,14 @@ LO        |                       |   |  |
 
         rarg.each_with_index do |arg, i|
           context = arg.compile(context)
-          context.ret_node.decide_type_once(context.to_key)
+          context.ret_node.decide_type_once(context.to_signature)
           rtype = context.ret_node.type
           context = rtype.gen_boxing(context)
           casm = context.assembler
           dst = OpIndirect.new(SPR, i * AsmType::MACHINE_WORD.size)
-          if  context.ret_reg.is_a?(OpRegistor) or 
+          if context.ret_reg.is_a?(OpRegistor) or 
               context.ret_reg.is_a?(OpImmidiate32) or 
               context.ret_reg.is_a?(OpImmidiate8) then
-
             casm.with_retry do
               casm.mov(dst, context.ret_reg)
             end
@@ -460,7 +459,7 @@ LO        |                       |   |  |
               casm.mov(dst, TMPR)
             end
           end
-          context.cpustack_setn(i * AsmType::MACHINE_WORD.size, context.ret_node)
+          context.cpustack_setn(i, context.ret_node)
         end
 
         # Copy Stack Pointer

data/lib/ytljit/vm_inline_method.rb

@@ -18,17 +18,21 @@ module YTLJit
         end
         context.set_reg_content(tempreg, context.ret_node)
         
-        # @argunemnts[1] is block
-        # @argunemnts[2] is self
-        # eval 2nd, 3thr, ... arguments and added
-        @arguments[3..-1].each do |aele|
-          context = aele.compile(context)
-          context.ret_node.decide_type_once(context.to_key)
-          rtype = context.ret_node.type
-          context = rtype.gen_unboxing(context)
+        # @argunents[1] is block
+        # @argunents[2] is self
+        # @arguments[3] is other
+        aele = @arguments[3]
+        context = aele.compile(context)
+        context.ret_node.decide_type_once(context.to_signature)
+        rtype = context.ret_node.type
+        context = rtype.gen_unboxing(context)
           
-          asm = context.assembler
+        asm = context.assembler
+        if block_given? then
+          yield(context)
+        else
           asm.with_retry do
+            # default code
             if context.ret_reg.using(tempreg) then
               asm.mov(TMPR, context.ret_reg)
               context.end_using_reg(context.ret_reg)
@@ -37,20 +41,19 @@ module YTLJit
               asm.send(inst, tempreg, context.ret_reg)
               context.end_using_reg(context.ret_reg)
             end
+            asm.mov(resreg, tempreg)
           end
         end
 
-        asm.with_retry do
-          asm.mov(resreg, tempreg)
-        end
         context.end_using_reg(tempreg)
-        
+
         context.ret_node = self
         context.ret_reg = resreg
         
-        decide_type_once(context.to_key)
-        if type.boxed then
-          context = type.gen_boxing(context)
+        decide_type_once(context.to_signature)
+
+        if @type.boxed then
+          context = @type.gen_boxing(context)
         end
         
         context
@@ -66,12 +69,12 @@ module YTLJit
         end
         context.set_reg_content(tempreg, context.ret_node)
         
-        # @argunemnts[1] is block
-        # @argunemnts[2] is self
-        # eval 2nd arguments and compare
+        # @arguments[1] is block
+        # @arguments[2] is self
+        # @arguments[3] is other arg
         aele = @arguments[3]
         context = aele.compile(context)
-        context.ret_node.decide_type_once(context.to_key)
+        context.ret_node.decide_type_once(context.to_signature)
         rtype = context.ret_node.type
         context = rtype.gen_unboxing(context)
           
@@ -89,7 +92,7 @@ module YTLJit
         context.ret_node = self
         context.ret_reg = resreg
         
-        decide_type_once(context.to_key)
+        decide_type_once(context.to_signature)
         if type.boxed then
           context = type.gen_boxing(context)
         end