/*
- * 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
*/
#include <string.h>
#include "sbcl.h"
-#include "genesis/config.h"
#include "runtime.h"
#include "os.h"
#include "alloc.h"
#if defined LISP_FEATURE_GENCGC
extern lispobj *alloc(int bytes);
lispobj *
-pa_alloc(int bytes)
+pa_alloc(int bytes)
{
lispobj *result=0;
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 (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;
+ 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();
+ return result;
}
#else
SET_FREE_POINTER((lispobj *)(result + bytes));
if (GET_GC_TRIGGER() && GET_FREE_POINTER() > GET_GC_TRIGGER()) {
- SET_GC_TRIGGER((char *)GET_FREE_POINTER()
- - (char *)current_dynamic_space);
+ SET_GC_TRIGGER((char *)GET_FREE_POINTER()
+ - (char *)current_dynamic_space);
}
return (lispobj *) result;
}
ptr->digits[0] = n;
- return make_lispobj(ptr, OTHER_POINTER_LOWTAG);
+ return make_lispobj(ptr, OTHER_POINTER_LOWTAG);
}
}
{
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);
}