ytljit 0.0.4 → 0.0.5

data/ext/ytljit.c

@@ -3,6 +3,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "ruby.h"
+#include "ruby/st.h"
 
 #include "ytljit.h"
 
@@ -33,16 +34,34 @@ ytl_address_of(VALUE self, VALUE symstr)
   return Qnil;
 }
 
+static rb_method_entry_t*
+search_method(VALUE klass, ID id)
+{
+    st_data_t body;
+    if (!klass) {
+	return 0;
+    }
+
+    while (!st_lookup(RCLASS_M_TBL(klass), id, &body)) {
+	klass = RCLASS_SUPER(klass);
+	if (!klass) {
+	    return 0;
+	}
+    }
+
+    return (rb_method_entry_t *)body;
+}
+
 VALUE 
 ytl_method_address_of(VALUE klass, VALUE mname)
 {
   rb_method_entry_t *me;
   ID mid = SYM2ID(mname);
 
-  me = rb_method_entry(klass, mid);
+  me = search_method(klass, mid);
 
   if (me && me->def && me->def->type == VM_METHOD_TYPE_CFUNC) {
-      return ULONG2NUM((uintptr_t)me->def->body.cfunc.func);
+    return ULONG2NUM((uintptr_t)me->def->body.cfunc.func);
   }
   else {
     return Qnil;
@@ -74,7 +93,7 @@ ytl_method_address_of_raw(VALUE klass, VALUE mname)
   rb_method_entry_t *me;
   ID mid = SYM2ID(mname);
 
-  me = rb_method_entry(klass, mid);
+  me = search_method(klass, mid);
 
   if (me && me->def && me->def->type == VM_METHOD_TYPE_CFUNC) {
       return (void *)me->def->body.cfunc.func;

data/lib/ytljit/instruction.rb

@@ -130,6 +130,10 @@ module YTLJit
     def using(reg)
        @reg == reg
     end
+
+    def reg_no
+      @reg.reg_no
+    end
   end
 
   case $ruby_platform

data/lib/ytljit/instruction_ia.rb

@@ -713,14 +713,12 @@ module YTLJit
       when OpRegXMM
         case src
         when OpRegXMM
-          rexseq, rexfmt = rex(dst, src)
           modseq, modfmt = modrm(inst, dst, src, dst, src)
-          (rexseq + [op, 0x0F, 0x10] + modseq).pack("#{rexfmt}C3#{modfmt}")
+          ([op, 0x0F, 0x10] + modseq).pack("C3#{modfmt}")
 
         when OpIndirect
-          rexseq, rexfmt = rex(dst, src)
           modseq, modfmt = modrm(inst, dst, src, dst, src)
-          (rexseq + [op, 0x0F, 0x10] + modseq).pack("#{rexfmt}C3#{modfmt}")
+          ([op, 0x0F, 0x10] + modseq).pack("C3#{modfmt}")
 
         else
           return nosupported_addressing_mode(inst, dst, src)
@@ -729,9 +727,8 @@ module YTLJit
       when OpIndirect
         case src
         when OpRegXMM
-          rexseq, rexfmt = rex(dst, src)
           modseq, modfmt = modrm(inst, src, dst, dst, src)
-          (rexseq + [op, 0x0F, 0x11] + modseq).pack("#{rexfmt}C3#{modfmt}")
+          ([op, 0x0F, 0x11] + modseq).pack("C3#{modfmt}")
           
         else
           return nosupported_addressing_mode(inst, dst, src)

data/lib/ytljit/instruction_x64.rb

@@ -8,7 +8,14 @@ module YTLJit
           rrex |= 0b1
         end
       end
-
+      
+      if dst.is_a?(OpIndirect) and dst.reg.is_a?(OpReg64) then
+        if dst.reg_no >= 8 then
+          rrex |= 0b1000
+          rrex |= 0b1
+        end
+      end
+      
       if src.is_a?(OpReg64) then
         rrex |= 0b1000
         if src.reg_no >= 8 then
@@ -16,6 +23,13 @@ module YTLJit
         end
       end
 
+      if src.is_a?(OpIndirect) and src.reg.is_a?(OpReg64) then
+        if dst.reg_no >= 8 then
+          rrex |= 0b1000
+          rrex |= 0b1
+        end
+      end
+
       if src.is_a?(OpImmidiate64) then
         rrex |= 0b1000
       end

data/lib/ytljit/util.rb

@@ -48,6 +48,41 @@ module YTLJit
   def boxing
     self
   end
+
+  # Singleton class can't be marshaled.
+  # So this class wrap to marshal singleton class
+  class ClassClassWrapper
+    def initialize(clsobj)
+      @klass_object = clsobj
+      @value = nil
+    end
+    
+    def value
+      if @value then
+        @value
+      else
+        @value = class << @klass_object; self; end
+        @value
+      end
+    end
+    
+    def name
+      value.name
+    end
+    
+    def ancestors
+      value.ancestors
+    end
+    
+    def marshal_dump
+      [@klass_object]
+    end
+    
+    def marshal_load(obj)
+      @klass_object = obj
+      @value = nil
+    end
+  end
 end
 
 class Fixnum
@@ -62,3 +97,4 @@ class Float
   end
 end
 
+

data/lib/ytljit/vm.rb

@@ -922,9 +922,10 @@ LocalVarNode
           @constant_tab = {}
           @method_tab = {}
           @klass_object = klassobj
-          @klassclass = class << @klass_object; self; end
+          @klassclass = ClassClassWrapper.new(@klass_object)
           @klassclass_node = nil # Lazy
-          RubyType::define_wraped_class(@klassclass, RubyType::RubyTypeBoxed)
+          RubyType::define_wraped_class(@klassclass, 
+                                        RubyType::RubyTypeBoxed)
           unless @@class_top_tab[klassobj]
             @@class_top_tab[klassobj] = self
           end
@@ -932,26 +933,29 @@ LocalVarNode
 
         def collect_info(context)
           context.modified_local_var.push [{}]
-          context.modified_instance_var = Hash.new {|hash, key| hash[key] = []}
+          context.modified_instance_var = Hash.new
           context = super
           context.modified_local_var.pop
           if @klassclass_node then
             @klassclass_node.collect_info(context)
+          else
+            context
           end
-          context
         end
 
         def collect_candidate_type(context, signode, sig)
           super
           if @klassclass_node then
-            context = @klassclass_node.collect_candidate_type(context, 
-                                                              signode, sig)
+            @klassclass_node.collect_candidate_type(context, signode, sig)
+          else
+            context
           end
-          context
         end
 
         def make_klassclass_node
-          clsclsnode = ClassTopNode.new(self, @klassclass, @klassclass.name)
+          clsclsnode = ClassTopNode.new(self, 
+                                        @klassclass, 
+                                        @klassclass.name)
           clsclsnode.body = DummyNode.new
           @klassclass_node = clsclsnode
         end
@@ -1038,8 +1042,11 @@ LocalVarNode
           cs = self.find_cs_by_signature(context.to_signature)
           if cs then
             asm = context.assembler
-            add = lambda { @klassclass.address }
+            add = lambda { @klassclass.value.address }
             var_klassclass = OpVarImmidiateAddress.new(add)
+            context.start_using_reg(FUNC_ARG[0])
+            context.start_using_reg(FUNC_ARG[1])
+            context.start_using_reg(FUNC_ARG[2])
             asm.with_retry do
               asm.mov(FUNC_ARG_YTL[0], BPR)
               asm.mov(FUNC_ARG_YTL[1], 4)
@@ -1047,6 +1054,9 @@ LocalVarNode
             end
             add = cs.var_base_address
             context = gen_call(context, add, 3)
+            context.end_using_reg(FUNC_ARG[2])
+            context.end_using_reg(FUNC_ARG[1])
+            context.end_using_reg(FUNC_ARG[0])
           end
           
           context
@@ -1068,10 +1078,22 @@ LocalVarNode
           @id.push 0
 
           @unwind_proc = CodeSpace.new
+          @init_node = nil
           init_unwind_proc
           add_code_space(nil, @unwind_proc)
         end
 
+        attr_accessor :init_node
+        attr          :code_space_tab
+        attr          :asm_tab
+
+        def traverse_childlen
+          if @init_node then
+            yield @init_node
+          end
+          yield @body
+        end
+
         def init_unwind_proc
           asm = Assembler.new(@unwind_proc)
           # Make linkage of frame pointer
@@ -1092,14 +1114,29 @@ LocalVarNode
           end
         end
 
+        def collect_info(context)
+          if @init_node then
+            context = @init_node.collect_info(context)
+          end
+          super(context)
+        end
+
         def collect_candidate_type(context, signode, sig)
           context.convergent = true
           context.visited_top_node = {}
-          super
+          if @init_node then
+            context = @init_node.collect_candidate_type(context, signode, sig)
+          end
+          super(context, signode, sig)
         end
 
-        attr :code_space_tab
-        attr :asm_tab
+        def compile(context)
+          if @init_node then
+            context = @init_node.compile(context)
+          end
+          context = super(context)
+          context
+        end
       end
 
       class LocalFrameInfoNode<BaseNode
@@ -1205,8 +1242,7 @@ LocalVarNode
             end
             context.cpustack_pushn(siz)
           end
-          context = @body.compile(context)
-          context
+          @body.compile(context)
         end
       end
 
@@ -1355,8 +1391,7 @@ LocalVarNode
           cursig = context.to_signature
           same_type(self, @value_node, cursig, cursig, context)
           same_type(@value_node, self, cursig, cursig, context)
-          context = @body.collect_candidate_type(context)
-          context
+          @body.collect_candidate_type(context)
         end
 
         def compile(context)
@@ -1390,9 +1425,7 @@ LocalVarNode
             context.ret_reg = RETR
           end
 
-          context = @body.compile(context)
-
-          context
+          @body.compile(context)
         end
       end
 
@@ -1516,10 +1549,10 @@ LocalVarNode
 
         def collect_candidate_type(context, sender = nil)
           if @come_from.keys[0] == sender then
-            context = @body.collect_candidate_type(context)
+            @body.collect_candidate_type(context)
+          else
+            context
           end
-
-          context
         end
 
         def compile(context)
@@ -1531,8 +1564,6 @@ LocalVarNode
           else
             context
           end
-
-          context
         end
       end
 
@@ -1755,16 +1786,14 @@ LocalVarNode
           end
           context = @define.collect_candidate_type(context, arg, sig)
 
-          context = @body.collect_candidate_type(context)
-          context
+          @body.collect_candidate_type(context)
         end
 
         def compile(context)
 #          raise "Can't compile"
           context = super(context)
           context = @define.compile(context)
-          context = @body.compile(context)
-          context
+          @body.compile(context)
         end
       end
 
@@ -1920,7 +1949,7 @@ LocalVarNode
               end
               if slfval == nil or mth == nil then
                 mth = rklass.instance_method(@name)
-                @ruby_reciever = rklass
+                @ruby_reciever = rtype.instance_eval {@ruby_type}
               end
 
               if variable_argument?(mth.parameters) then
@@ -2049,11 +2078,15 @@ LocalVarNode
               end
 
               addr = lambda {
-                if @ruby_reciever.class == Module then
+                rrec = @ruby_reciever
+                if rrec.is_a?(ClassClassWrapper) then
+                  rrec = rrec.value
+                end
+                if rrec.class == Module then
                   name = @name
-                  @ruby_reciever.send(:method_address_of, name)
+                  rrec.send(:method_address_of, name)
                 else
-                  @ruby_reciever.method_address_of(@name)
+                  rrec.method_address_of(@name)
                 end
               }
               if addr.call then
@@ -2262,8 +2295,8 @@ LocalVarNode
           if base == TMPR2 then
             context.end_using_reg(base)
           end
-          context = @body.compile(context)
-          context
+
+          @body.compile(context)
         end
       end
 
@@ -2286,6 +2319,9 @@ LocalVarNode
 
         def collect_info(context)
           vti = context.modified_instance_var[@name]
+          if vti == nil then
+            vti = []
+          end
           # Not dup so vti may update after.
           @var_type_info = vti 
 
@@ -2355,8 +2391,28 @@ LocalVarNode
         def initialize(parent, klass, name)
           super(parent)
           @name = name
+          rklass = nil
+          case klass
+          when LiteralNode, ConstantRefNode
+            rklass = klass.get_constant_value[0]
+            klass = ClassTopNode.get_class_top_node(rklass)
+
+          when ClassTopNode
+            rklass = klass.get_constant_value[0]
+            
+          else
+            klass = search_class_top
+          end
+
           @class_top = klass # .search_class_top
-          @value_node, dummy = klass.search_constant_with_super(@name)
+          @value_node = nil
+          clsnode = nil
+          if klass then
+            @value_node, clsnode = klass.search_constant_with_super(@name)
+          end
+          if clsnode == nil and rklass then
+            @value_node = LiteralNode.new(self, rklass.const_get(@name))
+          end
         end
 
         attr :value_node

data/lib/ytljit/vm_codegen.rb

@@ -77,7 +77,7 @@ LO        |                       |   |  |
       def initialize(tnode)
         @top_node = tnode
         @modified_local_var = []
-        @modified_instance_var = Hash.new {|hash, key| hash[key] = []}
+        @modified_instance_var = Hash.new
         @yield_node = []
       end
 
@@ -357,7 +357,7 @@ LO        |                       |   |  |
       def start_using_reg(reg)
         case reg
         when OpRegistor
-          if reg != TMPR then
+          if reg != TMPR and reg != XMM0 then
             start_using_reg_aux(reg)
           end
 

data/lib/ytljit/vm_cruby_obj.rb

@@ -11,14 +11,18 @@ module YTLJit
 
         def compile_main(context)
           slfoff = @current_frame_info.offset_arg(2, BPR)
-          asm = context.assembler
           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])
+          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.ret_reg = RETR
           context.ret_node = self
@@ -42,6 +46,9 @@ 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])
           asm = context.assembler
           asm.with_retry do
             asm.push(TMPR2)
@@ -52,6 +59,9 @@ 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.ret_reg = RETR
           context.ret_node = self

data/lib/ytljit/vm_sendnode.rb

@@ -944,7 +944,8 @@ module YTLJit
         end
 
         def compile_call_func(context, fname)
-          fadd = address_of(fname)
+          fadd = OpMemAddress.new(address_of(fname))
+          context.start_using_reg(FUNC_ARG[0])
           asm = context.assembler
           asm.with_retry do
             asm.mov(FUNC_FLOAT_ARG[0], context.ret_reg)
@@ -953,10 +954,11 @@ module YTLJit
             asm.fstpl(INDIRECT_SPR)
             asm.pop(XMM0)
           end
+          context.end_using_reg(FUNC_ARG[0])
           context
         end
 
-        def compile(context)
+        def compile2(context)
           @arguments[2].decide_type_once(context.to_signature)
           rtype = @arguments[2].type
           rrtype = rtype.ruby_type

data/lib/ytljit/vm_trans.rb

@@ -24,8 +24,8 @@ module YTLJit
         @not_reached_pos = false
       end
 
-      attr :the_top
-      attr :top_nodes
+      attr_accessor :the_top
+      attr          :top_nodes
 
       attr_accessor :current_file_name
       attr_accessor :current_class_node
@@ -137,6 +137,13 @@ module YTLJit
 
       def visit_block_start(code, ins, context)
         mtopnode = context.current_node
+        if !mtopnode.is_a?(TopNode) then
+          oldtop = context.the_top
+          mtopnode = TopTopNode.new(nil, Object)
+          context.the_top = mtopnode
+          oldtop.parent = mtopnode
+          mtopnode.init_node = oldtop
+        end
 
         locals = code.header['locals']
         args   = code.header['misc'][:arg_size]

data/lib/ytljit/vm_type.rb

@@ -232,7 +232,16 @@ module YTLJit
       end
 
       attr_accessor :asm_type
-      attr_accessor :ruby_type
+
+      def ruby_type
+        if @ruby_type.is_a?(ClassClassWrapper) then
+          @ruby_type.value
+        else
+          @ruby_type
+        end
+      end
+
+      attr_writer :ruby_type
     end
 
     # Same as VALUE type in MRI
@@ -247,11 +256,11 @@ module YTLJit
       end
 
       def to_unbox
-        @@unboxed_type_tab[@ruby_type].instance
+        @@unboxed_type_tab[ruby_type].instance
       end
 
       def to_box
-        @@boxed_type_tab[@ruby_type].instance
+        @@boxed_type_tab[ruby_type].instance
       end
 
       def ==(other)
@@ -272,7 +281,7 @@ module YTLJit
       end
 
       def to_unbox
-        @@unboxed_type_tab[@ruby_type].instance
+        @@unboxed_type_tab[ruby_type].instance
       end
 
       def to_box
@@ -288,7 +297,7 @@ module YTLJit
       end
 
       def to_box
-        @@boxed_type_tab[@ruby_type].instance
+        @@boxed_type_tab[ruby_type].instance
       end
 
       def to_unbox

data/lib/ytljit/vm_type_gen.rb

@@ -26,7 +26,7 @@ module YTLJit
         end
 
         def inspect
-          "{ #{boxed ? "BOXED" : "UNBOXED"} #{@ruby_type}}"
+          "{ #{boxed ? "BOXED" : "UNBOXED"} #{ruby_type}}"
         end
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Hideki Miura
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 +09:00
+date: 2010-12-17 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency