suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix GC alignment bug

Browse Source 
Merge to v5.3.1
This commit is contained in:
Matthew Flatt 2012-10-24 06:45:11 -06:00
parent 661f702497
commit a2c4f6064d
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/racket/gc2/newgc.c
View File

@ -753,14 +753,17 @@ int GC_is_allocated(void *p)
# else # else
# define PREFIX_WSIZE 3 # define PREFIX_WSIZE 3
# endif # endif
# define CHECK_ALIGN_MASK 0xF
#elif defined(GC_ALIGN_EIGHT) #elif defined(GC_ALIGN_EIGHT)
# if defined(SIXTY_FOUR_BIT_INTEGERS) # if defined(SIXTY_FOUR_BIT_INTEGERS)
# define PREFIX_WSIZE 0 # define PREFIX_WSIZE 0
# else # else
# define PREFIX_WSIZE 1 # define PREFIX_WSIZE 1
# endif # endif
# define CHECK_ALIGN_MASK 0x7
#else /* GC_ALIGN_FOUR or byte aligned */ #else /* GC_ALIGN_FOUR or byte aligned */
# define PREFIX_WSIZE 0 # define PREFIX_WSIZE 0
# define CHECK_ALIGN_MASK 0x3
#endif #endif
#define PREFIX_SIZE (PREFIX_WSIZE * WORD_SIZE) #define PREFIX_SIZE (PREFIX_WSIZE * WORD_SIZE)
@ -773,7 +776,8 @@ int GC_is_allocated(void *p)
#define MAX_OBJECT_SIZE (APAGE_SIZE - ((PREFIX_WSIZE + 3) * WORD_SIZE)) #define MAX_OBJECT_SIZE (APAGE_SIZE - ((PREFIX_WSIZE + 3) * WORD_SIZE))
#define ASSERT_TAG(tag) GC_ASSERT((tag) >= 0 && (tag) <= NUMBER_OF_TAGS) #define ASSERT_TAG(tag) GC_ASSERT((tag) >= 0 && (tag) <= NUMBER_OF_TAGS)
#define ASSERT_VALID_OBJPTR(objptr) GC_ASSERT(!((intptr_t)(objptr) & (0x3))) #define ASSERT_VALID_OBJPTR(objptr) GC_ASSERT(!((intptr_t)(objptr) & CHECK_ALIGN_MASK))
#define ASSERT_VALID_INFOPTR(objptr) GC_ASSERT(!(((intptr_t)(objptr) + sizeof(objhead)) & CHECK_ALIGN_MASK))
/* Generation 0. Generation 0 is a set of very large pages in a list(gc->gen0.pages), /* Generation 0. Generation 0 is a set of very large pages in a list(gc->gen0.pages),
plus a set of smaller bigpages in a separate list(gc->gen0.big_pages). plus a set of smaller bigpages in a separate list(gc->gen0.big_pages).
@ -1233,8 +1237,8 @@ inline static void gen0_allocate_and_setup_new_page(NewGC *gc) {
if (!gc->gen0.pages) if (!gc->gen0.pages)
gc->gen0.pages = new_mpage; gc->gen0.pages = new_mpage;
GC_gen0_alloc_page_ptr = NUM(new_mpage->addr); GC_gen0_alloc_page_ptr = NUM(new_mpage->addr) + new_mpage->size;
ASSERT_VALID_OBJPTR(GC_gen0_alloc_page_ptr); ASSERT_VALID_INFOPTR(GC_gen0_alloc_page_ptr);
GC_gen0_alloc_page_end = NUM(new_mpage->addr) + GEN0_ALLOC_SIZE(new_mpage); GC_gen0_alloc_page_end = NUM(new_mpage->addr) + GEN0_ALLOC_SIZE(new_mpage);
} }
@ -1249,7 +1253,7 @@ inline static uintptr_t allocate_slowpath(NewGC *gc, size_t allocate_size, uintp
if(gc->gen0.curr_alloc_page && gc->gen0.curr_alloc_page->next) { if(gc->gen0.curr_alloc_page && gc->gen0.curr_alloc_page->next) {
gc->gen0.curr_alloc_page = gc->gen0.curr_alloc_page->next; gc->gen0.curr_alloc_page = gc->gen0.curr_alloc_page->next;
GC_gen0_alloc_page_ptr = NUM(gc->gen0.curr_alloc_page->addr) + gc->gen0.curr_alloc_page->size; GC_gen0_alloc_page_ptr = NUM(gc->gen0.curr_alloc_page->addr) + gc->gen0.curr_alloc_page->size;
ASSERT_VALID_OBJPTR(GC_gen0_alloc_page_ptr); ASSERT_VALID_INFOPTR(GC_gen0_alloc_page_ptr);
GC_gen0_alloc_page_end = NUM(gc->gen0.curr_alloc_page->addr) + GEN0_ALLOC_SIZE(gc->gen0.curr_alloc_page); GC_gen0_alloc_page_end = NUM(gc->gen0.curr_alloc_page->addr) + GEN0_ALLOC_SIZE(gc->gen0.curr_alloc_page);
} }
/* WARNING: tries to avoid a collection but /* WARNING: tries to avoid a collection but
@ -1269,7 +1273,7 @@ inline static uintptr_t allocate_slowpath(NewGC *gc, size_t allocate_size, uintp
#endif #endif
} }
newptr = GC_gen0_alloc_page_ptr + allocate_size; newptr = GC_gen0_alloc_page_ptr + allocate_size;
ASSERT_VALID_OBJPTR(newptr); ASSERT_VALID_INFOPTR(newptr);
} while (OVERFLOWS_GEN0(newptr)); } while (OVERFLOWS_GEN0(newptr));
@ -1288,7 +1292,6 @@ inline static void *allocate(const size_t request_size, const int type)
/* ensure that allocation will fit in a gen0 page */ /* ensure that allocation will fit in a gen0 page */
newptr = GC_gen0_alloc_page_ptr + allocate_size; newptr = GC_gen0_alloc_page_ptr + allocate_size;
ASSERT_VALID_OBJPTR(newptr);
/* SLOW PATH: allocate_size overflows current gen0 page */ /* SLOW PATH: allocate_size overflows current gen0 page */
if(OVERFLOWS_GEN0(newptr)) { if(OVERFLOWS_GEN0(newptr)) {
@ -1303,11 +1306,14 @@ inline static void *allocate(const size_t request_size, const int type)
newptr = allocate_slowpath(gc, allocate_size, newptr); newptr = allocate_slowpath(gc, allocate_size, newptr);
} }
ASSERT_VALID_INFOPTR(GC_gen0_alloc_page_ptr);
/* actual Allocation */ /* actual Allocation */
{ {
objhead *info = (objhead *)PTR(GC_gen0_alloc_page_ptr); objhead *info = (objhead *)PTR(GC_gen0_alloc_page_ptr);
GC_gen0_alloc_page_ptr = newptr; GC_gen0_alloc_page_ptr = newptr;
ASSERT_VALID_INFOPTR(GC_gen0_alloc_page_ptr);
if (type == PAGE_ATOMIC) if (type == PAGE_ATOMIC)
memset(info, 0, sizeof(objhead)); /* init objhead */ memset(info, 0, sizeof(objhead)); /* init objhead */
@ -1333,7 +1339,6 @@ inline static void *fast_malloc_one_small_tagged(size_t request_size, int dirty)
const size_t allocate_size = COMPUTE_ALLOC_SIZE_FOR_OBJECT_SIZE(request_size); const size_t allocate_size = COMPUTE_ALLOC_SIZE_FOR_OBJECT_SIZE(request_size);
newptr = GC_gen0_alloc_page_ptr + allocate_size; newptr = GC_gen0_alloc_page_ptr + allocate_size;
ASSERT_VALID_OBJPTR(newptr);
if(OVERFLOWS_GEN0(newptr)) { if(OVERFLOWS_GEN0(newptr)) {
return GC_malloc_one_tagged(request_size); return GC_malloc_one_tagged(request_size);
@ -1341,6 +1346,7 @@ inline static void *fast_malloc_one_small_tagged(size_t request_size, int dirty)
objhead *info = (objhead *)PTR(GC_gen0_alloc_page_ptr); objhead *info = (objhead *)PTR(GC_gen0_alloc_page_ptr);
GC_gen0_alloc_page_ptr = newptr; GC_gen0_alloc_page_ptr = newptr;
ASSERT_VALID_INFOPTR(GC_gen0_alloc_page_ptr);
if (dirty) if (dirty)
memset(info, 0, sizeof(objhead)); /* init objhead */ memset(info, 0, sizeof(objhead)); /* init objhead */
@ -1366,7 +1372,6 @@ void *GC_malloc_pair(void *car, void *cdr)
const size_t allocate_size = PAIR_SIZE_IN_BYTES; const size_t allocate_size = PAIR_SIZE_IN_BYTES;
newptr = GC_gen0_alloc_page_ptr + allocate_size; newptr = GC_gen0_alloc_page_ptr + allocate_size;
ASSERT_VALID_OBJPTR(newptr);
if(OVERFLOWS_GEN0(newptr)) { if(OVERFLOWS_GEN0(newptr)) {
NewGC *gc = GC_get_GC(); NewGC *gc = GC_get_GC();
@ -1384,6 +1389,7 @@ void *GC_malloc_pair(void *car, void *cdr)
else { else {
objhead *info = (objhead *) PTR(GC_gen0_alloc_page_ptr); objhead *info = (objhead *) PTR(GC_gen0_alloc_page_ptr);
GC_gen0_alloc_page_ptr = newptr; GC_gen0_alloc_page_ptr = newptr;
ASSERT_VALID_INFOPTR(GC_gen0_alloc_page_ptr);
memset(info, 0, sizeof(objhead)); /* init objhead */ memset(info, 0, sizeof(objhead)); /* init objhead */
@ -1391,9 +1397,10 @@ void *GC_malloc_pair(void *car, void *cdr)
info->size = BYTES_MULTIPLE_OF_WORD_TO_WORDS(allocate_size); /* ALIGN_BYTES_SIZE bumbed us up to the next word boundary */ info->size = BYTES_MULTIPLE_OF_WORD_TO_WORDS(allocate_size); /* ALIGN_BYTES_SIZE bumbed us up to the next word boundary */
pair = OBJHEAD_TO_OBJPTR(info); pair = OBJHEAD_TO_OBJPTR(info);
ASSERT_VALID_OBJPTR(pair);
} }
ASSERT_VALID_OBJPTR(pair);
/* initialize pair */ /* initialize pair */
{ {
Scheme_Simple_Object *obj = (Scheme_Simple_Object *) pair; Scheme_Simple_Object *obj = (Scheme_Simple_Object *) pair;
@ -1711,7 +1718,7 @@ inline static void resize_gen0(NewGC *gc, uintptr_t new_size)
/* we're going to allocate onto the first page now */ /* we're going to allocate onto the first page now */
gc->gen0.curr_alloc_page = gc->gen0.pages; gc->gen0.curr_alloc_page = gc->gen0.pages;
GC_gen0_alloc_page_ptr = NUM(gc->gen0.curr_alloc_page->addr) + gc->gen0.curr_alloc_page->size; GC_gen0_alloc_page_ptr = NUM(gc->gen0.curr_alloc_page->addr) + gc->gen0.curr_alloc_page->size;
ASSERT_VALID_OBJPTR(GC_gen0_alloc_page_ptr); ASSERT_VALID_INFOPTR(GC_gen0_alloc_page_ptr);
GC_gen0_alloc_page_end = NUM(gc->gen0.curr_alloc_page->addr) + GEN0_ALLOC_SIZE(gc->gen0.curr_alloc_page); GC_gen0_alloc_page_end = NUM(gc->gen0.curr_alloc_page->addr) + GEN0_ALLOC_SIZE(gc->gen0.curr_alloc_page);
/* set the two size variables */ /* set the two size variables */
@ -2602,7 +2609,7 @@ static void wait_if_master_in_progress(NewGC *gc, Log_Master_Info *lmi) {
/* MUST CALL WITH cangc lock */ /* MUST CALL WITH cangc lock */
static intptr_t NewGCMasterInfo_find_free_id() { static intptr_t NewGCMasterInfo_find_free_id() {
GC_ASSERT(MASTERGCINFO->live <= MASTERGCINFO->size); GC_ASSERT(MASTERGCINFO->alive <= MASTERGCINFO->size);
if ((MASTERGCINFO->alive + 1) == MASTERGCINFO->size) { if ((MASTERGCINFO->alive + 1) == MASTERGCINFO->size) {
MASTERGCINFO->size++; MASTERGCINFO->size++;
MASTERGCINFO->alive++; MASTERGCINFO->alive++;
@ -2621,6 +2628,7 @@ static intptr_t NewGCMasterInfo_find_free_id() {
} }
printf("Error in MASTERGCINFO table\n"); printf("Error in MASTERGCINFO table\n");
abort(); abort();
return 0;
} }
static void NewGCMasterInfo_register_gc(NewGC *newgc) { static void NewGCMasterInfo_register_gc(NewGC *newgc) {