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

* compile.c (iseq_build_body), insns.def (getglobal, setglobal),

Browse Source 
iseq.c (iseq_load, iseq_data_to_ary), util.c (valid_filename):
  use VALUE.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-10-12 14:35:40 +00:00
parent 3c24bea4b5
commit 17c48bebf8
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,4 +1,8 @@
Tue Oct 12 23:09:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Oct 12 23:35:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (iseq_build_body), insns.def (getglobal, setglobal),
iseq.c (iseq_load, iseq_data_to_ary), util.c (valid_filename):
use VALUE.
* gc.c (obj_free, rb_objspace_call_finalizer): fix truncating * gc.c (obj_free, rb_objspace_call_finalizer): fix truncating
cast. cast.

6
compile.c
View File

@ -5268,7 +5268,7 @@ iseq_build_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
"unknown instruction: %s", RSTRING_PTR(insn)); "unknown instruction: %s", RSTRING_PTR(insn));
} }
if (argc != insn_len(insn_id)-1) { if (argc != insn_len((VALUE)insn_id)-1) {
rb_compile_error(RSTRING_PTR(iseq->filename), line_no, rb_compile_error(RSTRING_PTR(iseq->filename), line_no,
"operand size mismatch"); "operand size mismatch");
} }
@ -5277,7 +5277,7 @@ iseq_build_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
argv = compile_data_alloc(iseq, sizeof(VALUE) * argc); argv = compile_data_alloc(iseq, sizeof(VALUE) * argc);
for (j=0; j<argc; j++) { for (j=0; j<argc; j++) {
VALUE op = rb_ary_entry(obj, j+1); VALUE op = rb_ary_entry(obj, j+1);
switch (insn_op_type(insn_id, j)) { switch (insn_op_type((VALUE)insn_id, j)) {
case TS_OFFSET: { case TS_OFFSET: {
LABEL *label = register_label(iseq, labels_table, op); LABEL *label = register_label(iseq, labels_table, op);
argv[j] = (VALUE)label; argv[j] = (VALUE)label;
@ -5341,7 +5341,7 @@ iseq_build_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
} }
break; break;
default: default:
rb_raise(rb_eSyntaxError, "unknown operand: %c", insn_op_type(insn_id, j)); rb_raise(rb_eSyntaxError, "unknown operand: %c", insn_op_type((VALUE)insn_id, j));
} }
} }
} }

4
insns.def
View File

@ -258,7 +258,7 @@ getglobal
() ()
(VALUE val) (VALUE val)
{ {
val = GET_GLOBAL(entry); val = GET_GLOBAL((VALUE)entry);
} }
/** /**
@ -272,7 +272,7 @@ setglobal
(VALUE val) (VALUE val)
() ()
{ {
SET_GLOBAL(entry, val); SET_GLOBAL((VALUE)entry, val);
} }

4
iseq.c
View File

@ -512,7 +512,7 @@ iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
make_compile_option(&option, opt); make_compile_option(&option, opt);
prepare_iseq_build(iseq, name, filename, filepath, line_no, prepare_iseq_build(iseq, name, filename, filepath, line_no,
parent, iseq_type, 0, &option); parent, (VALUE)iseq_type, 0, &option);
rb_iseq_build_from_ary(iseq, locals, args, exception, body); rb_iseq_build_from_ary(iseq, locals, args, exception, body);
@ -1307,7 +1307,7 @@ iseq_data_to_ary(rb_iseq_t *iseq)
VALUE label; VALUE label;
if (st_lookup(labels_table, pos, &label)) { if (st_lookup(labels_table, pos, &label)) {
rb_ary_push(body, label); rb_ary_push(body, (VALUE)label);
} }
if (iseq->insn_info_table[i].line_no != line) { if (iseq->insn_info_table[i].line_no != line) {

2
util.c
View File

@ -373,7 +373,7 @@ valid_filename(const char *s)
#define D ((int*)d) #define D ((int*)d)
#define mmprepare(base, size) do {\ #define mmprepare(base, size) do {\
if (((long)base & (0x3)) == 0)\ if (((VALUE)base & (0x3)) == 0)\
if (size >= 16) mmkind = 1;\ if (size >= 16) mmkind = 1;\
else mmkind = 0;\ else mmkind = 0;\
else mmkind = -1;\ else mmkind = -1;\