X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Falloc.c;h=82969472de94b2b9377e1c25b263744f618a98d7;hb=1363121ddb1d2e722e2e41d1c93758551066797c;hp=8add02056b0e701235f24680f7aecc7b1cfd2ba9;hpb=902e93736a0888aa6b04dc328b1eb328423bf426;p=sbcl.git

diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c
index 8add020..8296947 100644
--- a/src/runtime/alloc.c
+++ b/src/runtime/alloc.c
@@ -1,5 +1,5 @@
 /*
- * allocation routines for C code.  For allocation done by Lisp look 
+ * allocation routines for C code.  For allocation done by Lisp look
  * instead at src/compiler/target/alloc.lisp and .../macros.lisp
  */
 
@@ -17,9 +17,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "sbcl.h"
 #include "runtime.h"
 #include "os.h"
-#include "sbcl.h"
 #include "alloc.h"
 #include "globals.h"
 #include "gc.h"
@@ -29,54 +29,48 @@
 #include "genesis/bignum.h"
 #include "genesis/sap.h"
 
-#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);
-
-#define ALIGNED_SIZE(n) (n+LOWTAG_MASK) & ~LOWTAG_MASK
+#define ALIGNED_SIZE(n) ((n) + LOWTAG_MASK) & ~LOWTAG_MASK
 
-#if defined LISP_FEATURE_GENCGC
+#ifdef LISP_FEATURE_GENCGC
 extern lispobj *alloc(int bytes);
-lispobj *
-pa_alloc(int bytes) 
-{
-    lispobj *result=0;
-    struct thread *th=arch_os_get_current_thread();
-    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 (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 */
-	do_pending_interrupt(); 
-    return result; 
-}
+#endif
 
-#else
 static lispobj *
 pa_alloc(int bytes)
 {
-    char *result;
+    lispobj *result;
+#ifdef LISP_FEATURE_GENCGC
+    struct thread *th = arch_os_get_current_thread();
 
-    /* Round to dual word boundary. */
-    bytes = (bytes + LOWTAG_MASK) & ~LOWTAG_MASK;
+    /* 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. */
+        do_pending_interrupt();
+#else
+    /* 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;
 
-    result = (char *)GET_FREE_POINTER();
+    /* Align up to next dual word boundary. */
+    bytes = ALIGNED_SIZE(bytes);
 
-    SET_FREE_POINTER((lispobj *)(result + bytes));
+    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 (lispobj *) result;
-}
 #endif
+    return result;
+}
 
 
 lispobj *
@@ -126,7 +120,7 @@ alloc_number(long n)
 
         ptr->digits[0] = n;
 
-	return make_lispobj(ptr, OTHER_POINTER_LOWTAG);
+        return make_lispobj(ptr, OTHER_POINTER_LOWTAG);
     }
 }
 
@@ -148,7 +142,7 @@ alloc_sap(void *ptr)
 {
     struct sap *sap;
     sap=(struct sap *)
-	alloc_unboxed((int)SAP_WIDETAG, sizeof(struct sap)/sizeof(lispobj) -1);
+        alloc_unboxed((int)SAP_WIDETAG, sizeof(struct sap)/sizeof(lispobj) -1);
     sap->pointer = ptr;
     return make_lispobj(sap,OTHER_POINTER_LOWTAG);
 }