rhodes 3.1.1 → 3.2.0.beta.1

data/platform/shared/ruby/generated/parse.h

@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.4.3.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -150,14 +149,13 @@
      idRespond_to = 366,
      idIFUNC = 367,
      idCFUNC = 368,
-     idThrowState = 369,
-     id_core_set_method_alias = 370,
-     id_core_set_variable_alias = 371,
-     id_core_undef_method = 372,
-     id_core_define_method = 373,
-     id_core_define_singleton_method = 374,
-     id_core_set_postexe = 375,
-     tLAST_TOKEN = 376
+     id_core_set_method_alias = 369,
+     id_core_set_variable_alias = 370,
+     id_core_undef_method = 371,
+     id_core_define_method = 372,
+     id_core_define_singleton_method = 373,
+     id_core_set_postexe = 374,
+     tLAST_TOKEN = 375
    };
 #endif
 
@@ -167,16 +165,17 @@
 typedef union YYSTYPE
 {
 
-/* Line 1676 of yacc.c  */
+/* Line 1685 of yacc.c  */
 
     VALUE val;
     NODE *node;
     ID id;
     int num;
+    const struct vtable *vars;
 
 
 
-/* Line 1676 of yacc.c  */
+/* Line 1685 of yacc.c  */
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

data/platform/shared/ruby/generated/vm.inc

@@ -3,7 +3,7 @@
 /*******************************************************************/
 /**
   This file is VM main loop.
-  
+
   ----
   This file is auto generated by insns2vm.rb
   DO NOT TOUCH!
@@ -53,6 +53,7 @@ INSN_ENTRY(getlocal){
     val = *(GET_LFP() - idx);
 
 #line 56 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_getlocal
 #undef INSN_IS_SC
@@ -77,7 +78,7 @@ INSN_ENTRY(setlocal){
 #line 72 "insns.def"
     (*(GET_LFP() - idx)) = val;
 
-#line 81 "vm.inc"
+#line 82 "vm.inc"
 #undef CURRENT_INSN_setlocal
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -103,7 +104,8 @@ INSN_ENTRY(getspecial){
 #line 86 "insns.def"
     val = vm_getspecial(th, GET_LFP(), key, type);
 
-#line 107 "vm.inc"
+#line 108 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_getspecial
 #undef INSN_IS_SC
@@ -128,7 +130,7 @@ INSN_ENTRY(setspecial){
 #line 100 "insns.def"
     lfp_svar_set(th, GET_LFP(), key, obj);
 
-#line 132 "vm.inc"
+#line 134 "vm.inc"
 #undef CURRENT_INSN_setspecial
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -152,14 +154,15 @@ INSN_ENTRY(getdynamic){
   USAGE_ANALYSIS_OPERAND(BIN(getdynamic), 1, level);
 {
 #line 116 "insns.def"
-    int i;
+    rb_num_t i;
     VALUE *dfp2 = GET_DFP();
     for (i = 0; i < level; i++) {
 	dfp2 = GET_PREV_DFP(dfp2);
     }
     val = *(dfp2 - idx);
 
-#line 163 "vm.inc"
+#line 165 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_getdynamic
 #undef INSN_IS_SC
@@ -184,14 +187,14 @@ INSN_ENTRY(setdynamic){
   USAGE_ANALYSIS_OPERAND(BIN(setdynamic), 1, level);
 {
 #line 137 "insns.def"
-    int i;
+    rb_num_t i;
     VALUE *dfp2 = GET_DFP();
     for (i = 0; i < level; i++) {
 	dfp2 = GET_PREV_DFP(dfp2);
     }
     *(dfp2 - idx) = val;
 
-#line 195 "vm.inc"
+#line 198 "vm.inc"
 #undef CURRENT_INSN_setdynamic
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -200,10 +203,11 @@ INSN_ENTRY(setdynamic){
 INSN_ENTRY(getinstancevariable){
 {
   VALUE val;
+  IC ic = (IC)GET_OPERAND(2);
   ID id = (ID)GET_OPERAND(1);
 
   DEBUG_ENTER_INSN("getinstancevariable");
-  ADD_PC(1+1);
+  ADD_PC(1+2);
   PREFETCH(GET_PC());
   #define CURRENT_INSN_getinstancevariable 1
   #define INSN_IS_SC()     0
@@ -211,11 +215,13 @@ INSN_ENTRY(getinstancevariable){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(getinstancevariable));
   USAGE_ANALYSIS_OPERAND(BIN(getinstancevariable), 0, id);
+  USAGE_ANALYSIS_OPERAND(BIN(getinstancevariable), 1, ic);
 {
 #line 157 "insns.def"
-    val = rb_ivar_get(GET_SELF(), id);
+    val = vm_getivar(GET_SELF(), id, ic);
 
-#line 219 "vm.inc"
+#line 224 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_getinstancevariable
 #undef INSN_IS_SC
@@ -224,10 +230,11 @@ INSN_ENTRY(getinstancevariable){
   END_INSN(getinstancevariable);}}}
 INSN_ENTRY(setinstancevariable){
 {
+  IC ic = (IC)GET_OPERAND(2);
   ID id = (ID)GET_OPERAND(1);
   VALUE val = TOPN(0);
   DEBUG_ENTER_INSN("setinstancevariable");
-  ADD_PC(1+1);
+  ADD_PC(1+2);
   PREFETCH(GET_PC());
   POPN(1);
   #define CURRENT_INSN_setinstancevariable 1
@@ -236,11 +243,12 @@ INSN_ENTRY(setinstancevariable){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(setinstancevariable));
   USAGE_ANALYSIS_OPERAND(BIN(setinstancevariable), 0, id);
+  USAGE_ANALYSIS_OPERAND(BIN(setinstancevariable), 1, ic);
 {
 #line 172 "insns.def"
-    rb_ivar_set(GET_SELF(), id, val);
+    vm_setivar(GET_SELF(), id, val, ic);
 
-#line 244 "vm.inc"
+#line 252 "vm.inc"
 #undef CURRENT_INSN_setinstancevariable
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -265,7 +273,8 @@ INSN_ENTRY(getclassvariable){
     NODE * const cref = vm_get_cref(GET_ISEQ(), GET_LFP(), GET_DFP());
     val = rb_cvar_get(vm_get_cvar_base(cref), id);
 
-#line 269 "vm.inc"
+#line 277 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_getclassvariable
 #undef INSN_IS_SC
@@ -291,7 +300,7 @@ INSN_ENTRY(setclassvariable){
     NODE * const cref = vm_get_cref(GET_ISEQ(), GET_LFP(), GET_DFP());
     rb_cvar_set(vm_get_cvar_base(cref), id, val);
 
-#line 295 "vm.inc"
+#line 304 "vm.inc"
 #undef CURRENT_INSN_setclassvariable
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -316,7 +325,8 @@ INSN_ENTRY(getconstant){
 #line 223 "insns.def"
     val = vm_get_ev_const(th, GET_ISEQ(), klass, id, 0);
 
-#line 320 "vm.inc"
+#line 329 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_getconstant
 #undef INSN_IS_SC
@@ -344,7 +354,7 @@ INSN_ENTRY(setconstant){
     rb_const_set(cbase, id, val);
     INC_VM_STATE_VERSION();
 
-#line 348 "vm.inc"
+#line 358 "vm.inc"
 #undef CURRENT_INSN_setconstant
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -368,7 +378,8 @@ INSN_ENTRY(getglobal){
 #line 261 "insns.def"
     val = GET_GLOBAL(entry);
 
-#line 372 "vm.inc"
+#line 382 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_getglobal
 #undef INSN_IS_SC
@@ -393,7 +404,7 @@ INSN_ENTRY(setglobal){
 #line 275 "insns.def"
     SET_GLOBAL(entry, val);
 
-#line 397 "vm.inc"
+#line 408 "vm.inc"
 #undef CURRENT_INSN_setglobal
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -416,7 +427,8 @@ INSN_ENTRY(putnil){
 #line 294 "insns.def"
     val = Qnil;
 
-#line 420 "vm.inc"
+#line 431 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_putnil
 #undef INSN_IS_SC
@@ -440,7 +452,8 @@ INSN_ENTRY(putself){
 #line 308 "insns.def"
     val = GET_SELF();
 
-#line 444 "vm.inc"
+#line 456 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_putself
 #undef INSN_IS_SC
@@ -464,7 +477,8 @@ INSN_ENTRY(putobject){
 #line 324 "insns.def"
     /* */
 
-#line 468 "vm.inc"
+#line 481 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_putobject
 #undef INSN_IS_SC
@@ -494,11 +508,15 @@ INSN_ENTRY(putspecialobject){
       case VM_SPECIAL_OBJECT_CBASE:
 	val = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
 	break;
+      case VM_SPECIAL_OBJECT_CONST_BASE:
+	val = vm_get_const_base(GET_ISEQ(), GET_LFP(), GET_DFP());
+	break;
       default:
 	rb_bug("putspecialobject insn: unknown value_type");
     }
 
-#line 502 "vm.inc"
+#line 519 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_putspecialobject
 #undef INSN_IS_SC
@@ -520,10 +538,11 @@ INSN_ENTRY(putiseq){
   USAGE_ANALYSIS_INSN(BIN(putiseq));
   USAGE_ANALYSIS_OPERAND(BIN(putiseq), 0, iseq);
 {
-#line 362 "insns.def"
+#line 365 "insns.def"
     ret = iseq->self;
 
-#line 527 "vm.inc"
+#line 545 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(ret);
 #undef CURRENT_INSN_putiseq
 #undef INSN_IS_SC
@@ -545,10 +564,11 @@ INSN_ENTRY(putstring){
   USAGE_ANALYSIS_INSN(BIN(putstring));
   USAGE_ANALYSIS_OPERAND(BIN(putstring), 0, str);
 {
-#line 376 "insns.def"
-    val = rb_str_replace(rb_str_new(0, 0), str);
+#line 379 "insns.def"
+    val = rb_str_resurrect(str);
 
-#line 552 "vm.inc"
+#line 571 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_putstring
 #undef INSN_IS_SC
@@ -570,17 +590,18 @@ INSN_ENTRY(concatstrings){
   USAGE_ANALYSIS_INSN(BIN(concatstrings));
   USAGE_ANALYSIS_OPERAND(BIN(concatstrings), 0, num);
 {
-#line 390 "insns.def"
-    int i;
+#line 393 "insns.def"
+    rb_num_t i = num;
 
     val = rb_str_new(0, 0);
-    for (i = num - 1; i >= 0; i--) {
+    while (i-- > 0) {
 	const VALUE v = TOPN(i);
 	rb_str_append(val, v);
     }
     POPN(num);
 
-#line 584 "vm.inc"
+#line 604 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_concatstrings
 #undef INSN_IS_SC
@@ -601,10 +622,11 @@ INSN_ENTRY(tostring){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(tostring));
 {
-#line 411 "insns.def"
+#line 414 "insns.def"
     val = rb_obj_as_string(val);
 
-#line 608 "vm.inc"
+#line 629 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_tostring
 #undef INSN_IS_SC
@@ -628,18 +650,19 @@ INSN_ENTRY(toregexp){
   USAGE_ANALYSIS_OPERAND(BIN(toregexp), 0, opt);
   USAGE_ANALYSIS_OPERAND(BIN(toregexp), 1, cnt);
 {
-#line 426 "insns.def"
+#line 429 "insns.def"
     VALUE rb_reg_new_ary(VALUE ary, int options);
-    int i;
-    const VALUE ary = rb_ary_new2(cnt);
-    RBASIC(ary)->klass = 0;
+    rb_num_t i;
+    const VALUE ary = rb_ary_tmp_new(cnt);
     for (i = 0; i < cnt; i++) {
         rb_ary_store(ary, cnt-i-1, TOPN(i));
     }
     POPN(cnt);
-    val = rb_reg_new_ary(ary, opt);
+    val = rb_reg_new_ary(ary, (int)opt);
+    rb_ary_clear(ary);
 
-#line 643 "vm.inc"
+#line 665 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_toregexp
 #undef INSN_IS_SC
@@ -661,11 +684,12 @@ INSN_ENTRY(newarray){
   USAGE_ANALYSIS_INSN(BIN(newarray));
   USAGE_ANALYSIS_OPERAND(BIN(newarray), 0, num);
 {
-#line 448 "insns.def"
+#line 451 "insns.def"
     val = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
     POPN(num);
 
-#line 669 "vm.inc"
+#line 692 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_newarray
 #undef INSN_IS_SC
@@ -687,10 +711,11 @@ INSN_ENTRY(duparray){
   USAGE_ANALYSIS_INSN(BIN(duparray));
   USAGE_ANALYSIS_OPERAND(BIN(duparray), 0, ary);
 {
-#line 463 "insns.def"
-    val = rb_ary_replace(rb_ary_new2(0), ary);
+#line 466 "insns.def"
+    val = rb_ary_resurrect(ary);
 
-#line 694 "vm.inc"
+#line 718 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_duparray
 #undef INSN_IS_SC
@@ -714,10 +739,10 @@ INSN_ENTRY(expandarray){
   USAGE_ANALYSIS_OPERAND(BIN(expandarray), 0, num);
   USAGE_ANALYSIS_OPERAND(BIN(expandarray), 1, flag);
 {
-#line 484 "insns.def"
-    vm_expandarray(GET_CFP(), ary, num, flag);
+#line 487 "insns.def"
+    vm_expandarray(GET_CFP(), ary, num, (int)flag);
 
-#line 721 "vm.inc"
+#line 746 "vm.inc"
 #undef CURRENT_INSN_expandarray
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -739,7 +764,7 @@ INSN_ENTRY(concatarray){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(concatarray));
 {
-#line 498 "insns.def"
+#line 501 "insns.def"
     const VALUE ary2 = ary2st;
     VALUE tmp1 = rb_check_convert_type(ary1, T_ARRAY, "Array", "to_a");
     VALUE tmp2 = rb_check_convert_type(ary2, T_ARRAY, "Array", "to_a");
@@ -757,7 +782,8 @@ INSN_ENTRY(concatarray){
     }
     ary = rb_ary_concat(tmp1, tmp2);
 
-#line 761 "vm.inc"
+#line 786 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(ary);
 #undef CURRENT_INSN_concatarray
 #undef INSN_IS_SC
@@ -780,14 +806,15 @@ INSN_ENTRY(splatarray){
   USAGE_ANALYSIS_INSN(BIN(splatarray));
   USAGE_ANALYSIS_OPERAND(BIN(splatarray), 0, flag);
 {
-#line 527 "insns.def"
+#line 530 "insns.def"
     VALUE tmp = rb_check_convert_type(ary, T_ARRAY, "Array", "to_a");
     if (NIL_P(tmp)) {
 	tmp = rb_ary_new3(1, ary);
     }
     obj = tmp;
 
-#line 791 "vm.inc"
+#line 817 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(obj);
 #undef CURRENT_INSN_splatarray
 #undef INSN_IS_SC
@@ -811,7 +838,7 @@ INSN_ENTRY(checkincludearray){
   USAGE_ANALYSIS_INSN(BIN(checkincludearray));
   USAGE_ANALYSIS_OPERAND(BIN(checkincludearray), 0, flag);
 {
-#line 545 "insns.def"
+#line 548 "insns.def"
     int i;
     result = Qfalse;
 
@@ -840,7 +867,8 @@ INSN_ENTRY(checkincludearray){
 	}
     }
 
-#line 844 "vm.inc"
+#line 871 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 2);
   PUSH(obj);
   PUSH(result);
 #undef CURRENT_INSN_checkincludearray
@@ -863,8 +891,8 @@ INSN_ENTRY(newhash){
   USAGE_ANALYSIS_INSN(BIN(newhash));
   USAGE_ANALYSIS_OPERAND(BIN(newhash), 0, num);
 {
-#line 586 "insns.def"
-    int i;
+#line 589 "insns.def"
+    rb_num_t i;
     val = rb_hash_new();
 
     for (i = num; i > 0; i -= 2) {
@@ -874,7 +902,8 @@ INSN_ENTRY(newhash){
     }
     POPN(num);
 
-#line 878 "vm.inc"
+#line 906 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_newhash
 #undef INSN_IS_SC
@@ -898,10 +927,11 @@ INSN_ENTRY(newrange){
   USAGE_ANALYSIS_INSN(BIN(newrange));
   USAGE_ANALYSIS_OPERAND(BIN(newrange), 0, flag);
 {
-#line 608 "insns.def"
-    val = rb_range_new(low, high, flag);
+#line 611 "insns.def"
+    val = rb_range_new(low, high, (int)flag);
 
-#line 905 "vm.inc"
+#line 934 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_newrange
 #undef INSN_IS_SC
@@ -922,11 +952,11 @@ INSN_ENTRY(pop){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(pop));
 {
-#line 626 "insns.def"
+#line 629 "insns.def"
     val = val;
     /* none */
 
-#line 930 "vm.inc"
+#line 960 "vm.inc"
 #undef CURRENT_INSN_pop
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -948,10 +978,11 @@ INSN_ENTRY(dup){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(dup));
 {
-#line 641 "insns.def"
+#line 644 "insns.def"
     val1 = val2 = val;
 
-#line 955 "vm.inc"
+#line 985 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 2);
   PUSH(val1);
   PUSH(val2);
 #undef CURRENT_INSN_dup
@@ -973,15 +1004,15 @@ INSN_ENTRY(dupn){
   USAGE_ANALYSIS_INSN(BIN(dupn));
   USAGE_ANALYSIS_OPERAND(BIN(dupn), 0, n);
 {
-#line 655 "insns.def"
-    int i;
+#line 658 "insns.def"
+    rb_num_t i;
     VALUE *sp = STACK_ADDR_FROM_TOP(n);
     for (i = 0; i < n; i++) {
 	GET_SP()[i] = sp[i];
     }
     INC_SP(n);
 
-#line 985 "vm.inc"
+#line 1016 "vm.inc"
 #undef CURRENT_INSN_dupn
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -1002,10 +1033,11 @@ INSN_ENTRY(swap){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(swap));
 {
-#line 675 "insns.def"
+#line 678 "insns.def"
     /* none */
 
-#line 1009 "vm.inc"
+#line 1040 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 2);
   PUSH(obj);
   PUSH(val);
 #undef CURRENT_INSN_swap
@@ -1027,10 +1059,11 @@ INSN_ENTRY(reput){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(reput));
 {
-#line 689 "insns.def"
+#line 692 "insns.def"
     /* none */
 
-#line 1034 "vm.inc"
+#line 1066 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_reput
 #undef INSN_IS_SC
@@ -1052,10 +1085,11 @@ INSN_ENTRY(topn){
   USAGE_ANALYSIS_INSN(BIN(topn));
   USAGE_ANALYSIS_OPERAND(BIN(topn), 0, n);
 {
-#line 703 "insns.def"
+#line 706 "insns.def"
     val = TOPN(n);
 
-#line 1059 "vm.inc"
+#line 1092 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_topn
 #undef INSN_IS_SC
@@ -1077,10 +1111,11 @@ INSN_ENTRY(setn){
   USAGE_ANALYSIS_INSN(BIN(setn));
   USAGE_ANALYSIS_OPERAND(BIN(setn), 0, n);
 {
-#line 717 "insns.def"
+#line 720 "insns.def"
     TOPN(n-1) = val;
 
-#line 1084 "vm.inc"
+#line 1118 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_setn
 #undef INSN_IS_SC
@@ -1101,10 +1136,10 @@ INSN_ENTRY(adjuststack){
   USAGE_ANALYSIS_INSN(BIN(adjuststack));
   USAGE_ANALYSIS_OPERAND(BIN(adjuststack), 0, n);
 {
-#line 731 "insns.def"
+#line 734 "insns.def"
     DEC_SP(n);
 
-#line 1108 "vm.inc"
+#line 1143 "vm.inc"
 #undef CURRENT_INSN_adjuststack
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -1130,7 +1165,7 @@ INSN_ENTRY(defined){
   USAGE_ANALYSIS_OPERAND(BIN(defined), 1, obj);
   USAGE_ANALYSIS_OPERAND(BIN(defined), 2, needstr);
 {
-#line 750 "insns.def"
+#line 753 "insns.def"
     VALUE klass;
     const char *expr_type = 0;
     val = Qnil;
@@ -1145,7 +1180,7 @@ INSN_ENTRY(defined){
 	klass = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
 	break;
       case DEFINED_GVAR:
-	if (rb_gvar_defined((struct global_entry *)(obj & ~1))) {
+	if (rb_gvar_defined(rb_global_entry(SYM2ID(obj)))) {
 	    expr_type = "global-variable";
 	}
 	break;
@@ -1168,19 +1203,28 @@ INSN_ENTRY(defined){
 	}
 	break;
       case DEFINED_METHOD:{
-	  VALUE klass = CLASS_OF(v);
-	  NODE *method = (NODE *) rb_method_node(klass, SYM2ID(obj));
-
-	  if (method) {
-	      if (!(method->nd_noex & NOEX_PRIVATE)) {
-		  if (!((method->nd_noex & NOEX_PROTECTED) &&
-			!rb_obj_is_kind_of(GET_SELF(),
-					   rb_class_real(klass)))) {
-		      expr_type = "method";
-		  }
-	      }
-	  }
-	  break;
+	VALUE klass = CLASS_OF(v);
+	const rb_method_entry_t *me = rb_method_entry(klass, SYM2ID(obj));
+
+	if (me) {
+	    if (!(me->flag & NOEX_PRIVATE)) {
+		if (!((me->flag & NOEX_PROTECTED) &&
+		      !rb_obj_is_kind_of(GET_SELF(),
+					 rb_class_real(klass)))) {
+		    expr_type = "method";
+		}
+	    }
+	}
+	{
+	    VALUE args[2];
+	    VALUE r;
+
+	    args[0] = obj; args[1] = Qfalse;
+	    r = rb_check_funcall(v, rb_intern("respond_to_missing?"), 2, args);
+	    if (r != Qundef && RTEST(r)) 
+		expr_type = "method";
+	}
+	break;
       }
       case DEFINED_YIELD:
 	if (GET_BLOCK_PTR()) {
@@ -1188,27 +1232,27 @@ INSN_ENTRY(defined){
 	}
 	break;
       case DEFINED_ZSUPER:{
-	  rb_iseq_t *ip = GET_ISEQ();
-	  while (ip) {
-	      if (ip->defined_method_id) {
-		  break;
-	      }
-	      ip = ip->parent_iseq;
-	  }
-	  if (ip) {
-	      VALUE klass = vm_search_normal_superclass(ip->klass, GET_SELF());
-	      if (rb_method_boundp(klass, ip->defined_method_id, 0)) {
-		  expr_type = "super";
-	      }
-	  }
-	  break;
+	rb_iseq_t *ip = GET_ISEQ();
+	while (ip) {
+	    if (ip->defined_method_id) {
+		break;
+	    }
+	    ip = ip->parent_iseq;
+	}
+	if (ip) {
+	    VALUE klass = vm_search_normal_superclass(ip->klass, GET_SELF());
+	    if (rb_method_boundp(klass, ip->defined_method_id, 0)) {
+		expr_type = "super";
+	    }
+	}
+	break;
       }
       case DEFINED_REF:{
-	  val = vm_getspecial(th, GET_LFP(), Qfalse, FIX2INT(obj));
-	  if (val != Qnil) {
-	      expr_type = "global-variable";
-	  }
-	  break;
+	val = vm_getspecial(th, GET_LFP(), Qfalse, FIX2INT(obj));
+	if (val != Qnil) {
+	    expr_type = "global-variable";
+	}
+	break;
       }
       default:
 	rb_bug("unimplemented defined? type (VM)");
@@ -1223,7 +1267,8 @@ INSN_ENTRY(defined){
 	}
     }
 
-#line 1227 "vm.inc"
+#line 1271 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_defined
 #undef INSN_IS_SC
@@ -1244,12 +1289,12 @@ INSN_ENTRY(trace){
   USAGE_ANALYSIS_INSN(BIN(trace));
   USAGE_ANALYSIS_OPERAND(BIN(trace), 0, nf);
 {
-#line 854 "insns.def"
-    rb_event_flag_t flag = nf;
+#line 866 "insns.def"
+    rb_event_flag_t flag = (rb_event_flag_t)nf;
 
     EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* TODO: id, klass */);
 
-#line 1253 "vm.inc"
+#line 1298 "vm.inc"
 #undef CURRENT_INSN_trace
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -1276,7 +1321,7 @@ INSN_ENTRY(defineclass){
   USAGE_ANALYSIS_OPERAND(BIN(defineclass), 1, class_iseq);
   USAGE_ANALYSIS_OPERAND(BIN(defineclass), 2, define_type);
 {
-#line 878 "insns.def"
+#line 890 "insns.def"
     VALUE klass;
 
     switch ((int)define_type) {
@@ -1290,6 +1335,7 @@ INSN_ENTRY(defineclass){
 	vm_check_if_namespace(cbase);
 
 	/* find klass */
+	rb_autoload_load(cbase, id);
 	if (rb_const_defined_at(cbase, id)) {
 	    /* already exist */
 	    klass = rb_const_get_at(cbase, id);
@@ -1310,7 +1356,7 @@ INSN_ENTRY(defineclass){
 	else {
 	    /* new class declaration */
 	    klass = rb_define_class_id(id, super);
-	    rb_set_class_path(klass, cbase, rb_id2name(id));
+	    rb_set_class_path_string(klass, cbase, rb_id2str(id));
 	    rb_const_set(cbase, id, klass);
 	    rb_class_inherited(super, klass);
 	}
@@ -1337,7 +1383,7 @@ INSN_ENTRY(defineclass){
 	else {
 	    /* new module declaration */
 	    klass = rb_define_module_id(id);
-	    rb_set_class_path(klass, cbase, rb_id2name(id));
+	    rb_set_class_path_string(klass, cbase, rb_id2str(id));
 	    rb_const_set(cbase, id, klass);
 	}
 	break;
@@ -1345,11 +1391,11 @@ INSN_ENTRY(defineclass){
 	rb_bug("unknown defineclass type: %d", (int)define_type);
     }
 
-    COPY_CREF(class_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC));
+    COPY_CREF(class_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC, NULL));
 
     /* enter scope */
     vm_push_frame(th, class_iseq,
-		  VM_FRAME_MAGIC_CLASS, klass, (VALUE) GET_DFP() | 0x02,
+		  VM_FRAME_MAGIC_CLASS, klass, (VALUE) GET_BLOCK_PTR(),
 		  class_iseq->iseq_encoded, GET_SP(), 0,
 		  class_iseq->local_size);
     RESTORE_REGS();
@@ -1357,7 +1403,8 @@ INSN_ENTRY(defineclass){
     INC_VM_STATE_VERSION();
     NEXT_INSN();
 
-#line 1361 "vm.inc"
+#line 1407 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_defineclass
 #undef INSN_IS_SC
@@ -1387,28 +1434,23 @@ INSN_ENTRY(send){
   USAGE_ANALYSIS_OPERAND(BIN(send), 3, op_flag);
   USAGE_ANALYSIS_OPERAND(BIN(send), 4, ic);
 {
-#line 981 "insns.def"
-    NODE *mn;
+#line 994 "insns.def"
+    const rb_method_entry_t *me;
     VALUE recv, klass;
     rb_block_t *blockptr = 0;
-    rb_num_t num = caller_setup_args(th, GET_CFP(), op_flag, op_argc,
-				     (rb_iseq_t *)blockiseq, &blockptr);
+    int num = caller_setup_args(th, GET_CFP(), op_flag, (int)op_argc,
+				(rb_iseq_t *)blockiseq, &blockptr);
     rb_num_t flag = op_flag;
     ID id = op_id;
 
     /* get receiver */
     recv = (flag & VM_CALL_FCALL_BIT) ? GET_SELF() : TOPN(num);
     klass = CLASS_OF(recv);
-    mn = vm_method_search(id, klass, ic);
-
-    /* send/funcall optimization */
-    if (flag & VM_CALL_SEND_BIT) {
-	vm_send_optimize(GET_CFP(), &mn, &flag, &num, &id, klass);
-    }
-
-    CALL_METHOD(num, blockptr, flag, id, mn, recv);
+    me = vm_method_search(id, klass, ic);
+    CALL_METHOD(num, blockptr, flag, id, me, recv);
 
-#line 1412 "vm.inc"
+#line 1453 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_send
 #undef INSN_IS_SC
@@ -1434,21 +1476,29 @@ INSN_ENTRY(invokesuper){
   USAGE_ANALYSIS_OPERAND(BIN(invokesuper), 1, blockiseq);
   USAGE_ANALYSIS_OPERAND(BIN(invokesuper), 2, op_flag);
 {
-#line 1015 "insns.def"
+#line 1022 "insns.def"
     rb_block_t *blockptr = !(op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? GET_BLOCK_PTR() : 0;
-    int num = caller_setup_args(th, GET_CFP(), op_flag, op_argc, blockiseq, &blockptr);
+    int num = caller_setup_args(th, GET_CFP(), op_flag,
+				(int)op_argc, blockiseq, &blockptr);
     VALUE recv, klass;
-    NODE *mn;
     ID id;
-    const VALUE flag = VM_CALL_SUPER_BIT | VM_CALL_FCALL_BIT;
+    VALUE flag = VM_CALL_SUPER_BIT | VM_CALL_FCALL_BIT;
+    const rb_method_entry_t *me;
 
     recv = GET_SELF();
     vm_search_superclass(GET_CFP(), GET_ISEQ(), recv, TOPN(num), &id, &klass);
-    mn = rb_method_node(klass, id);
 
-    CALL_METHOD(num, blockptr, flag, id, mn, recv);
+    /* temporary measure for [Bug #2402] [Bug #2502] [Bug #3136] */
+    if (!rb_obj_is_kind_of(recv, klass)) {
+	rb_raise(rb_eNotImpError, "super from singleton method that is defined to multiple classes is not supported; this will be fixed in 1.9.3 or later");
+    }
+
+    me = rb_method_entry(klass, id);
+
+    CALL_METHOD(num, blockptr, flag, id, me, recv);
 
-#line 1452 "vm.inc"
+#line 1501 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_invokesuper
 #undef INSN_IS_SC
@@ -1472,14 +1522,15 @@ INSN_ENTRY(invokeblock){
   USAGE_ANALYSIS_OPERAND(BIN(invokeblock), 0, num);
   USAGE_ANALYSIS_OPERAND(BIN(invokeblock), 1, flag);
 {
-#line 1041 "insns.def"
+#line 1055 "insns.def"
     val = vm_invoke_block(th, GET_CFP(), num, flag);
     if (val == Qundef) {
 	RESTORE_REGS();
 	NEXT_INSN();
     }
 
-#line 1483 "vm.inc"
+#line 1533 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_invokeblock
 #undef INSN_IS_SC
@@ -1500,7 +1551,7 @@ INSN_ENTRY(leave){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(leave));
 {
-#line 1059 "insns.def"
+#line 1073 "insns.def"
     if (OPT_CHECKED_RUN) {
 	if (reg_cfp->sp != reg_cfp->bp) {
 	    rb_bug("Stack consistency error (sp: %"PRIdPTRDIFF", bp: %"PRIdPTRDIFF")",
@@ -1512,7 +1563,8 @@ INSN_ENTRY(leave){
     vm_pop_frame(th);
     RESTORE_REGS();
 
-#line 1516 "vm.inc"
+#line 1567 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_leave
 #undef INSN_IS_SC
@@ -1533,7 +1585,7 @@ INSN_ENTRY(finish){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(finish));
 {
-#line 1082 "insns.def"
+#line 1096 "insns.def"
 #if OPT_CALL_THREADED_CODE
     rb_bug("unused instruction on OPT_CALL_THREADED_CODE");
 #else
@@ -1541,7 +1593,8 @@ INSN_ENTRY(finish){
     return val;
 #endif
 
-#line 1545 "vm.inc"
+#line 1597 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_finish
 #undef INSN_IS_SC
@@ -1564,13 +1617,14 @@ INSN_ENTRY(throw){
   USAGE_ANALYSIS_INSN(BIN(throw));
   USAGE_ANALYSIS_OPERAND(BIN(throw), 0, throw_state);
 {
-#line 1105 "insns.def"
+#line 1119 "insns.def"
     RUBY_VM_CHECK_INTS();
     val = vm_throw(th, GET_CFP(), throw_state, throwobj);
     THROW_EXCEPTION(val);
     /* unreachable */
 
-#line 1574 "vm.inc"
+#line 1627 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_throw
 #undef INSN_IS_SC
@@ -1591,11 +1645,11 @@ INSN_ENTRY(jump){
   USAGE_ANALYSIS_INSN(BIN(jump));
   USAGE_ANALYSIS_OPERAND(BIN(jump), 0, dst);
 {
-#line 1126 "insns.def"
+#line 1140 "insns.def"
     RUBY_VM_CHECK_INTS();
     JUMP(dst);
 
-#line 1599 "vm.inc"
+#line 1653 "vm.inc"
 #undef CURRENT_INSN_jump
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -1616,13 +1670,13 @@ INSN_ENTRY(branchif){
   USAGE_ANALYSIS_INSN(BIN(branchif));
   USAGE_ANALYSIS_OPERAND(BIN(branchif), 0, dst);
 {
-#line 1141 "insns.def"
+#line 1155 "insns.def"
     if (RTEST(val)) {
 	RUBY_VM_CHECK_INTS();
 	JUMP(dst);
     }
 
-#line 1626 "vm.inc"
+#line 1680 "vm.inc"
 #undef CURRENT_INSN_branchif
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -1643,13 +1697,13 @@ INSN_ENTRY(branchunless){
   USAGE_ANALYSIS_INSN(BIN(branchunless));
   USAGE_ANALYSIS_OPERAND(BIN(branchunless), 0, dst);
 {
-#line 1158 "insns.def"
+#line 1172 "insns.def"
     if (!RTEST(val)) {
 	RUBY_VM_CHECK_INTS();
 	JUMP(dst);
     }
 
-#line 1653 "vm.inc"
+#line 1707 "vm.inc"
 #undef CURRENT_INSN_branchunless
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -1658,8 +1712,8 @@ INSN_ENTRY(branchunless){
 INSN_ENTRY(getinlinecache){
 {
   VALUE val;
-  OFFSET dst = (OFFSET)GET_OPERAND(2);
-  IC ic = (IC)GET_OPERAND(1);
+  IC ic = (IC)GET_OPERAND(2);
+  OFFSET dst = (OFFSET)GET_OPERAND(1);
 
   DEBUG_ENTER_INSN("getinlinecache");
   ADD_PC(1+2);
@@ -1669,12 +1723,12 @@ INSN_ENTRY(getinlinecache){
   #define INSN_LABEL(lab)  LABEL_getinlinecache_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(getinlinecache));
-  USAGE_ANALYSIS_OPERAND(BIN(getinlinecache), 0, ic);
-  USAGE_ANALYSIS_OPERAND(BIN(getinlinecache), 1, dst);
+  USAGE_ANALYSIS_OPERAND(BIN(getinlinecache), 0, dst);
+  USAGE_ANALYSIS_OPERAND(BIN(getinlinecache), 1, ic);
 {
-#line 1180 "insns.def"
+#line 1194 "insns.def"
     if (ic->ic_vmstat == GET_VM_STATE_VERSION()) {
-	val = ic->ic_value;
+	val = ic->ic_value.value;
 	JUMP(dst);
     }
     else {
@@ -1682,7 +1736,8 @@ INSN_ENTRY(getinlinecache){
 	val = Qnil;
     }
 
-#line 1686 "vm.inc"
+#line 1740 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_getinlinecache
 #undef INSN_IS_SC
@@ -1692,8 +1747,8 @@ INSN_ENTRY(getinlinecache){
 INSN_ENTRY(onceinlinecache){
 {
   VALUE val;
-  OFFSET dst = (OFFSET)GET_OPERAND(2);
-  IC ic = (IC)GET_OPERAND(1);
+  IC ic = (IC)GET_OPERAND(2);
+  OFFSET dst = (OFFSET)GET_OPERAND(1);
 
   DEBUG_ENTER_INSN("onceinlinecache");
   ADD_PC(1+2);
@@ -1703,20 +1758,29 @@ INSN_ENTRY(onceinlinecache){
   #define INSN_LABEL(lab)  LABEL_onceinlinecache_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(onceinlinecache));
-  USAGE_ANALYSIS_OPERAND(BIN(onceinlinecache), 0, ic);
-  USAGE_ANALYSIS_OPERAND(BIN(onceinlinecache), 1, dst);
+  USAGE_ANALYSIS_OPERAND(BIN(onceinlinecache), 0, dst);
+  USAGE_ANALYSIS_OPERAND(BIN(onceinlinecache), 1, ic);
 {
-#line 1201 "insns.def"
+#line 1215 "insns.def"
+  retry:
     if (ic->ic_vmstat) {
-	val = ic->ic_value;
+	val = ic->ic_value.value;
 	JUMP(dst);
     }
+    else if (ic->ic_value.value == Qundef)
+    {
+    	RUBY_VM_CHECK_INTS();
+    	rb_thread_schedule();
+	goto retry;
+    }
     else {
 	/* none */
+	ic->ic_value.value = Qundef;
 	val = Qnil;
     }
 
-#line 1720 "vm.inc"
+#line 1783 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_onceinlinecache
 #undef INSN_IS_SC
@@ -1725,7 +1789,7 @@ INSN_ENTRY(onceinlinecache){
   END_INSN(onceinlinecache);}}}
 INSN_ENTRY(setinlinecache){
 {
-  OFFSET dst = (OFFSET)GET_OPERAND(1);
+  IC ic = (IC)GET_OPERAND(1);
   VALUE val = TOPN(0);
   DEBUG_ENTER_INSN("setinlinecache");
   ADD_PC(1+1);
@@ -1736,16 +1800,18 @@ INSN_ENTRY(setinlinecache){
   #define INSN_LABEL(lab)  LABEL_setinlinecache_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(setinlinecache));
-  USAGE_ANALYSIS_OPERAND(BIN(setinlinecache), 0, dst);
+  USAGE_ANALYSIS_OPERAND(BIN(setinlinecache), 0, ic);
 {
-#line 1222 "insns.def"
-    IC ic = GET_CONST_INLINE_CACHE(dst);
-
-    ic->ic_value = val;
+#line 1244 "insns.def"
+    if (ic->ic_value.value == Qundef) {
+	rb_ary_push(GET_ISEQ()->mark_ary, val);
+    }
+    ic->ic_value.value = val;
     ic->ic_vmstat = GET_VM_STATE_VERSION() - ruby_vm_const_missing_count;
     ruby_vm_const_missing_count = 0;
 
-#line 1749 "vm.inc"
+#line 1814 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_setinlinecache
 #undef INSN_IS_SC
@@ -1769,11 +1835,8 @@ INSN_ENTRY(opt_case_dispatch){
   USAGE_ANALYSIS_OPERAND(BIN(opt_case_dispatch), 0, hash);
   USAGE_ANALYSIS_OPERAND(BIN(opt_case_dispatch), 1, else_offset);
 {
-#line 1240 "insns.def"
-    if (0) {
-	/* TODO: if some === method is overrided */
-    }
-    else {
+#line 1263 "insns.def"
+    if (BASIC_OP_UNREDEFINED_P(BOP_EQQ)) {
 	VALUE val;
 	if (st_lookup(RHASH_TBL(hash), key, &val)) {
 	    JUMP(FIX2INT(val));
@@ -1782,8 +1845,22 @@ INSN_ENTRY(opt_case_dispatch){
 	    JUMP(else_offset);
 	}
     }
+    else {
+	struct opt_case_dispatch_i_arg arg;
+
+	arg.obj = key;
+	arg.label = -1;
+	st_foreach(RHASH_TBL(hash), opt_case_dispatch_i, (st_data_t)&arg);
+
+	if (arg.label != -1) {
+	    JUMP(arg.label);
+	}
+	else {
+	    JUMP(else_offset);
+	}
+    }
 
-#line 1787 "vm.inc"
+#line 1864 "vm.inc"
 #undef CURRENT_INSN_opt_case_dispatch
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -1802,7 +1879,7 @@ INSN_ENTRY(opt_checkenv){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_checkenv));
 {
-#line 1265 "insns.def"
+#line 1299 "insns.def"
     if (GET_CFP()->bp != GET_DFP() + 1) {
 	VALUE *new_dfp = GET_CFP()->bp - 1;
 	/* TODO: copy env and clean stack at creating env? */
@@ -1810,7 +1887,7 @@ INSN_ENTRY(opt_checkenv){
 	SET_DFP(new_dfp);
     }
 
-#line 1814 "vm.inc"
+#line 1891 "vm.inc"
 #undef CURRENT_INSN_opt_checkenv
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -1819,11 +1896,11 @@ INSN_ENTRY(opt_checkenv){
 INSN_ENTRY(opt_plus){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_plus");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_plus 1
@@ -1831,8 +1908,9 @@ INSN_ENTRY(opt_plus){
   #define INSN_LABEL(lab)  LABEL_opt_plus_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_plus));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_plus), 0, ic);
 {
-#line 1287 "insns.def"
+#line 1321 "insns.def"
     if (0) {
 
     }
@@ -1897,7 +1975,8 @@ INSN_ENTRY(opt_plus){
 	CALL_SIMPLE_METHOD(1, idPLUS, recv);
     }
 
-#line 1901 "vm.inc"
+#line 1979 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_plus
 #undef INSN_IS_SC
@@ -1907,11 +1986,11 @@ INSN_ENTRY(opt_plus){
 INSN_ENTRY(opt_minus){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_minus");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_minus 1
@@ -1919,8 +1998,9 @@ INSN_ENTRY(opt_minus){
   #define INSN_LABEL(lab)  LABEL_opt_minus_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_minus));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_minus), 0, ic);
 {
-#line 1363 "insns.def"
+#line 1397 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
 	BASIC_OP_UNREDEFINED_P(BOP_MINUS)) {
 	long a, b, c;
@@ -1936,14 +2016,30 @@ INSN_ENTRY(opt_minus){
 	    val = rb_big_minus(rb_int2big(a), rb_int2big(b));
 	}
     }
+    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+	if (0) {
+	}
+#if 1
+	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+		 HEAP_CLASS_OF(obj) == rb_cFloat  &&
+		 BASIC_OP_UNREDEFINED_P(BOP_MINUS)) {
+	    val = DBL2NUM(RFLOAT_VALUE(recv) - RFLOAT_VALUE(obj));
+	}
+#endif
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
     else {
 	/* other */
+      INSN_LABEL(normal_dispatch):
 	PUSH(recv);
 	PUSH(obj);
 	CALL_SIMPLE_METHOD(1, idMINUS, recv);
     }
 
-#line 1947 "vm.inc"
+#line 2042 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_minus
 #undef INSN_IS_SC
@@ -1953,11 +2049,11 @@ INSN_ENTRY(opt_minus){
 INSN_ENTRY(opt_mult){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_mult");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_mult 1
@@ -1965,17 +2061,19 @@ INSN_ENTRY(opt_mult){
   #define INSN_LABEL(lab)  LABEL_opt_mult_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_mult));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_mult), 0, ic);
 {
-#line 1397 "insns.def"
+#line 1446 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
 	BASIC_OP_UNREDEFINED_P(BOP_MULT)) {
-	long a, b, c;
+	long a, b;
 
 	a = FIX2LONG(recv);
 	if (a == 0) {
 	    val = recv;
 	}
 	else {
+	    volatile long c;
 	    b = FIX2LONG(obj);
 	    c = a * b;
 
@@ -2008,7 +2106,8 @@ INSN_ENTRY(opt_mult){
 	CALL_SIMPLE_METHOD(1, idMULT, recv);
     }
 
-#line 2012 "vm.inc"
+#line 2110 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_mult
 #undef INSN_IS_SC
@@ -2018,11 +2117,11 @@ INSN_ENTRY(opt_mult){
 INSN_ENTRY(opt_div){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_div");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_div 1
@@ -2030,8 +2129,9 @@ INSN_ENTRY(opt_div){
   #define INSN_LABEL(lab)  LABEL_opt_div_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_div));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_div), 0, ic);
 {
-#line 1450 "insns.def"
+#line 1500 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
 	BASIC_OP_UNREDEFINED_P(BOP_DIV)) {
 	long x, y, div;
@@ -2084,7 +2184,8 @@ INSN_ENTRY(opt_div){
 	CALL_SIMPLE_METHOD(1, idDIV, recv);
     }
 
-#line 2088 "vm.inc"
+#line 2188 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_div
 #undef INSN_IS_SC
@@ -2094,11 +2195,11 @@ INSN_ENTRY(opt_div){
 INSN_ENTRY(opt_mod){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_mod");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_mod 1
@@ -2106,8 +2207,9 @@ INSN_ENTRY(opt_mod){
   #define INSN_LABEL(lab)  LABEL_opt_mod_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_mod));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_mod), 0, ic);
 {
-#line 1514 "insns.def"
+#line 1564 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
 	BASIC_OP_UNREDEFINED_P(BOP_MOD)) {
 	long x, y, mod;
@@ -2175,7 +2277,8 @@ INSN_ENTRY(opt_mod){
 	CALL_SIMPLE_METHOD(1, idMOD, recv);
     }
 
-#line 2179 "vm.inc"
+#line 2281 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_mod
 #undef INSN_IS_SC
@@ -2199,7 +2302,7 @@ INSN_ENTRY(opt_eq){
   USAGE_ANALYSIS_INSN(BIN(opt_eq));
   USAGE_ANALYSIS_OPERAND(BIN(opt_eq), 0, ic);
 {
-#line 1593 "insns.def"
+#line 1643 "insns.def"
     val = opt_eq_func(recv, obj, ic);
 
     if (val == Qundef) {
@@ -2209,7 +2312,8 @@ INSN_ENTRY(opt_eq){
 	CALL_SIMPLE_METHOD(1, idEq, recv);
     }
 
-#line 2213 "vm.inc"
+#line 2316 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_eq
 #undef INSN_IS_SC
@@ -2219,8 +2323,8 @@ INSN_ENTRY(opt_eq){
 INSN_ENTRY(opt_neq){
 {
   VALUE val;
-  IC ic2 = (IC)GET_OPERAND(2);
-  IC ic1 = (IC)GET_OPERAND(1);
+  IC ic_eq = (IC)GET_OPERAND(2);
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_neq");
@@ -2232,16 +2336,16 @@ INSN_ENTRY(opt_neq){
   #define INSN_LABEL(lab)  LABEL_opt_neq_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_neq));
-  USAGE_ANALYSIS_OPERAND(BIN(opt_neq), 0, ic1);
-  USAGE_ANALYSIS_OPERAND(BIN(opt_neq), 1, ic2);
+  USAGE_ANALYSIS_OPERAND(BIN(opt_neq), 0, ic);
+  USAGE_ANALYSIS_OPERAND(BIN(opt_neq), 1, ic_eq);
 {
-#line 1614 "insns.def"
+#line 1664 "insns.def"
     extern VALUE rb_obj_not_equal(VALUE obj1, VALUE obj2);
-    NODE *mn = vm_method_search(idNeq, CLASS_OF(recv), ic1);
+    const rb_method_entry_t *me = vm_method_search(idNeq, CLASS_OF(recv), ic);
     val = Qundef;
 
-    if (check_cfunc(mn, rb_obj_not_equal)) {
-	val = opt_eq_func(recv, obj, ic2);
+    if (check_cfunc(me, rb_obj_not_equal)) {
+	val = opt_eq_func(recv, obj, ic_eq);
 
 	if (val != Qundef) {
 	    val = RTEST(val) ? Qfalse : Qtrue;
@@ -2255,7 +2359,8 @@ INSN_ENTRY(opt_neq){
 	CALL_SIMPLE_METHOD(1, idNeq, recv);
     }
 
-#line 2259 "vm.inc"
+#line 2363 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_neq
 #undef INSN_IS_SC
@@ -2265,11 +2370,11 @@ INSN_ENTRY(opt_neq){
 INSN_ENTRY(opt_lt){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_lt");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_lt 1
@@ -2277,8 +2382,9 @@ INSN_ENTRY(opt_lt){
   #define INSN_LABEL(lab)  LABEL_opt_lt_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_lt));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_lt), 0, ic);
 {
-#line 1645 "insns.def"
+#line 1695 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
 	BASIC_OP_UNREDEFINED_P(BOP_LT)) {
 	SIGNED_VALUE a = recv, b = obj;
@@ -2290,13 +2396,35 @@ INSN_ENTRY(opt_lt){
 	    val = Qfalse;
 	}
     }
+    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+	if (0) {
+	}
+#if 1
+	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+		 HEAP_CLASS_OF(obj) == rb_cFloat  &&
+		 BASIC_OP_UNREDEFINED_P(BOP_LT)) {
+	    double a = RFLOAT_VALUE(recv);
+	    double b = RFLOAT_VALUE(obj);
+#if defined(_MSC_VER) && _MSC_VER < 1300
+	    if (isnan(a) || isnan(b)) val = Qfalse;
+	    else
+#endif
+	    val = a < b ? Qtrue : Qfalse;
+	}
+#endif
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
     else {
+      INSN_LABEL(normal_dispatch):
 	PUSH(recv);
 	PUSH(obj);
 	CALL_SIMPLE_METHOD(1, idLT, recv);
     }
 
-#line 2300 "vm.inc"
+#line 2427 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_lt
 #undef INSN_IS_SC
@@ -2306,11 +2434,11 @@ INSN_ENTRY(opt_lt){
 INSN_ENTRY(opt_le){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_le");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_le 1
@@ -2318,8 +2446,9 @@ INSN_ENTRY(opt_le){
   #define INSN_LABEL(lab)  LABEL_opt_le_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_le));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_le), 0, ic);
 {
-#line 1674 "insns.def"
+#line 1745 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
 	BASIC_OP_UNREDEFINED_P(BOP_LE)) {
 	SIGNED_VALUE a = recv, b = obj;
@@ -2338,7 +2467,8 @@ INSN_ENTRY(opt_le){
 	CALL_SIMPLE_METHOD(1, idLE, recv);
     }
 
-#line 2342 "vm.inc"
+#line 2471 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_le
 #undef INSN_IS_SC
@@ -2348,11 +2478,11 @@ INSN_ENTRY(opt_le){
 INSN_ENTRY(opt_gt){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_gt");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_gt 1
@@ -2360,8 +2490,9 @@ INSN_ENTRY(opt_gt){
   #define INSN_LABEL(lab)  LABEL_opt_gt_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_gt));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_gt), 0, ic);
 {
-#line 1704 "insns.def"
+#line 1775 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
 	BASIC_OP_UNREDEFINED_P(BOP_GT)) {
 	SIGNED_VALUE a = recv, b = obj;
@@ -2373,13 +2504,35 @@ INSN_ENTRY(opt_gt){
 	    val = Qfalse;
 	}
     }
+    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
+	if (0) {
+	}
+#if 1
+	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
+		 HEAP_CLASS_OF(obj) == rb_cFloat  &&
+		 BASIC_OP_UNREDEFINED_P(BOP_GT)) {
+	    double a = RFLOAT_VALUE(recv);
+	    double b = RFLOAT_VALUE(obj);
+#if defined(_MSC_VER) && _MSC_VER < 1300
+	    if (isnan(a) || isnan(b)) val = Qfalse;
+	    else
+#endif
+	    val = a > b ? Qtrue : Qfalse;
+	}
+#endif
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
     else {
+      INSN_LABEL(normal_dispatch):
 	PUSH(recv);
 	PUSH(obj);
 	CALL_SIMPLE_METHOD(1, idGT, recv);
     }
 
-#line 2383 "vm.inc"
+#line 2535 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_gt
 #undef INSN_IS_SC
@@ -2389,11 +2542,11 @@ INSN_ENTRY(opt_gt){
 INSN_ENTRY(opt_ge){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_ge");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_ge 1
@@ -2401,8 +2554,9 @@ INSN_ENTRY(opt_ge){
   #define INSN_LABEL(lab)  LABEL_opt_ge_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_ge));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_ge), 0, ic);
 {
-#line 1733 "insns.def"
+#line 1825 "insns.def"
     if (FIXNUM_2_P(recv, obj) &&
 	BASIC_OP_UNREDEFINED_P(BOP_GE)) {
 	SIGNED_VALUE a = recv, b = obj;
@@ -2420,7 +2574,8 @@ INSN_ENTRY(opt_ge){
 	CALL_SIMPLE_METHOD(1, idGE, recv);
     }
 
-#line 2424 "vm.inc"
+#line 2578 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_ge
 #undef INSN_IS_SC
@@ -2430,11 +2585,11 @@ INSN_ENTRY(opt_ge){
 INSN_ENTRY(opt_ltlt){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_ltlt");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_ltlt 1
@@ -2442,8 +2597,9 @@ INSN_ENTRY(opt_ltlt){
   #define INSN_LABEL(lab)  LABEL_opt_ltlt_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_ltlt));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_ltlt), 0, ic);
 {
-#line 1762 "insns.def"
+#line 1854 "insns.def"
     if (!SPECIAL_CONST_P(recv)) {
 	if (0) {
 	}
@@ -2466,7 +2622,8 @@ INSN_ENTRY(opt_ltlt){
 	CALL_SIMPLE_METHOD(1, idLTLT, recv);
     }
 
-#line 2470 "vm.inc"
+#line 2626 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_ltlt
 #undef INSN_IS_SC
@@ -2476,11 +2633,11 @@ INSN_ENTRY(opt_ltlt){
 INSN_ENTRY(opt_aref){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(1);
   VALUE obj = TOPN(0);
   DEBUG_ENTER_INSN("opt_aref");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(2);
   #define CURRENT_INSN_opt_aref 1
@@ -2488,8 +2645,9 @@ INSN_ENTRY(opt_aref){
   #define INSN_LABEL(lab)  LABEL_opt_aref_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_aref));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_aref), 0, ic);
 {
-#line 1796 "insns.def"
+#line 1888 "insns.def"
     if (!SPECIAL_CONST_P(recv) && BASIC_OP_UNREDEFINED_P(BOP_AREF)) {
 	if (HEAP_CLASS_OF(recv) == rb_cArray && FIXNUM_P(obj)) {
 	    val = rb_ary_entry(recv, FIX2LONG(obj));
@@ -2508,7 +2666,8 @@ INSN_ENTRY(opt_aref){
 	CALL_SIMPLE_METHOD(1, idAREF, recv);
     }
 
-#line 2512 "vm.inc"
+#line 2670 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_aref
 #undef INSN_IS_SC
@@ -2518,12 +2677,12 @@ INSN_ENTRY(opt_aref){
 INSN_ENTRY(opt_aset){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(2);
   VALUE obj = TOPN(1);
   VALUE set = TOPN(0);
   DEBUG_ENTER_INSN("opt_aset");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(3);
   #define CURRENT_INSN_opt_aset 1
@@ -2531,8 +2690,9 @@ INSN_ENTRY(opt_aset){
   #define INSN_LABEL(lab)  LABEL_opt_aset_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_aset));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_aset), 0, ic);
 {
-#line 1826 "insns.def"
+#line 1918 "insns.def"
     if (!SPECIAL_CONST_P(recv) &&
 	BASIC_OP_UNREDEFINED_P(BOP_ASET)) {
 	if (HEAP_CLASS_OF(recv) == rb_cArray && FIXNUM_P(obj)) {
@@ -2555,7 +2715,8 @@ INSN_ENTRY(opt_aset){
 	CALL_SIMPLE_METHOD(2, idASET, recv);
     }
 
-#line 2559 "vm.inc"
+#line 2719 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_aset
 #undef INSN_IS_SC
@@ -2565,10 +2726,10 @@ INSN_ENTRY(opt_aset){
 INSN_ENTRY(opt_length){
 {
   VALUE val;
-
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(0);
   DEBUG_ENTER_INSN("opt_length");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(1);
   #define CURRENT_INSN_opt_length 1
@@ -2576,10 +2737,11 @@ INSN_ENTRY(opt_length){
   #define INSN_LABEL(lab)  LABEL_opt_length_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_length));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_length), 0, ic);
 {
-#line 1860 "insns.def"
-    if (!SPECIAL_CONST_P(recv) &&
-	BASIC_OP_UNREDEFINED_P(BOP_LENGTH)) {
+#line 1952 "insns.def"
+    if (LIKELY(!SPECIAL_CONST_P(recv) &&
+	       BASIC_OP_UNREDEFINED_P(BOP_LENGTH))) {
 	if (HEAP_CLASS_OF(recv) == rb_cString) {
 	    val = rb_str_length(recv);
 	}
@@ -2599,20 +2761,67 @@ INSN_ENTRY(opt_length){
 	CALL_SIMPLE_METHOD(0, idLength, recv);
     }
 
-#line 2603 "vm.inc"
+#line 2765 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_length
 #undef INSN_IS_SC
 #undef INSN_LABEL
 #undef LABEL_IS_SC
   END_INSN(opt_length);}}}
-INSN_ENTRY(opt_succ){
+INSN_ENTRY(opt_size){
 {
   VALUE val;
+  IC ic = (IC)GET_OPERAND(1);
+  VALUE recv = TOPN(0);
+  DEBUG_ENTER_INSN("opt_size");
+  ADD_PC(1+1);
+  PREFETCH(GET_PC());
+  POPN(1);
+  #define CURRENT_INSN_opt_size 1
+  #define INSN_IS_SC()     0
+  #define INSN_LABEL(lab)  LABEL_opt_size_##lab
+  #define LABEL_IS_SC(lab) LABEL_##lab##_##t
+  USAGE_ANALYSIS_INSN(BIN(opt_size));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_size), 0, ic);
+{
+#line 1985 "insns.def"
+    if (LIKELY(BASIC_OP_UNREDEFINED_P(BOP_SIZE) &&
+	       !SPECIAL_CONST_P(recv))) {
+	if (HEAP_CLASS_OF(recv) == rb_cString) {
+	    val = rb_str_length(recv);
+	}
+	else if (HEAP_CLASS_OF(recv) == rb_cArray) {
+	    val = LONG2NUM(RARRAY_LEN(recv));
+	}
+	else if (HEAP_CLASS_OF(recv) == rb_cHash) {
+	    val = INT2FIX(RHASH_SIZE(recv));
+	}
+	else {
+	    goto INSN_LABEL(normal_dispatch);
+	}
+    }
+    else {
+      INSN_LABEL(normal_dispatch):
+	PUSH(recv);
+	CALL_SIMPLE_METHOD(0, idSize, recv);
+    }
 
+#line 2811 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
+  PUSH(val);
+#undef CURRENT_INSN_opt_size
+#undef INSN_IS_SC
+#undef INSN_LABEL
+#undef LABEL_IS_SC
+  END_INSN(opt_size);}}}
+INSN_ENTRY(opt_succ){
+{
+  VALUE val;
+  IC ic = (IC)GET_OPERAND(1);
   VALUE recv = TOPN(0);
   DEBUG_ENTER_INSN("opt_succ");
-  ADD_PC(1+0);
+  ADD_PC(1+1);
   PREFETCH(GET_PC());
   POPN(1);
   #define CURRENT_INSN_opt_succ 1
@@ -2620,8 +2829,9 @@ INSN_ENTRY(opt_succ){
   #define INSN_LABEL(lab)  LABEL_opt_succ_##lab
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_succ));
+  USAGE_ANALYSIS_OPERAND(BIN(opt_succ), 0, ic);
 {
-#line 1893 "insns.def"
+#line 2018 "insns.def"
     if (SPECIAL_CONST_P(recv)) {
 	if (FIXNUM_P(recv) &&
 	    BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
@@ -2657,7 +2867,8 @@ INSN_ENTRY(opt_succ){
 	CALL_SIMPLE_METHOD(0, idSucc, recv);
     }
 
-#line 2661 "vm.inc"
+#line 2871 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_succ
 #undef INSN_IS_SC
@@ -2680,11 +2891,11 @@ INSN_ENTRY(opt_not){
   USAGE_ANALYSIS_INSN(BIN(opt_not));
   USAGE_ANALYSIS_OPERAND(BIN(opt_not), 0, ic);
 {
-#line 1940 "insns.def"
+#line 2065 "insns.def"
     extern VALUE rb_obj_not(VALUE obj);
-    NODE *mn = vm_method_search(idNot, CLASS_OF(recv), ic);
+    const rb_method_entry_t *me = vm_method_search(idNot, CLASS_OF(recv), ic);
 
-    if (check_cfunc(mn, rb_obj_not)) {
+    if (check_cfunc(me, rb_obj_not)) {
 	val = RTEST(recv) ? Qfalse : Qtrue;
     }
     else {
@@ -2692,7 +2903,8 @@ INSN_ENTRY(opt_not){
 	CALL_SIMPLE_METHOD(0, idNot, recv);
     }
 
-#line 2696 "vm.inc"
+#line 2907 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_not
 #undef INSN_IS_SC
@@ -2715,10 +2927,11 @@ INSN_ENTRY(opt_regexpmatch1){
   USAGE_ANALYSIS_INSN(BIN(opt_regexpmatch1));
   USAGE_ANALYSIS_OPERAND(BIN(opt_regexpmatch1), 0, r);
 {
-#line 1964 "insns.def"
+#line 2089 "insns.def"
     val = rb_reg_match(r, obj);
 
-#line 2722 "vm.inc"
+#line 2934 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_regexpmatch1
 #undef INSN_IS_SC
@@ -2741,7 +2954,7 @@ INSN_ENTRY(opt_regexpmatch2){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(opt_regexpmatch2));
 {
-#line 1978 "insns.def"
+#line 2103 "insns.def"
     if (TYPE(obj2) == T_STRING) {
 	val = rb_reg_match(obj1, obj2);
     }
@@ -2749,7 +2962,8 @@ INSN_ENTRY(opt_regexpmatch2){
 	val = rb_funcall(obj2, idEqTilde, 1, obj1);
     }
 
-#line 2753 "vm.inc"
+#line 2966 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(val);
 #undef CURRENT_INSN_opt_regexpmatch2
 #undef INSN_IS_SC
@@ -2770,7 +2984,7 @@ INSN_ENTRY(opt_call_c_function){
   USAGE_ANALYSIS_INSN(BIN(opt_call_c_function));
   USAGE_ANALYSIS_OPERAND(BIN(opt_call_c_function), 0, funcptr);
 {
-#line 1997 "insns.def"
+#line 2122 "insns.def"
     reg_cfp = (funcptr)(th, reg_cfp);
 
     if (reg_cfp == 0) {
@@ -2782,7 +2996,7 @@ INSN_ENTRY(opt_call_c_function){
     RESTORE_REGS();
     NEXT_INSN();
 
-#line 2786 "vm.inc"
+#line 3000 "vm.inc"
 #undef CURRENT_INSN_opt_call_c_function
 #undef INSN_IS_SC
 #undef INSN_LABEL
@@ -2802,10 +3016,11 @@ INSN_ENTRY(bitblt){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(bitblt));
 {
-#line 2020 "insns.def"
+#line 2145 "insns.def"
     ret = rb_str_new2("a bit of bacon, lettuce and tomato");
 
-#line 2809 "vm.inc"
+#line 3023 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(ret);
 #undef CURRENT_INSN_bitblt
 #undef INSN_IS_SC
@@ -2826,10 +3041,11 @@ INSN_ENTRY(answer){
   #define LABEL_IS_SC(lab) LABEL_##lab##_##t
   USAGE_ANALYSIS_INSN(BIN(answer));
 {
-#line 2034 "insns.def"
+#line 2159 "insns.def"
     ret = INT2FIX(42);
 
-#line 2833 "vm.inc"
+#line 3048 "vm.inc"
+  CHECK_STACK_OVERFLOW(REG_CFP, 1);
   PUSH(ret);
 #undef CURRENT_INSN_answer
 #undef INSN_IS_SC