X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Falloc.c;h=58c1798d7ee7fedf5196e3f08b4f3bc3916063c5;hb=f2c8e80369a67f5b7e4e47725bed257b3c41de62;hp=4f3be56341ef518005e8b291b7cbada0a74672e8;hpb=29a168e2bf7a6d509dea282cc5c781aba734d87c;p=sbcl.git

diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c
index 4f3be56..58c1798 100644
--- a/src/runtime/alloc.c
+++ b/src/runtime/alloc.c
@@ -24,6 +24,7 @@
 #include "globals.h"
 #include "gc.h"
 #include "thread.h"
+#include "pseudo-atomic.h"
 #include "genesis/vector.h"
 #include "genesis/cons.h"
 #include "genesis/bignum.h"
@@ -39,8 +40,12 @@ pa_alloc(int bytes, int page_type_flag)
     lispobj *result;
     struct thread *th = arch_os_get_current_thread();
 
+    /* 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);
+
     /* 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
@@ -68,13 +73,13 @@ pa_alloc(int bytes, int page_type_flag)
 #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;
+        *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
-        current_control_stack_pointer -= 1;
-        result = (lispobj *) *current_control_stack_pointer;
+        access_control_stack_pointer(th) -= 1;
+        result = (lispobj *) *access_control_stack_pointer(th);
 #endif
     }
     return result;
@@ -88,7 +93,7 @@ pa_alloc(int bytes, int page_type_flag)
     /* 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();
+    check_deferrables_blocked_or_lose(0);
 
     result = dynamic_space_free_pointer;
 
@@ -189,17 +194,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;