merge revisions 61753:61750 61747:61740 61737:61728

Revert all the VM generator rewrites; requested by naruse


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 3 deletions

diff --git a/compile.c b/compile.c
index 87a1bd8f6a..1e1d85ab3e 100644
--- a/compile.c
+++ b/compile.c
@@ -15,6 +15,7 @@
 #include "encindex.h"
 #include <math.h>
 
+#define USE_INSN_STACK_INCREASE 1
 #include "vm_core.h"
 #include "vm_debug.h"
 #include "iseq.h"
@@ -7372,16 +7373,16 @@ dump_disasm_list_with_cursor(const LINK_ELEMENT *link, const LINK_ELEMENT *curr,
 const char *
 rb_insns_name(int i)
 {
-    return insn_name(i);
+    return insn_name_info[i];
 }
 
 VALUE
 rb_insns_name_array(void)
 {
-    VALUE ary = rb_ary_new_capa(VM_INSTRUCTION_SIZE);
+    VALUE ary = rb_ary_new();
     int i;
     for (i = 0; i < VM_INSTRUCTION_SIZE; i++) {
-	rb_ary_push(ary, rb_fstring_cstr(insn_name(i)));
+	rb_ary_push(ary, rb_fstring_cstr(insn_name_info[i]));
     }
     return rb_obj_freeze(ary);
 }