ytljit 0.0.2 → 0.0.3

data/ext/ytljit.h

@@ -67,7 +67,7 @@ struct rb_iseq_struct {
     VALUE name;	         /* String: iseq name */
     VALUE filename;      /* file information where this sequence from */
     VALUE filepath;      /* real file path or nil */
-    VALUE *iseq;         /* iseq (insn number and openrads) */
+    VALUE *iseq;         /* iseq (insn number and operands) */
     VALUE *iseq_encoded; /* encoded iseq */
     unsigned long iseq_size;
     VALUE mark_ary;	/* Array: includes operands which should be GC marked */
@@ -91,7 +91,7 @@ struct rb_iseq_struct {
      * argument information
      *
      *  def m(a1, a2, ..., aM,                    # mandatory
-     *        b1=(...), b2=(...), ..., bN=(...),  # optinal
+     *        b1=(...), b2=(...), ..., bN=(...),  # optional
      *        *c,                                 # rest
      *        d1, d2, ..., dO,                    # post
      *        &e)                                 # block

data/lib/ytljit/asmext.rb

@@ -136,6 +136,26 @@ module YTLJit
           return [rcode, TypedData.new(rtype, dst)]
         end
 
+      when :push
+        case dst
+        when OpRegXMM
+          rcode = ""
+          rcode += sub(SPR, 8)
+          rcode += mov(INDIRECT_SPR, dst)
+
+          return rcode
+        end
+
+      when :pop
+        case dst
+        when OpRegXMM
+          rcode = ""
+          rcode += mov(dst, INDIRECT_SPR)
+          rcode += add(SPR, 8)
+
+          return rcode
+        end
+
       when :seta, :setae, :setb, :setbe, :setl, :setle, :setg, :setge,
            :setna, :setnae, :setnb, :setnbe, :setnc, :setnle,
            :setno, :seto, :setz, :setnz

data/lib/ytljit/asmext_x64.rb

@@ -14,6 +14,9 @@ module YTLJit
       when :c
         ARGPOS2REG
 
+      when :cfloat
+        ARGPOS2FREG
+
       when :ytl
         []
 
@@ -29,6 +32,9 @@ module YTLJit
     def argpos2reg
       case @abi_kind
       when :c
+        ARGPOS2REG
+
+      when :cfloat
         ARGPOS2FREG
 
       when :ytl
@@ -81,13 +87,15 @@ module YTLJit
 
       if @no < argpos2reg.size then
         argreg = argpos2reg[@no]
-        
+
+=begin        
         # for nested function call. need save previous reg.
         if asm.retry_mode != :change_op and 
             fainfo.used_arg_tab.last[@no] then
           asm.update_state(gen.push(argreg))
           fainfo.push argreg
         end
+=end
         code += asm.update_state(gen.mov(argreg, src))
       else
         # spilled reg 
@@ -165,7 +173,7 @@ module YTLJit
       code += @asm.update_state(mov(RAX, OpImmidiate32.new(argnum)))
       code += @asm.update_state(call(addr))
       callpos = @asm.current_address - @asm.output_stream.base_address
-      if @asm.retry_mode != :change_op then
+      if @asm.retry_mode == :change_op then
         return [code, callpos]
       end
 

data/lib/ytljit/asmext_x86.rb

@@ -7,7 +7,7 @@ module YTLJit
       when :c 
         AsmType::MACHINE_WORD.size
 
-      when :ytl
+      when :ytl, :cfloat
         8
       end
     end

data/lib/ytljit/asmutil.rb

@@ -92,7 +92,10 @@ module YTLJit
       TMPR = OpEAX.instance
       TMPR2 = OpEDX.instance
       TMPR3 = OpECX.instance
+      DBLLOR = OpEAX.instance
+      DBLHIR = OpEDX.instance
       RETR = OpEAX.instance
+      RETFR = XMM0
       SPR = OpESP.instance
       BPR = OpEBP.instance
     when /x86_64/
@@ -101,7 +104,10 @@ module YTLJit
 #      TMPR3 = OpRCX.instance
       TMPR2 = OpR10.instance
       TMPR3 = OpR11.instance
+      DBLLOR = OpRAX.instance
+      DBLHIR = OpRDX.instance
       RETR = OpRAX.instance
+      RETFR = XMM0
       SPR = OpRSP.instance
       BPR = OpRBP.instance
     end
@@ -114,7 +120,7 @@ module YTLJit
       hash[key] = FunctionArgumentInt.new(key, :c)
     }
     FUNC_FLOAT_ARG = Hash.new {|hash, key| 
-      hash[key] = FunctionArgumentFloat.new(key, :c)
+      hash[key] = FunctionArgumentFloat.new(key, :cfloat)
     }
     FUNC_ARG_YTL = Hash.new {|hash, key| 
       hash[key] = FunctionArgumentInt.new(key, :ytl)

data/lib/ytljit/instruction_ia.rb

@@ -1193,20 +1193,20 @@ module YTLJit
       case dst 
       when OpReg8, OpMem8
         if src == nil then
-          modseq, modfmt = modrm(:imul, 5, dst, dst, 5)
+          modseq, modfmt = modrm(:imul, 5, dst, dst, src)
           return ([0xF6] + modseq).pack("C#{modfmt}")
         end
 
       when OpIndirect, OpMem32
-        if src != nil then
-          modseq, modfmt = modrm(:imul, 5, dst, dst, 5)
-          return (rexseq + [0xF7] + modseq).pack("#{rexfmt}C#(modfmt}")
+        if src == nil then
+          modseq, modfmt = modrm(:imul, 5, dst, dst, src)
+          return (rexseq + [0xF7] + modseq).pack("#{rexfmt}C#{modfmt}")
         end
 
       when OpReg32, OpReg64
         case src
         when nil
-          modseq, modfmt = modrm(:imul, 5, dst, dst, 5)
+          modseq, modfmt = modrm(:imul, 5, dst, dst, src)
           return (rexseq + [0xF7] + modseq).pack("#{rexfmt}C#(modfmt}")
           
         when OpReg32, OpMem32, OpIndirect, OpReg64
@@ -1250,6 +1250,48 @@ module YTLJit
       return nosupported_addressing_mode(:imul, dst, src, src2)
     end
 
+    def idiv(src)
+      rexseq, rexfmt = rex(src, nil)
+      case src
+      when OpReg8, OpMem8
+        modseq, modfmt = modrm(:idiv, 7, src, src, nil)
+        return ([0xF6] + modseq).pack("C#{modfmt}")
+
+      when OpIndirect, OpMem32
+        modseq, modfmt = modrm(:idiv, 7, src, src, nil)
+        return (rexseq + [0xF7] + modseq).pack("#{rexfmt}C#{modfmt}")
+
+      when OpReg32, OpReg64
+        modseq, modfmt = modrm(:idiv, 7, src, src, nil)
+        return (rexseq + [0xF7] + modseq).pack("#{rexfmt}C#{modfmt}")
+      end
+
+      return nosupported_addressing_mode(:idiv, src, nil, nil)
+    end
+
+    def neg(src)
+      rexseq, rexfmt = rex(src, nil)
+      case src
+      when OpReg8, OpMem8
+        modseq, modfmt = modrm(:neg, 3, src, src, nil)
+        return ([0xF6] + modseq).pack("C#{modfmt}")
+
+      when OpIndirect, OpMem32
+        modseq, modfmt = modrm(:neg, 3, src, src, nil)
+        return (rexseq + [0xF7] + modseq).pack("#{rexfmt}C#{modfmt}")
+
+      when OpReg32, OpReg64
+        modseq, modfmt = modrm(:neg, 3, src, src, nil)
+        return (rexseq + [0xF7] + modseq).pack("#{rexfmt}C#{modfmt}")
+      end
+
+      return nosupported_addressing_mode(:neg, src, nil, nil)
+    end
+
+    def cdq
+      [0x99].pack("C")
+    end
+
     def movss(dst, src)
       common_movssd(dst, src, 0xF3, :movss)
     end

data/lib/ytljit/util.rb

@@ -61,3 +61,4 @@ class Float
     [self].pack('d').unpack('q')[0]
   end
 end
+