ytljit 0.0.5 → 0.0.6

data/lib/ytljit/vm_type_gen.rb

@@ -26,12 +26,13 @@ module YTLJit
         end
 
         def inspect
-          "{ #{boxed ? "BOXED" : "UNBOXED"} #{ruby_type}}"
+          "{ #{boxed ? "BOXED" : "UNBOXED"} #{@ruby_type}}"
         end
       end
 
       module FixnumTypeUnboxedCodeGen
         include AbsArch
+        include CommonCodeGen
 
         def gen_boxing(context)
           asm = context.assembler
@@ -57,6 +58,7 @@ module YTLJit
 
       module FixnumTypeBoxedCodeGen
         include AbsArch
+        include CommonCodeGen
 
         def gen_boxing(context)
           context
@@ -80,6 +82,7 @@ module YTLJit
 
       module FloatTypeBoxedCodeGen
         include AbsArch
+        include CommonCodeGen
 
         def gen_boxing(context)
           context
@@ -99,21 +102,29 @@ module YTLJit
 
       module FloatTypeUnboxedCodeGen
         include AbsArch
+        include CommonCodeGen
 
         def gen_boxing(context)
           asm = context.assembler
           val = context.ret_reg
           vnode = context.ret_node
           context.start_using_reg(TMPR2)
-          context.start_using_reg(TMPR3)
-          context.start_using_reg(FUNC_FLOAT_ARG[0])
+          context.start_arg_reg(FUNC_FLOAT_ARG)
+          context.start_arg_reg
           rbfloatnew = OpMemAddress.new(address_of("rb_float_new"))
+=begin
+          # This is sample of backtrace
+          sh = OpMemAddress.new(address_of("ytl_step_handler"))
+          context = gen_call(context, sh, 0, vnode)
+=end
           asm.with_retry do
             asm.mov(FUNC_FLOAT_ARG[0], val)
-            asm.call_with_arg(rbfloatnew, 1)
           end
-          context.end_using_reg(FUNC_FLOAT_ARG[0])
-          context.end_using_reg(TMPR3)
+          context.set_reg_content(FUNC_FLOAT_ARG[0].dst_opecode, vnode)
+          context = gen_call(context, rbfloatnew, 1, vnode)
+          context.end_arg_reg
+          context.end_arg_reg(FUNC_FLOAT_ARG)
+#          context.end_using_reg(TMPR3)
           context.end_using_reg(TMPR2)
           context.ret_reg = RETR
           context
@@ -126,6 +137,7 @@ module YTLJit
 
       module ArrayTypeBoxedCodeGen
         include AbsArch
+        include CommonCodeGen
 
         def instance
           ni = self.dup
@@ -147,30 +159,34 @@ module YTLJit
         def gen_copy(context)
           asm = context.assembler
           val = context.ret_reg
-          context.start_using_reg(TMPR2)
+          vnode = context.ret_node
           context.start_using_reg(TMPR3)
-          context.start_using_reg(FUNC_ARG[0])
+          context.start_arg_reg
           rbarydup = OpMemAddress.new(address_of("rb_ary_dup"))
           asm.with_retry do
             asm.mov(FUNC_ARG[0], val)
-            asm.call_with_arg(rbarydup, 1)
           end
-          context.end_using_reg(FUNC_ARG[0])
+          context.set_reg_content(FUNC_ARG[0].dst_opecode, vnode)
+          context = gen_call(context, rbarydup, 1, vnode)
+          context.end_arg_reg
           context.end_using_reg(TMPR3)
-          context.end_using_reg(TMPR2)
           context.ret_reg = RETR
 
           context
         end
 
         def ==(other)
-          other.is_a?(self.class) and
-          self.class == other.class and
-          @element_type == other.element_type
+          if other then
+            oc = other.ruby_type
+            sc = self.ruby_type
+            sc == oc and
+              @element_type == other.element_type
+          else
+            false
+          end
         end
 
         def eql?(other)
-          other.is_a?(self.class) and
           self.class == other.class and
           @element_type == other.element_type
         end
@@ -178,20 +194,21 @@ module YTLJit
 
       module StringTypeBoxedCodeGen
         include AbsArch
+        include CommonCodeGen
 
         def gen_copy(context)
           asm = context.assembler
           val = context.ret_reg
+          vnode = context.ret_node
           context.start_using_reg(TMPR2)
-          context.start_using_reg(TMPR3)
-          context.start_using_reg(FUNC_ARG[0])
+          context.start_arg_reg
           rbstrresurrect = OpMemAddress.new(address_of("rb_str_resurrect"))
           asm.with_retry do
             asm.mov(FUNC_ARG[0], val)
-            asm.call_with_arg(rbstrresurrect, 1)
           end
-          context.end_using_reg(FUNC_ARG[0])
-          context.end_using_reg(TMPR3)
+          context.set_reg_content(FUNC_ARG[0].dst_opecode, vnode)
+          context = gen_call(context, rbstrresurrect, 1, vnode)
+          context.end_arg_reg
           context.end_using_reg(TMPR2)
           context.ret_reg = RETR
 
@@ -199,7 +216,72 @@ module YTLJit
         end
       end
 
+      module RangeTypeUnboxedCodeGen
+        include AbsArch
+        include CommonCodeGen
+
+        def instance
+          ni = self.dup
+          ni.instance_eval { extend RangeTypeUnboxedCodeGen }
+          ni.init
+          ni
+        end
+
+        def init
+          @args = nil
+        end
+
+        attr_accessor :args
+
+        def gen_boxing(context)
+          rtype = args[0].decide_type_once(context.to_signature)
+
+          base = context.ret_reg
+          rbrangenew = OpMemAddress.new(address_of("rb_range_new"))
+          begoff = OpIndirect.new(TMPR2, 0)
+          endoff = OpIndirect.new(TMPR2, AsmType::MACHINE_WORD.size)
+          excoff = OpIndirect.new(TMPR2, AsmType::MACHINE_WORD.size * 2)
+ 
+          context.start_using_reg(TMPR2)
+          context.start_arg_reg
+          asm = context.assembler
+          asm.with_retry do
+            asm.mov(TMPR2, base)
+          end
+
+          context.ret_reg = begoff
+          context = rtype.gen_boxing(context)
+          asm.with_retry do
+            asm.mov(FUNC_ARG[0], context.ret_reg)
+          end
+
+          context.ret_reg = endoff
+          context = rtype.gen_boxing(context)
+          asm.with_retry do
+            asm.mov(FUNC_ARG[1], context.ret_reg)
+          end
+
+          asm.with_retry do
+            asm.mov(FUNC_ARG[2], excoff)
+            asm.call_with_arg(rbrangenew, 3)
+          end
+
+          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
         end

data/test/test_assemble2.rb

@@ -5,7 +5,7 @@ include YTLJit
 
 class Integer
   def to_as
-    "$0X#{self.to_s(16)}"
+    "$0x#{self.to_s(16)}"
   end
 end
 
@@ -17,19 +17,23 @@ 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].each do |reg|
-      [0, 12, 255, 8192, 65535].each do |offset|
+#    [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, 
+#       0, 12, 255, 8192, 65535
+     ].each do |offset|
         @indirects.push OpIndirect.new(reg, offset)
       end
     end
@@ -160,7 +164,6 @@ class InstructionTests < Test::Unit::TestCase
       
       ytlres = disasm_ytljit(@cs)
       gasres = disasm_gas(@cs)
-#      print @asout
       ytlres.each_with_index do |lin, i|
         assert_equal(gasres[i], lin)
       end

metadata

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