@@ -60,6 +60,8 @@ for y in 0..count_size printf "%c", byte_acc # .chr byte_acc = 0 bit_num = 0 + else + 0 end # nil end bm_so_mandelbrot.rb @@ -376,7 +376,12 @@ module SendUtil return [nil, nil] elsif candidatenum == 1 then - minfo = mtab.values[0] + minfo = nil + if recklass then + minfo = mtab[recklass] + else + minfo = mtab.values[0] + end if minfo.is_a?(Hash) then return [minfo, minfo[:func]] else @@ -631,23 +636,27 @@ module SendUtil rectype = receiver ? receiver[0] : nil minfo, func = gen_method_select(rectype, info[0], mname) if minfo then + rettype = minfo[:rettype] + # rettype = RubyType.new(nil, info[3], "Return type of #{mname}") pppp "RubyMethod called #{mname.inspect}" para = gen_arg_eval(args, receiver, ins, local_vars, info, minfo, mname) - @expstack.push [minfo[:rettype], + @expstack.push [rettype, lambda {|b, context| recklass = receiver ? receiver[0].klass : nil minfo, func = gen_method_select(rectype, info[0], mname) + if !with_selfp(receiver, info[0], mname) then para.pop end + if func then gen_call(func, para ,b, context) else # p mname # p recklass # raise "Undefined method \"#{mname}\" in #{info[3]}" - rettype = minfo[:rettype] +# rettype = minfo[:rettype] gen_call_from_ruby(rettype, receiver[0], mname, para, curlevel, b, context) end }] lib/llvmutil.rb @@ -795,6 +795,7 @@ class YarvTranslator<YarvVisitor end def visit_default(code, ins, local_vars, ln, info) + p ins pppp "Unprocessed instruction #{ins}" end @@ -1158,7 +1159,8 @@ class YarvTranslator<YarvVisitor }] end - # putspecialobject + def visit_putspecialobject(code, ins, local_vars, ln, info) + end def visit_putiseq(code, ins, local_vars, ln, info) end lib/vmtraverse.rb 40acfe5cc57a9bc6c4134124d57033725437461f U-KOZUE\kozue m-72@tf6.so-net.ne.jp http://github.com/miura1729/yarv2llvm/commit/466fba17e5f032af4d649230a71b7efdf7c2c523 466fba17e5f032af4d649230a71b7efdf7c2c523 2009-06-12T02:27:02-07:00 2009-06-12T02:27:02-07:00 Bug about static method dispatch fixed 46f35f31f4cd2126126de8dad374b2f2d9049d9e U-KOZUE\kozue m-72@tf6.so-net.ne.jp