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

* insns.def (DEFINE_INSN): subtract of pointers is ptrdiff_t.

Browse Source 
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
This commit is contained in:
naruse 2008-06-01 03:23:50 +00:00
parent cf0109cff7
commit 9256f94d9a
5 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
Sun Jun 1 12:18:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
* 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 <akr@fsij.org> Sun Jun 1 10:32:18 2008 Tanaka Akira <akr@fsij.org>
* test/ruby/envutil.rb (assert_normal_exit): show coredump status. * test/ruby/envutil.rb (assert_normal_exit): show coredump status.

2
insns.def
View File

@ -1107,7 +1107,7 @@ leave
{ {
if (OPT_CHECKED_RUN) { if (OPT_CHECKED_RUN) {
if (reg_cfp->sp != reg_cfp->bp) { 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)); VM_SP_CNT(th, reg_cfp->sp), VM_SP_CNT(th, reg_cfp->bp));
} }
} }

6
transcode.c
View File

@ -326,7 +326,7 @@ str_transcode(int argc, VALUE *argv, VALUE *self)
my_transcoding.ruby_string_dest = dest; my_transcoding.ruby_string_dest = dest;
(*my_transcoder->preprocessor)(&fromp, &bp, (sp+slen), (bp+blen), &my_transcoding); (*my_transcoder->preprocessor)(&fromp, &bp, (sp+slen), (bp+blen), &my_transcoding);
if (fromp != sp+slen) { 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); buf = (unsigned char *)RSTRING_PTR(dest);
*bp = '\0'; *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); transcode_loop(&fromp, &bp, (sp+slen), (bp+blen), my_transcoder, &my_transcoding, options);
if (fromp != sp+slen) { 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); buf = (unsigned char *)RSTRING_PTR(dest);
*bp = '\0'; *bp = '\0';
@ -358,7 +358,7 @@ str_transcode(int argc, VALUE *argv, VALUE *self)
my_transcoding.ruby_string_dest = dest; my_transcoding.ruby_string_dest = dest;
(*my_transcoder->postprocessor)(&fromp, &bp, (sp+slen), (bp+blen), &my_transcoding); (*my_transcoder->postprocessor)(&fromp, &bp, (sp+slen), (bp+blen), &my_transcoding);
if (fromp != sp+slen) { 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); buf = (unsigned char *)RSTRING_PTR(dest);
*bp = '\0'; *bp = '\0';

8
version.h
View File

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.9.0" #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_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20080531 #define RUBY_RELEASE_CODE 20080601
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 31 #define RUBY_RELEASE_DAY 1
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];

22
vm_dump.c
View File

@ -21,8 +21,8 @@ static void
control_frame_dump(rb_thread_t *th, rb_control_frame_t *cfp) control_frame_dump(rb_thread_t *th, rb_control_frame_t *cfp)
{ {
int pc = -1, bp = -1, line = 0; int pc = -1, bp = -1, line = 0;
unsigned int lfp = cfp->lfp - th->stack; ptrdiff_t lfp = cfp->lfp - th->stack;
unsigned int dfp = cfp->dfp - th->stack; ptrdiff_t dfp = cfp->dfp - th->stack;
char lfp_in_heap = ' ', dfp_in_heap = ' '; char lfp_in_heap = ' ', dfp_in_heap = ' ';
char posbuf[MAX_POSBUF+1]; 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) { if (lfp < 0 || lfp > th->stack_size) {
lfp = (unsigned int)cfp->lfp; lfp = (ptrdiff_t)cfp->lfp;
lfp_in_heap = 'p'; lfp_in_heap = 'p';
} }
if (dfp < 0 || dfp > th->stack_size) { if (dfp < 0 || dfp > th->stack_size) {
dfp = (unsigned int)cfp->dfp; dfp = (ptrdiff_t)cfp->dfp;
dfp_in_heap = 'p'; dfp_in_heap = 'p';
} }
if (cfp->bp) { if (cfp->bp) {
@ -115,7 +115,7 @@ control_frame_dump(rb_thread_t *th, rb_control_frame_t *cfp)
line = -1; line = -1;
} }
fprintf(stderr, "c:%04d ", fprintf(stderr, "c:%04td ",
(rb_control_frame_t *)(th->stack + th->stack_size) - cfp); (rb_control_frame_t *)(th->stack + th->stack_size) - cfp);
if (pc == -1) { if (pc == -1) {
fprintf(stderr, "p:---- "); fprintf(stderr, "p:---- ");
@ -123,9 +123,9 @@ control_frame_dump(rb_thread_t *th, rb_control_frame_t *cfp)
else { else {
fprintf(stderr, "p:%04d ", pc); fprintf(stderr, "p:%04d ", pc);
} }
fprintf(stderr, "s:%04d b:%04d ", cfp->sp - th->stack, bp); fprintf(stderr, "s:%04td b:%04d ", cfp->sp - th->stack, bp);
fprintf(stderr, lfp_in_heap == ' ' ? "l:%06d " : "l:%06x ", lfp % 10000); fprintf(stderr, lfp_in_heap == ' ' ? "l:%06td " : "l:%06tx ", lfp % 10000);
fprintf(stderr, dfp_in_heap == ' ' ? "d:%06d " : "d:%06x ", dfp % 10000); fprintf(stderr, dfp_in_heap == ' ' ? "d:%06td " : "d:%06tx ", dfp % 10000);
fprintf(stderr, "%-6s ", magic); fprintf(stderr, "%-6s ", magic);
if (line) { if (line) {
fprintf(stderr, "%s", posbuf); fprintf(stderr, "%s", posbuf);
@ -308,7 +308,7 @@ stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp)
else { else {
rstr = rb_inspect(*ptr); 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); ptr - th->stack);
} }
} }
@ -345,7 +345,7 @@ debug_print_register(rb_thread_t *th)
dfp = -1; dfp = -1;
cfpi = ((rb_control_frame_t *)(th->stack + th->stack_size)) - cfp; 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); 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; VALUE *seq = iseq->iseq;
int pc = cfp->pc - iseq->iseq_encoded; 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); ruby_iseq_disasm_insn(0, seq, pc, iseq, 0);
} }