X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Falloc.c;h=92e237b54662f1d4ae3dcf57c8a1dc69485e2e13;hb=7f1e94ae961a198e00daf281eb1dc858e5b2dcc7;hp=3319e2c4199c34410a9d1a3d8867a3c27266f5ab;hpb=d7f6139a91d7d9b0667a597584ae306d958bb2f4;p=sbcl.git diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c index 3319e2c..92e237b 100644 --- a/src/runtime/alloc.c +++ b/src/runtime/alloc.c @@ -1,5 +1,6 @@ /* - * allocation routines + * allocation routines for C code. For allocation done by Lisp look + * instead at src/compiler/target/alloc.lisp and .../macros.lisp */ /* @@ -13,49 +14,101 @@ * files for more information. */ -#include "runtime.h" +#include +#include + #include "sbcl.h" +#include "runtime.h" +#include "os.h" #include "alloc.h" #include "globals.h" #include "gc.h" -#include +#include "thread.h" +#include "pseudo-atomic.h" +#include "genesis/vector.h" +#include "genesis/cons.h" +#include "genesis/bignum.h" +#include "genesis/sap.h" +#include "genesis/code.h" -#ifdef ibmrt -#define GET_FREE_POINTER() ((lispobj *)SymbolValue(ALLOCATION_POINTER)) -#define SET_FREE_POINTER(new_value) \ - (SetSymbolValue(ALLOCATION_POINTER,(lispobj)(new_value))) -#define GET_GC_TRIGGER() ((lispobj *)SymbolValue(INTERNAL_GC_TRIGGER)) -#define SET_GC_TRIGGER(new_value) \ - (SetSymbolValue(INTERNAL_GC_TRIGGER,(lispobj)(new_value))) -#else -#define GET_FREE_POINTER() dynamic_space_free_pointer -#define SET_FREE_POINTER(new_value) \ - (dynamic_space_free_pointer = (new_value)) -#define GET_GC_TRIGGER() current_auto_gc_trigger -#define SET_GC_TRIGGER(new_value) \ - clear_auto_gc_trigger(); set_auto_gc_trigger(new_value); -#endif +#define ALIGNED_SIZE(n) ((n) + LOWTAG_MASK) & ~LOWTAG_MASK + +#ifdef LISP_FEATURE_GENCGC +static lispobj * +pa_alloc(int bytes, int page_type_flag) +{ + lispobj *result; + struct thread *th = arch_os_get_current_thread(); -#define ALIGNED_SIZE(n) (n+lowtag_Mask) & ~lowtag_Mask +#ifndef LISP_FEATURE_SB_SAFEPOINT + /* SIG_STOP_FOR_GC must be unblocked: else two threads racing here + * may deadlock: one will wait on the GC lock, and the other + * cannot stop the first one... */ + check_gc_signals_unblocked_or_lose(0); +#endif -#if defined(WANT_CGC) || defined(GENCGC) -extern lispobj *alloc(int bytes); + /* FIXME: OOAO violation: see arch_pseudo_* */ + set_pseudo_atomic_atomic(th); + result = general_alloc(bytes, page_type_flag); +#if 0 + /* See how the runtime deals with GC being triggerred. */ + if ((SymbolValue(GC_PENDING,th) == NIL) && + (SymbolValue(GC_INHIBIT,th) == NIL) && + (random() < RAND_MAX/100)) { + SetSymbolValue(GC_PENDING,T,th); + set_pseudo_atomic_interrupted(th); + maybe_save_gc_mask_and_block_deferrables(NULL); + } +#endif + clear_pseudo_atomic_atomic(th); + + if (get_pseudo_atomic_interrupted(th)) { + /* WARNING KLUDGE FIXME: pa_alloc() is not pseudo-atomic on + * anything but x86[-64]. maybe_defer_handler doesn't defer + * interrupts if foreign_function_call_active + * + * If the C stack is not scavenged during GC, result needs to + * be protected against not being referred to by any roots, so + * we push it onto the lisp control stack, and read it back + * off after any potential GC has finished */ +#ifndef LISP_FEATURE_C_STACK_IS_CONTROL_STACK +#ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD +#error "!C_STACK_IS_CONTROL_STACK and STACK_GROWS_DOWNWARD_NOT_UPWARD is not supported" +#endif + *access_control_stack_pointer(th) = (lispobj) result; + access_control_stack_pointer(th) += 1; +#endif + do_pending_interrupt(); +#ifndef LISP_FEATURE_C_STACK_IS_CONTROL_STACK + access_control_stack_pointer(th) -= 1; + result = (lispobj *) *access_control_stack_pointer(th); +#endif + } + return result; +} #else static lispobj * -alloc(int bytes) +pa_alloc(int bytes, int page_type_flag) { lispobj *result; - /* Round to dual word boundary. */ - bytes = (bytes + lowtag_Mask) & ~lowtag_Mask; + /* This is not pseudo atomic at all, but is called only from + * interrupt safe places like interrupt handlers. MG - + * 2005-08-09 */ + check_deferrables_blocked_or_lose(0); + + result = dynamic_space_free_pointer; - result = GET_FREE_POINTER(); + /* Align up to next dual word boundary. */ + bytes = ALIGNED_SIZE(bytes); - SET_FREE_POINTER(result + (bytes / sizeof(lispobj))); + dynamic_space_free_pointer = (lispobj *)((char *)result + bytes); - if (GET_GC_TRIGGER() && GET_FREE_POINTER() > GET_GC_TRIGGER()) { - SET_GC_TRIGGER((char *)GET_FREE_POINTER() - - (char *)current_dynamic_space); + if (current_auto_gc_trigger + && dynamic_space_free_pointer > current_auto_gc_trigger) { + clear_auto_gc_trigger(); + set_auto_gc_trigger((char *)dynamic_space_free_pointer + - (char *)current_dynamic_space); } return result; } @@ -66,58 +119,63 @@ alloc_unboxed(int type, int words) { lispobj *result; - result = alloc(ALIGNED_SIZE((1 + words) * sizeof(lispobj))); - *result = (lispobj) (words << type_Bits) | type; + result = pa_alloc(ALIGNED_SIZE((1 + words) * sizeof(lispobj)), + UNBOXED_PAGE_FLAG); + *result = (lispobj) (words << N_WIDETAG_BITS) | type; return result; } static lispobj -alloc_vector(int type, int length, int size) +alloc_vector(int type, int length, int size, int page_type_flag) { struct vector *result; result = (struct vector *) - alloc(ALIGNED_SIZE((2 + (length*size + 31) / 32) * sizeof(lispobj))); + pa_alloc(ALIGNED_SIZE((2 + (length*size + 31) / 32) * sizeof(lispobj)), + page_type_flag); result->header = type; result->length = make_fixnum(length); - return ((lispobj)result)|type_OtherPointer; + return make_lispobj(result,OTHER_POINTER_LOWTAG); } lispobj alloc_cons(lispobj car, lispobj cdr) { - struct cons *ptr = (struct cons *)alloc(ALIGNED_SIZE(sizeof(struct cons))); + struct cons *ptr = + (struct cons *)pa_alloc(ALIGNED_SIZE(sizeof(struct cons)), + BOXED_PAGE_FLAG); ptr->car = car; ptr->cdr = cdr; - return (lispobj)ptr | type_ListPointer; + return make_lispobj(ptr, LIST_POINTER_LOWTAG); } lispobj -alloc_number(long n) +alloc_number(sword_t n) { struct bignum *ptr; if (-0x20000000 < n && n < 0x20000000) return make_fixnum(n); else { - ptr = (struct bignum *)alloc_unboxed(type_Bignum, 1); + ptr = (struct bignum *)alloc_unboxed(BIGNUM_WIDETAG, 1); ptr->digits[0] = n; - return (lispobj) ptr | type_OtherPointer; + return make_lispobj(ptr, OTHER_POINTER_LOWTAG); } } lispobj -alloc_string(char *str) +alloc_base_string(char *str) { int len = strlen(str); - lispobj result = alloc_vector(type_SimpleString, len+1, 8); - struct vector *vec = (struct vector *)PTR(result); + lispobj result = alloc_vector(SIMPLE_BASE_STRING_WIDETAG, len+1, 8, + UNBOXED_PAGE_FLAG); + struct vector *vec = (struct vector *)native_pointer(result); vec->length = make_fixnum(len); strcpy((char *)vec->data, str); @@ -128,10 +186,40 @@ alloc_string(char *str) lispobj alloc_sap(void *ptr) { - int n_words_to_alloc = - (sizeof(struct sap) - sizeof(lispobj)) / sizeof(u32); - struct sap *sap = - (struct sap *)alloc_unboxed ((int)type_Sap, n_words_to_alloc); + struct sap *sap; + sap=(struct sap *) + alloc_unboxed((int)SAP_WIDETAG, sizeof(struct sap)/sizeof(lispobj) -1); sap->pointer = ptr; - return (lispobj) sap | type_OtherPointer; + return make_lispobj(sap,OTHER_POINTER_LOWTAG); +} + +lispobj +alloc_code_object (unsigned boxed, unsigned unboxed) { + struct code * code; + /* 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 = (boxed + 1 + + (offsetof(struct code, trace_table_offset) >> + WORD_SHIFT)) << 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(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 >> (WORD_SHIFT - N_FIXNUM_TAG_BITS); + code->entry_points = NIL; + code->debug_info = NIL; + return make_lispobj(code, OTHER_POINTER_LOWTAG); }