clean up to avoid some more compiler warnings

svn: r12632
This commit is contained in:
Matthew Flatt 2008-11-28 15:00:20 +00:00
parent 9da2a8f395
commit 4bfb12ff3c

View File

@ -1245,7 +1245,7 @@ typedef struct MarkSegment {
struct MarkSegment *next; struct MarkSegment *next;
void **top; void **top;
void **end; void **end;
void **stop_here; /* this is only used for its address */ void *stop_here; /* this is only used for its address */
} MarkSegment; } MarkSegment;
static THREAD_LOCAL MarkSegment *mark_stack = NULL; static THREAD_LOCAL MarkSegment *mark_stack = NULL;
@ -1253,7 +1253,7 @@ static THREAD_LOCAL MarkSegment *mark_stack = NULL;
inline static MarkSegment* mark_stack_create_frame() { inline static MarkSegment* mark_stack_create_frame() {
MarkSegment *mark_frame = (MarkSegment*)ofm_malloc(STACK_PART_SIZE); MarkSegment *mark_frame = (MarkSegment*)ofm_malloc(STACK_PART_SIZE);
mark_frame->next = NULL; mark_frame->next = NULL;
mark_frame->top = PPTR(&(mark_frame->stop_here)); mark_frame->top = &(mark_frame->stop_here);
mark_frame->end = PPTR(NUM(mark_frame) + STACK_PART_SIZE); mark_frame->end = PPTR(NUM(mark_frame) + STACK_PART_SIZE);
return mark_frame; return mark_frame;
} }
@ -1272,7 +1272,7 @@ inline static void push_ptr(void *ptr)
if(mark_stack->next) { if(mark_stack->next) {
/* we do, so just use it */ /* we do, so just use it */
mark_stack = mark_stack->next; mark_stack = mark_stack->next;
mark_stack->top = PPTR(&(mark_stack->stop_here)); mark_stack->top = &(mark_stack->stop_here);
} else { } else {
/* we don't, so we need to allocate one */ /* we don't, so we need to allocate one */
mark_stack->next = mark_stack_create_frame(); mark_stack->next = mark_stack_create_frame();
@ -1287,7 +1287,7 @@ inline static void push_ptr(void *ptr)
inline static int pop_ptr(void **ptr) inline static int pop_ptr(void **ptr)
{ {
if(mark_stack->top == PPTR(&mark_stack->stop_here)) { if(mark_stack->top == &mark_stack->stop_here) {
if(mark_stack->prev) { if(mark_stack->prev) {
/* if there is a previous page, go to it */ /* if there is a previous page, go to it */
mark_stack = mark_stack->prev; mark_stack = mark_stack->prev;