ytljit 0.0.7 → 0.0.8

data/lib/ytljit/vm_trans.rb

@@ -406,8 +406,23 @@ module YTLJit
         context.current_node = node
       end
 
-      # getglobal
-      # setglobal
+      def visit_getglobal(code, ins, context)
+        name = ins[1]
+        curnode = context.current_node
+        node = GlobalVarRefNode.new(curnode, name)
+        curnode.body = node
+        context.expstack.push node
+      end
+
+      def visit_setglobal(code, ins, context)
+        value = context.expstack.pop
+        name = ins[1]
+        curnode = context.current_node
+        node = GlobalVarAssignNode.new(curnode, name, value)
+        node.debug_info = context.debug_info
+        curnode.body = node
+        context.current_node = node
+      end
       
       def visit_putnil(code, ins, context)
         nnode = LiteralNode.new(nil, nil)
@@ -538,7 +553,29 @@ module YTLJit
       # concatarray
       # splatarray
       # checkincludearray
-      # newhash
+
+      def visit_newhash(code, ins, context)
+        curnode= context.current_node
+        argnum = ins[1]
+        args = []
+        while argnum > 0
+          argnum = argnum - 2
+          args.push context.expstack.pop
+          args.push context.expstack.pop
+        end
+        topnode = ClassTopNode.get_class_top_node(Object)
+        hcnode = ConstantRefNode.new(curnode, topnode, :Hash)
+        context.expstack.push hcnode
+        visit_send(code, [:send, :new, 0, nil, 0, nil], context)
+
+        args.reverse.each_slice(2) do |key, value|
+          visit_dup(code, [:dup] , context)
+          context.expstack.push key
+          context.expstack.push value
+          visit_send(code, [:send, :[]=, 2, nil, 0, nil], context)
+          visit_pop(code, [:pop] , context)
+        end
+      end
 
       def visit_newrange(code, ins, context)
         exclflag = LiteralNode.new(nil, ins[1] != 0)

data/lib/ytljit/vm_type_gen.rb

@@ -127,7 +127,9 @@ module YTLJit
           context.start_arg_reg(FUNC_FLOAT_ARG)
           context.start_arg_reg
           addr = lambda {
-            address_of("rb_float_new")
+            a = address_of("rb_float_new")
+            $symbol_table[a] = "rb_float_new"
+            a
           }
           rbfloatnew = OpVarMemAddress.new(addr)
 =begin
@@ -223,7 +225,9 @@ module YTLJit
           vnode = context.ret_node
           context.start_arg_reg
           addr = lambda {
-            address_of("rb_ary_dup")
+            a = address_of("rb_ary_dup")
+            $symbol_table[a] = "rb_ary_dup"
+            a
           }
           rbarydup = OpVarMemAddress.new(addr)
           asm.with_retry do
@@ -259,7 +263,7 @@ module YTLJit
 
         def gen_boxing(context)
 #          raise "foo"
-#          return context
+          return context
           cursig = context.to_signature
           asm = context.assembler
           val = context.ret_reg
@@ -295,7 +299,9 @@ module YTLJit
             context.cpustack_pushn(2 * AsmType::MACHINE_WORD.size)
 
             addr = lambda {
-              address_of("rb_ary_new4")
+              a = address_of("rb_ary_new4")
+              $symbol_table[a] = "rb_ary_new4"
+              a
             }
             rbarynew = OpVarMemAddress.new(addr)
             asm.with_retry do
@@ -336,7 +342,9 @@ module YTLJit
           vnode = context.ret_node
           context.start_arg_reg
           addr = lambda {
-            address_of("rb_str_dup")
+            a = address_of("rb_str_dup")
+            $symbol_table[a] = "rb_str_dup"
+            a
           }
           rbstrdup = OpVarMemAddress.new(addr)
           asm.with_retry do
@@ -413,7 +421,9 @@ module YTLJit
           vnode = context.ret_node
           base = context.ret_reg
           addr = lambda {
-            address_of("rb_range_new")
+            a = address_of("rb_range_new")
+            $symbol_table[a] = "rb_range_new"
+            a
           }
           rbrangenew = OpVarMemAddress.new(addr)
           begoff = OpIndirect.new(TMPR2, 0)

data/lib/ytljit/vm_typeinf.rb

@@ -27,7 +27,11 @@ module YTLJit
 
         def compile_main(context)
           slf = context.slf
-          ivval = lambda { slf.instance_var_address_of(@name) }
+          ivval = lambda { 
+            a = slf.instance_var_address_of(@name) 
+            $symbol_table[a] = @name
+            a
+          }
           ivadd = OpVarImmidiateAddress.new(ivval)
           asm = context.assembler
           asm.with_retry do
@@ -49,7 +53,11 @@ module YTLJit
           context = @val.compile(context)
           valr = context.ret_reg
           slf = context.slf
-          ivval = lambda { slf.instance_var_address_of(@name) }
+          ivval = lambda { 
+            a = slf.instance_var_address_of(@name) 
+            $symbol_table[a] = @name
+            a
+          }
           ivadd = OpVarImmdiateAddress.new(ivval)
           asm = context.assembler
           asm.with_retry do

data/lib/ytljit.rb

@@ -34,9 +34,9 @@ require 'ytljit/rubyvm'
 
 require 'ytljit/vm_codegen'
 require 'ytljit/vm_inspect'
-require 'ytljit/vm'
-
 require 'ytljit/vm_inline_method'
+
+require 'ytljit/vm'
 require 'ytljit/vm_sendnode'
 
 require 'ytljit/vm_trans'
@@ -55,6 +55,6 @@ require 'runtime/object.rb'
 require 'runtime/gc.rb'
 
 module YTLJit
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end
 

data/test/test_assemble2.rb

@@ -307,6 +307,34 @@ class InstructionTests < Test::Unit::TestCase
       @cs.reset
       @asout = ""
     end
+
+    [:cvtsd2si, :cvtss2si, :cvttsd2si, :cvttss2si].each do |mnm|
+
+      # Pattern reg, xmmrmm
+      @regs.each do |reg|
+        @xmmregs.each do |src|
+          asm_ytljit(mnm, reg, src)
+          asm_gas(mnm, reg, src)
+        end
+      end
+
+      # Pattern reg, xmmrmm
+      @regs.each do |dst|
+        @indirects.each do |src|
+          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

metadata

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