* compile.c (iseq_set_sequence, iseq_insns_unification,

  insn_data_to_s_detail): constified.

* iseq.c (insn_operand_intern, ruby_iseq_disasm_insn): ditto.

* template/{insns_info,opt_sc,optunifs}.inc.tmpl: ditto.

* tool/instruction.rb (OptUnifsIncGenerator): ditto.


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

3 files changed, 12 insertions, 12 deletions

diff --git a/template/insns_info.inc.tmpl b/template/insns_info.inc.tmpl
index d7e745bca7..a58ac3ca64 100644
--- a/template/insns_info.inc.tmpl
+++ b/template/insns_info.inc.tmpl
@@ -11,20 +11,20 @@
 
 <%= insn_type_chars %>
 
-static char *insn_name_info[] = {
+static const char *const insn_name_info[] = {
 <%= insn_names %>
 };
 
-static char *insn_operand_info[] = {
+static const char *const insn_operand_info[] = {
 <%= operands_info %>
 };
 
-static int insn_len_info[] = {
+static const int insn_len_info[] = {
 <%= operands_num_info %>
 };
 
 #ifdef USE_INSN_RET_NUM
-static int insn_stack_push_num_info[] = {
+static const int insn_stack_push_num_info[] = {
 <%= stack_num_info %>
 };
 #endif
@@ -50,13 +50,13 @@ insn_len(int insn)
   return insn_len_info[insn];
 }
 
-static char *
+static const char *
 insn_name(int insn)
 {
   return insn_name_info[insn];
 }
 
-static char *
+static const char *
 insn_op_types(int insn)
 {
   return insn_operand_info[insn];
diff --git a/template/opt_sc.inc.tmpl b/template/opt_sc.inc.tmpl
index fc1c2f7184..f5ad339663 100644
--- a/template/opt_sc.inc.tmpl
+++ b/template/opt_sc.inc.tmpl
@@ -22,11 +22,11 @@
 
 #define SC_ERROR 0xffffffff
 
-static VALUE sc_insn_info[][SC_STATE_SIZE] = {
+static const VALUE sc_insn_info[][SC_STATE_SIZE] = {
 <%= sc_insn_info %>
 };
 
-static VALUE sc_insn_next[] = {
+static const VALUE sc_insn_next[] = {
 <%= sc_insn_next %>
 };
 
diff --git a/template/optunifs.inc.tmpl b/template/optunifs.inc.tmpl
index 8a3ae3e897..9b268f06fb 100644
--- a/template/optunifs.inc.tmpl
+++ b/template/optunifs.inc.tmpl
@@ -13,16 +13,16 @@
  */
 
 /*
-  static int UNIFIED_insn_name_1[] = {id, size, ...};
-  static int UNIFIED_insn_name_2[] = {id, size, ...};
+  static const int UNIFIED_insn_name_1[] = {id, size, ...};
+  static const int UNIFIED_insn_name_2[] = {id, size, ...};
   ...
 
-  static *int UNIFIED_insn_name[] = {size,
+  static const int *const UNIFIED_insn_name[] = {size,
     UNIFIED_insn_name_1,
     UNIFIED_insn_name_2, ...};
   ...
   
-  static **int unified_insns_data[] = {
+  static const int *const *const unified_insns_data[] = {
     UNIFIED_insn_nameA,
     UNIFIED_insn_nameB, ...};
  */