X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Falloc.c;h=19518e4970d045619fae8bbdbc25e4051b3ed75c;hb=de0a47a2f2b165f34177669bd9499135847b4897;hp=661cdf4e40b132efd7d13e4bb466ba1276fc366f;hpb=6e662062162ad5a6f09d6d3a5ec1249520e813a5;p=sbcl.git diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c index 661cdf4..19518e4 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,40 +14,95 @@ * 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 - -#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); +#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" -#define ALIGNED_SIZE(n) (n+LOWTAG_MASK) & ~LOWTAG_MASK +#define ALIGNED_SIZE(n) ((n) + LOWTAG_MASK) & ~LOWTAG_MASK -#if defined GENCGC -extern lispobj *alloc(int bytes); +#ifdef LISP_FEATURE_GENCGC +static lispobj * +pa_alloc(int bytes, int page_type_flag) +{ + lispobj *result; + struct thread *th = arch_os_get_current_thread(); + + /* FIXME: OOAO violation: see arch_pseudo_* */ + clear_pseudo_atomic_interrupted(th); + 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 + *current_control_stack_pointer = (lispobj) result; + current_control_stack_pointer += 1; +#endif + do_pending_interrupt(); +#ifndef LISP_FEATURE_C_STACK_IS_CONTROL_STACK + current_control_stack_pointer -= 1; + result = (lispobj *) *current_control_stack_pointer; +#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(); + + 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; } @@ -57,34 +113,38 @@ alloc_unboxed(int type, int words) { lispobj *result; - result = alloc(ALIGNED_SIZE((1 + words) * sizeof(lispobj))); + 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)|OTHER_POINTER_LOWTAG; + 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 | LIST_POINTER_LOWTAG; + return make_lispobj(ptr, LIST_POINTER_LOWTAG); } lispobj @@ -99,15 +159,16 @@ alloc_number(long n) ptr->digits[0] = n; - return (lispobj) ptr | OTHER_POINTER_LOWTAG; + 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(SIMPLE_STRING_WIDETAG, len+1, 8); + 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); @@ -119,10 +180,31 @@ 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)SAP_WIDETAG, 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 | OTHER_POINTER_LOWTAG; + return make_lispobj(sap,OTHER_POINTER_LOWTAG); +} + +lispobj +alloc_code_object (unsigned boxed, unsigned unboxed) { + struct code * code; + /* 4 == trace_table_offset offset in words */ + boxed = make_fixnum(boxed + 1 + 4); + boxed &= ~LOWTAG_MASK; + + unboxed += LOWTAG_MASK; + unboxed &= ~LOWTAG_MASK; + + code = (struct code *)pa_alloc(ALIGNED_SIZE((boxed + unboxed) * + sizeof(lispobj)), + CODE_PAGE_FLAG); + + boxed = boxed << (N_WIDETAG_BITS - WORD_SHIFT); + code->header = boxed | CODE_HEADER_WIDETAG; + code->code_size = unboxed; + code->entry_points = NIL; + code->debug_info = NIL; + return make_lispobj(code, OTHER_POINTER_LOWTAG); }