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

* gc.c (mark_current_machine_context): suppress warnings.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-10-12 14:03:24 +00:00
parent f5bcc56bcd
commit 0172f3181f
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,6 @@
Tue Oct 12 22:41:07 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Oct 12 23:03:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (mark_current_machine_context): suppress warnings.
* compile.c (iseq_compile_each): fix truncating cast. * compile.c (iseq_compile_each): fix truncating cast.

13
gc.c
View File

@ -2272,22 +2272,25 @@ void rb_vm_mark(void *ptr);
(start = STACK_END, end = STACK_START) : (start = STACK_START, end = STACK_END+appendix)) (start = STACK_END, end = STACK_START) : (start = STACK_START, end = STACK_END+appendix))
#endif #endif
#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
static void static void
mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th) mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
{ {
rb_jmp_buf save_regs_gc_mark; union {
rb_jmp_buf j;
VALUE v[sizeof(rb_jmp_buf) / sizeof(VALUE)];
} save_regs_gc_mark;
VALUE *stack_start, *stack_end; VALUE *stack_start, *stack_end;
FLUSH_REGISTER_WINDOWS; FLUSH_REGISTER_WINDOWS;
/* This assumes that all registers are saved into the jmp_buf (and stack) */ /* This assumes that all registers are saved into the jmp_buf (and stack) */
rb_setjmp(save_regs_gc_mark); rb_setjmp(save_regs_gc_mark.j);
SET_STACK_END; SET_STACK_END;
GET_STACK_BOUNDS(stack_start, stack_end, 1); GET_STACK_BOUNDS(stack_start, stack_end, 1);
mark_locations_array(objspace, mark_locations_array(objspace, save_regs_gc_mark.v, numberof(save_regs_gc_mark.v));
(VALUE*)save_regs_gc_mark,
sizeof(save_regs_gc_mark) / sizeof(VALUE));
rb_gc_mark_locations(stack_start, stack_end); rb_gc_mark_locations(stack_start, stack_end);
#ifdef __ia64 #ifdef __ia64