steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compiler warnings in tools.deploy.shaker

db4
Slava Pestov 2009-04-17 20:38:55 -05:00
parent a6ea915e09
commit f4cdcaa1ce
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/tools/deploy/shaker/shaker.factor
View File

@ -357,7 +357,7 @@ IN: tools.deploy.shaker
V{ } set-namestack V{ } set-namestack
V{ } set-catchstack V{ } set-catchstack
"Saving final image" show "Saving final image" show
[ save-image-and-exit ] call-clear ; save-image-and-exit ;
SYMBOL: deploy-vocab SYMBOL: deploy-vocab
@ -421,10 +421,10 @@ SYMBOL: deploy-vocab
: deploy-error-handler ( quot -- ) : deploy-error-handler ( quot -- )
[ [
strip-debugger? strip-debugger?
[ error-continuation get call>> callstack>array die ] [ error-continuation get call>> callstack>array die 1 exit ]
! Don't reference these words literally, if we're stripping the ! Don't reference these words literally, if we're stripping the
! debugger out we don't want to load the prettyprinter at all ! debugger out we don't want to load the prettyprinter at all
[ [:c] execute nl [print-error] execute flush ] if [ [:c] execute( -- ) nl [print-error] execute( error -- ) flush ] if
1 exit 1 exit
] recover ; inline ] recover ; inline

3
vm/data_gc.c
View File

@ -160,7 +160,8 @@ void copy_roots(void)
copy_handle(&stacks->catchstack_save); copy_handle(&stacks->catchstack_save);
copy_handle(&stacks->current_callback_save); copy_handle(&stacks->current_callback_save);
mark_active_blocks(stacks); if(!performing_compaction)
mark_active_blocks(stacks);
stacks = stacks->next; stacks = stacks->next;
} }

1
vm/data_gc.h
View File

@ -5,6 +5,7 @@ DLLEXPORT void minor_gc(void);
F_ZONE *newspace; F_ZONE *newspace;
bool performing_gc; bool performing_gc;
bool performing_compaction;
CELL collecting_gen; CELL collecting_gen;
/* if true, we collecting AGING space for the second time, so if it is still /* if true, we collecting AGING space for the second time, so if it is still

2
vm/image.c
View File

@ -187,7 +187,9 @@ void primitive_save_image_and_exit(void)
userenv[i] = F; userenv[i] = F;
/* do a full GC + code heap compaction */ /* do a full GC + code heap compaction */
performing_compaction = true;
compact_code_heap(); compact_code_heap();
performing_compaction = false;
UNREGISTER_C_STRING(path); UNREGISTER_C_STRING(path);