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

* common.mk (compile.$(OBJEXT)): dependencies lacking.

Browse Source 
* vm_method.c (rb_add_method_cfunc): invalid initializer for C89

	* compile.c (iseq_insns_unification): int might be smaller than int*


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-01-20 07:12:16 +00:00
parent 926fd9a939
commit 0d3de66006
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Wed Jan 20 16:09:59 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* common.mk (compile.$(OBJEXT)): dependencies lacking.
* vm_method.c (rb_add_method_cfunc): invalid initializer for C89
* compile.c (iseq_insns_unification): int might be smaller than int*
Tue Jan 19 20:00:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Jan 19 20:00:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/resolv.rb (Resolv::Config.default_config_hash): return an * lib/resolv.rb (Resolv::Config.default_config_hash): return an

3
common.mk
View File

@ -635,7 +635,8 @@ version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \ compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
$(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \ $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
{$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc {$(VPATH)}debug.h {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc {$(VPATH)}debug.h \
{$(VPATH)}optunifs.inc {$(VPATH)}opt_sc.inc
iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \ iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
$(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \ $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
{$(VPATH)}insns_info.inc {$(VPATH)}node_name.inc {$(VPATH)}debug.h {$(VPATH)}insns_info.inc {$(VPATH)}node_name.inc {$(VPATH)}debug.h

5
compile.c
View File

@ -1936,7 +1936,8 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
#if OPT_INSTRUCTIONS_UNIFICATION #if OPT_INSTRUCTIONS_UNIFICATION
LINK_ELEMENT *list; LINK_ELEMENT *list;
INSN *iobj, *niobj; INSN *iobj, *niobj;
int id, j, k; int id, k;
intptr_t j;
list = FIRST_ELEMENT(anchor); list = FIRST_ELEMENT(anchor);
while (list) { while (list) {
@ -1945,7 +1946,7 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
id = iobj->insn_id; id = iobj->insn_id;
if (unified_insns_data[id] != 0) { if (unified_insns_data[id] != 0) {
const int *const *entry = unified_insns_data[id]; const int *const *entry = unified_insns_data[id];
for (j = 1; j < (int)entry[0]; j++) { for (j = 1; j < (intptr_t)entry[0]; j++) {
const int *unified = entry[j]; const int *unified = entry[j];
LINK_ELEMENT *li = list->next; LINK_ELEMENT *li = list->next;
for (k = 2; k < unified[1]; k++) { for (k = 2; k < unified[1]; k++) {

6
vm_method.c
View File

@ -116,9 +116,9 @@ void
rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex) rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex)
{ {
if (func != rb_f_notimplement) { if (func != rb_f_notimplement) {
rb_method_cfunc_t opt = { rb_method_cfunc_t opt;
func, argc, opt.func = func;
}; opt.argc = argc;
rb_add_method(klass, mid, VM_METHOD_TYPE_CFUNC, &opt, noex); rb_add_method(klass, mid, VM_METHOD_TYPE_CFUNC, &opt, noex);
} }
else { else {