#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"
lispobj *result;
struct thread *th = arch_os_get_current_thread();
+ /* SIG_STOP_FOR_GC needs to be enabled before we can call lisp:
+ * otherwise two threads racing here may deadlock: the other will
+ * wait on the GC lock, and the other cannot stop the first
+ * one... */
+ check_gc_signals_unblocked_or_lose();
+
/* 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
+ /* See how the runtime deals with GC being triggerred. */
+ if ((SymbolValue(GC_PENDING,th) == NIL) &&
+ (SymbolValue(GC_INHIBIT,th) == NIL) &&
+ (random() < RAND_MAX/100)) {
+ SetSymbolValue(GC_PENDING,T,th);
+ set_pseudo_atomic_interrupted(th);
+ maybe_save_gc_mask_and_block_deferrables(NULL);
+ }
+#endif
clear_pseudo_atomic_atomic(th);
if (get_pseudo_atomic_interrupted(th)) {
{
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 */
+ /* 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();
+
result = dynamic_space_free_pointer;
/* Align up to next dual word boundary. */
}
#endif
-lispobj *
+static lispobj *
alloc_unboxed(int type, int words)
{
lispobj *result;
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;