ytljit 0.0.7 → 0.0.8

data/ext/memory.c

@@ -10,8 +10,8 @@ VALUE ytl_cArena;
 void
 ytl_arena_mark(struct ArenaHeader *arenah)
 {
-  VALUE *base;
   VALUE *start;
+  VALUE *end;
   struct ArenaBody *bodyptr;
   struct ArenaBody *next_bodyptr;
   struct ArenaBody *lastbodyptr;
@@ -36,8 +36,8 @@ ytl_arena_mark(struct ArenaHeader *arenah)
       continue;
     }
 
-    base = bodyptr->body + (bodyptr->size / sizeof(VALUE));
-    for (bodyeleptr = start; bodyeleptr < base; bodyeleptr++) {
+    end = bodyptr->body + (bodyptr->size / sizeof(VALUE));
+    for (bodyeleptr = start; bodyeleptr <= end; bodyeleptr++) {
       rb_gc_mark_maybe(*bodyeleptr);
     }
     next_bodyptr = bodyptr->next;
@@ -158,7 +158,7 @@ ytl_arena_ref(VALUE self, VALUE offset)
   int raw_offset;
 
   Data_Get_Struct(self, struct ArenaHeader, arenah);
-  raw_offset = FIX2INT(offset);
+  raw_offset = (arenah->body->size / sizeof(VALUE)) - FIX2INT(offset);
 
   return ULONG2NUM(arenah->body->body[raw_offset]);
 }
@@ -169,11 +169,17 @@ ytl_arena_emit(VALUE self, VALUE offset, VALUE src)
   struct ArenaHeader *arenah;
 
   int raw_offset;
+  int newsize;
+  VALUE *newlastptr;
 
   Data_Get_Struct(self, struct ArenaHeader, arenah);
-  raw_offset = NUM2ULONG(offset);
+  raw_offset = (arenah->body->size / sizeof(VALUE)) - NUM2ULONG(offset);
 
   arenah->body->body[raw_offset] = FIX2INT(src);
+  newlastptr = arenah->body->body + raw_offset;
+  if (newlastptr < arenah->lastptr) {
+    arenah->lastptr = newlastptr;
+  }
 
   return src;
 }

data/ext/ytljit.c

@@ -424,6 +424,43 @@ body(uintptr_t *regbuf)
   rb_funcall2(ytl_eStepHandler, ytl_v_step_handler_id, NUMREGS + 1, argv);
 }
 
+void
+ytl_backtrace(VALUE rip, 
+	      VALUE rax, VALUE rcx, VALUE rdx, VALUE rbx, 
+	      VALUE rbp, VALUE rsp, VALUE rdi, VALUE rsi, 
+	      VALUE r8, VALUE r9, VALUE r10, VALUE r11, 
+	      VALUE r12, VALUE r13, VALUE r14, VALUE r15) 
+{
+  VALUE *argv;
+  uintptr_t sp;
+  int i;
+
+  argv = ALLOCA_N(VALUE, NUMREGS + 1);
+
+  argv[0] = ULONG2NUM(rax);
+  argv[1] = ULONG2NUM(rip);
+  argv[2] = ULONG2NUM(rcx);
+  argv[3] = ULONG2NUM(rdx);
+  argv[4] = ULONG2NUM(rbx);
+  argv[5] = ULONG2NUM(rbp);
+  argv[6] = ULONG2NUM(rdi);
+  argv[7] = ULONG2NUM(rsi);
+  argv[8] = ULONG2NUM(r8); 
+  argv[9] = ULONG2NUM(r9); 
+  argv[10] = ULONG2NUM(r10); 
+  argv[11] = ULONG2NUM(r11); 
+  argv[12] = ULONG2NUM(r12); 
+  argv[13] = ULONG2NUM(r13); 
+  argv[14] = ULONG2NUM(r14); 
+  argv[15] = ULONG2NUM(r15); 
+  sp = (uintptr_t)rsp;
+  sp += NUMREGS * sizeof(uintptr_t); /* reg save area */
+  sp += sizeof(uintptr_t); 	/* stored pc by call instruction */
+  argv[NUMREGS] = ULONG2NUM(sp);
+
+  rb_funcall2(ytl_eStepHandler, ytl_v_step_handler_id, NUMREGS + 1, argv);
+}
+
 static uintptr_t * __attribute__ ((noinline, optimize("omit-frame-pointer")))
 pushall(void)
 {

data/lib/ytljit/codespace.rb

@@ -76,7 +76,12 @@ module YTLJit
       File.popen(objdump_cmd, "r") {|fp|
         fp.readlines.each do |lin|
           if /([0-9a-f]*):(\t[0-9a-f ]+? *\t.*)/ =~ lin then
-            @@disasm_cache[$1] = $2
+            src = $2
+            addr = $1
+            $symbol_table.each do |val, sym|
+              src.gsub!(val.to_s(16), "#{sym} (#{val})")
+            end
+            @@disasm_cache[addr] = src
           end
         end
       }

data/lib/ytljit/instruction_ia.rb

@@ -797,6 +797,23 @@ module YTLJit
         return nosupported_addressing_mode(inst, dst, src)
       end
     end
+
+    def common_cvt2(dst, src, op0, op1, inst)
+      if (src.is_a?(OpRegXMM) or 
+          src.is_a?(OpIndirect)) and
+          (dst.is_a?(OpReg32) or
+           dst.is_a?(OpReg64)) then
+        rexseq, rexfmt = rex(dst, src)
+        modseq, modfmt = modrm(inst, dst, src, dst, src)
+        if op0 then
+          ([op0] + rexseq + [0x0F, op1] + modseq).pack("C#{rexfmt}C2#{modfmt}")
+        else
+          (rexseq + [0x0F, op1] + modseq).pack("#{rexfmt}C2#{modfmt}")
+        end
+      else
+        return nosupported_addressing_mode(inst, dst, src)
+      end
+    end
   end
   
   class GeneratorIABinary<Generator
@@ -1392,6 +1409,22 @@ module YTLJit
       common_cvt(dst, src, 0xf3, 0x2a, :cvtsi2ss)
     end
 
+    def cvtsd2si(dst, src)
+      common_cvt2(dst, src, 0xf2, 0x2d, :cvtsd2si)
+    end
+
+    def cvttsd2si(dst, src)
+      common_cvt2(dst, src, 0xf2, 0x2c, :cvttsd2si)
+    end
+
+    def cvtss2si(dst, src)
+      common_cvt2(dst, src, 0xf3, 0x2d, :cvtss2si)
+    end
+
+    def cvttss2si(dst, src)
+      common_cvt2(dst, src, 0xf3, 0x2c, :cvttss2si)
+    end
+
     def int3
       [0xcc].pack("C")
     end

data/lib/ytljit/util.rb

@@ -127,4 +127,5 @@ class Float
   end
 end
 
+$symbol_table = {}