X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgc-common.c;h=acbadae73dbfd6b7e72c91a66e2527fc04e7e43e;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=147b2f332f89b7f7c05a6f64af57a61b655bf013;hpb=2db3b6b4cb740d5b6512459c223859f747807b09;p=sbcl.git diff --git a/src/runtime/gc-common.c b/src/runtime/gc-common.c index 147b2f3..acbadae 100644 --- a/src/runtime/gc-common.c +++ b/src/runtime/gc-common.c @@ -99,6 +99,9 @@ lispobj (*transother[256])(lispobj object); int (*sizetab[256])(lispobj *where); struct weak_pointer *weak_pointers; +unsigned long bytes_consed_between_gcs = 12*1024*1024; + + /* * copying objects */ @@ -230,7 +233,6 @@ scav_fun_pointer(lispobj *where, lispobj object) switch (widetag_of(*first_pointer)) { case SIMPLE_FUN_HEADER_WIDETAG: - case CLOSURE_FUN_HEADER_WIDETAG: copy = trans_fun_header(object); break; default: @@ -766,7 +768,7 @@ static int #define NWORDS(x,y) (CEILING((x),(y)) / (y)) -scav_string(lispobj *where, lispobj object) +scav_base_string(lispobj *where, lispobj object) { struct vector *vector; int length, nwords; @@ -781,7 +783,7 @@ scav_string(lispobj *where, lispobj object) return nwords; } static lispobj -trans_string(lispobj object) +trans_base_string(lispobj object) { struct vector *vector; int length, nwords; @@ -800,7 +802,7 @@ trans_string(lispobj object) } static int -size_string(lispobj *where) +size_base_string(lispobj *where) { struct vector *vector; int length, nwords; @@ -1526,17 +1528,25 @@ gc_init_tables(void) scavtab[COMPLEX_LONG_FLOAT_WIDETAG] = scav_unboxed; #endif scavtab[SIMPLE_ARRAY_WIDETAG] = scav_boxed; - scavtab[SIMPLE_STRING_WIDETAG] = scav_string; + scavtab[SIMPLE_BASE_STRING_WIDETAG] = scav_base_string; scavtab[SIMPLE_BIT_VECTOR_WIDETAG] = scav_vector_bit; scavtab[SIMPLE_ARRAY_NIL_WIDETAG] = scav_vector_nil; scavtab[SIMPLE_ARRAY_UNSIGNED_BYTE_2_WIDETAG] = scav_vector_unsigned_byte_2; scavtab[SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG] = scav_vector_unsigned_byte_4; + scavtab[SIMPLE_ARRAY_UNSIGNED_BYTE_7_WIDETAG] = + scav_vector_unsigned_byte_8; scavtab[SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG] = scav_vector_unsigned_byte_8; + scavtab[SIMPLE_ARRAY_UNSIGNED_BYTE_15_WIDETAG] = + scav_vector_unsigned_byte_16; scavtab[SIMPLE_ARRAY_UNSIGNED_BYTE_16_WIDETAG] = scav_vector_unsigned_byte_16; + scavtab[SIMPLE_ARRAY_UNSIGNED_BYTE_29_WIDETAG] = + scav_vector_unsigned_byte_32; + scavtab[SIMPLE_ARRAY_UNSIGNED_BYTE_31_WIDETAG] = + scav_vector_unsigned_byte_32; scavtab[SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG] = scav_vector_unsigned_byte_32; #ifdef SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG @@ -1571,14 +1581,14 @@ gc_init_tables(void) scavtab[SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG] = scav_vector_complex_long_float; #endif - scavtab[COMPLEX_STRING_WIDETAG] = scav_boxed; + scavtab[COMPLEX_BASE_STRING_WIDETAG] = scav_boxed; + scavtab[COMPLEX_VECTOR_NIL_WIDETAG] = scav_boxed; scavtab[COMPLEX_BIT_VECTOR_WIDETAG] = scav_boxed; scavtab[COMPLEX_VECTOR_WIDETAG] = scav_boxed; scavtab[COMPLEX_ARRAY_WIDETAG] = scav_boxed; scavtab[CODE_HEADER_WIDETAG] = scav_code_header; #ifndef LISP_FEATURE_GENCGC /* FIXME ..._X86 ? */ scavtab[SIMPLE_FUN_HEADER_WIDETAG] = scav_fun_header; - scavtab[CLOSURE_FUN_HEADER_WIDETAG] = scav_fun_header; scavtab[RETURN_PC_HEADER_WIDETAG] = scav_return_pc_header; #endif #ifdef LISP_FEATURE_X86 @@ -1621,7 +1631,7 @@ gc_init_tables(void) transother[COMPLEX_LONG_FLOAT_WIDETAG] = trans_unboxed; #endif transother[SIMPLE_ARRAY_WIDETAG] = trans_boxed; /* but not GENCGC */ - transother[SIMPLE_STRING_WIDETAG] = trans_string; + transother[SIMPLE_BASE_STRING_WIDETAG] = trans_base_string; transother[SIMPLE_BIT_VECTOR_WIDETAG] = trans_vector_bit; transother[SIMPLE_VECTOR_WIDETAG] = trans_vector; transother[SIMPLE_ARRAY_NIL_WIDETAG] = trans_vector_nil; @@ -1629,10 +1639,18 @@ gc_init_tables(void) trans_vector_unsigned_byte_2; transother[SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG] = trans_vector_unsigned_byte_4; + transother[SIMPLE_ARRAY_UNSIGNED_BYTE_7_WIDETAG] = + trans_vector_unsigned_byte_8; transother[SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG] = trans_vector_unsigned_byte_8; + transother[SIMPLE_ARRAY_UNSIGNED_BYTE_15_WIDETAG] = + trans_vector_unsigned_byte_16; transother[SIMPLE_ARRAY_UNSIGNED_BYTE_16_WIDETAG] = trans_vector_unsigned_byte_16; + transother[SIMPLE_ARRAY_UNSIGNED_BYTE_29_WIDETAG] = + trans_vector_unsigned_byte_32; + transother[SIMPLE_ARRAY_UNSIGNED_BYTE_31_WIDETAG] = + trans_vector_unsigned_byte_32; transother[SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG] = trans_vector_unsigned_byte_32; #ifdef SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG @@ -1671,13 +1689,13 @@ gc_init_tables(void) transother[SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG] = trans_vector_complex_long_float; #endif - transother[COMPLEX_STRING_WIDETAG] = trans_boxed; + transother[COMPLEX_BASE_STRING_WIDETAG] = trans_boxed; transother[COMPLEX_BIT_VECTOR_WIDETAG] = trans_boxed; + transother[COMPLEX_VECTOR_NIL_WIDETAG] = trans_boxed; transother[COMPLEX_VECTOR_WIDETAG] = trans_boxed; transother[COMPLEX_ARRAY_WIDETAG] = trans_boxed; transother[CODE_HEADER_WIDETAG] = trans_code_header; transother[SIMPLE_FUN_HEADER_WIDETAG] = trans_fun_header; - transother[CLOSURE_FUN_HEADER_WIDETAG] = trans_fun_header; transother[RETURN_PC_HEADER_WIDETAG] = trans_return_pc_header; transother[CLOSURE_HEADER_WIDETAG] = trans_boxed; transother[FUNCALLABLE_INSTANCE_HEADER_WIDETAG] = trans_boxed; @@ -1721,7 +1739,7 @@ gc_init_tables(void) sizetab[COMPLEX_LONG_FLOAT_WIDETAG] = size_unboxed; #endif sizetab[SIMPLE_ARRAY_WIDETAG] = size_boxed; - sizetab[SIMPLE_STRING_WIDETAG] = size_string; + sizetab[SIMPLE_BASE_STRING_WIDETAG] = size_base_string; sizetab[SIMPLE_BIT_VECTOR_WIDETAG] = size_vector_bit; sizetab[SIMPLE_VECTOR_WIDETAG] = size_vector; sizetab[SIMPLE_ARRAY_NIL_WIDETAG] = size_vector_nil; @@ -1729,10 +1747,18 @@ gc_init_tables(void) size_vector_unsigned_byte_2; sizetab[SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG] = size_vector_unsigned_byte_4; + sizetab[SIMPLE_ARRAY_UNSIGNED_BYTE_7_WIDETAG] = + size_vector_unsigned_byte_8; sizetab[SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG] = size_vector_unsigned_byte_8; + sizetab[SIMPLE_ARRAY_UNSIGNED_BYTE_15_WIDETAG] = + size_vector_unsigned_byte_16; sizetab[SIMPLE_ARRAY_UNSIGNED_BYTE_16_WIDETAG] = size_vector_unsigned_byte_16; + sizetab[SIMPLE_ARRAY_UNSIGNED_BYTE_29_WIDETAG] = + size_vector_unsigned_byte_32; + sizetab[SIMPLE_ARRAY_UNSIGNED_BYTE_31_WIDETAG] = + size_vector_unsigned_byte_32; sizetab[SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG] = size_vector_unsigned_byte_32; #ifdef SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG @@ -1767,7 +1793,8 @@ gc_init_tables(void) sizetab[SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG] = size_vector_complex_long_float; #endif - sizetab[COMPLEX_STRING_WIDETAG] = size_boxed; + sizetab[COMPLEX_BASE_STRING_WIDETAG] = size_boxed; + sizetab[COMPLEX_VECTOR_NIL_WIDETAG] = size_boxed; sizetab[COMPLEX_BIT_VECTOR_WIDETAG] = size_boxed; sizetab[COMPLEX_VECTOR_WIDETAG] = size_boxed; sizetab[COMPLEX_ARRAY_WIDETAG] = size_boxed; @@ -1775,7 +1802,6 @@ gc_init_tables(void) #if 0 /* We shouldn't see these, so just lose if it happens. */ sizetab[SIMPLE_FUN_HEADER_WIDETAG] = size_function_header; - sizetab[CLOSURE_FUN_HEADER_WIDETAG] = size_function_header; sizetab[RETURN_PC_HEADER_WIDETAG] = size_return_pc_header; #endif sizetab[CLOSURE_HEADER_WIDETAG] = size_boxed;