added some xma/xmmgr code

moo/lib/heap.c

@@ -29,15 +29,30 @@
 #define MIN_HEAP_SIZE 65536 * 5 /* TODO: adjust this value? */
 #define PERM_SPACE_SIZE 65536 * 2 /* TODO: adjust perm space size depending on what's allocated in the permspace */
 
+static void* xma_alloc (moo_mmgr_t* mmgr, moo_oow_t size)
+{
+	return moo_xma_alloc(mmgr->ctx, size);
+}
+
+static void* xma_realloc (moo_mmgr_t* mmgr, void* ptr, moo_oow_t size)
+{
+	return moo_xma_realloc(mmgr->ctx, ptr, size);
+}
+
+static void xma_free (moo_mmgr_t* mmgr, void* ptr)
+{
+	return moo_xma_free (mmgr->ctx, ptr);
+}
+
 moo_heap_t* moo_makeheap (moo_t* moo, moo_oow_t size)
 {
 	moo_heap_t* heap;
 	moo_oow_t space_size;
 
-	if (size < MIN_HEAP_SIZE) size = MIN_HEAP_SIZE;
+	if (size < MIN_HEAP_SIZE && moo->gc_type != MOO_GC_TYPE_MARK_SWEEP) size = MIN_HEAP_SIZE;
 
 	heap = (moo_heap_t*)moo->vmprim.alloc_heap(moo, MOO_SIZEOF(*heap) + size);
-	if (!heap) 
+	if (MOO_UNLIKELY(!heap)) 
 	{
 		const moo_ooch_t* oldmsg = moo_backuperrmsg(moo);
 		moo_seterrbfmt (moo, moo_geterrnum(moo), "unable to allocate heap - %js", oldmsg);
@@ -48,6 +63,32 @@ moo_heap_t* moo_makeheap (moo_t* moo, moo_oow_t size)
 	heap->base = (moo_uint8_t*)(heap + 1);
 	heap->size = size;
 
+	if (moo->gc_type == MOO_GC_TYPE_MARK_SWEEP)
+	{
+		if (size <= 0)
+		{
+			heap->xmmgr = *moo_getmmgr(moo);
+		}
+		else
+		{
+			heap->xma = moo_xma_open(moo_getmmgr(moo), 0, heap->base, heap->size);
+			if (MOO_UNLIKELY(!heap->xma))
+			{
+				moo->vmprim.free_heap (moo, heap);
+				moo_seterrbfmt (moo, MOO_ESYSMEM, "unable to allocate xma");
+				return MOO_NULL;
+			}
+
+			heap->xmmgr.alloc = xma_alloc;
+			heap->xmmgr.realloc = xma_realloc;
+			heap->xmmgr.free = xma_free;
+			heap->xmmgr.ctx = heap->xma;
+		}
+	}
+	else
+	{
+		MOO_ASSERT (moo, moo->gc_type == MOO_GC_TYPE_SS_COPY);
+
 		space_size = (size - PERM_SPACE_SIZE) / 2;
 
 		/* TODO: consider placing permspace in a separate memory chunk in case we have to grow
@@ -69,12 +110,14 @@ moo_heap_t* moo_makeheap (moo_t* moo, moo_oow_t size)
 		 * this moment depending on the alignment of space.base. subsequent
 		 * calls to moo_allocheapspace() are bound to fail. Make sure to
 		 * pass a heap size large enough */
+	}
 
 	return heap;
 }
 
 void moo_killheap (moo_t* moo, moo_heap_t* heap)
 {
+	if (heap->xma) moo_xma_close (heap->xma);
 	moo->vmprim.free_heap (moo, heap);
 }
 

moo/lib/moo.h

@@ -29,6 +29,7 @@
 
 #include <moo-cmn.h>
 #include <moo-rbt.h>
+#include <moo-xma.h>
 #include <stdarg.h>
 
 /* TODO: move this macro out to the build files.... */
@@ -214,6 +215,14 @@ struct moo_gchdr_t
 /* The size of moo_gchdr_t must be aligned to MOO_SIZEOF_OOP_T */
 #endif
 
+
+enum moo_gc_type_t
+{
+	MOO_GC_TYPE_SS_COPY,
+	MOO_GC_TYPE_MARK_SWEEP
+};
+typedef enum moo_gc_type_t moo_gc_type_t;
+
 /* =========================================================================
  * OBJECT STRUCTURE
  * ========================================================================= */
@@ -1006,6 +1015,9 @@ struct moo_heap_t
 	moo_space_t  permspace;
 	moo_space_t  curspace;
 	moo_space_t  newspace;
+
+	moo_xma_t*   xma; /* used if MARK_SWEEP is enabled */
+	moo_mmgr_t   xmmgr;
 };
 
 typedef struct moo_dbgi_t moo_dbgi_t;
@@ -1570,6 +1582,7 @@ struct moo_t
 
 	int shuterr;
 	int igniting;
+	moo_gc_type_t gc_type;
 
 	struct
 	{

moo/lib/obj.c

@@ -41,7 +41,7 @@ void* moo_allocbytes (moo_t* moo, moo_oow_t size)
 #if defined(MOO_ENABLE_GC_MARK_SWEEP)
 	if (MOO_UNLIKELY(moo->igniting))
 	{
-//moo_xma_calloc(moo->gci.xma, MOO_SIZEOF(*gch) + size);
+/* TODO: use heap.xmmgr for allocation... */
 		gch = (moo_gchdr_t*)moo_callocmem(moo, MOO_SIZEOF(*gch) + size); 
 		if (MOO_UNLIKELY(!gch)) return MOO_NULL;
 	}