ytljit 0.0.8 → 0.0.9

data/lib/ytljit/marshal.rb

@@ -130,4 +130,15 @@ module YTLJit
       @refer_operands = obj.pop
     end
   end
+
+  module Runtime
+    class Arena
+      def _dump_data
+        []
+      end
+      
+      def _load_data(obj)
+      end
+    end
+  end
 end

data/lib/ytljit/type.rb

@@ -104,8 +104,8 @@ module YTLJit
     deftype :uint32, [4, 4]
     deftype :int64, [8, 8]
     deftype :uint64, [8, 8]
-    deftype :double, [8, 8]
-    deftype :float, [4, 4]
+    deftype :double, [8, 8, :float]
+    deftype :float, [4, 4, :float]
 
     case $ruby_platform
     when /i.86/ 

data/lib/ytljit/vm.rb

@@ -111,7 +111,7 @@ LocalVarNode
               @my_element_node = BaseNode.new(self)
             end
             if @element_node_list == [] then
-              @element_node_list = [[sig[2], sig, @my_element_node, nil]]
+              @element_node_list = [[type, sig, @my_element_node, nil]]
             end
           end
         end
@@ -140,7 +140,7 @@ LocalVarNode
               @my_element_node = BaseNode.new(self)
             end
             if @element_node_list == [] then
-              @element_node_list = [[sig[2], sig, @my_element_node, nil]]
+              @element_node_list = [[type, sig, @my_element_node, nil]]
             end
           end
         end
@@ -223,7 +223,8 @@ LocalVarNode
         end
 
         def ti_changed
-          @ti_observer.each do |rec, lst|
+          @ti_observer.keys.each do |rec|
+            lst = @ti_observer[rec]
             lst.each do |dsig, ssig, prc|
               prc.call
             end
@@ -265,31 +266,54 @@ LocalVarNode
           end
         end
 
-        def marge_element_node(dst, src)
+        def marge_element_node(dst, src, context)
           res = dst
-          regnode = dst[0]
           src.each do |sele|
-            if !res.include?(sele) then
+            exist_same_type = false
+#=begin
+            res.each do |rele|
+              if rele[3] == sele[3] and
+                  rele[1] == sele[1] and
+                  rele[2] != sele[2] then
+                # Add entry for old element type version of self
+                rtype = rele[2].decide_type_once(rele[1])
+                if rtype == nil or 
+                    rtype.ruby_type == NilClass then
+                  nele = [rele[0], sele[1], sele[2], sele[3]]
+                  if !res.include?(nele) then
+                    res.push nele
+                    exist_same_type = true
+                  end
+                end
+              end
+            end
+#=end
+            
+            if !exist_same_type and !res.include?(sele) then
               res.push sele
             end
           end
-
+          
           res
         end
 
         def marge_type(dst, src)
           res = dst
           src.each do |sele|
-            if res.all? {|e| e.ruby_type != sele.ruby_type or 
-                e.boxed != sele.boxed } then
-              res.push sele
-            elsif sele.have_element? and sele.element_type then
-              # Replace type object which have more collect element type
-              res.each_with_index do |rele, i|
-                if rele == sele and rele.element_type == nil then
-                  res[i] = sele
-                end
+            org = nil
+            res.delete_if {|e| 
+              if e.ruby_type == sele.ruby_type and
+                  e.boxed == sele.boxed then
+                org = e
+              else
+                nil
               end
+            }
+
+            if org and org.have_element? and org.element_type then
+              res.push org
+            else
+              res.push sele
             end
           end
           
@@ -315,17 +339,17 @@ LocalVarNode
           if orgsize != dtsize then
             dst.type = nil
             dst.ti_changed
-            context.convergent = false
+#            context.convergent = false
           end
 
           dtlist = dst.element_node_list
           stlist = src.element_node_list
 
           orgsize = dtlist.size
-          dst.element_node_list = marge_element_node(dtlist, stlist)
+          dst.element_node_list = marge_element_node(dtlist, stlist, context)
           if orgsize != dtlist.size then
             dst.ti_changed
-            context.convergent = false
+#            context.convergent = false
           end
           
           dst.set_escape_node(src.is_escape)
@@ -352,15 +376,25 @@ LocalVarNode
           ti_update(dst, src, dsig, ssig, context)
         end
 
-        def add_element_node_backward(args, visitnode = {})
+        def add_element_node_backward(args)
+          add_element_node(*args)
+          visitnode = {}
+          visitnode[self] = true
+          @ti_observee.each do |rec|
+            rec.add_element_node(*args, true)
+#            rec.add_element_node_backward_aux(args, visitnode)
+          end
+        end
+
+        def add_element_node_backward_aux(args, visitnode)
           if visitnode[self] then
             return
           end
 
-          add_element_node(*args)
+          add_element_node(*args, true)
           visitnode[self] = true
           @ti_observee.each do |rec|
-            rec.add_element_node_backward(args, visitnode)
+            rec.add_element_node_backward_aux(args, visitnode)
           end
         end
 
@@ -390,30 +424,48 @@ LocalVarNode
           end
         end
 
-        def add_element_node(curslf, encsig, enode, index, context)
-          slfetnode = @element_node_list
+        def add_element_node(curslf, encsig, enode, index, context, 
+                             backp = false)
           newele = [curslf, encsig, enode, index]
-          if @element_node_list == [] then
-            @element_node_list.push [curslf, encsig, enode, nil]
+
+          # search entry whose index( [3]) is nil
+          nlentry = nil
+          @element_node_list.each do |e| 
+            if e[1] == encsig and
+                e[0] == curslf and
+                e[3] == nil then
+              nlentry = e
+              break
+            end
+          end
+
+          # entry nil index of new self to non-empty table 
+          if nlentry == nil then
+            nlnode = BaseNode.new(nil)
+            nlentry = [curslf, encsig, nlnode, nil]
+            @element_node_list.push nlentry
           end
+
           if !@element_node_list.include?(newele) then
             @element_node_list.push newele
-            orgsig = @element_node_list[0][1]
-            orgnode = @element_node_list[0][2]
-            if orgnode != enode then
-              same_type(orgnode, enode, orgsig, encsig, context)
+            nelesig = nlentry[1]
+            nelenode = nlentry[2]
+            if nelenode != enode then
+              same_type(nelenode, enode, nelesig, encsig, context)
             end
             if index != nil then
-              @element_node_list.each do |orgslf, orgsig, orgnode, orgindex|
-                if orgslf == curslf and
-                    orgindex == index and
-                    orgnode != enode then
-                  same_type(orgnode, enode, orgsig, encsig, context)
+              @element_node_list.each do |tmpslf, tmpsig, tmpnode, tmpindex|
+                if tmpslf == curslf and
+                    tmpindex == index and
+                    tmpnode != enode then
+                  same_type(tmpnode, enode, tmpsig, encsig, context)
                 end
               end
             end
             
-            ti_changed
+            if !backp then
+              ti_changed
+            end
             #            context.convergent = false
           end
         end
@@ -444,11 +496,7 @@ LocalVarNode
 
           when 2
             if tlist[0].ruby_type == tlist[1].ruby_type then
-              if tlist[0].abnormal? then
-                tlist[0]
-              else
-                tlist[1]
-              end
+              tlist[0]
               
             elsif tlist[0].ruby_type == NilClass then
               # nil-able type
@@ -466,6 +514,14 @@ LocalVarNode
                 tlist[1].ruby_type == Float then
               tlist[1]
 
+            elsif tlist[0].ruby_type == TrueClass and
+                tlist[1].ruby_type == FalseClass then
+              tlist[0]
+
+            elsif tlist[0].ruby_type == FalseClass and
+                tlist[1].ruby_type == TrueClass then
+              tlist[1]
+
             else 
               RubyType::DefaultType0.new
             end
@@ -475,11 +531,7 @@ LocalVarNode
             tmptlist.delete_if {|ele| ele.ruby_type == NilClass}
             if tmptlist.size == 2 and 
                 tmptlist[0].ruby_type == tmptlist[1].ruby_type then
-              if tmptlist[0].abnormal? then
-                tmptlist[0]
-              else
-                tmptlist[1]
-              end
+              tmptlist[0]
 
             elsif tmptlist[0].ruby_type == tmptlist[1].ruby_type and
                   tmptlist[0].ruby_type == tmptlist[2].ruby_type  then
@@ -513,7 +565,7 @@ LocalVarNode
           if  # @decided_signature != cursig or
               @type.equal?(nil) or 
               @type.is_a?(RubyType::DefaultType0) then
-            tlist = type_list(cursig).flatten.uniq
+            tlist = type_list(cursig).flatten.reverse.uniq
             @decided_signature = cursig
             @type = decide_type_core(tlist, cursig, local_cache)
           end
@@ -525,11 +577,12 @@ LocalVarNode
             etype2 = {}
             etype = nil
             @element_node_list.each do |ele|
+              node = ele[2]
               sig = ele[1]
               slf = ele[0]
-              if sig == cursig then
-                node = ele[2]
-                node.type = nil
+
+              if @type == slf then
+                # node.type = nil
                 tt = node.decide_type_once(sig, local_cache)
                 etype2[ele[3]] ||= []
                 curidx = etype2[ele[3]]
@@ -555,6 +608,15 @@ LocalVarNode
           end
         end
 
+        def search_valid_signature
+          node = @type_list.search_valid_node
+          if node then
+            node.key
+          else
+            nil
+          end
+        end
+
         def inference_type
           cs = @type_inference_proc
           cs.call(cs.var_base_address)
@@ -652,25 +714,35 @@ LocalVarNode
         def signature(context, args = @arguments)
           res = []
           cursig = context.to_signature
-          res.push args[0].decide_type_once(cursig)
-
-          mt, slf = get_send_method_node(cursig)
-          if mt and (ynode = mt.yield_node[0]) then
-            context.push_signature(args, mt)
-            args[1].type = nil
-            res.push args[1].decide_type_once(ynode.signature(context))
-            context.pop_signature
+          if args[1].is_a?(BlockTopNode) then 
+            res.push cursig[1]
+          else
+            res.push args[0].decide_type_once(cursig)
+          end
+          if @func.is_a?(YieldNode) then
+            res.push cursig[0]
           else
-#            args[1].type = nil
             res.push args[1].decide_type_once(cursig)
-#            args[2].type = nil
-            slf = args[2].decide_type_once(cursig)
           end
+
+          mt, slf = get_send_method_node(cursig)
           res.push slf
 
           args[3..-1].each do |ele|
-#            ele.type = nil
-            res.push ele.decide_type_once(cursig)
+            if ele.type_list(cursig) == [[], []] then
+              res.push ele.type
+            else
+              ele.type = nil
+              res.push ele.decide_type_once(cursig)
+            end
+          end
+
+          if mt and args[1].is_a?(BlockTopNode) then
+            sig =  @yield_signature_cache[cursig]
+            if sig then
+              args[1].type = nil
+              res[1] = args[1].decide_type_once(sig)
+            end
           end
 
           res
@@ -689,7 +761,7 @@ LocalVarNode
               casm.mov(FUNC_ARG[0], rarg.size) # argc
               casm.mov(FUNC_ARG[1], TMPR2)     # argv
             end
-            context.set_reg_content(FUNC_ARG[0].dst_opecode, true)
+            context.set_reg_content(FUNC_ARG[0].dst_opecode, :argc)
             context.set_reg_content(FUNC_ARG[1].dst_opecode, TMPR2)
 
             # Method Select
@@ -756,9 +828,7 @@ LocalVarNode
               context = arg.compile(context)
               rnode = context.ret_node
               rtype = rnode.decide_type_once(sig)
-#              if rnode.is_escape != :global_export then
-                context = rtype.gen_boxing(context)
-#              end
+              context = rtype.gen_boxing(context)
               casm = context.assembler
               casm.with_retry do 
                 casm.mov(FUNC_ARG[argpos], context.ret_reg)
@@ -775,7 +845,6 @@ LocalVarNode
           
           context.cpustack_popn(numarg * AsmType::MACHINE_WORD.size)
           context.end_arg_reg
-          context.end_using_reg(fnc)
           context.ret_reg = RETR
           context.set_reg_content(context.ret_reg, self)
           
@@ -790,7 +859,7 @@ LocalVarNode
         def compile_ytl(context)
           fnc = nil
           numarg = @arguments.size
-          sig = context.to_signature
+          cursig = context.to_signature
           
           context.start_arg_reg
           context.start_arg_reg(FUNC_ARG_YTL)
@@ -806,7 +875,7 @@ LocalVarNode
                 ent = entbase[3]
               end
               if ent then
-                csadd = ent.get_code_space(sig).var_base_immidiate_address
+                csadd = ent.get_code_space(cursig).var_base_immidiate_address
               else
                 csadd = TopTopNode.get_nothing_proc.var_base_immidiate_address
               end
@@ -818,7 +887,7 @@ LocalVarNode
               casm.mov(TMPR, fstentry)
               casm.mov(handoff, TMPR)
             end
-            context.set_reg_content(handoff, true)
+            context.set_reg_content(handoff, :first_exception_entry)
           end
 
           # push prev env
@@ -829,6 +898,12 @@ LocalVarNode
               casm.mov(FUNC_ARG_YTL[0], TMPR)
             end
             context.set_reg_content(FUNC_ARG_YTL[0].dst_opecode, prevenv)
+          elsif @func.is_a?(DirectBlockNode) then
+            context = @arguments[0].compile(context)
+            casm.with_retry do 
+              casm.mov(FUNC_ARG_YTL[0], context.ret_reg)
+            end
+            context.set_reg_content(FUNC_ARG_YTL[0].dst_opecode, context.ret_node)
           else
             casm.with_retry do 
               casm.mov(FUNC_ARG_YTL[0], BPR)
@@ -843,6 +918,7 @@ LocalVarNode
           # compile block with other code space and context
           tcontext = context.dup
           tcontext.prev_context = context
+          tcontext.stack_content = []
           @arguments[1].compile(tcontext)
           
           casm = context.assembler
@@ -857,12 +933,15 @@ LocalVarNode
             context.set_reg_content(FUNC_ARG_YTL[i + 3].dst_opecode, 
                                     context.ret_node)
           end
-          
+
+          sig = @yield_signature_cache[cursig]
+          ecs = @arguments[1].code_space_from_signature[sig]
+          ecs ||= @arguments[1].code_space
+          entry = ecs.var_base_immidiate_address
           casm.with_retry do 
-            entry = @arguments[1].code_space.var_base_immidiate_address
             casm.mov(FUNC_ARG_YTL[1], entry)
           end
-          context.set_reg_content(FUNC_ARG_YTL[1].dst_opecode, true)
+          context.set_reg_content(FUNC_ARG_YTL[1].dst_opecode, entry)
 
           # self
           # Method Select
@@ -876,12 +955,12 @@ LocalVarNode
           end
           context.set_reg_content(FUNC_ARG_YTL[2].dst_opecode, @arguments[2])
 
+          context = gen_save_thepr(context)
           context = gen_call(context, fnc, numarg)
           
           context.cpustack_popn(numarg * 8)
           context.end_arg_reg
           context.end_arg_reg(FUNC_ARG_YTL)
-          context.end_using_reg(fnc)
 
           context
         end
@@ -922,7 +1001,6 @@ LocalVarNode
           
           context.cpustack_popn(numarg * AsmType::MACHINE_WORD.size)
           context.end_arg_reg
-          context.end_using_reg(fnc)
           context.ret_reg = RETR
           context.set_reg_content(context.ret_reg, self)
           
@@ -931,6 +1009,29 @@ LocalVarNode
         end
       end
 
+      module SendSingletonClassUtil
+        def get_singleton_class_object(slfnode)
+          tt = nil
+          case slfnode
+          when ConstantRefNode
+            clstop = slfnode.value_node
+            case clstop
+            when ClassTopNode
+              tt = RubyType::BaseType.from_ruby_class(clstop.klass_object)
+            when LiteralNode
+              tt = RubyType::BaseType.from_ruby_class(clstop.value)
+            else
+              raise "Unkown node type in constant #{slfnode.value_node.class}"
+            end
+            
+          else
+            raise "Unkonwn node type #{@arguments[2].class} "
+          end
+
+          tt
+        end
+      end
+
       module MultipleCodeSpaceUtil
         def find_cs_by_signature(sig)
           @code_spaces.each do |csig, val|
@@ -979,6 +1080,21 @@ LocalVarNode
         end
       end
 
+      class TypedDummyNode<BaseNode
+        include TypeListWithoutSignature
+        @@node_table = {}
+
+        def self.instance(cursig, type)
+          ins = @@node_table[type]
+          if ins == nil then
+            ins = @@node_table[type] = TypedDummyNode.new(nil)
+            ins.add_type(cursig, type)
+          end
+
+          ins
+        end
+      end
+
       # The top of top node
       class TopNode<BaseNode
         include HaveChildlenMixin
@@ -989,6 +1105,7 @@ LocalVarNode
           super(parent)
           @name = name
           @code_spaces = [] # [[nil, CodeSpace.new]]
+          @code_space_from_signature = {}  # return type -> codespace
           @yield_node = []
           if @parent then
             @classtop = search_class_top
@@ -997,15 +1114,25 @@ LocalVarNode
           end
           @end_nodes = []
           @signature_cache = []
+          @current_signature = []
           @exception_table = nil
+          @send_nodes_with_block = nil
+
+          @escape_info_tab = {}
+          @escape_info = nil
         end
 
         attr_accessor :name
+        attr          :code_space_from_signature
         attr          :end_nodes
         attr          :yield_node
 
         attr          :signature_cache
+        attr          :current_signature
+        attr          :classtop
         attr_accessor :exception_table
+        attr_accessor :send_nodes_with_block
+        attr          :escape_info
 
         def modified_instance_var
           search_end.modified_instance_var
@@ -1033,7 +1160,8 @@ LocalVarNode
 
         def construct_frame_info(locals, argnum, args)
           finfo = LocalFrameInfoNode.new(self)
-          finfo.system_num = 5         # BP ON Stack, HP, ET, BP, RET
+          # 5means BP on Stack, HP, Exception Tag, BP and SP
+          finfo.system_num = 5
 
           argc = args
           opt_label = []
@@ -1043,16 +1171,17 @@ LocalVarNode
           block_index = -1
           simple = -1
           if args.is_a?(Array) then
-            argc = args[0]
-            opt_label = args[1]
-            post_len = args[2]
-            post_start = args[3]
-            rest_index = args[4]
-            block_index = args[5]
-            simple = args[6]
-          end
+            argc, opt_label, post_len, post_start, 
+              rest_index, block_index, simple = args
+            finfo.opt_label = opt_label
+            finfo.post_len = post_len
+            finfo.post_start = post_start
+            finfo.rest_index = rest_index
+            finfo.block_index = block_index
+            finfo.simple = simple
+          end
+          finfo.argc = argc
           
-          # 5means BP, HP, Exception Tag, BP and SP
           lsize = locals.size + finfo.system_num
           
           # construct frame
@@ -1102,7 +1231,7 @@ LocalVarNode
           finfo
         end
 
-        def collect_info(context)
+        def collect_info_top(context)
           context.yield_node.push []
           context = @body.collect_info(context)
           @yield_node = context.yield_node.pop
@@ -1118,21 +1247,13 @@ LocalVarNode
           context
         end
 
-        def collect_candidate_type(context, signode, sig)
-          if add_cs_for_signature(sig) == nil and  
-              context.visited_top_node[self] then
-            return context
-          end
-
-          context.visited_top_node[self] = true
+        def collect_info(context)
+          collect_info_top(context)
+        end
 
-          if !@signature_cache.include?(sig) then
-            @signature_cache.push sig
-          end
-          
+        def collect_candidate_type_common(context, signode, sig)
           context.push_signature(signode, self)
           context = @body.collect_candidate_type(context)
-
           if @exception_table then
             @exception_table.each do |kind, lst|
               lst.each do |st, ed, cnt, body|
@@ -1142,13 +1263,13 @@ LocalVarNode
               end
             end
           end
-
           context.pop_signature
 
           @end_nodes.each do |enode|
             same_type(self, enode, sig, sig, context)
             same_type(enode, self, sig, sig, context)
           end
+          @current_signature = nil
           context
         end
 
@@ -1166,6 +1287,24 @@ LocalVarNode
           end
         end
 
+        def gen_comment(context)
+          if debug_info then
+            lineno = debug_info[3]
+            fname = debug_info[0]
+            entry = [1, @name]
+            @code_spaces.each do |sig, cs|
+              ent2 = []
+              ent2.push sig
+              ent2.push decide_type_once(sig)
+              entry.push ent2
+            end
+
+            context.comment[fname] ||= {}
+            context.comment[fname][lineno] ||= []
+            context.comment[fname][lineno].push entry
+          end
+        end
+
         def compile_init(context)
           context
         end
@@ -1191,6 +1330,7 @@ LocalVarNode
               end
             end
             context.current_method_signature.pop
+            @code_space_from_signature[sig] = cs
           end
 
           if oldcs then
@@ -1201,6 +1341,10 @@ LocalVarNode
             disp_signature
           end
 
+          if context.options[:insert_signature_comment] then
+            gen_comment(context)
+          end
+
           context.ret_node = self
           context
         end
@@ -1217,6 +1361,37 @@ LocalVarNode
           context
         end
 
+        def apply_escape_info_to_args(signode)
+          @escape_info.each_with_index do |val, idx|
+            if val then
+              signode[idx].set_escape_node_backward(val)
+            end
+          end
+        end
+
+        def collect_candidate_type(context, signode, sig)
+          @current_signature = nil
+          @escape_info_tab[sig] ||= []
+          @escape_info = @escape_info_tab[sig]
+          context.visited_top_node[self] ||= []
+          if add_cs_for_signature(sig) == nil and  
+              context.visited_top_node[self].include?(sig) then
+            apply_escape_info_to_args(signode)
+            return context
+          end
+
+          @current_signature = sig
+          context.visited_top_node[self].push sig
+
+          if !@signature_cache.include?(sig) then
+            @signature_cache.push sig
+          end
+
+          context = collect_candidate_type_common(context, signode, sig)
+          @escape_info = nil
+          context
+        end
+
         def construct_frame_info(locals, argnum, args)
           locals.unshift :_self
           locals.unshift :_block
@@ -1230,7 +1405,7 @@ LocalVarNode
       class BlockTopNode<MethodTopNode
         def collect_info(context)
           context.modified_local_var.last.push Hash.new
-          context = @body.collect_info(context)
+          context = collect_info_top(context)
           context.modified_local_var.last.pop
           context
         end
@@ -1369,6 +1544,13 @@ LocalVarNode
         def search_constant_with_super(name, klassobj = @klass_object)
           clsnode = @@class_top_tab[klassobj]
           if clsnode then
+            clsnode.before_search_module.each do |scope, mod|
+              ctab = mod.get_constant_tab
+              if val = ctab[name] then
+                return [val, mod]
+              end
+            end
+
             ctab = clsnode.get_constant_tab
             if val = ctab[name] then
               return [val, clsnode]
@@ -1390,16 +1572,21 @@ LocalVarNode
         end
 
         def collect_candidate_type(context, signode, sig)
+          @current_signature = nil
           @type = RubyType::BaseType.from_ruby_class(@klassclass)
           add_type(sig, @type)
+          context.visited_top_node[self] ||= []
 
           if add_cs_for_signature(sig) == nil and  
-              context.visited_top_node[self] then
+              context.visited_top_node[self].include?(sig) then
             return context
           end
 
-          context.visited_top_node[self] = true
-          @signature_cache.push sig
+          @current_signature = sig
+          context.visited_top_node[self].push sig
+          if !@signature_cache.include?(sig) then
+            @signature_cache.push sig
+          end
           
           context.push_signature(signode, self)
           context = @body.collect_candidate_type(context)
@@ -1411,6 +1598,7 @@ LocalVarNode
           end
 
           set_escape_node(:not_export)
+          @current_signature = nil
 
           context
         end
@@ -1441,6 +1629,7 @@ LocalVarNode
             context.set_reg_content(FUNC_ARG_YTL[1].dst_opecode, true)
             context.set_reg_content(FUNC_ARG_YTL[2].dst_opecode, self)
             add = cs.var_base_address
+            context = gen_save_thepr(context)
             context = gen_call(context, add, 3)
             context.end_arg_reg
           end
@@ -1569,32 +1758,40 @@ LocalVarNode
 
         def get_global_arena_address
           ar = @@global_object_area
-          ar.raw_address
+          addr = lambda {
+            ar.raw_address
+          }
+          OpVarImmidiateAddress.new(addr)           
         end
 
         def get_global_arena_end_address
           ar = @@global_object_area
-          ar.body_address + ar.size
+          addr = lambda {
+            ar.body_address + ar.size
+          }
+          OpVarImmidiateAddress.new(addr)           
         end
 
         def get_local_arena_address
           ar = @@local_object_area
-          ar.raw_address
+          addr = lambda {
+            ar.raw_address
+          }
+          OpVarImmidiateAddress.new(addr)           
         end
 
         def get_local_arena_end_address
           ar = @@local_object_area
-          (ar.body_address + ar.size) & (~0xf)
+          addr = lambda {
+            (ar.body_address + ar.size) & (~0xf)
+          }
+          OpVarImmidiateAddress.new(addr)           
         end
 
         def compile_init(context)
-          addr = lambda {
-            get_local_arena_end_address
-          }
-          aa = OpVarImmidiateAddress.new(addr) 
           asm = context.assembler
           asm.with_retry do
-            asm.mov(THEPR, aa)
+            asm.mov(THEPR, get_local_arena_end_address)
           end
           context
         end
@@ -1671,6 +1868,15 @@ LocalVarNode
           @offset_cache = {}
           @local_area_size = nil
           @alloca_area_size = 0
+
+          @argc = nil
+          @opt_label = []
+          @opt_label_node = []
+          @post_len = nil
+          @post_start = nil
+          @rest_index = nil
+          @block_index = nil
+          @simple = true
         end
 
         def init_after_construct
@@ -1699,6 +1905,15 @@ LocalVarNode
         attr_accessor :system_num
         attr          :previous_frame
 
+        attr_accessor :argc
+        attr_accessor :opt_label
+        attr_accessor :opt_label_node
+        attr_accessor :post_len
+        attr_accessor :post_start
+        attr_accessor :rest_index
+        attr_accessor :block_index
+        attr_accessor :simple
+
         def traverse_childlen
           @frame_layout.each do |vinf|
             yield vinf
@@ -1825,16 +2040,29 @@ LocalVarNode
           if fragstart <= @offset then
             argoff = @offset - fragstart
             tobj = context.current_method_signature_node.last[argoff]
-            cursig = context.to_signature
-            cursig2 = context.to_signature(-2)
             if tobj then
+              cursig = context.to_signature
+              cursig2 = context.to_signature(-2)
               same_type(self, tobj, cursig, cursig2, context)
-#              same_type(tobj, self, cursig2, cursig, context)
+              # same_type(tobj, self, cursig2, cursig, context)
             end
           end
           context
         end
 
+        def set_escape_node(value)
+          topnode = @parent.parent
+          if topnode.escape_info then
+            flay = @parent.frame_layout
+            fragstart = flay.size - @parent.argument_num
+            if fragstart <= @offset then
+              argoff = @offset - fragstart
+              topnode.escape_info[argoff] = value
+            end
+          end
+          super(value)
+        end
+
         def compile(context)
           context = super(context)
           context
@@ -1849,6 +2077,7 @@ LocalVarNode
         end
 
         attr :offset
+        attr :name
 
         def collect_candidate_type(context)
           context
@@ -1894,6 +2123,16 @@ LocalVarNode
 
         def compile(context)
           context = super(context)
+          if context.options[:insert_signature_comment] then
+            lineno = debug_info[3] + 1
+            fname = debug_info[0]
+            context.comment[fname] ||= {}
+            context.comment[fname][lineno] ||= []
+            ent = []
+            ent.push 3
+            ent.push @is_escape
+            context.comment[fname][lineno].push ent
+          end
           context = gen_method_epilogue(context)
           curas = context.assembler
           curas.with_retry do
@@ -2288,8 +2527,10 @@ LocalVarNode
           handoff = OpIndirect.new(BPR, AsmType::MACHINE_WORD.size * 2)
           ensureoff = OpIndirect.new(TMPR, 0)
           asm.with_retry do
+            asm.push(TMPR)
             asm.mov(TMPR, handoff)
             asm.call(ensureoff)
+            asm.pop(TMPR)
           end
           gen_method_epilogue(context)
         end
@@ -2301,9 +2542,9 @@ LocalVarNode
             
           elsif @state == 2 then # break
             context = @exception_object.compile(context)
-            asm.with_retry do
-              if context.ret_reg != RETR then
-                asm.mov(RETR, context.ret_reg)                
+            if context.ret_reg != TMPR then
+              asm.with_retry do
+                asm.mov(TMPR, context.ret_reg)                
               end
             end
             context.set_reg_content(RETR, context.ret_node)
@@ -2316,13 +2557,15 @@ LocalVarNode
             end
 
           elsif @state == 1 then # return
-            if context.ret_reg != RETR then
-              asm.mov(RETR, context.ret_reg)                
+            context = @exception_object.compile(context)
+            if context.ret_reg != TMPR then
+              asm.with_retry do
+                asm.mov(TMPR, context.ret_reg)                
+              end
             end
             context.set_reg_content(RETR, context.ret_node)
             tnode = search_frame_info
             finfo = tnode
-            depth = 0
             while finfo.parent.is_a?(BlockTopNode)
               finfo = finfo.previous_frame
               # two epilogue means block and method which is called with block
@@ -2343,18 +2586,49 @@ LocalVarNode
         include HaveChildlenMixin
       end
 
+      # Holder of MultiplexNode
+      class MultiplexHolderNode<BaseNode
+        include HaveChildlenMixin
+
+        def initialize(parent, node)
+          super(parent)
+          @mult = node
+        end
+
+        def traverse_childlen
+          yield @mult
+        end
+
+        def collect_info(context)
+          context = @mult.collect_info(context)
+          @body.collect_info(context)
+        end
+
+        def collect_candidate_type(context)
+          context = @mult.collect_candidate_type(context)
+          @body.collect_candidate_type(context)
+        end
+
+        def compile(context)
+          context = @mult.compile(context)
+          @body.compile(context)
+        end
+      end
+
       # Multiplexer of node (Using YARV stack operation)
       class MultiplexNode<BaseNode
         include HaveChildlenMixin
         include NodeUtil
 
-        def initialize(node)
-          super(node.parent)
+        def initialize(parent, node)
+          super(parent)
           @node = node
           @compiled_by_signature = []
           @res_area = nil
         end
 
+        attr :node
+
         def traverse_childlen
           yield @node
         end
@@ -2392,19 +2666,26 @@ LocalVarNode
             end
             context.set_reg_content(@res_area, self)
             @compiled_by_signature.push sig
-
-            context
           else
             asm = context.assembler
-            asm.with_retry do
-              asm.mov(RETR, @res_area)
+            rtype = decide_type_once(sig)
+            if rtype.ruby_type == Float and !rtype.boxed then
+              asm.with_retry do
+                asm.movsd(XMM0, @res_area)
+              end
+              context.set_reg_content(XMM0, self)
+              context.ret_reg = XMM0
+            else
+              asm.with_retry do
+                asm.mov(RETR, @res_area)
+              end
+              context.set_reg_content(RETR, self)
+              context.ret_reg = RETR
             end
-            context.set_reg_content(RETR, self)
-            context.ret_reg = RETR
             context.ret_node = self
-
-            context
           end
+
+          context
         end
       end
 
@@ -2421,14 +2702,15 @@ LocalVarNode
         
         attr :value
 
+        # Dummy for pass as block (nil)
+        def code_space_from_signature
+          {}
+        end
+
         def collect_candidate_type(context)
           sig = context.to_signature
           if @type == nil then
-            if @type_list != [[], []] then
-              @type = decide_type_once(sig)
-            else
-              @type = RubyType::BaseType.from_object(@value) 
-            end
+            @type = RubyType::BaseType.from_object(@value) 
           end
 
           case @value
@@ -2464,6 +2746,7 @@ LocalVarNode
               @type.args.push exclnode
               context = exclnode.collect_candidate_type(context)
               add_element_node(@type, sig, fstnode, [0], context)
+              add_element_node(@type, sig, sndnode, [1], context)
             end
           else
             add_type(sig, @type)
@@ -2525,9 +2808,9 @@ LocalVarNode
           [@value]
         end
 
-#        def type=(val)
-#          val
-#        end
+        def type=(val)
+          val
+        end
       end
 
       class ClassValueNode<BaseNode
@@ -2598,10 +2881,12 @@ LocalVarNode
           super(parent)
           @name = "block yield"
           @frame_info = search_frame_info
+          @depth = 0
         end
 
         attr :name
         attr :frame_info
+        attr_accessor :depth
 
         def collect_info(context)
           context.yield_node.last.push @parent
@@ -2623,27 +2908,96 @@ LocalVarNode
         def compile(context)
           context = super(context)
           asm = context.assembler
-          # You can crash when you use yield in block.
-          # You can fix this bug for traversing PTMPR for method top.
-          # But is is little troublesome. So it  is not supported.
           prevenv = @frame_info.offset_arg(0, BPR)
+          prevenv2 = @frame_info.offset_arg(0, TMPR2)
           # offset of self is common, so it no nessery traverse prev frame
           # for @frame_info.
           slfarg = @frame_info.offset_arg(2, PTMPR)
           asm.with_retry do
             asm.mov(PTMPR, prevenv)
+          end
+
+          @depth.times do
+            asm.with_retry do
+              asm.mov(PTMPR, prevenv)
+            end
+          end
+          
+          asm.with_retry do
             asm.mov(PTMPR, slfarg)
           end
-          context.set_reg_content(PTMPR, true)
+          context.set_reg_content(PTMPR, :self_of_block)
           context.ret_reg2 = PTMPR
-          
-          context.ret_reg = @frame_info.offset_arg(1, BPR)
+
+          if @depth == 0 then
+            context.ret_reg = @frame_info.offset_arg(1, BPR)
+          else
+            context.start_using_reg(TMPR2)
+            asm.with_retry do
+              asm.mov(TMPR2, prevenv)
+            end
+            (@depth - 1).times do
+              asm.with_retry do
+                asm.mov(TMPR2, prevenv2)
+              end
+            end
+            asm.with_retry do
+              asm.mov(TMPR2, @frame_info.offset_arg(1, TMPR2))
+            end
+            context.ret_reg = TMPR2
+          end
+            
           context.ret_node = self
           context.set_reg_content(context.ret_reg, self)
           context
         end
       end
 
+      # Use when you wish call block without calling method with block
+      class DirectBlockNode<BaseNode
+        include NodeUtil
+
+        include SendUtil
+
+        def initialize(parent, blk)
+          super(parent)
+          @name = "direct call block"
+          @block = blk
+          @frame_info = search_frame_info
+        end
+
+        attr :name
+        attr :frame_info
+
+        def collect_info(context)
+          context
+        end
+
+        def collect_candidate_type(context)
+          context
+        end
+
+        def calling_convention(context)
+          :ytl
+        end
+
+        def method_top_node(ctop, slf)
+          @block
+        end
+
+        def compile(context)
+          context = super(context)
+          asm = context.assembler
+          slfarg = OpIndirect.new(TMPR2, AsmType::MACHINE_WORD.size * 3)
+          asm.with_retry do
+            asm.mov(PTMPR, slfarg)
+          end
+          context.ret_reg = @block.code_space.var_base_address
+          context.ret_reg2 = PTMPR
+          context
+        end
+      end
+
       class CApiCommonNode<BaseNode
         include NodeUtil
         include SendUtil
@@ -2699,13 +3053,16 @@ LocalVarNode
 
       # Method name
       class MethodSelectNode<BaseNode
-        def initialize(parent, val)
+        include SendNodeCodeGen
+
+        def initialize(parent, name)
           super(parent)
-          @name = val
+          @name = name
           @calling_convention = :unkown
           @reciever = nil
           @send_node = nil
           @ruby_reciever = nil
+          @inline_node = nil
         end
 
         def set_reciever(sendnode)
@@ -2724,6 +3081,7 @@ LocalVarNode
         attr :name
         attr :calling_convention
         attr_accessor :reciever
+        attr :inline_node
 
         def collect_candidate_type(context)
           context
@@ -2756,12 +3114,14 @@ LocalVarNode
                 addr = recobj.method_address_of(@name)
                 $symbol_table[addr] = @name
                 if addr then
-                  if variable_argument?(recobj.method(@name).parameters) then
+                  mth = recobj.instance_method(@name)
+                  if variable_argument?(mth.parameters) then
                     @calling_convention = :c_vararg
                   else
                     @calling_convention = :c_fixarg
                   end
                 else
+                  p parent.debug_info
                   raise "Unkown method - #{recobj}##{@name}"
                   @calling_convention = :c
                 end
@@ -2786,17 +3146,45 @@ LocalVarNode
             rklass = rtype.ruby_type_raw
 
             knode = ClassTopNode.get_class_top_node(rklass)
-            if knode and knode.search_method_with_super(@name)[0] then
+            if knode and 
+                (mtop = knode.search_method_with_super(@name)[0]) then
               @calling_convention = :ytl
+
+              # Check getter/setter
+              body = mtop.body.body
+              if body.is_a?(SetResultNode) then
+                if body.value_node.is_a?(CRubyInstanceVarRefNode) and
+                    body.body.is_a?(MethodEndNode) then
+                  @calling_convention = :getter
+                  @inline_node = body.value_node
+                end
+              else
+                if body.is_a?(CRubyInstanceVarAssignNode) and
+                    body.val.is_a?(MultiplexNode) and
+                    body.val.node.is_a?(LocalVarRefNode) and
+                    ! body.val.node.is_a?(SelfRefNode) and
+                    body.body.is_a?(SetResultNode) and
+                    body.body.body.is_a?(MethodEndNode) then
+                  @calling_convention = :setter
+                  @inline_node = body
+                end
+              end
               @ruby_reciever = rklass
             else
               slfval = @reciever.get_constant_value
               mth = nil
               if slfval then
                 begin
-                  mth = slfval[0].instance_method(@name)
-                  @ruby_reciever = slfval[0]
+                  # search normal method
+                  mth = slfval[0].class.instance_method(@name)
+                  @ruby_reciever = slfval[0].class
                 rescue NameError
+                  begin
+                    # search sigleton method
+                    mth = slfval[0].method(@name)
+                    @ruby_reciever = ClassClassWrapper.instance(slfval[0])
+                  rescue NameError
+                  end
                 end
               end
               if slfval == nil or mth == nil then
@@ -2807,21 +3195,56 @@ LocalVarNode
                   mth = rklass.instance_method(@name)
                   @ruby_reciever = rtype.ruby_type_raw
                 rescue NameError
-#=begin
+=begin
                   p @parent.debug_info
                   p sig
                   p @name
                   p @reciever.class
-#                  p @reciever.instance_eval {@type_list }
-                  p type_list(sig)
-=begin
+                  p @reciever.instance_eval {@type_list }
+                  p @reciever.type_list(sig)
                   mc = @reciever.get_send_method_node(context.to_signature)[0]
                   iv = mc.end_nodes[0].parent.value_node
                   p iv.instance_eval {@name}
                   p iv.instance_eval {@type_list}
 =end
-                  return :c_fixarg
-                  raise
+                  tlist = @reciever.type_list(sig).flatten
+                  if tlist.all? {|e| 
+                      eklass = e.ruby_type_raw
+                      knode = ClassTopNode.get_class_top_node(eklass)
+                      knode and  knode.search_method_with_super(@name)[0]
+                    } then
+                    @calling_convention = :ytl
+
+                  elsif tlist.all? {|e|
+                      begin
+                        mth = rklass.instance_method(@name)
+                        variable_argument?(mth.parameters)
+                      rescue NameError
+                        false
+                      end
+                    } then
+                    @calling_convention = :c_vararg
+                  
+                  elsif tlist.all? {|e|
+                      begin
+                        mth = rklass.instance_method(@name)
+                        !variable_argument?(mth.parameters)
+                      rescue NameError
+                        false
+                      end
+                    } then
+                    @calling_convention = :c_fixarg
+                    
+                  else
+                    @calling_convention = :mixed
+                  end
+
+                  p sig
+                  p @reciever.instance_eval {@type_list}
+                  p @name
+                  p @parent.debug_info
+                  p @calling_convention
+                  return @calling_convention
                 end
               end
 
@@ -2844,7 +3267,7 @@ LocalVarNode
             asm.with_retry do
               asm.mov(PTMPR, slfop)
             end
-            context.set_reg_content(PTMPR, true)
+            context.set_reg_content(PTMPR, :callee_reciever)
             context.ret_reg2 = PTMPR
             mtop = @reciever.search_method_with_super(@name)[0]
             if mtop then
@@ -2888,10 +3311,9 @@ LocalVarNode
             context = @reciever.compile(context)
             rnode = context.ret_node
             rtype = rnode.decide_type_once(context.to_signature)
+            do_dyna = rtype.is_a?(RubyType::DefaultType0)
             if @calling_convention != :ytl then
-#              if rnode.is_escape != :global_export then
-                context = rtype.gen_boxing(context)
-#              end
+              context = rtype.gen_boxing(context)
               rtype = rtype.to_box
             elsif !rtype.boxed then
               context = rtype.gen_unboxing(context)
@@ -2901,7 +3323,7 @@ LocalVarNode
             knode = ClassTopNode.get_class_top_node(rrtype)
             mtop = nil
 
-            if rtype.is_a?(RubyType::DefaultType0) then
+            if do_dyna then
               # Can't type inference. Dynamic method search
               mnval = @name.address
               addr = lambda {
@@ -2944,8 +3366,8 @@ LocalVarNode
               context.end_arg_reg
               
               context.ret_node = self
-              context.set_reg_content(RETR, true)
-              context.set_reg_content(TMPR2, true)
+              context.set_reg_content(RETR, :method_address)
+              context.set_reg_content(TMPR2, RETR)
               context.set_reg_content(PTMPR, @reciever)
               context.ret_reg = TMPR2
 
@@ -2970,8 +3392,11 @@ LocalVarNode
 
               sig = @parent.signature(context)
               cs = mtop.find_cs_by_signature(sig)
+              if cs == nil then
+                sig[0] = context.to_signature[1]
+                cs = mtop.find_cs_by_signature(sig)
+              end
               context.ret_reg = cs.var_base_address
-
             else
               # regident type 
 
@@ -2987,6 +3412,7 @@ LocalVarNode
                 asm.with_retry do
                   asm.mov(PTMPR, recval)
                 end
+                context.set_reg_content(PTMPR, context.ret_node)
                 context.set_reg_content(TMPR2, @reciever)
                 context.ret_reg2 = PTMPR
               end
@@ -3044,7 +3470,9 @@ LocalVarNode
           end
           @current_frame_info = tnode
         end
-
+        
+        attr :offset
+        attr :depth
         attr :frame_info
         attr :current_frame_info
       end
@@ -3062,7 +3490,11 @@ LocalVarNode
           end
 
           if vti then
-            @var_type_info = vti.map {|e| e.dup }
+            if depth == 0 then
+              @var_type_info = vti.map {|e| e.dup }
+            else
+              @var_type_info = vti
+            end
           else
             raise "maybe bug"
             roff = @current_frame_info.real_offset(@offset)
@@ -3073,11 +3505,12 @@ LocalVarNode
         end
 
         def collect_candidate_type(context)
-          @var_type_info.each do |topnode, node|
-            cursig = context.to_signature
+          cursig = context.to_signature
+          @type = nil
+          @var_type_info.reverse.each do |topnode, node|
             varsig = context.to_signature(topnode)
             same_type(self, node, cursig, varsig, context)
-            same_type(node, self, varsig, cursig, context)
+            # same_type(node, self, varsig, cursig, context)
           end
           context
         end
@@ -3129,8 +3562,22 @@ LocalVarNode
 #=begin
         def collect_candidate_type(context)
           if @topnode.is_a?(ClassTopNode) then
-            @type = RubyType::BaseType.from_ruby_class(@classtop.klass_object)
-            add_type(context.to_signature, @type)
+            tt = RubyType::BaseType.from_ruby_class(@classtop.klass_object)
+            cursig = context.to_signature
+            # size of @var_type_info is always 1.because you can't assign self
+            topnode, node = @var_type_info[0]
+
+            vsig = context.to_signature(topnode)
+            vtype = node.decide_type_once(vsig)
+            same_type(self, node, cursig, vsig, context)
+            if vtype.boxed != tt.boxed then
+              if vtype.boxed then
+                tt= tt.to_box
+              else
+                tt = tt.to_unbox
+              end
+            end
+            add_type(cursig, tt)
             context
           else
             super(context)
@@ -3151,6 +3598,7 @@ LocalVarNode
           val.parent = self
           @val = val
           @var_from = nil
+          @var_type_info = nil
         end
 
         def traverse_childlen
@@ -3180,6 +3628,7 @@ LocalVarNode
           end
             
           context.modified_local_var.last[-@depth - 1][@offset] = nodepare
+          @var_type_info = nodepare
 
           @body.collect_info(context)
         end
@@ -3187,9 +3636,16 @@ LocalVarNode
         def collect_candidate_type(context)
           context = @val.collect_candidate_type(context)
           cursig = context.to_signature
-          varcursig = context.to_signature(@var_from)
-          same_type(self, @val, varcursig, cursig, context)
-#          same_type(@val, self, cursig, varcursig, context)
+          varsig = context.to_signature(@var_from)
+          @var_type_info.reverse.each do |topnode, node|
+            if node != self then
+              varsig2 = context.to_signature(topnode)
+              same_type(self, node, cursig, varsig2, context)
+            end
+          end
+          same_type(self, @val, varsig, cursig, context)
+#          same_type(@val, self, cursig, varsig, context)
+
           @body.collect_candidate_type(context)
         end
 
@@ -3197,15 +3653,29 @@ LocalVarNode
           context = super(context)
           context = @val.compile(context)
 
-          sig = context.to_signature(-@depth - 1)
-          decide_type_once(sig)
-          rtype = @val.decide_type_once(context.to_signature)
-          if @type.boxed then
-#            if @val.is_escape != :global_export then
-              context = rtype.gen_boxing(context)
-#            end
+          cursig = context.to_signature
+          varsig = context.to_signature(-@depth - 1)
+
+          vartype = decide_type_once(varsig)
+          valtype = @val.decide_type_once(cursig)
+
+          asm = context.assembler
+          # type conversion
+          if vartype.ruby_type == Float and
+              valtype.ruby_type == Fixnum then
+            context = valtype.gen_unboxing(context)
+            asm.with_retry do
+              asm.mov(TMPR, context.ret_reg)
+              asm.cvtsi2sd(XMM0, TMPR)
+            end
+            context.ret_reg = XMM0
+            valtype = valtype.to_unbox
+          end
+
+          if vartype.boxed then
+            context = valtype.gen_boxing(context)
           else
-            context = rtype.gen_unboxing(context)
+            context = valtype.gen_unboxing(context)
           end
 
           valr = context.ret_reg
@@ -3214,7 +3684,6 @@ LocalVarNode
           base = context.ret_reg
           offarg = @current_frame_info.offset_arg(@offset, base)
 
-          asm = context.assembler
           if valr.is_a?(OpRegistor) or 
               (valr.is_a?(OpImmidiate) and !valr.is_a?(OpImmidiate64)) then
             asm.with_retry do
@@ -3230,9 +3699,9 @@ LocalVarNode
 
           tmpctx = context
           @depth.times { tmpctx = tmpctx.prev_context}
-          tmpctx.set_reg_content(offarg, valn)
+          tmpctx.set_reg_content(offarg, @val)
 
-          context.ret_reg = nil
+          context.ret_reg = TMPR
           if base == TMPR2 then
             context.end_using_reg(base)
           end
@@ -3277,9 +3746,11 @@ LocalVarNode
         end
 
         def collect_candidate_type(context)
-          @var_type_info.each do |src|
-            cursig = context.to_signature
-            same_type(self, src, cursig, cursig, context)
+          cursig = context.to_signature
+          @var_type_info.each do |node, sigs|
+            sigs.each do |sig|
+              same_type(self, node, cursig, sig, context)
+            end
           end
           
           context
@@ -3301,8 +3772,11 @@ LocalVarNode
           super(parent, name, mnode)
           val.parent = self
           @val = val
+          @curpare = [self, []]
         end
 
+        attr :val
+
         def traverse_childlen
           yield @val
           yield @body
@@ -3313,22 +3787,26 @@ LocalVarNode
           if context.modified_instance_var[@name] == nil then
             context.modified_instance_var[@name] = []
           end
-          context.modified_instance_var[@name].push self
+          context.modified_instance_var[@name].push @curpare
           @body.collect_info(context)
         end
 
         def collect_candidate_type(context)
           context = @val.collect_candidate_type(context)
           cursig = context.to_signature
+          if !@curpare[1].include? cursig then
+              @curpare[1].push cursig
+          end
           same_type(self, @val, cursig, cursig, context)
 #          same_type(@val, self, cursig, cursig, context)
           @val.type = nil
           rtype = @val.decide_type_once(cursig)
           rrtype = rtype.ruby_type
           if rrtype != Fixnum and rrtype != Float then
-            if cursig[2].boxed then
+            if cursig[2].boxed and @val.is_escape != :global_export and true then
               @val.set_escape_node_backward(:global_export)
-#              @class_top.set_escape_node(:global_export)
+              context = @val.collect_candidate_type(context)
+#              context.convergent = false
             else
               @val.set_escape_node_backward(:local_export)
             end
@@ -3348,6 +3826,23 @@ LocalVarNode
 
       # Global Variable
       class GlobalVarRefNode<VariableRefCommonNode
+        def self.instance(parent, name)
+          if /^\$[a-zA-Z_]/ =~ name.to_s then
+            GlobalVarNormalRefNode.new(parent, name)
+          else
+            GlobalVarSpecialRefNode.new(parent, name)
+          end
+        end
+
+        def collect_info(context)
+          context.modified_global_var[@name] ||= []
+          @assign_nodes = context.modified_global_var[@name]
+          context
+        end
+      end
+
+
+      class GlobalVarNormalRefNode<GlobalVarRefNode
         include NodeUtil
         include TypeListWithoutSignature
         include UnboxedArrayUtil
@@ -3358,15 +3853,14 @@ LocalVarNode
           @offset = nil
         end
 
-        def collect_info(context)
-          @assign_nodes = context.modified_global_var[@name]
-          context
-        end
-
         def collect_candidate_type(context)
-          @offset = @assign_nodes[0].offset
-          sig = context.to_signature
-          same_type(self, @assign_nodes[0], sig, sig, context)
+          if @assign_nodes then
+            @offset = @assign_nodes[0][0].offset
+            sig = context.to_signature
+            @assign_nodes.reverse.each do |an, asig|
+              same_type(self, an, sig, asig, context)
+            end
+          end
           context
         end
 
@@ -3377,7 +3871,7 @@ LocalVarNode
           asm.with_retry do
             asm.mov(TMPR2, context.top_node.get_global_arena_end_address)
           end
-          context.set_reg_content(TMPR2, true)
+          context.set_reg_content(TMPR2, :global_arena)
           context = gen_ref_element(context, nil, -@offset)
           context.end_using_reg(TMPR2)
           rtype = decide_type_once(sig)
@@ -3396,6 +3890,61 @@ LocalVarNode
         end
       end
 
+      class GlobalVarSpecialRefNode<GlobalVarRefNode
+        include NodeUtil
+        include TypeListWithoutSignature
+        include UnboxedArrayUtil
+        include SendNodeCodeGen
+
+        def initialize(parent, name)
+          super(parent)
+          @name = name
+          @assign_nodes = nil
+          @offset = nil
+        end
+
+        def collect_candidate_type(context)
+          tt = RubyType::BaseType.from_object(eval(@name.to_s))
+          sig = context.to_signature
+          add_type(sig, tt)
+          
+          context
+        end
+
+        def compile(context)
+          asm = context.assembler
+          add = lambda { 
+            a = address_of("rb_global_entry")
+            $symbol_table[a] = "rb_global_entry"
+            a
+          }
+          gentry = OpVarMemAddress.new(add)
+
+          add = lambda { 
+            a = address_of("rb_gvar_get")
+            $symbol_table[a] = "rb_gvar_get"
+            a
+          }
+          gget = OpVarMemAddress.new(add)
+          wsize = AsmType::MACHINE_WORD.size
+          symid = ((@name.__id__ << 1) / (5 * wsize))
+          asm.with_retry do
+            asm.mov(FUNC_ARG[0], symid)
+          end
+          context = gen_save_thepr(context)
+          context = gen_call(context, gentry, 1)
+
+          asm.with_retry do
+            asm.mov(FUNC_ARG[0], RETR)
+          end
+          context = gen_save_thepr(context)
+          context = gen_call(context, gget, 1)
+
+          context.ret_reg = RETR
+          context
+        end
+      end
+
       class GlobalVarAssignNode<VariableRefCommonNode
         include NodeUtil
         include HaveChildlenMixin
@@ -3407,28 +3956,31 @@ LocalVarNode
           @value = value
           @assign_nodes = nil
           @offset = nil
+          @assign_no = nil
         end
 
         attr :offset
 
         def collect_info(context)
           context = @value.collect_info(context)
-          if context.modified_global_var[@name] == nil then
-            context.modified_global_var[@name] = []
+          context.modified_global_var[@name] ||= []
+          @assign_nodes = context.modified_global_var[@name]
+          asize = @assign_nodes.size
+          if asize == 0 then
             @offset = context.modified_global_var.keys.size - 1
           end
-          @assign_nodes = context.modified_global_var[@name]
-          @assign_nodes.push self
+          @assign_no  = asize
+          @assign_nodes.push [self, nil]
           @body.collect_info(context)
         end
 
         def collect_candidate_type(context)
           sig = context.to_signature
+          @assign_nodes[@assign_no][1] = sig
           context = @value.collect_candidate_type(context)
-          same_type(@assign_nodes[0], @value, sig, sig, context)
-          same_type(self, @assign_nodes[0], sig, sig, context)
+          same_type(self, @value, sig, sig, context)
           if @offset == nil then
-            @offset = @assign_nodes[0].offset
+            @offset = @assign_nodes[0][0].offset
           end
           @body.collect_candidate_type(context)
         end
@@ -3440,7 +3992,7 @@ LocalVarNode
           asm.with_retry do
             asm.mov(TMPR2, context.top_node.get_global_arena_end_address)
           end
-          context.set_reg_content(TMPR2, :foo)
+          context.set_reg_content(TMPR2, :global_arena)
           contet = gen_set_element(context, nil, -@offset, @value)
           context.end_using_reg(TMPR2)
           @body.compile(context)
@@ -3469,13 +4021,23 @@ LocalVarNode
           end
 
           @class_top = klass # .search_class_top
+          @rklass = rklass
           @value_node = nil
+          set_value_node
+        end
+
+        def set_value_node
+          klass = @class_top
+          rklass = @rklass
           clsnode = nil
           if klass then
             @value_node, clsnode = klass.search_constant_with_super(@name)
           end
           if clsnode == nil and rklass then
-            @value_node = LiteralNode.new(self, rklass.const_get(@name))
+            begin
+              @value_node = LiteralNode.new(self, rklass.const_get(@name))
+            rescue
+            end
           end
         end
 
@@ -3493,6 +4055,13 @@ LocalVarNode
           context
         end
 
+        def collect_info(context)
+          if @value_node == nil then
+            set_value_node
+          end
+          super
+        end
+
         def compile(context)
           case @value_node
           when ClassTopNode
@@ -3540,6 +4109,7 @@ LocalVarNode
         end
 
         def traverse_childlen
+          yield @value
           yield @body
         end