X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Falloc.c;h=7843e0b7c2f5ed6ffe34f093dc79e034adfb1aab;hb=c1c2f11c297774cd7f0f48baeaa7631fec155405;hp=82969472de94b2b9377e1c25b263744f618a98d7;hpb=60f5682d731a1973095c7fe620f2afb24fdfe087;p=sbcl.git

diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c
index 8296947..7843e0b 100644
--- a/src/runtime/alloc.c
+++ b/src/runtime/alloc.c
@@ -28,31 +28,53 @@
 #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
 
 #ifdef LISP_FEATURE_GENCGC
-extern lispobj *alloc(int bytes);
-#endif
-
 static lispobj *
-pa_alloc(int bytes)
+pa_alloc(int bytes, int page_type_flag)
 {
     lispobj *result;
-#ifdef LISP_FEATURE_GENCGC
     struct thread *th = arch_os_get_current_thread();
 
     /* FIXME: OOAO violation: see arch_pseudo_* */
-    SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(0),th);
-    SetSymbolValue(PSEUDO_ATOMIC_ATOMIC, make_fixnum(1),th);
-    result = alloc(bytes);
-    SetSymbolValue(PSEUDO_ATOMIC_ATOMIC, make_fixnum(0),th);
-    if (fixnum_value(SymbolValue(PSEUDO_ATOMIC_INTERRUPTED,th)))
-        /* Even if we gc at this point, the new allocation will be
-         * protected from being moved, because result is on the c stack
-         * and points to it. */
+    clear_pseudo_atomic_interrupted(th);
+    set_pseudo_atomic_atomic(th);
+    result = general_alloc(bytes, page_type_flag);
+    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 *
+pa_alloc(int bytes, int page_type_flag)
+{
+    lispobj *result;
+
     /* FIXME: this is not pseudo atomic at all, but is called only from
      * interrupt safe places like interrupt handlers. MG - 2005-08-09 */
     result = dynamic_space_free_pointer;
@@ -68,28 +90,27 @@ pa_alloc(int bytes)
         set_auto_gc_trigger((char *)dynamic_space_free_pointer
                             - (char *)current_dynamic_space);
     }
-#endif
     return result;
 }
-
+#endif
 
 lispobj *
 alloc_unboxed(int type, int words)
 {
     lispobj *result;
 
-    result = pa_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 *)
-      pa_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);
@@ -100,7 +121,8 @@ alloc_vector(int type, int length, int size)
 lispobj
 alloc_cons(lispobj car, lispobj cdr)
 {
-    struct cons *ptr = (struct cons *)pa_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;
@@ -128,7 +150,7 @@ lispobj
 alloc_base_string(char *str)
 {
     int len = strlen(str);
-    lispobj result = alloc_vector(SIMPLE_BASE_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);
@@ -146,3 +168,23 @@ alloc_sap(void *ptr)
     sap->pointer = ptr;
     return make_lispobj(sap,OTHER_POINTER_LOWTAG);
 }
+
+lispobj
+alloc_code_object (unsigned boxed, unsigned unboxed) {
+    struct code * code;
+    boxed = make_fixnum(boxed + 1 + 4); /* 4 == trace_table_offset offset in words */
+    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);
+}