1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* compile.c (make_masgn_lhs, iseq_compile_each): fixed indent.

Browse Source 
* compile.c (iseq_translate_threaded_code),
  vm_evalbody.ci (get_insns_address_table),
  template/vmtc.inc.tmpl (insns_address_table): constified.

* vm_evalbody.ci (vm_eval),
  template/insns_info.inc.tmpl (insn_stack_increase, insn_ret_num):
  suppress warnings.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-08-23 06:48:28 +00:00
parent fcab7ebb71
commit aa071a3b26
5 changed files with 73 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Thu Aug 23 15:48:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (make_masgn_lhs, iseq_compile_each): fixed indent.
* compile.c (iseq_translate_threaded_code),
vm_evalbody.ci (get_insns_address_table),
template/vmtc.inc.tmpl (insns_address_table): constified.
* vm_evalbody.ci (vm_eval),
template/insns_info.inc.tmpl (insn_stack_increase, insn_ret_num):
suppress warnings.
Thu Aug 23 13:19:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Aug 23 13:19:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (f_norm_arg): check also nested arguments. [ruby-dev:31502] * parse.y (f_norm_arg): check also nested arguments. [ruby-dev:31502]

7
compile.c
View File

@ -13,6 +13,7 @@
#include "ruby/ruby.h" #include "ruby/ruby.h"
#include "ruby/node.h" #include "ruby/node.h"
#define USE_INSN_STACK_INCREASE 1
#include "vm_core.h" #include "vm_core.h"
#include "compile.h" #include "compile.h"
#include "insns.inc" #include "insns.inc"
@ -226,10 +227,10 @@ iseq_translate_threaded_code(rb_iseq_t *iseq)
#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE #if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
#if OPT_DIRECT_THREADED_CODE #if OPT_DIRECT_THREADED_CODE
void **table = (void **)vm_eval(0); const void *const *table = (const void **)vm_eval(0);
#else #else
extern void **get_insns_address_table(); extern const void *const *get_insns_address_table();
void **table = get_insns_address_table(); const void *const *table = get_insns_address_table();
#endif #endif
int i; int i;

6
template/insns_info.inc.tmpl
View File

@ -23,10 +23,13 @@ static int insn_len_info[] = {
<%= operands_num_info %> <%= operands_num_info %>
}; };
#ifdef USE_INSN_RET_NUM
static int insn_stack_push_num_info[] = { static int insn_stack_push_num_info[] = {
<%= stack_num_info %> <%= stack_num_info %>
}; };
#endif
#ifdef USE_INSN_STACK_INCREASE
static int static int
insn_stack_increase(int depth, int insn, VALUE *opes) insn_stack_increase(int depth, int insn, VALUE *opes)
{ {
@ -37,6 +40,7 @@ insn_stack_increase(int depth, int insn, VALUE *opes)
} }
return 0; return 0;
} }
#endif
/* some utilities */ /* some utilities */
@ -70,8 +74,10 @@ insn_op_type(int insn, int pos)
} }
} }
#ifdef USE_INSN_RET_NUM
static int static int
insn_ret_num(int insn) insn_ret_num(int insn)
{ {
return insn_stack_push_num_info[insn]; return insn_stack_push_num_info[insn];
} }
#endif

2
template/vmtc.inc.tmpl
View File

@ -12,7 +12,7 @@
or insns2vm.rb or insns2vm.rb
*/ */
static const void *insns_address_table[] = { static const void *const insns_address_table[] = {
<%= insns_table %> <%= insns_table %>
}; };

6
vm_evalbody.ci
View File

@ -102,7 +102,7 @@ vm_eval(rb_thread_t *th, VALUE initial)
/* unreachable */ /* unreachable */
rb_bug("vm_eval: unreachable"); rb_bug("vm_eval: unreachable");
return Qundef; goto first;
} }
#else #else
@ -110,10 +110,10 @@ vm_eval(rb_thread_t *th, VALUE initial)
#include "vm.inc" #include "vm.inc"
#include "vmtc.inc" #include "vmtc.inc"
void ** const void *const *
get_insns_address_table() get_insns_address_table()
{ {
return (void **)insns_address_table; return insns_address_table;
} }
VALUE VALUE