/*
- * allocation routines
+ * allocation routines for C code. For allocation done by Lisp look
+ * instead at src/compiler/target/alloc.lisp and .../macros.lisp
*/
/*
* files for more information.
*/
+#include <stdio.h>
+#include <string.h>
+
+#include "genesis/config.h"
#include "runtime.h"
+#include "os.h"
#include "sbcl.h"
#include "alloc.h"
#include "globals.h"
#include "gc.h"
-#include <stdio.h>
-#include <string.h>
+#include "thread.h"
+#include "genesis/vector.h"
+#include "genesis/cons.h"
+#include "genesis/bignum.h"
+#include "genesis/sap.h"
#define GET_FREE_POINTER() dynamic_space_free_pointer
#define SET_FREE_POINTER(new_value) \
#define ALIGNED_SIZE(n) (n+LOWTAG_MASK) & ~LOWTAG_MASK
-#if defined GENCGC
+#if defined 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;
+}
+
#else
static lispobj *
-alloc(int bytes)
+pa_alloc(int bytes)
{
char *result;
}
#endif
+
lispobj *
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)));
*result = (lispobj) (words << N_WIDETAG_BITS) | type;
return result;
}
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)));
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)));
ptr->car = car;
ptr->cdr = cdr;
- return (lispobj)ptr | LIST_POINTER_LOWTAG;
+ return make_lispobj(ptr, LIST_POINTER_LOWTAG);
}
lispobj
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);
struct vector *vec = (struct vector *)native_pointer(result);
vec->length = make_fixnum(len);
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);
}