merged volatile memory barriers

[cacao.git] / src / mm / gc-none.cpp

diff --git a/src/mm/gc-none.cpp b/src/mm/gc-none.cpp
index 54b3e7b26f0fe660d5bb24c67420d19114418f89..55eedeb0fb0a97f7228dd3719671a788c88af39f 100644 (file)
--- a/src/mm/gc-none.cpp
+++ b/src/mm/gc-none.cpp
@@ -27,27 +27,22 @@
 
 #include <stdlib.h>
 
-#if defined(HAVE_SYS_MMAN_H)
-# include <sys/mman.h>
-#endif
-
 #include "vm/types.h"
 
 #include "boehm-gc/include/gc.h"
 
 #include "mm/gc.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
-#include "toolbox/logging.h"
+#include "toolbox/logging.hpp"
 
-#include "vm/builtin.h"
+#include "vm/jit/builtin.hpp"
 #include "vm/global.h"
-#include "vm/stringlocal.h"
+#include "vm/loader.hpp"
+#include "vm/options.h"
+#include "vm/os.hpp"
 #include "vm/vm.hpp"
 
-#include "vmcore/loader.h"
-#include "vmcore/options.h"
-
 
 /* global stuff ***************************************************************/
 
@@ -59,7 +54,7 @@ static int mmapsize = 0;
 static void *mmaptop = NULL;
 
 
-void *heap_alloc(u4 size, u4 references, methodinfo *finalizer, bool collect)
+void* heap_alloc(size_t size, int references, methodinfo *finalizer, bool collect)
 {
        void *m;
 
@@ -77,20 +72,20 @@ void *heap_alloc(u4 size, u4 references, methodinfo *finalizer, bool collect)
 }
 
 
-void *heap_alloc_uncollectable(u4 size)
+void* heap_alloc_uncollectable(size_t size)
 {
        return heap_alloc(size, false, NULL, false);
 }
 
 
-void heap_free(void *p)
+void heap_free(void* p)
 {
        /* nop */
 }
 
 
 
-void gc_init(u4 heapmaxsize, u4 heapstartsize)
+void gc_init(size_t heapmaxsize, size_t heapstartsize)
 {
        heapmaxsize = MEMORY_ALIGN(heapmaxsize, ALIGNSIZE);