clean-ups to commit 4fde0e9901

This commit is contained in:
Matthew Flatt 2014-04-23 18:58:34 -06:00
parent fa23a373ac
commit 4d2b24b325
2 changed files with 4 additions and 5 deletions

View File

@ -3768,7 +3768,7 @@ void GC_dump_with_traces(int flags,
}
for (ty = 0; ty < MED_PAGE_TYPES; ty++) {
GCWARN((GCOUTF, "Generation 1 [medium%s]:", ty ? " atomic" : ""));
GCWARN((GCOUTF, "Generation 1 [medium%s]:", (ty == MED_PAGE_ATOMIC) ? " atomic" : ""));
for (i = 0; i < NUM_MED_PAGE_SIZES; i++) {
if (gc->med_pages[ty][i]) {
intptr_t count = 0, page_count = 0;
@ -3963,7 +3963,7 @@ static void mark_backpointers(NewGC *gc)
work->marked_on = 1;
pagemap_add(pagemap, work);
if (!ty) {
if (ty == MED_PAGE_NONATOMIC) {
while(start <= end) {
objhead *info = (objhead *)start;
if(!info->dead) {

View File

@ -142,9 +142,8 @@ typedef struct NewGC {
/* All non-gen0 pages are held in the following structure. */
struct mpage *gen1_pages[PAGE_TYPES];
/* 0 is non-atomic, 1 is atomic: */
struct mpage *med_pages[2][NUM_MED_PAGE_SIZES];
struct mpage *med_freelist_pages[2][NUM_MED_PAGE_SIZES];
struct mpage *med_pages[MED_PAGE_TYPES][NUM_MED_PAGE_SIZES];
struct mpage *med_freelist_pages[MED_PAGE_TYPES][NUM_MED_PAGE_SIZES];
MarkSegment *mark_stack;