projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.7.12.35
[sbcl.git]
/
src
/
runtime
/
alloc.c
diff --git
a/src/runtime/alloc.c
b/src/runtime/alloc.c
index
0e0a438
..
00a24f1
100644
(file)
--- a/
src/runtime/alloc.c
+++ b/
src/runtime/alloc.c
@@
-30,7
+30,7
@@
#define ALIGNED_SIZE(n) (n+LOWTAG_MASK) & ~LOWTAG_MASK
#define ALIGNED_SIZE(n) (n+LOWTAG_MASK) & ~LOWTAG_MASK
-#if defined GENCGC
+#if defined LISP_FEATURE_GENCGC
extern lispobj *alloc(int bytes);
#else
static lispobj *
extern lispobj *alloc(int bytes);
#else
static lispobj *
@@
-74,7
+74,7
@@
alloc_vector(int type, int length, int size)
result->header = type;
result->length = make_fixnum(length);
result->header = type;
result->length = make_fixnum(length);
- return ((lispobj)result)|OTHER_POINTER_LOWTAG;
+ return make_lispobj(result,OTHER_POINTER_LOWTAG);
}
lispobj
}
lispobj
@@
-85,7
+85,7
@@
alloc_cons(lispobj car, lispobj cdr)
ptr->car = car;
ptr->cdr = cdr;
ptr->car = car;
ptr->cdr = cdr;
- return (lispobj)ptr | LIST_POINTER_LOWTAG;
+ return make_lispobj(ptr, LIST_POINTER_LOWTAG);
}
lispobj
}
lispobj
@@
-100,7
+100,7
@@
alloc_number(long n)
ptr->digits[0] = n;
ptr->digits[0] = n;
- return (lispobj) ptr | OTHER_POINTER_LOWTAG;
+ return make_lispobj(ptr, OTHER_POINTER_LOWTAG);
}
}
}
}
@@
-124,5
+124,5
@@
alloc_sap(void *ptr)
sap=(struct sap *)
alloc_unboxed((int)SAP_WIDETAG, sizeof(struct sap)/sizeof(lispobj) -1);
sap->pointer = ptr;
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);
}
}