From 9256f94d9a27c7a3adf9292b085141e32a4bc247 Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 1 Jun 2008 03:23:50 +0000 Subject: * insns.def (DEFINE_INSN): subtract of pointers is ptrdiff_t. this is not int on 64bit system. * vm_dump.c (control_frame_dump): ditto. * vm_dump.c (stack_dump_each): ditto. * vm_dump.c (debug_print_register): ditto. * vm_dump.c (debug_print_pre): ditto. * transcode.c (str_transcode): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 15 +++++++++++++++ insns.def | 2 +- transcode.c | 6 +++--- version.h | 8 ++++---- vm_dump.c | 22 +++++++++++----------- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53b1d81877..8297c9a16f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Sun Jun 1 12:18:12 2008 NARUSE, Yui + + * insns.def (DEFINE_INSN): subtract of pointers is ptrdiff_t. + this is not int on 64bit system. + + * vm_dump.c (control_frame_dump): ditto. + + * vm_dump.c (stack_dump_each): ditto. + + * vm_dump.c (debug_print_register): ditto. + + * vm_dump.c (debug_print_pre): ditto. + + * transcode.c (str_transcode): ditto. + Sun Jun 1 10:32:18 2008 Tanaka Akira * test/ruby/envutil.rb (assert_normal_exit): show coredump status. diff --git a/insns.def b/insns.def index 4e45d5e532..da1f19b939 100644 --- a/insns.def +++ b/insns.def @@ -1107,7 +1107,7 @@ leave { if (OPT_CHECKED_RUN) { if (reg_cfp->sp != reg_cfp->bp) { - rb_bug("Stack consistency error (sp: %d, bp: %d)", + rb_bug("Stack consistency error (sp: %td, bp: %td)", VM_SP_CNT(th, reg_cfp->sp), VM_SP_CNT(th, reg_cfp->bp)); } } diff --git a/transcode.c b/transcode.c index 729baffb9a..f58c683357 100644 --- a/transcode.c +++ b/transcode.c @@ -326,7 +326,7 @@ str_transcode(int argc, VALUE *argv, VALUE *self) my_transcoding.ruby_string_dest = dest; (*my_transcoder->preprocessor)(&fromp, &bp, (sp+slen), (bp+blen), &my_transcoding); if (fromp != sp+slen) { - rb_raise(rb_eArgError, "not fully converted, %d bytes left", sp+slen-fromp); + rb_raise(rb_eArgError, "not fully converted, %td bytes left", sp+slen-fromp); } buf = (unsigned char *)RSTRING_PTR(dest); *bp = '\0'; @@ -343,7 +343,7 @@ str_transcode(int argc, VALUE *argv, VALUE *self) transcode_loop(&fromp, &bp, (sp+slen), (bp+blen), my_transcoder, &my_transcoding, options); if (fromp != sp+slen) { - rb_raise(rb_eArgError, "not fully converted, %d bytes left", sp+slen-fromp); + rb_raise(rb_eArgError, "not fully converted, %td bytes left", sp+slen-fromp); } buf = (unsigned char *)RSTRING_PTR(dest); *bp = '\0'; @@ -358,7 +358,7 @@ str_transcode(int argc, VALUE *argv, VALUE *self) my_transcoding.ruby_string_dest = dest; (*my_transcoder->postprocessor)(&fromp, &bp, (sp+slen), (bp+blen), &my_transcoding); if (fromp != sp+slen) { - rb_raise(rb_eArgError, "not fully converted, %d bytes left", sp+slen-fromp); + rb_raise(rb_eArgError, "not fully converted, %td bytes left", sp+slen-fromp); } buf = (unsigned char *)RSTRING_PTR(dest); *bp = '\0'; diff --git a/version.h b/version.h index d408aa76ba..69a00ae27f 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-05-31" +#define RUBY_RELEASE_DATE "2008-06-01" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080531 +#define RUBY_RELEASE_CODE 20080601 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 -#define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_MONTH 6 +#define RUBY_RELEASE_DAY 1 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; diff --git a/vm_dump.c b/vm_dump.c index 23413cdcf5..c9e0657755 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -21,8 +21,8 @@ static void control_frame_dump(rb_thread_t *th, rb_control_frame_t *cfp) { int pc = -1, bp = -1, line = 0; - unsigned int lfp = cfp->lfp - th->stack; - unsigned int dfp = cfp->dfp - th->stack; + ptrdiff_t lfp = cfp->lfp - th->stack; + ptrdiff_t dfp = cfp->dfp - th->stack; char lfp_in_heap = ' ', dfp_in_heap = ' '; char posbuf[MAX_POSBUF+1]; @@ -34,11 +34,11 @@ control_frame_dump(rb_thread_t *th, rb_control_frame_t *cfp) } if (lfp < 0 || lfp > th->stack_size) { - lfp = (unsigned int)cfp->lfp; + lfp = (ptrdiff_t)cfp->lfp; lfp_in_heap = 'p'; } if (dfp < 0 || dfp > th->stack_size) { - dfp = (unsigned int)cfp->dfp; + dfp = (ptrdiff_t)cfp->dfp; dfp_in_heap = 'p'; } if (cfp->bp) { @@ -115,7 +115,7 @@ control_frame_dump(rb_thread_t *th, rb_control_frame_t *cfp) line = -1; } - fprintf(stderr, "c:%04d ", + fprintf(stderr, "c:%04td ", (rb_control_frame_t *)(th->stack + th->stack_size) - cfp); if (pc == -1) { fprintf(stderr, "p:---- "); @@ -123,9 +123,9 @@ control_frame_dump(rb_thread_t *th, rb_control_frame_t *cfp) else { fprintf(stderr, "p:%04d ", pc); } - fprintf(stderr, "s:%04d b:%04d ", cfp->sp - th->stack, bp); - fprintf(stderr, lfp_in_heap == ' ' ? "l:%06d " : "l:%06x ", lfp % 10000); - fprintf(stderr, dfp_in_heap == ' ' ? "d:%06d " : "d:%06x ", dfp % 10000); + fprintf(stderr, "s:%04td b:%04d ", cfp->sp - th->stack, bp); + fprintf(stderr, lfp_in_heap == ' ' ? "l:%06td " : "l:%06tx ", lfp % 10000); + fprintf(stderr, dfp_in_heap == ' ' ? "d:%06td " : "d:%06tx ", dfp % 10000); fprintf(stderr, "%-6s ", magic); if (line) { fprintf(stderr, "%s", posbuf); @@ -308,7 +308,7 @@ stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp) else { rstr = rb_inspect(*ptr); } - fprintf(stderr, " stack %2d: %8s (%d)\n", i, StringValueCStr(rstr), + fprintf(stderr, " stack %2d: %8s (%td)\n", i, StringValueCStr(rstr), ptr - th->stack); } } @@ -345,7 +345,7 @@ debug_print_register(rb_thread_t *th) dfp = -1; cfpi = ((rb_control_frame_t *)(th->stack + th->stack_size)) - cfp; - fprintf(stderr, " [PC] %04d, [SP] %04d, [LFP] %04d, [DFP] %04d, [CFP] %04d\n", + fprintf(stderr, " [PC] %04d, [SP] %04td, [LFP] %04d, [DFP] %04d, [CFP] %04d\n", pc, cfp->sp - th->stack, lfp, dfp, cfpi); } @@ -366,7 +366,7 @@ debug_print_pre(rb_thread_t *th, rb_control_frame_t *cfp) VALUE *seq = iseq->iseq; int pc = cfp->pc - iseq->iseq_encoded; - printf("%3d ", VM_CFP_CNT(th, cfp)); + printf("%3td ", VM_CFP_CNT(th, cfp)); ruby_iseq_disasm_insn(0, seq, pc, iseq, 0); } -- cgit v1.2.3