ytljit 0.0.1 → 0.0.2

data/README

@@ -9,13 +9,19 @@ and refer to CPU flags (carry,zero,negative and so on).
 
 2. Install
 
-You must install iseq gem before installing ytljit
-  gem install iseq
+You can install by gem. Type
+  gem install ytljit
+
+If you want install manually, please do the following steps.
+
+   Install iseq gem before installing ytljit
+       gem install iseq
+
+   Compile extend library writting in C (ext/*). 
+
+   Copy extend library and  main program writting in Ruby (lib/*) to
+   your ruby library directory.
 
-GEM or install script doesn't exist yet.
-compile extend library writting in C (ext/*). 
-copy extend library and  main program writting in Ruby (lib/*) to
-your ruby library directory.
 
 3. License
 

data/lib/ytljit/instruction.rb

@@ -6,6 +6,9 @@ require 'singleton'
 module YTLJit
 
   class Operand
+    def using(reg)
+      false
+    end
   end
 
   class OpImmidiate<Operand
@@ -104,6 +107,10 @@ module YTLJit
     def value
       reg_no
     end
+    
+    def using(reg)
+      reg == self
+    end
   end
 
   class OpIndirect<Operand
@@ -119,6 +126,10 @@ module YTLJit
     def to_as
       "#{@disp}(#{@reg.to_as})"
     end
+
+    def using(reg)
+       @reg == reg
+    end
   end
 
   case $ruby_platform

data/lib/ytljit/vm.rb

@@ -383,6 +383,10 @@ LocalVarNode
       end
 
       class DummyNode
+        def collect_info(context)
+          context
+        end
+
         def collect_candidate_type(context)
           context
         end
@@ -495,9 +499,13 @@ LocalVarNode
         end
 
         def collect_candidate_type(context, signode, sig)
-          if add_cs_for_signature(sig) == nil then
-#            return context
+          if add_cs_for_signature(sig) == nil and  
+              context.visited_top_node[self] then
+            return context
           end
+
+          context.visited_top_node[self] = true
+
           context.current_method_signature_node.push signode
           context = @body.collect_candidate_type(context)
           @end_nodes.each do |enode|
@@ -533,7 +541,10 @@ LocalVarNode
           if oldcs then
             context.set_code_space(oldcs)
           end
-          disp_signature
+
+          if context.options[:disp_signature] then
+            disp_signature
+          end
           context
         end
       end
@@ -613,6 +624,7 @@ LocalVarNode
 
         def collect_candidate_type(context, signode, sig)
           context.convergent = true
+          context.visited_top_node = {}
           super
         end
 
@@ -692,10 +704,16 @@ LocalVarNode
         end
 
         def offset_arg(n, basereg)
-          rc = @offset_cache[n]
-          unless rc
+          rc = nil
+          if basereg == BPR then
+            rc = @offset_cache[n]
+            unless rc
+              off = offset_by_byte(n)
+              rc = @offset_cache[n] = OpIndirect.new(basereg, off)
+            end
+          else
             off = offset_by_byte(n)
-            rc = @offset_cache[n] = OpIndirect.new(basereg, off)
+            rc = OpIndirect.new(basereg, off)
           end
 
           rc
@@ -716,7 +734,7 @@ LocalVarNode
             asm.with_retry do
               asm.sub(SPR, siz)
             end
-            cpustack_pushn(siz)
+            context.cpustack_pushn(siz)
           end
           context = @body.compile(context)
           context
@@ -890,10 +908,12 @@ LocalVarNode
 
         def collect_candidate_type(context)
           @local_label.come_from.values.each do |vnode|
-            same_type(self, vnode, 
-                      context.to_key, context.to_key, context)
-            same_type(vnode, self, 
-                      context.to_key, context.to_key, context)
+            if vnode then
+              same_type(self, vnode, 
+                        context.to_key, context.to_key, context)
+              same_type(vnode, self, 
+                        context.to_key, context.to_key, context)
+            end
           end
           context
         end
@@ -1463,7 +1483,6 @@ LocalVarNode
         def compile(context)
           context = super(context)
           context = gen_pursue_parent_function(context, @depth)
-          asm = context.assembler
           base = context.ret_reg
           offarg = @current_frame_info.offset_arg(@offset, base)
           context.ret_node = self
@@ -1479,9 +1498,7 @@ LocalVarNode
         end
 
         def compile_main(context)
-          context = gen_pursue_parent_function(context, @depth)
-          base = context.ret_reg
-          offarg = @current_frame_info.offset_arg(@offset, base)
+          offarg = @current_frame_info.offset_arg(@offset, BPR)
           context.ret_node = self
           context.ret_reg = offarg
         end
@@ -1527,14 +1544,14 @@ LocalVarNode
         def compile(context)
           context = super(context)
           context = @val.compile(context)
-#=begin
+
           decide_type_once(context.to_key)
           if @type.boxed then
             @val.decide_type_once(context.to_key)
             rtype = @val.type
             context = rtype.gen_boxing(context)
           end
-#=end
+
           valr = context.ret_reg
           context = gen_pursue_parent_function(context, @depth)
           base = context.ret_reg
@@ -1554,6 +1571,9 @@ LocalVarNode
           end
           
           context.ret_reg = nil
+          if base == TMPR2 then
+            context.end_using_reg(base)
+          end
           context = @body.compile(context)
           context
         end

data/lib/ytljit/vm_codegen.rb

@@ -125,6 +125,7 @@ LO        |                       |   |  |
         @top_node = tnode
         @current_method_signature_node = []
         @convergent = false
+        @visited_top_node = {}
       end
 
       def to_key(offset = -1)
@@ -143,6 +144,7 @@ LO        |                       |   |  |
       attr          :top_node
       attr          :current_method_signature_node
       attr_accessor :convergent
+      attr_accessor :visited_top_node
     end
 
     class CompileContext
@@ -158,12 +160,16 @@ LO        |                       |   |  |
         # RETR(EAX, RAX) or RETFR(STO, XM0) or Immdiage object
         @ret_reg = RETR
         @ret_node = nil
-        @depth_reg = {}
+#        @depth_reg = {}
+        @depth_reg = Hash.new(0)
         @stack_content = []
         @reg_content = {}
 
         # Use only type inference compile mode
         @slf = nil
+
+        # Options from user
+        @options = {}
       end
 
       attr          :top_node
@@ -180,6 +186,8 @@ LO        |                       |   |  |
 
       attr_accessor :slf
 
+      attr          :options
+
       def set_reg_content(dst, val)
         if dst.is_a?(FunctionArgument) then
           dst = dst.dst_opecode
@@ -246,7 +254,8 @@ LO        |                       |   |  |
       end
 
       def reset_using_reg
-        @depth_reg = {}
+#        @depth_reg = {}
+        @depth_reg = Hash.new(0)
       end
 
       def start_using_reg_aux(reg)
@@ -483,7 +492,9 @@ LO        |                       |   |  |
           dmy, callpos = casm.call_with_arg(fnc, numarg)
         end
         @var_return_address = casm.output_stream.var_base_address(callpos)
-        dump_context(context)
+        if context.options[:dump_context] then
+          dump_context(context)
+        end
         context
       end
     end

data/lib/ytljit/vm_inline_method.rb

@@ -1,11 +1,20 @@
 module YTLJit
   module VM
     module ArithmeticOperationUtil
+      include AbsArch
       def gen_arithmetic_operation(context, inst, tempreg, resreg)
         context.start_using_reg(tempreg)
+        context = gen_eval_self(context)
         asm = context.assembler
         asm.with_retry do
-          asm.mov(tempreg, context.ret_reg)
+            if context.ret_reg.using(tempreg) then
+              asm.mov(TMPR, context.ret_reg)
+              context.end_using_reg(context.ret_reg)
+              asm.mov(tempreg, TMPR)
+            else
+              asm.mov(tempreg, context.ret_reg)
+              context.end_using_reg(context.ret_reg)
+            end
         end
         context.set_reg_content(tempreg, context.ret_node)
         
@@ -20,7 +29,14 @@ module YTLJit
           
           asm = context.assembler
           asm.with_retry do
-            asm.send(inst, tempreg, context.ret_reg)
+            if context.ret_reg.using(tempreg) then
+              asm.mov(TMPR, context.ret_reg)
+              context.end_using_reg(context.ret_reg)
+              asm.send(inst, tempreg, TMPR)
+            else
+              asm.send(inst, tempreg, context.ret_reg)
+              context.end_using_reg(context.ret_reg)
+            end
           end
         end
 

data/lib/ytljit/vm_sendnode.rb

@@ -105,7 +105,6 @@ module YTLJit
         end
 
         def collect_candidate_type_regident(context, slf)
-          p @func.name
           context
         end
 
@@ -129,7 +128,7 @@ module YTLJit
           @modified_local_var    = context.modified_local_var.dup
           @modified_instance_var = context.modified_instance_var.dup
 
-          context
+          @body.collect_info(context)
         end
 
         def collect_candidate_type(context)
@@ -395,6 +394,11 @@ module YTLJit
           yield @new_method
         end
 
+        def collect_info(context)
+          context = @new_method.collect_info(context)
+          @body.collect_info(context)
+        end
+
         def collect_candidate_type(context)
           # type inference of @new method execute when "send" instruction.
           @body.collect_candidate_type(context)
@@ -447,7 +451,6 @@ module YTLJit
           end
 
           context.current_method_signature.push signature(context)
-          context = gen_eval_self(context)
           if rtype.ruby_type == Fixnum then
             context = gen_arithmetic_operation(context, :add, TMPR2, TMPR)
           elsif rtype.ruby_type == Float then

data/test/vmtest.rb

@@ -10,12 +10,14 @@ is = RubyVM::InstructionSequence.compile(
 #        "def test(x);if x then a = 1 else a = 3 end;p a end;test(3)","", "", 0,
 #        "def test(x);if x == 3 then a = 1 else a = 3 end;p a end;test(3)","", "", 0,
 #        "def fib(x);if x < 2 then 1 else fib(x + -1) + fib(x + -2) end;end;p fib(35)","", "", 0,
+#        "def fib(x);if x < 2 then 1 else fib(x - 1) + fib(x  - 2) end;end;p fib(35)","", "", 0,
 #        "def ffib(x);if x < 2 then 1.0 else ffib(x + -1) + ffib(x + -2) end;end;p ffib(5)","", "", 0,
 #        "def foo; [1, 2, 3][0] + [1, 2, 3][1]  end; p foo", "", "", 0, 
 #        "def foo(x); if x then x = 1 else x = 2 end; x; end; p foo(1)", "", "", 0, 
 #        "def foo(x); if x then x = 2.0 else x = 1 end; x; end; p foo(1)", "", "", 0, 
-         "def foo(x); yield(x) + 2; end; p foo(1) {|a| a + 1}", "", "", 0, 
+#         "def foo(x); yield(x) + 2; end; p foo(1) {|a| a + 1}", "", "", 0, 
 #         "def id(x); x; end; p id(1); p id(1.0)", "", "", 0, 
+         "def id(x); x; end; p id(1); p id(1.0); def id2(x) x end; id2(1)", "", "", 0, 
 #        "1.1","", "", 0,
               {  :peephole_optimization    => true,
                  :inline_const_cache       => false,

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Hideki Miura
@@ -14,10 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 +09:00
+date: 2010-10-20 00:00:00 +09:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: iseq
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: 
 executables: []