From: Gabor M. <me...@us...> - 2009-03-14 18:21:50
|
Update of /cvsroot/sbcl/sbcl/src/runtime In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2405/src/runtime Modified Files: alloc.c Log Message: 1.0.26.2: alloc_code_object facelift - use offsetof trace_table_offset instead of a hard coded constant - alloc (boxed + unboxed) bytes not words - check the gc is inhibited because the half initilialized code object could trip gc Index: alloc.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/alloc.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- alloc.c 16 Feb 2009 21:54:06 -0000 1.40 +++ alloc.c 14 Mar 2009 18:21:33 -0000 1.41 @@ -195,17 +195,26 @@ lispobj alloc_code_object (unsigned boxed, unsigned unboxed) { struct code * code; - /* 4 == trace_table_offset offset in words */ - boxed = make_fixnum(boxed + 1 + 4); + /* Coming in, boxed is the number of boxed words requested. + * Converting it to a fixnum makes it measured in bytes. It's also + * rounded up to double word along the way. */ + boxed = make_fixnum(boxed + 1 + + (offsetof(struct code, trace_table_offset) >> + WORD_SHIFT)); boxed &= ~LOWTAG_MASK; + /* Unboxed is in bytes, round it up to double word boundary. Now + * it's also a fixnum containing the number of unboxed words. */ unboxed += LOWTAG_MASK; unboxed &= ~LOWTAG_MASK; - code = (struct code *)pa_alloc(ALIGNED_SIZE((boxed + unboxed) * - sizeof(lispobj)), - CODE_PAGE_FLAG); + code = (struct code *)pa_alloc(boxed + unboxed, CODE_PAGE_FLAG); + /* It used to be that even on gencgc builds the + * ALLOCATE-CODE-OBJECT VOP did all this initialization within + * pseudo atomic. Here, we rely on gc being inhibited. */ + if (SymbolValue(GC_INHIBIT, arch_os_get_current_thread()) == NIL) + lose("alloc_code_object called with GC enabled."); boxed = boxed << (N_WIDETAG_BITS - WORD_SHIFT); code->header = boxed | CODE_HEADER_WIDETAG; code->code_size = unboxed; |