X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Falloc.c;h=0e0a438efa12e270c0b7ee35bcc0ae1710846f70;hb=94ac5b7c3ff37850210b6fc9a7593cf1c5752993;hp=661cdf4e40b132efd7d13e4bb466ba1276fc366f;hpb=6e662062162ad5a6f09d6d3a5ec1249520e813a5;p=sbcl.git

diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c
index 661cdf4..0e0a438 100644
--- a/src/runtime/alloc.c
+++ b/src/runtime/alloc.c
@@ -19,6 +19,7 @@
 #include "globals.h"
 #include "gc.h"
 #include <stdio.h>
+#include <string.h>
 
 #define GET_FREE_POINTER() dynamic_space_free_pointer
 #define SET_FREE_POINTER(new_value) \
@@ -35,24 +36,24 @@ extern lispobj *alloc(int bytes);
 static lispobj *
 alloc(int bytes)
 {
-    lispobj *result;
+    char *result;
 
     /* Round to dual word boundary. */
     bytes = (bytes + LOWTAG_MASK) & ~LOWTAG_MASK;
 
-    result = GET_FREE_POINTER();
+    result = (char *)GET_FREE_POINTER();
 
-    SET_FREE_POINTER(result + (bytes / sizeof(lispobj)));
+    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);
     }
-    return result;
+    return (lispobj *) result;
 }
 #endif
 
-static lispobj *
+lispobj *
 alloc_unboxed(int type, int words)
 {
     lispobj *result;
@@ -119,10 +120,9 @@ alloc_string(char *str)
 lispobj
 alloc_sap(void *ptr)
 {
-    int n_words_to_alloc =
-	(sizeof(struct sap) - sizeof(lispobj)) / sizeof(u32);
-    struct sap *sap =
-	(struct sap *)alloc_unboxed((int)SAP_WIDETAG, n_words_to_alloc);
+    struct sap *sap;
+    sap=(struct sap *)
+	alloc_unboxed((int)SAP_WIDETAG, sizeof(struct sap)/sizeof(lispobj) -1);
     sap->pointer = ptr;
     return (lispobj) sap | OTHER_POINTER_LOWTAG;
 }