From f12b298a4ce9090470000360b49523e56475a680 Mon Sep 17 00:00:00 2001 From: Gabor Melis Date: Sat, 14 Mar 2009 18:21:33 +0000 Subject: [PATCH] 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 --- src/runtime/alloc.c | 19 ++++++++++++++----- version.lisp-expr | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c index dc4f5f2..500bfb0 100644 --- a/src/runtime/alloc.c +++ b/src/runtime/alloc.c @@ -195,17 +195,26 @@ alloc_sap(void *ptr) 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; diff --git a/version.lisp-expr b/version.lisp-expr index e6987e1..fd0fbf7 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.26.1" +"1.0.26.2" -- 1.7.10.4