ytljit 0.0.6 → 0.0.7

data/lib/ytljit/vm_type_gen.rb

@@ -13,6 +13,11 @@ module YTLJit
           false
         end
 
+        # Can represent nil by this format
+        def include_nil?
+          true
+        end
+
         def gen_boxing(context)
           context
         end
@@ -28,12 +33,21 @@ module YTLJit
         def inspect
           "{ #{boxed ? "BOXED" : "UNBOXED"} #{@ruby_type}}"
         end
+
+        def copy_type
+          # Do not copy. It is immutable
+          self
+        end
       end
 
       module FixnumTypeUnboxedCodeGen
         include AbsArch
         include CommonCodeGen
 
+        def include_nil?
+          false
+        end
+
         def gen_boxing(context)
           asm = context.assembler
           val = context.ret_reg
@@ -74,6 +88,7 @@ module YTLJit
             end
             asm.sar(TMPR)
           end
+
           context.set_reg_content(TMPR, vnode)
           context.ret_reg = TMPR
           context
@@ -111,16 +126,21 @@ module YTLJit
           context.start_using_reg(TMPR2)
           context.start_arg_reg(FUNC_FLOAT_ARG)
           context.start_arg_reg
-          rbfloatnew = OpMemAddress.new(address_of("rb_float_new"))
+          addr = lambda {
+            address_of("rb_float_new")
+          }
+          rbfloatnew = OpVarMemAddress.new(addr)
 =begin
           # This is sample of backtrace
           sh = OpMemAddress.new(address_of("ytl_step_handler"))
+          context = gen_save_thepr(context)
           context = gen_call(context, sh, 0, vnode)
 =end
           asm.with_retry do
             asm.mov(FUNC_FLOAT_ARG[0], val)
           end
           context.set_reg_content(FUNC_FLOAT_ARG[0].dst_opecode, vnode)
+          context = gen_save_thepr(context)
           context = gen_call(context, rbfloatnew, 1, vnode)
           context.end_arg_reg
           context.end_arg_reg(FUNC_FLOAT_ARG)
@@ -130,14 +150,65 @@ module YTLJit
           context
         end
 
+        def include_nil?
+          false
+        end
+
         def gen_unboxing(context)
           context
         end
       end
 
+      module ArrayTypeCommonCodeGen
+        def init
+          @element_type = nil
+        end
+
+        attr_accessor :element_type
+
+        def have_element?
+          true
+        end
+
+        def ==(other)
+          if other then
+            oc = other.ruby_type
+            sc = self.ruby_type
+            sc == oc and
+              ((other.element_type == nil and
+               @element_type == nil) or
+               (other.element_type and @element_type and
+                @element_type[nil] == other.element_type[nil])) and
+              boxed == other.boxed
+          else
+            false
+          end
+        end
+
+=begin
+        def eql?(other)
+          if other then
+            oc = other.ruby_type
+            sc = self.ruby_type
+
+            sc == oc and
+              boxed == other.boxed
+          else
+            false
+          end
+        end
+=end
+
+        def inspect
+          etype = @element_type.inspect
+          "{ #{boxed ? "BOXED" : "UNBOXED"} #{@ruby_type} (#{etype})}"
+        end
+      end
+
       module ArrayTypeBoxedCodeGen
         include AbsArch
         include CommonCodeGen
+        include ArrayTypeCommonCodeGen
 
         def instance
           ni = self.dup
@@ -146,49 +217,112 @@ module YTLJit
           ni
         end
 
-        def init
-          @element_type = nil
-        end
-
-        attr_accessor :element_type
-
-        def have_element?
-          true
-        end
-
         def gen_copy(context)
           asm = context.assembler
           val = context.ret_reg
           vnode = context.ret_node
-          context.start_using_reg(TMPR3)
           context.start_arg_reg
-          rbarydup = OpMemAddress.new(address_of("rb_ary_dup"))
+          addr = lambda {
+            address_of("rb_ary_dup")
+          }
+          rbarydup = OpVarMemAddress.new(addr)
           asm.with_retry do
             asm.mov(FUNC_ARG[0], val)
           end
           context.set_reg_content(FUNC_ARG[0].dst_opecode, vnode)
+          context = gen_save_thepr(context)
           context = gen_call(context, rbarydup, 1, vnode)
           context.end_arg_reg
-          context.end_using_reg(TMPR3)
           context.ret_reg = RETR
 
           context
         end
 
-        def ==(other)
-          if other then
-            oc = other.ruby_type
-            sc = self.ruby_type
-            sc == oc and
-              @element_type == other.element_type
-          else
-            false
+        def copy_type
+          dao = self.class.from_ruby_class(@ruby_type)
+          dao = dao.to_box
+          dao.element_type = @element_type
+          dao
+        end
+      end
+
+      module ArrayTypeUnboxedCodeGen
+        include ArrayTypeCommonCodeGen
+        include SendNodeCodeGen
+
+        def instance
+          ni = self.dup
+          ni.instance_eval { extend ArrayTypeUnboxedCodeGen }
+          ni.init
+          ni
+        end
+
+        def gen_boxing(context)
+#          raise "foo"
+#          return context
+          cursig = context.to_signature
+          asm = context.assembler
+          val = context.ret_reg
+          vnode = context.ret_node
+          etypel = []
+          vnode.element_node_list[1..-1].each do |a|
+            if a[3] then
+              curidx = a[3][0]
+              if etypel[curidx] == nil then
+                etypel[curidx] = a[2].decide_type_once(a[1])
+              end
+            end
           end
+          siz = etypel.size
+
+          context.start_using_reg(TMPR3)
+          context.start_using_reg(TMPR2)
+          asm.with_retry do
+            asm.mov(TMPR3, val)
+          end
+
+          argcomp = lambda {|context, arg, idx|
+            eleacc = OpIndirect.new(TMPR3, idx * AsmType::MACHINE_WORD.size)
+            asm.with_retry do
+              asm.mov(TMPR2, eleacc)
+            end
+            context.ret_reg = TMPR2
+            arg
+          }
+
+          context = gen_make_argv(context, etypel, argcomp) do |context, rarg|
+            context.start_arg_reg
+            context.cpustack_pushn(2 * AsmType::MACHINE_WORD.size)
+
+            addr = lambda {
+              address_of("rb_ary_new4")
+            }
+            rbarynew = OpVarMemAddress.new(addr)
+            asm.with_retry do
+              asm.mov(FUNC_ARG[0], siz)
+              asm.mov(FUNC_ARG[1], TMPR2)
+            end
+
+            context = gen_save_thepr(context)
+            context = gen_call(context, rbarynew, 2, vnode)
+            context.cpustack_popn(2 * AsmType::MACHINE_WORD.size)
+            context.end_arg_reg
+            context.ret_reg = RETR
+            context.set_reg_content(context.ret_reg, vnode)
+            context
+          end
+
+          context.end_using_reg(TMPR2)
+          context.end_using_reg(TMPR3)
+          context
         end
 
-        def eql?(other)
-          self.class == other.class and
-          @element_type == other.element_type
+
+        def copy_type
+          dao = self.class.from_ruby_class(@ruby_type)
+          dao = dao.to_unbox
+          dao.element_type = @element_type
+          dao
         end
       end
 
@@ -200,25 +334,71 @@ module YTLJit
           asm = context.assembler
           val = context.ret_reg
           vnode = context.ret_node
-          context.start_using_reg(TMPR2)
           context.start_arg_reg
-          rbstrresurrect = OpMemAddress.new(address_of("rb_str_resurrect"))
+          addr = lambda {
+            address_of("rb_str_dup")
+          }
+          rbstrdup = OpVarMemAddress.new(addr)
           asm.with_retry do
             asm.mov(FUNC_ARG[0], val)
           end
           context.set_reg_content(FUNC_ARG[0].dst_opecode, vnode)
-          context = gen_call(context, rbstrresurrect, 1, vnode)
+          context = gen_save_thepr(context)
+          context = gen_call(context, rbstrdup, 1, vnode)
           context.end_arg_reg
-          context.end_using_reg(TMPR2)
           context.ret_reg = RETR
-
+          
           context
         end
       end
 
+      module RangeTypeCommonCodeGen
+        def init
+          @args = nil
+          @element_type = nil
+        end
+
+        attr_accessor :args
+        attr_accessor :element_type
+
+        def have_element?
+          true
+        end
+
+        def inspect
+          "{ #{boxed ? "BOXED" : "UNBOXED"} #{@ruby_type} (#{@element_type.inspect})}"
+        end
+
+        def ==(other)
+          self.class == other.class and
+#            @args == other.args and
+            boxed == other.boxed
+        end
+      end
+
+      module RangeTypeBoxedCodeGen
+        include RangeTypeCommonCodeGen
+
+        def instance
+          ni = self.dup
+          ni.instance_eval { extend RangeTypeBoxedCodeGen }
+          ni.init
+          ni
+        end
+
+        def copy_type
+          dro = self.class.from_ruby_class(@ruby_type)
+          dro = dro.to_box
+          dro.element_type = @element_type
+          dro.args = @args
+          dro
+        end
+      end
+
       module RangeTypeUnboxedCodeGen
         include AbsArch
         include CommonCodeGen
+        include RangeTypeCommonCodeGen
 
         def instance
           ni = self.dup
@@ -227,17 +407,15 @@ module YTLJit
           ni
         end
 
-        def init
-          @args = nil
-        end
-
-        attr_accessor :args
-
         def gen_boxing(context)
-          rtype = args[0].decide_type_once(context.to_signature)
+          rtype = @args[0].decide_type_once(context.to_signature)
 
+          vnode = context.ret_node
           base = context.ret_reg
-          rbrangenew = OpMemAddress.new(address_of("rb_range_new"))
+          addr = lambda {
+            address_of("rb_range_new")
+          }
+          rbrangenew = OpVarMemAddress.new(addr)
           begoff = OpIndirect.new(TMPR2, 0)
           endoff = OpIndirect.new(TMPR2, AsmType::MACHINE_WORD.size)
           excoff = OpIndirect.new(TMPR2, AsmType::MACHINE_WORD.size * 2)
@@ -263,27 +441,22 @@ module YTLJit
 
           asm.with_retry do
             asm.mov(FUNC_ARG[2], excoff)
-            asm.call_with_arg(rbrangenew, 3)
           end
+          context = gen_save_thepr(context)
+          context = gen_call(context, rbrangenew, 3, vnode)
 
           context.end_arg_reg
           context.end_using_reg(TMPR2)
           context.ret_reg = RETR
           context
         end
-        
-        def ==(other)
-          self.class == other.class and
-            @args == other.args
-        end
-      end
 
-      module ArrayTypeUnboxedCodeGen
-        include AbsArch
-        include CommonCodeGen
-
-        def have_element?
-          true
+        def copy_type
+          dro = self.class.from_ruby_class(@ruby_type)
+          dro = dro.to_unbox
+          dro.element_type = @element_type
+          dro.args = @args
+          dro
         end
       end
     end

data/lib/ytljit.rb

@@ -53,3 +53,8 @@ require 'ytljit/arena'
 
 require 'runtime/object.rb'
 require 'runtime/gc.rb'
+
+module YTLJit
+  VERSION = "0.0.7"
+end
+

data/test/test_assemble2.rb

@@ -17,18 +17,18 @@ class InstructionTests < Test::Unit::TestCase
     @cs = CodeSpace.new
     @asm = Assembler.new(@cs, GeneratorExtend)
     @asout = ""
-#    @regs = [EAX, ECX, EDX, EBX, EBP, EDI, ESI, ESP]
+    @regs = [EAX, ECX, EDX, EBX, EBP, EDI, ESI, ESP]
     @regs8 = [AL, CL, DL, BL]
-    @regs = [RAX, RCX, RDX, RBX, RBP, RDI, RSI, RSP, R8, R9, R10,
-             R11, R12, R13, R14, R15]
+#    @regs = [RAX, RCX, RDX, RBX, RBP, RDI, RSI, RSP, R8, R9, R10,
+#             R11, R12, R13, R14, R15]
 
     @xmmregs = [XMM0, XMM1, XMM2, XMM3, XMM4, XMM5, XMM6, XMM7]
     @lits = [OpImmidiate32.new(0x0), OpImmidiate32.new(0x92),
              OpImmidiate32.new(0x8212), OpImmidiate32.new(0x12345678),
              0, 0x92, 0x8212, 0x12345678]# , 0xffffffff]
     @indirects = []
-#    [EBP, EDI, ESI, ESP].each do |reg|
-    [RBP, RDI, RSI, RSP, R8, R9, R10, R11, R12].each do |reg|
+    [EBP, EDI, ESI, ESP].each do |reg|
+#    [RBP, RDI, RSI, RSP, R8, R9, R10, R11, R12].each do |reg|
      [ 
 #      -65535, -8192, -256, -255, -80, -12, -8, 
        -80, -8, 0, 8, 
@@ -279,6 +279,36 @@ class InstructionTests < Test::Unit::TestCase
     end
   end
 
+  def test_xmm_cvt
+    [:cvtsi2sd, :cvtsi2ss].each do |mnm|
+
+      # Pattern xmmreg, reg
+      @xmmregs.each do |reg|
+        @regs.each do |src|
+          asm_ytljit(mnm, reg, src)
+          asm_gas(mnm, reg, src)
+        end
+      end
+
+      # Pattern xmmreg, indirect
+      @indirects.each do |src|
+        @xmmregs.each do |dst|
+          asm_ytljit(mnm, dst, src)
+          asm_gas(mnm, dst, src)
+        end
+      end
+      
+      ytlres = disasm_ytljit(@cs)
+      gasres = disasm_gas(@cs)
+#      print @asout
+      ytlres.each_with_index do |lin, i|
+        assert_equal(gasres[i], lin)
+      end
+      @cs.reset
+      @asout = ""
+    end
+  end
+
   def test_xmm_arith
     [:addss, :addsd, :subss, :subsd, 
      :mulss, :mulsd, :divss, :divsd,

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Hideki Miura
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +09:00
+date: 2011-05-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency