From 8a233a2b0b5cf6cdbb79c87cb47da67ee09e853c Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 9 Jan 2018 13:30:35 +0000
Subject: insns_info.inc.tmpl: share large tablese

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 tool/ruby_vm/views/_insn_len_info.erb     | 17 +++++++------
 tool/ruby_vm/views/_insn_name_info.erb    | 37 ++++++++++++++++------------
 tool/ruby_vm/views/_insn_operand_info.erb | 41 +++++++++++++++++--------------
 3 files changed, 54 insertions(+), 41 deletions(-)

(limited to 'tool')

diff --git a/tool/ruby_vm/views/_insn_len_info.erb b/tool/ruby_vm/views/_insn_len_info.erb
index 96b4629a2f..abbdb2e92c 100644
--- a/tool/ruby_vm/views/_insn_len_info.erb
+++ b/tool/ruby_vm/views/_insn_len_info.erb
@@ -6,15 +6,18 @@
 %# conditions mentioned  in the  file COPYING  are met.   Consult the  file for
 %# details.
 CONSTFUNC(MAYBE_UNUSED(static int insn_len(VALUE insn)));
+extern const char rb_vm_insn_len_info[];
+
+#ifdef RUBY_VM_INSNS_INFO
+const char rb_vm_insn_len_info[] = {
+% RubyVM::Instructions.each_slice 25 do |a|
+    <%= a.map(&:width).join(', ') -%>,
+% end
+};
+#endif
 
 int
 insn_len(VALUE i)
 {
-    static const char t[] = {
-% RubyVM::Instructions.each_slice 16 do |a|
-        <%= a.map(&:width).join(', ') -%>,
-% end
-    };
-
-    return t[i];
+    return rb_vm_insn_len_info[i];
 }
diff --git a/tool/ruby_vm/views/_insn_name_info.erb b/tool/ruby_vm/views/_insn_name_info.erb
index c8c305e556..79a48cd9cb 100644
--- a/tool/ruby_vm/views/_insn_name_info.erb
+++ b/tool/ruby_vm/views/_insn_name_info.erb
@@ -12,31 +12,36 @@
 % c.pop
 %
 CONSTFUNC(MAYBE_UNUSED(static const char *insn_name(VALUE insn)));
+extern const char *rb_vm_insn_name_info;
+extern const unsigned short rb_vm_insn_name_offset[];
 
-const char *
-insn_name(VALUE i)
-{
-    static const unsigned short o[] = {
+#ifdef RUBY_VM_INSNS_INFO
+const unsigned short rb_vm_insn_name_offset[] = {
 % c.each_slice 12 do |d|
-        <%= d.map {|i| sprintf("%4d", i) }.join(', ') %>,
+    <%= d.map {|i| sprintf("%4d", i) }.join(', ') %>,
 % end
-    };
+};
+ASSERT_VM_INSTRUCTION_SIZE(rb_vm_insn_name_offset);
 
-    PACKED_STRUCT(static const struct {
+PACKED_STRUCT(struct rb_vm_insn_name_info_tag {
 % b.each_slice 3 do |d|
-        <%= d.map {|i|
-            sprintf("const char L%03d[%2d]", i, a[i].length + 1)
-        }.join('; ') %>;
+    <%= d.map {|i|
+        sprintf("const char L%03d[%2d]", i, a[i].length + 1)
+    }.join('; ') %>;
 % end
+});
 
-    }) t = {
+static const struct rb_vm_insn_name_info_tag rb_vm_insn_name_base = {
 % a.each_slice 2 do |d|
-        <%= d.map {|i| sprintf("%-30s", cstr(i)) }.join(', ') %>,
+    <%= d.map {|i| sprintf("%-30s", cstr(i)) }.join(', ') %>,
 % end
-    };
+};
 
-    ASSERT_VM_INSTRUCTION_SIZE(o);
-    static const char *p = (const char *)&t;
+const char *rb_vm_insn_name_info = (const char *)&rb_vm_insn_name_base;
+#endif
 
-    return &p[o[i]];
+const char *
+insn_name(VALUE i)
+{
+    return &rb_vm_insn_name_info[rb_vm_insn_name_offset[i]];
 }
diff --git a/tool/ruby_vm/views/_insn_operand_info.erb b/tool/ruby_vm/views/_insn_operand_info.erb
index 688c466eda..f6b6565d59 100644
--- a/tool/ruby_vm/views/_insn_operand_info.erb
+++ b/tool/ruby_vm/views/_insn_operand_info.erb
@@ -11,35 +11,40 @@
 % c = a.inject([0]) {|r, i| r << (r[-1] + i.length + 1) }
 % c.pop
 %
-MAYBE_UNUSED(static const char *insn_op_types(VALUE insn));
-MAYBE_UNUSED(static int insn_op_type(VALUE insn, long pos));
+CONSTFUNC(MAYBE_UNUSED(static const char *insn_op_types(VALUE insn)));
+CONSTFUNC(MAYBE_UNUSED(static int insn_op_type(VALUE insn, long pos)));
+extern const char *rb_vm_insn_op_info;
+extern const unsigned short rb_vm_insn_op_offset[];
 
-const char *
-insn_op_types(VALUE i)
-{
-    static const unsigned short o[] = {
+#ifdef RUBY_VM_INSNS_INFO
+const unsigned short rb_vm_insn_op_offset[] = {
 % c.each_slice 14 do |d|
-        <%= d.map {|i| sprintf("%3d", i) }.join(', ') %>,
+    <%= d.map {|i| sprintf("%3d", i) }.join(', ') %>,
 % end
-    };
+};
+ASSERT_VM_INSTRUCTION_SIZE(rb_vm_insn_op_offset);
 
-    PACKED_STRUCT(static const struct {
+PACKED_STRUCT(struct rb_vm_insn_op_info_tag {
 % b.each_slice 3 do |d|
-        <%= d.map {|i|
-            sprintf("const char L%03d[%2d]", i, a[i].length + 1)
-        }.join('; ') %>;
+    <%= d.map {|i|
+        sprintf("const char L%03d[%2d]", i, a[i].length + 1)
+    }.join('; ') %>;
 % end
+});
 
-    }) t = {
+static const struct rb_vm_insn_op_info_tag rb_vm_insn_op_base = {
 % a.each_slice 8 do |d|
-        <%= d.map {|i| sprintf("%-6s", cstr(i)) }.join(', ') %>,
+    <%= d.map {|i| sprintf("%-6s", cstr(i)) }.join(', ') %>,
 % end
-    };
+};
 
-    ASSERT_VM_INSTRUCTION_SIZE(o);
-    static const char *p = (const char *)&t;
+const char *rb_vm_insn_op_info = (const char *)&rb_vm_insn_op_base;
+#endif
 
-    return &p[o[i]];
+const char *
+insn_op_types(VALUE i)
+{
+    return &rb_vm_insn_op_info[rb_vm_insn_op_offset[i]];
 }
 
 int
-- 
cgit v1.2.3