* src/mm/memory.cpp,

  src/mm/memory.hpp: Switched to C++.

--HG--
rename : src/mm/memory.c => src/mm/memory.cpp
rename : src/mm/memory.h => src/mm/memory.hpp

diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am
index 78ba758a196f5adfac2e806460f21703cdb2482e..b486fcf3327a26ca3ae973fd931ae1caffcfa1cc 100644 (file)
--- a/src/mm/Makefile.am
+++ b/src/mm/Makefile.am
@@ -63,8 +63,8 @@ libmm_la_SOURCES = \
        dumpmemory.hpp \
        $(GC_FILE) \
        gc.hpp \
-       memory.c \
-       memory.h
+       memory.cpp \
+       memory.hpp
 
 libmm_la_LIBADD = \
        $(GC_LIB)

diff --git a/src/mm/cacao-gc/compact.c b/src/mm/cacao-gc/compact.c
index 80ff5a1bb4e2e4b7809bf0ab3f654b780cf57fb2..0cd0ad60d543b8f0604117bca7d628ccfb07b651 100644 (file)
--- a/src/mm/cacao-gc/compact.c
+++ b/src/mm/cacao-gc/compact.c
@@ -31,7 +31,7 @@
 #include "gc.h"
 #include "heap.h"
 #include "mark.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "toolbox/logging.hpp"
 
 

diff --git a/src/mm/cacao-gc/copy.c b/src/mm/cacao-gc/copy.c
index 7eea339f787a1042e1f9bef2557a16d6b2edc51c..94822d938b720202a4f773fca1910bc7fcb5800f 100644 (file)
--- a/src/mm/cacao-gc/copy.c
+++ b/src/mm/cacao-gc/copy.c
@@ -33,7 +33,7 @@
 #include "mark.h"
 #include "region.h"
 #include "rootset.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "toolbox/logging.hpp"
 #include "vm/global.h"
 

diff --git a/src/mm/cacao-gc/final.c b/src/mm/cacao-gc/final.c
index e34b5b3096eede44fa4110816193b559e349b958..fadad86875ec0f5d9129784c1f42ca35c9f3f3ad 100644 (file)
--- a/src/mm/cacao-gc/final.c
+++ b/src/mm/cacao-gc/final.c
@@ -29,7 +29,7 @@
 #include "gc.h"
 #include "final.h"
 #include "heap.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "vm/finalizer.hpp"
 
 

diff --git a/src/mm/cacao-gc/gc.c b/src/mm/cacao-gc/gc.c
index cda5c05791a0f77edbe306af58f76bf438f14ace..6853ebc95b910ccdfcdd641658e24bac156b177f 100644 (file)
--- a/src/mm/cacao-gc/gc.c
+++ b/src/mm/cacao-gc/gc.c
@@ -41,7 +41,7 @@
 #include "mark.h"
 #include "region.h"
 #include "rootset.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "toolbox/logging.hpp"
 
 #include "vm/finalizer.hpp"

diff --git a/src/mm/cacao-gc/heap.c b/src/mm/cacao-gc/heap.c
index 649a59bab49ff2bca0bf591a9f6fbcb4bc273439..66a9f8c5e5a269467987a9a10ec9ea0943fbf91c 100644 (file)
--- a/src/mm/cacao-gc/heap.c
+++ b/src/mm/cacao-gc/heap.c
@@ -33,7 +33,7 @@
 #include "heap.h"
 #include "mark.h"
 #include "region.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "native/include/java_lang_String.h"
 #include "native/llni.h"
 #include "toolbox/logging.hpp"

diff --git a/src/mm/cacao-gc/mark.c b/src/mm/cacao-gc/mark.c
index 9c81d10d52d024f90c1b86a5fdca11b6701fd327..a18ceca7274dd004ce8e18568d6e04e0f8a08ea6 100644 (file)
--- a/src/mm/cacao-gc/mark.c
+++ b/src/mm/cacao-gc/mark.c
@@ -30,7 +30,7 @@
 #include "heap.h"
 #include "mark.h"
 #include "rootset.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "toolbox/logging.hpp"
 
 #include "vm/global.h"

diff --git a/src/mm/cacao-gc/region.c b/src/mm/cacao-gc/region.c
index d625fd5f9b4a41edde1f01d20e54539936580152..f601e530a8783ea67a24619b89e058848fd455c6 100644 (file)
--- a/src/mm/cacao-gc/region.c
+++ b/src/mm/cacao-gc/region.c
@@ -29,7 +29,7 @@
 #include "vm/types.h"
 
 #include "region.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "toolbox/logging.hpp"
 
 

diff --git a/src/mm/cacao-gc/rootset.c b/src/mm/cacao-gc/rootset.c
index 757468ad1064f67e9348417be27124645f860fde..ce6a680712fd5d44da1f30042df4062bb2f00b68 100644 (file)
--- a/src/mm/cacao-gc/rootset.c
+++ b/src/mm/cacao-gc/rootset.c
@@ -30,7 +30,7 @@
 #include "heap.h"
 #include "mark.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/threadlist.h"
 #include "threads/thread.hpp"

diff --git a/src/mm/codememory.c b/src/mm/codememory.c
index b56179221b9333c55b51f6423befe5654043ae84..c3e00384cabd03751410120125a8d08eeb40dd85 100644 (file)
--- a/src/mm/codememory.c
+++ b/src/mm/codememory.c
@@ -33,7 +33,7 @@
 #include "threads/thread.hpp"
 
 #include "mm/codememory.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/global.h"
 #include "vm/options.h"

diff --git a/src/mm/dumpmemory.cpp b/src/mm/dumpmemory.cpp
index 4650d52fbc2551fb78feab26853e401a6a379ec6..75de734a53a04a9e37fce82cb35b54a65201635c 100644 (file)
--- a/src/mm/dumpmemory.cpp
+++ b/src/mm/dumpmemory.cpp
@@ -29,7 +29,7 @@
 #include <stdint.h>
 
 #include "mm/dumpmemory.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/thread.hpp"
 

diff --git a/src/mm/dumpmemory.hpp b/src/mm/dumpmemory.hpp
index c871d3e04a7dd3bd342946bbab338682cd227145..79433a1864386310058d7d71810e1f1fb5893ce5 100644 (file)
--- a/src/mm/dumpmemory.hpp
+++ b/src/mm/dumpmemory.hpp
@@ -209,7 +209,7 @@ public:
 
 
 // Includes.
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/thread.hpp"
 

diff --git a/src/mm/gc-boehm.cpp b/src/mm/gc-boehm.cpp
index 7737541bf1262a8325555ef25baf49cbbec0103c..ca8501e639d4ebc2fd8ad079e6424785591f1968 100644 (file)
--- a/src/mm/gc-boehm.cpp
+++ b/src/mm/gc-boehm.cpp
@@ -39,7 +39,7 @@
 
 #include "boehm-gc/include/gc.h"
 #include "mm/gc.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/logging.hpp"
 

diff --git a/src/mm/gc-none.cpp b/src/mm/gc-none.cpp
index 2c3a18d07723d4a04741832dd17d476784a17d6e..0ef0cf3f0909c0a95022080a7582c783770644c1 100644 (file)
--- a/src/mm/gc-none.cpp
+++ b/src/mm/gc-none.cpp
@@ -36,7 +36,7 @@
 #include "boehm-gc/include/gc.h"
 
 #include "mm/gc.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/logging.hpp"
 

diff --git a/src/mm/memory.c b/src/mm/memory.c
deleted file mode 100644 (file)
index 4462b8c..0000000
--- a/src/mm/memory.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* src/mm/memory.c - memory management
-
-   Copyright (C) 1996-2005, 2006, 2007, 2008
-   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
-
-   This file is part of CACAO.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-*/
-
-
-#include "config.h"
-
-#include <assert.h>
-#include <stdint.h>
-
-#if defined(__DARWIN__)
-/* If we compile with -ansi on darwin, <sys/types.h> is not
-   included. So let's do it here. */
-# include <sys/types.h>
-#endif
-
-#include "vm/types.h"
-
-#include "arch.h"
-
-#include "mm/memory.h"
-
-#include "native/native.hpp"
-
-#include "threads/lock.hpp"
-#include "threads/thread.hpp"
-
-#include "toolbox/logging.hpp"
-
-#include "vm/global.h"
-#include "vm/string.hpp"
-#include "vm/vm.hpp"
-
-#include "vm/options.h"
-#include "vm/os.hpp"
-
-#if defined(ENABLE_STATISTICS)
-# include "vm/statistics.h"
-#endif
-
-
-/* memory_mprotect *************************************************************
-
-   Convenience function for mprotect.  This function also does error
-   checking.
-
-*******************************************************************************/
-
-void memory_mprotect(void *addr, size_t len, int prot)
-{
-       if (os_mprotect(addr, len, prot) != 0)
-               vm_abort_errno("memory_mprotect: os_mprotect failed");
-}
-
-
-/* memory_checked_alloc ********************************************************
-
-   Allocated zeroed-out memory and does an OOM check.
-
-   ERROR HANDLING:
-      XXX If no memory could be allocated, this function justs *exists*.
-
-*******************************************************************************/
-
-void *memory_checked_alloc(size_t size)
-{
-       /* always allocate memory zeroed out */
-
-       void *p = os_calloc(size, 1);
-
-       if (p == NULL)
-               vm_abort("memory_checked_alloc: calloc failed: out of memory");
-
-       return p;
-}
-
-
-void *mem_alloc(int32_t size)
-{
-       void *m;
-
-       if (size == 0)
-               return NULL;
-
-#if defined(ENABLE_STATISTICS)
-       if (opt_stat) {
-               memoryusage += size;
-
-               if (memoryusage > maxmemusage)
-                       maxmemusage = memoryusage;
-       }
-#endif
-
-       m = memory_checked_alloc(size);
-
-#if defined(ENABLE_MEMCHECK)
-       /* XXX we would like to poison the memory, but callers rely on */
-       /* the zeroing. This should change sooner or later.            */
-       /* memset(m, MEMORY_CLEAR_BYTE, size); */
-#endif
-
-       return m;
-}
-
-
-void *mem_realloc(void *src, int32_t len1, int32_t len2)
-{
-       void *dst;
-
-       /* prevent compiler warnings */
-
-       dst = NULL;
-
-       if (src == NULL)
-               if (len1 != 0)
-                       vm_abort("mem_realloc: reallocating memoryblock with address NULL, length != 0");
-
-#if defined(ENABLE_STATISTICS)
-       if (opt_stat)
-               memoryusage = (memoryusage - len1) + len2;
-#endif
-
-#if defined(ENABLE_MEMCHECK)
-       if (len2 < len1)
-               os_memset((u1*)dst + len2, MEMORY_CLEAR_BYTE, len1 - len2);
-#endif
-
-       dst = realloc(src, len2);
-
-       if (dst == NULL)
-               vm_abort("mem_realloc: realloc failed: out of memory");
-
-#if defined(ENABLE_MEMCHECK)
-       if (len2 > len1)
-               os_memset((u1*)dst + len1, MEMORY_CLEAR_BYTE, len2 - len1);
-#endif
-
-       return dst;
-}
-
-
-void mem_free(void *m, int32_t size)
-{
-       if (!m) {
-               if (size == 0)
-                       return;
-
-               log_text("returned memoryblock with address NULL, length != 0");
-               assert(0);
-       }
-
-#if defined(ENABLE_STATISTICS)
-       if (opt_stat)
-               memoryusage -= size;
-#endif
-
-#if defined(ENABLE_MEMCHECK)
-       /* destroy the contents */
-       os_memset(m, MEMORY_CLEAR_BYTE, size);
-#endif
-
-       os_free(m);
-}
-
-
-/* memory_thread ***************************************************************
-
-   Prints regularly memory statistics.
-
-*******************************************************************************/
-
-#if defined(ENABLE_THREADS) && !defined(NDEBUG)
-static void memory_thread(void)
-{
-       int32_t seconds;
-
-       /* Prevent compiler warning. */
-
-       seconds = 1;
-
-       /* If both arguments are specified, use the value of
-          ProfileMemoryUsage. */
-
-       if (opt_ProfileGCMemoryUsage)
-               seconds = opt_ProfileGCMemoryUsage;
-
-       if (opt_ProfileMemoryUsage)
-               seconds = opt_ProfileMemoryUsage;
-
-       while (true) {
-               /* sleep thread */
-
-               threads_sleep(seconds * 1000, 0);
-
-# if defined(ENABLE_STATISTICS)
-               /* Print current date and time (only when we print to the
-                  stdout). */
-
-               if (!opt_ProfileMemoryUsageGNUPlot)
-                       statistics_print_date();
-
-               /* print memory usage */
-
-               if (opt_ProfileMemoryUsage)
-                       statistics_print_memory_usage();
-
-               /* print GC memory usage */
-
-               if (opt_ProfileGCMemoryUsage)
-                       statistics_print_gc_memory_usage();
-# endif
-       }
-}
-#endif
-
-
-/* memory_start_thread *********************************************************
-
-   Starts the memory profiling thread.
-
-*******************************************************************************/
-
-#if defined(ENABLE_THREADS) && !defined(NDEBUG)
-bool memory_start_thread(void)
-{
-       utf *name;
-
-       name = utf_new_char("Memory Profiler");
-
-       /* start the memory profiling thread */
-
-       if (!threads_thread_start_internal(name, memory_thread))
-               return false;
-
-       /* everything's ok */
-
-       return true;
-}
-#endif
-
-
-/*
- * These are local overrides for various environment variables in Emacs.
- * Please do not remove this and leave it at the end of the file, where
- * Emacs will automagically detect them.
- * ---------------------------------------------------------------------
- * Local variables:
- * mode: c
- * indent-tabs-mode: t
- * c-basic-offset: 4
- * tab-width: 4
- * End:
- * vim:noexpandtab:sw=4:ts=4:
- */

diff --git a/src/mm/memory.cpp b/src/mm/memory.cpp
new file mode 100644 (file)
index 0000000..f074e1d
--- /dev/null
+++ b/src/mm/memory.cpp
@@ -0,0 +1,274 @@
+/* src/mm/memory.cpp - memory management
+
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
+
+   This file is part of CACAO.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+*/
+
+
+#include "config.h"
+
+#include <assert.h>
+#include <stdint.h>
+
+#if defined(__DARWIN__)
+/* If we compile with -ansi on darwin, <sys/types.h> is not
+   included. So let's do it here. */
+# include <sys/types.h>
+#endif
+
+#include "vm/types.h"
+
+#include "arch.h"
+
+#include "mm/memory.hpp"
+
+#include "native/native.hpp"
+
+#include "threads/lock.hpp"
+#include "threads/thread.hpp"
+
+#include "toolbox/logging.hpp"
+
+#include "vm/global.h"
+#include "vm/string.hpp"
+#include "vm/vm.hpp"
+
+#include "vm/options.h"
+#include "vm/os.hpp"
+
+#if defined(ENABLE_STATISTICS)
+# include "vm/statistics.h"
+#endif
+
+
+/* memory_mprotect *************************************************************
+
+   Convenience function for mprotect.  This function also does error
+   checking.
+
+*******************************************************************************/
+
+void memory_mprotect(void *addr, size_t len, int prot)
+{
+       if (os::mprotect(addr, len, prot) != 0)
+               vm_abort_errno("memory_mprotect: os::mprotect failed");
+}
+
+
+/* memory_checked_alloc ********************************************************
+
+   Allocated zeroed-out memory and does an OOM check.
+
+   ERROR HANDLING:
+      XXX If no memory could be allocated, this function justs *exists*.
+
+*******************************************************************************/
+
+void *memory_checked_alloc(size_t size)
+{
+       /* always allocate memory zeroed out */
+
+       void *p = os::calloc(size, 1);
+
+       if (p == NULL)
+               vm_abort("memory_checked_alloc: calloc failed: out of memory");
+
+       return p;
+}
+
+
+void *mem_alloc(int32_t size)
+{
+       void *m;
+
+       if (size == 0)
+               return NULL;
+
+#if defined(ENABLE_STATISTICS)
+       if (opt_stat) {
+               memoryusage += size;
+
+               if (memoryusage > maxmemusage)
+                       maxmemusage = memoryusage;
+       }
+#endif
+
+       m = memory_checked_alloc(size);
+
+#if defined(ENABLE_MEMCHECK)
+       /* XXX we would like to poison the memory, but callers rely on */
+       /* the zeroing. This should change sooner or later.            */
+       /* memset(m, MEMORY_CLEAR_BYTE, size); */
+#endif
+
+       return m;
+}
+
+
+void *mem_realloc(void *src, int32_t len1, int32_t len2)
+{
+       void *dst;
+
+       /* prevent compiler warnings */
+
+       dst = NULL;
+
+       if (src == NULL)
+               if (len1 != 0)
+                       vm_abort("mem_realloc: reallocating memoryblock with address NULL, length != 0");
+
+#if defined(ENABLE_STATISTICS)
+       if (opt_stat)
+               memoryusage = (memoryusage - len1) + len2;
+#endif
+
+#if defined(ENABLE_MEMCHECK)
+       if (len2 < len1)
+               os::memset((u1*)dst + len2, MEMORY_CLEAR_BYTE, len1 - len2);
+#endif
+
+       dst = realloc(src, len2);
+
+       if (dst == NULL)
+               vm_abort("mem_realloc: realloc failed: out of memory");
+
+#if defined(ENABLE_MEMCHECK)
+       if (len2 > len1)
+               os::memset((u1*)dst + len1, MEMORY_CLEAR_BYTE, len2 - len1);
+#endif
+
+       return dst;
+}
+
+
+void mem_free(void *m, int32_t size)
+{
+       if (!m) {
+               if (size == 0)
+                       return;
+
+               log_text("returned memoryblock with address NULL, length != 0");
+               assert(0);
+       }
+
+#if defined(ENABLE_STATISTICS)
+       if (opt_stat)
+               memoryusage -= size;
+#endif
+
+#if defined(ENABLE_MEMCHECK)
+       /* destroy the contents */
+       os::memset(m, MEMORY_CLEAR_BYTE, size);
+#endif
+
+       os::free(m);
+}
+
+
+/* memory_thread ***************************************************************
+
+   Prints regularly memory statistics.
+
+*******************************************************************************/
+
+#if defined(ENABLE_THREADS) && !defined(NDEBUG)
+static void memory_thread(void)
+{
+       int32_t seconds;
+
+       /* Prevent compiler warning. */
+
+       seconds = 1;
+
+       /* If both arguments are specified, use the value of
+          ProfileMemoryUsage. */
+
+       if (opt_ProfileGCMemoryUsage)
+               seconds = opt_ProfileGCMemoryUsage;
+
+       if (opt_ProfileMemoryUsage)
+               seconds = opt_ProfileMemoryUsage;
+
+       while (true) {
+               /* sleep thread */
+
+               threads_sleep(seconds * 1000, 0);
+
+# if defined(ENABLE_STATISTICS)
+               /* Print current date and time (only when we print to the
+                  stdout). */
+
+               if (!opt_ProfileMemoryUsageGNUPlot)
+                       statistics_print_date();
+
+               /* print memory usage */
+
+               if (opt_ProfileMemoryUsage)
+                       statistics_print_memory_usage();
+
+               /* print GC memory usage */
+
+               if (opt_ProfileGCMemoryUsage)
+                       statistics_print_gc_memory_usage();
+# endif
+       }
+}
+#endif
+
+
+/* memory_start_thread *********************************************************
+
+   Starts the memory profiling thread.
+
+*******************************************************************************/
+
+#if defined(ENABLE_THREADS) && !defined(NDEBUG)
+bool memory_start_thread(void)
+{
+       utf *name;
+
+       name = utf_new_char("Memory Profiler");
+
+       /* start the memory profiling thread */
+
+       if (!threads_thread_start_internal(name, memory_thread))
+               return false;
+
+       /* everything's ok */
+
+       return true;
+}
+#endif
+
+
+/*
+ * These are local overrides for various environment variables in Emacs.
+ * Please do not remove this and leave it at the end of the file, where
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: c++
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ * vim:noexpandtab:sw=4:ts=4:
+ */

diff --git a/src/mm/memory.h b/src/mm/memory.h
deleted file mode 100644 (file)
index ec6393f..0000000
--- a/src/mm/memory.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* src/mm/memory.h - macros for memory management
-
-   Copyright (C) 1996-2005, 2006, 2007, 2008
-   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
-
-   This file is part of CACAO.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-*/
-
-
-#ifndef _MEMORY_H
-#define _MEMORY_H
-
-#include "config.h"
-
-#include <stdint.h>
-
-
-// Align the size of memory allocations to this size.
-#define ALIGNSIZE 8
-#define MEMORY_ALIGN(pos,size) ((((pos) + (size) - 1) / (size)) * (size))
-
-
-// Constants for ENABLE_MEMCHECK.
-
-#if defined(ENABLE_MEMCHECK)
-#define MEMORY_CANARY_SIZE          16
-#define MEMORY_CANARY_FIRST_BYTE    0xca
-#define MEMORY_CLEAR_BYTE           0xa5
-#endif
-
-
-// Includes.
-#include "mm/codememory.h"
-#include "mm/dumpmemory.hpp"
-#include "mm/gc.hpp"
-
-
-/* 
----------------------------- Interface description -----------------------
-
-There are two possible choices for allocating memory:
-
-       1.   explicit allocating / deallocating
-
-                       mem_alloc ..... allocate a memory block 
-                       mem_free ...... free a memory block
-                       mem_realloc ... change size of a memory block (position may change)
-                       mem_usage ..... amount of allocated memory
-
-There are some useful macros:
-
-       NEW (type) ....... allocate memory for an element of type `type`
-       FREE (ptr,type) .. free memory
-       
-       MNEW (type,num) .. allocate memory for an array
-       MFREE (ptr,type,num) .. free memory
-       
-       MREALLOC (ptr,type,num1,num2) .. enlarge the array to size num2
-                                        
--------------------------------------------------------------------------------
-
-Some more macros:
-
-       MEMORY_ALIGN (pos, size) ... make pos divisible by size. always returns an
-                                 address >= pos.
-                             
-       
-       OFFSET (s,el) ....... returns the offset of 'el' in structure 's' in bytes.
-                             
-       MCOPY (dest,src,type,num) ... copy 'num' elements of type 'type'.
-       
-
-*/
-
-#define PADDING(pos,size)     (MEMORY_ALIGN((pos),(size)) - (pos))
-#define OFFSET(s,el)          ((int32_t) ((ptrint) &(((s*) 0)->el)))
-
-
-#define NEW(type)             ((type *) mem_alloc(sizeof(type)))
-#define FREE(ptr,type)        mem_free((ptr), sizeof(type))
-
-#define MNEW(type,num)        ((type *) mem_alloc(sizeof(type) * (num)))
-#define MFREE(ptr,type,num)   mem_free((ptr), sizeof(type) * (num))
-
-#define MREALLOC(ptr,type,num1,num2) mem_realloc((ptr), sizeof(type) * (num1), \
-                                                        sizeof(type) * (num2))
-
-
-#define MCOPY(dest,src,type,num) memcpy((dest), (src), sizeof(type) * (num))
-#define MSET(ptr,byte,type,num) memset((ptr), (byte), sizeof(type) * (num))
-#define MZERO(ptr,type,num)     MSET(ptr,0,type,num)
-#define MMOVE(dest,src,type,num) memmove((dest), (src), sizeof(type) * (num))
-
-
-/* GC macros (boehm only) *****************************************************/
-
-#if defined(ENABLE_GC_BOEHM)
-
-/* Uncollectable memory which can contain references */
-
-#define GCNEW_UNCOLLECTABLE(type,num) ((type *) heap_alloc_uncollectable(sizeof(type) * (num)))
-
-#define GCNEW(type)           heap_alloc(sizeof(type), true, NULL, true)
-#define GCMNEW(type,num)      heap_alloc(sizeof(type) * (num), true, NULL, true)
-
-#define GCFREE(ptr)           heap_free((ptr))
-
-#endif
-
-
-/* function prototypes ********************************************************/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool  memory_init(void);
-
-void  memory_mprotect(void *addr, size_t len, int prot);
-
-void *memory_checked_alloc(size_t size);
-
-void *memory_cnew(int32_t size);
-void  memory_cfree(void *p, int32_t size);
-
-void *mem_alloc(int32_t size);
-void  mem_free(void *m, int32_t size);
-void *mem_realloc(void *src, int32_t len1, int32_t len2);
-
-#if defined(ENABLE_THREADS)
-bool  memory_start_thread(void);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MEMORY_H */
-
-
-/*
- * These are local overrides for various environment variables in Emacs.
- * Please do not remove this and leave it at the end of the file, where
- * Emacs will automagically detect them.
- * ---------------------------------------------------------------------
- * Local variables:
- * mode: c
- * indent-tabs-mode: t
- * c-basic-offset: 4
- * tab-width: 4
- * End:
- * vim:noexpandtab:sw=4:ts=4:
- */

diff --git a/src/mm/memory.hpp b/src/mm/memory.hpp
new file mode 100644 (file)
index 0000000..9045b48
--- /dev/null
+++ b/src/mm/memory.hpp
@@ -0,0 +1,169 @@
+/* src/mm/memory.hpp - macros for memory management
+
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
+
+   This file is part of CACAO.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+*/
+
+
+#ifndef _MEMORY_H
+#define _MEMORY_H
+
+#include "config.h"
+
+#include <stdint.h>
+
+
+// Align the size of memory allocations to this size.
+#define ALIGNSIZE 8
+#define MEMORY_ALIGN(pos,size) ((((pos) + (size) - 1) / (size)) * (size))
+
+
+// Constants for ENABLE_MEMCHECK.
+
+#if defined(ENABLE_MEMCHECK)
+#define MEMORY_CANARY_SIZE          16
+#define MEMORY_CANARY_FIRST_BYTE    0xca
+#define MEMORY_CLEAR_BYTE           0xa5
+#endif
+
+
+// Includes.
+#include "mm/codememory.h"
+#include "mm/dumpmemory.hpp"
+#include "mm/gc.hpp"
+
+
+/* 
+---------------------------- Interface description -----------------------
+
+There are two possible choices for allocating memory:
+
+       1.   explicit allocating / deallocating
+
+                       mem_alloc ..... allocate a memory block 
+                       mem_free ...... free a memory block
+                       mem_realloc ... change size of a memory block (position may change)
+                       mem_usage ..... amount of allocated memory
+
+There are some useful macros:
+
+       NEW (type) ....... allocate memory for an element of type `type`
+       FREE (ptr,type) .. free memory
+       
+       MNEW (type,num) .. allocate memory for an array
+       MFREE (ptr,type,num) .. free memory
+       
+       MREALLOC (ptr,type,num1,num2) .. enlarge the array to size num2
+                                        
+-------------------------------------------------------------------------------
+
+Some more macros:
+
+       MEMORY_ALIGN (pos, size) ... make pos divisible by size. always returns an
+                                 address >= pos.
+                             
+       
+       OFFSET (s,el) ....... returns the offset of 'el' in structure 's' in bytes.
+                             
+       MCOPY (dest,src,type,num) ... copy 'num' elements of type 'type'.
+       
+
+*/
+
+#define PADDING(pos,size)     (MEMORY_ALIGN((pos),(size)) - (pos))
+#define OFFSET(s,el)          ((int32_t) ((ptrint) &(((s*) 0)->el)))
+
+
+#define NEW(type)             ((type *) mem_alloc(sizeof(type)))
+#define FREE(ptr,type)        mem_free((ptr), sizeof(type))
+
+#define MNEW(type,num)        ((type *) mem_alloc(sizeof(type) * (num)))
+#define MFREE(ptr,type,num)   mem_free((ptr), sizeof(type) * (num))
+
+#define MREALLOC(ptr,type,num1,num2) mem_realloc((ptr), sizeof(type) * (num1), \
+                                                        sizeof(type) * (num2))
+
+
+#define MCOPY(dest,src,type,num) memcpy((dest), (src), sizeof(type) * (num))
+#define MSET(ptr,byte,type,num) memset((ptr), (byte), sizeof(type) * (num))
+#define MZERO(ptr,type,num)     MSET(ptr,0,type,num)
+#define MMOVE(dest,src,type,num) memmove((dest), (src), sizeof(type) * (num))
+
+
+/* GC macros (boehm only) *****************************************************/
+
+#if defined(ENABLE_GC_BOEHM)
+
+/* Uncollectable memory which can contain references */
+
+#define GCNEW_UNCOLLECTABLE(type,num) ((type *) heap_alloc_uncollectable(sizeof(type) * (num)))
+
+#define GCNEW(type)           heap_alloc(sizeof(type), true, NULL, true)
+#define GCMNEW(type,num)      heap_alloc(sizeof(type) * (num), true, NULL, true)
+
+#define GCFREE(ptr)           heap_free((ptr))
+
+#endif
+
+
+/* function prototypes ********************************************************/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool  memory_init(void);
+
+void  memory_mprotect(void *addr, size_t len, int prot);
+
+void *memory_checked_alloc(size_t size);
+
+void *memory_cnew(int32_t size);
+void  memory_cfree(void *p, int32_t size);
+
+void *mem_alloc(int32_t size);
+void  mem_free(void *m, int32_t size);
+void *mem_realloc(void *src, int32_t len1, int32_t len2);
+
+#if defined(ENABLE_THREADS)
+bool  memory_start_thread(void);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _MEMORY_H */
+
+
+/*
+ * These are local overrides for various environment variables in Emacs.
+ * Please do not remove this and leave it at the end of the file, where
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: c++
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ * vim:noexpandtab:sw=4:ts=4:
+ */

diff --git a/src/mm/tlh.c b/src/mm/tlh.c
index e46cf87602be1397271c68a2f4751c08337d6bac..6fcaf5a7a42b0e5192f0252bb278437c3394b656 100644 (file)
--- a/src/mm/tlh.c
+++ b/src/mm/tlh.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "mm/tlh.h"
 
 #include "vm/global.h"

diff --git a/src/native/jni.cpp b/src/native/jni.cpp
index 21269a989086418d17ddb7a0f14b05b660ea4791..1f3bb40d2a7fca51455b3bc97277aaeefa031740 100644 (file)
--- a/src/native/jni.cpp
+++ b/src/native/jni.cpp
@@ -32,7 +32,7 @@
 #include "vm/types.h"
 
 #include "mm/gc.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/jni.hpp"
 #include "native/llni.h"

diff --git a/src/native/jvmti/jvmti.c b/src/native/jvmti/jvmti.c
index 8aba6633291fb909060f2326b0850275993aa735..461869ecc9cdb421a1532cbcb4bf29ae94865f6c 100644 (file)
--- a/src/native/jvmti/jvmti.c
+++ b/src/native/jvmti/jvmti.c
@@ -51,7 +51,7 @@
 #include "toolbox/logging.hpp"
 #include "vm/options.h"
 #include "vm/string.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "threads/mutex.h"
 #include "threads/thread.hpp"
 #include "threads/lock.hpp"

diff --git a/src/native/localref.cpp b/src/native/localref.cpp
index 3619e0df3660307eef1c7388738d1e6b5ed9bcab..bec9bfe0208f90a9b0079670ae254593d370397f 100644 (file)
--- a/src/native/localref.cpp
+++ b/src/native/localref.cpp
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/localref.hpp"
 

diff --git a/src/native/native.cpp b/src/native/native.cpp
index a53f8415239be4fad01430d32aa759f86d4c2cff..0c12b69d11b6eb2f803dd88e1d4d6b9980daf6cc 100644 (file)
--- a/src/native/native.cpp
+++ b/src/native/native.cpp
@@ -34,7 +34,7 @@
 #include <functional>
 #include <map>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/jni.hpp"
 #include "native/native.hpp"

diff --git a/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp b/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp
index 2ece32fc4ba96ee68313b3df4e261b3dced6b02a..ba78eaaddf441a7309fec2eee7b96f5fa3495ed6 100644 (file)
--- a/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp
+++ b/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <zlib.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/jni.hpp"
 #include "native/llni.h"

diff --git a/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp b/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp
index 9ad7f7c206d258eb6d074778a4b3ea8c0de0998a..16bebd345efc6aa23b3d1d82550b4c612853c676 100644 (file)
--- a/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp
+++ b/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp
@@ -34,7 +34,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/jni.hpp"
 #include "native/llni.h"

diff --git a/src/native/vm/cldc1.1/java_lang_System.cpp b/src/native/vm/cldc1.1/java_lang_System.cpp
index ccc1c0eccc57c92e9d751b0db67fa881eff5e5a0..bd7af408764eb226d8c7f113c70239129870e8b4 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_System.cpp
+++ b/src/native/vm/cldc1.1/java_lang_System.cpp
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/jni.hpp"
 #include "native/native.hpp"

diff --git a/src/native/vm/gnuclasspath/gnu_classpath_VMSystemProperties.cpp b/src/native/vm/gnuclasspath/gnu_classpath_VMSystemProperties.cpp
index 0789c0eda8d96a7a61fb1c31e31e32ab9a86c337..dc4e5ebb04726356aa8a571c0f3b228669a116b9 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_classpath_VMSystemProperties.cpp
+++ b/src/native/vm/gnuclasspath/gnu_classpath_VMSystemProperties.cpp
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/jni.hpp"
 #include "native/native.hpp"

diff --git a/src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp b/src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp
index cab192f8a1cfec4fe8be1299a827916577024e39..ebeeb162885c7f07b55162ea875171cfeebc57a2 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <sys/stat.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/jni.hpp"
 #include "native/llni.h"

diff --git a/src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp b/src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp
index 93b8833f1335bd0aa0ec2609993f643b27353790..2a885667889121a6f8d78e290b960cbbd9ce1ee2 100644 (file)
--- a/src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp
+++ b/src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp
@@ -39,7 +39,7 @@
 # include <mach/mach.h>
 #endif
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "mm/gc.hpp"
 
 #include "native/jni.hpp"

diff --git a/src/native/vm/gnuclasspath/sun_reflect_ConstantPool.cpp b/src/native/vm/gnuclasspath/sun_reflect_ConstantPool.cpp
index c454823053967732266cafca80bb6b3418887ff3..b811d6068dca24d65060697de33a1f9a57f3d283 100644 (file)
--- a/src/native/vm/gnuclasspath/sun_reflect_ConstantPool.cpp
+++ b/src/native/vm/gnuclasspath/sun_reflect_ConstantPool.cpp
@@ -40,7 +40,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/jni.hpp"
 #include "native/llni.h"

diff --git a/src/native/vm/nativevm.cpp b/src/native/vm/nativevm.cpp
index a61f61920a7792201cf92bb3c1bcdad6c161d57b..675bacb8518215d0ff0fe8ca071ebe3efaa76817 100644 (file)
--- a/src/native/vm/nativevm.cpp
+++ b/src/native/vm/nativevm.cpp
@@ -36,7 +36,7 @@
 #include "vm/os.hpp"
 
 #if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
-# include "mm/memory.h"
+# include "mm/memory.hpp"
 
 # include "native/native.hpp"
 

diff --git a/src/native/vm/openjdk/hpi.cpp b/src/native/vm/openjdk/hpi.cpp
index ad6eec544c960f81079d65585f4c44d0bd157fab..7c7527897a487dffbae493c7ffc441f5441f43d1 100644 (file)
--- a/src/native/vm/openjdk/hpi.cpp
+++ b/src/native/vm/openjdk/hpi.cpp
@@ -28,7 +28,7 @@
 // Include this one early.
 #include "native/vm/openjdk/hpi.hpp"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/native/vm/openjdk/jvm.cpp b/src/native/vm/openjdk/jvm.cpp
index 1e27cfdea6a8c77155ef7193de4bdd4dc7ababc4..2133bf626adca31c49c01e4ac72b1bf370136f83 100644 (file)
--- a/src/native/vm/openjdk/jvm.cpp
+++ b/src/native/vm/openjdk/jvm.cpp
@@ -50,7 +50,7 @@
 #include INCLUDE_JVM_MD_H
 #include INCLUDE_JVM_H
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 #include "native/native.hpp"

diff --git a/src/native/vm/sun_misc_Unsafe.cpp b/src/native/vm/sun_misc_Unsafe.cpp
index bdba0c83a297d4022589d3980de4a76b184c89c8..7f68184968cb544334041221c62689ea32b551d0 100644 (file)
--- a/src/native/vm/sun_misc_Unsafe.cpp
+++ b/src/native/vm/sun_misc_Unsafe.cpp
@@ -30,7 +30,7 @@
 
 #include "threads/atomic.hpp"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/jni.hpp"
 #include "native/llni.h"

diff --git a/src/threads/lock.cpp b/src/threads/lock.cpp
index 7df64763527b45a3601f080d3a81da02b7c422f7..67c1e2f5342d485444bdced0528e62a67dc64698 100644 (file)
--- a/src/threads/lock.cpp
+++ b/src/threads/lock.cpp
@@ -33,7 +33,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/threads/posix/thread-posix.cpp b/src/threads/posix/thread-posix.cpp
index 29d0767ce2536ce15d72b3ce15d740815f9b2dfa..6a8b82feb4d624d318ce97fabc1f4141b8e94446 100644 (file)
--- a/src/threads/posix/thread-posix.cpp
+++ b/src/threads/posix/thread-posix.cpp
@@ -43,7 +43,7 @@
 #include "arch.h"
 
 #include "mm/gc.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #if defined(ENABLE_GC_CACAO)
 # include "mm/cacao-gc/gc.h"

diff --git a/src/threads/posix/thread-posix.hpp b/src/threads/posix/thread-posix.hpp
index 76892b7c3a6539fcceba3af97f98fa1d9f30d36a..8f0e55c71ad5fac2115d5143259408dfe0a8b1e1 100644 (file)
--- a/src/threads/posix/thread-posix.hpp
+++ b/src/threads/posix/thread-posix.hpp
@@ -193,7 +193,7 @@ inline static threadobject* thread_get_current(void);
 
 
 // Includes.
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/localref.hpp"
 

diff --git a/src/threads/thread.cpp b/src/threads/thread.cpp
index fefb4a34f662c6465c63b023f1d3416ccf01a849..39d172970dcdcfaa664ea6b34afabe6bf2cd5a70 100644 (file)
--- a/src/threads/thread.cpp
+++ b/src/threads/thread.cpp
@@ -31,7 +31,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #if defined(ENABLE_GC_BOEHM)
 /* We need to include Boehm's gc.h here for GC_register_my_thread and

diff --git a/src/toolbox/avl.c b/src/toolbox/avl.c
index cb247f110ce95154e08ac0cf0ff4ba12d1ca3e00..d9d31210b3a863ecf9015efd341b2dc86c33c197 100644 (file)
--- a/src/toolbox/avl.c
+++ b/src/toolbox/avl.c
@@ -29,7 +29,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/mutex.hpp"
 

diff --git a/src/toolbox/bitvector.c b/src/toolbox/bitvector.c
index 66b9df11561033c0222f2486dd8a1f527b5551a0..9d82d46b910886acfed7a977417887b7f9f70261 100644 (file)
--- a/src/toolbox/bitvector.c
+++ b/src/toolbox/bitvector.c
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "toolbox/bitvector.h"
 
 

diff --git a/src/toolbox/hashtable.c b/src/toolbox/hashtable.c
index dd49f3de543a65e191c909da805d04ab9c5764df..9fa938f416abf01cee84220c1a529ef6ccc77810 100644 (file)
--- a/src/toolbox/hashtable.c
+++ b/src/toolbox/hashtable.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/mutex.hpp"
 

diff --git a/src/toolbox/logging.cpp b/src/toolbox/logging.cpp
index 00258dadfd10a90bc6245397eefe7b5395d25301..c38b32b02ef4e3f47a5cc31a90c19742f75cb866 100644 (file)
--- a/src/toolbox/logging.cpp
+++ b/src/toolbox/logging.cpp
@@ -31,7 +31,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/thread.hpp"
 

diff --git a/src/toolbox/set.c b/src/toolbox/set.c
index c63ddf8827f91b68d35225c7f09820a02111219d..d30fafaae532a7f702615f34d11f03672b724623 100644 (file)
--- a/src/toolbox/set.c
+++ b/src/toolbox/set.c
@@ -36,7 +36,7 @@
 
 #include "toolbox/set.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/global.h"
 

diff --git a/src/toolbox/util.c b/src/toolbox/util.c
index 2e26c259b6c1be35205db5583e73d469480cd6f7..4adb970f5f00d0c0ffa97d1a37f8d8a6a13eedb0 100644 (file)
--- a/src/toolbox/util.c
+++ b/src/toolbox/util.c
@@ -32,7 +32,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "vm/vm.hpp"
 
 

diff --git a/src/toolbox/worklist.c b/src/toolbox/worklist.c
index 6cb9fb37a90daf9838c3f9c6963fc15f65ee5e36..5489f1709d9cb61aeea1188b5e6de61d90f988ca 100644 (file)
--- a/src/toolbox/worklist.c
+++ b/src/toolbox/worklist.c
@@ -29,7 +29,7 @@
 
 */
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "toolbox/worklist.h"
 
 

diff --git a/src/vm/access.cpp b/src/vm/access.cpp
index a0abbc1569e81429bedaa00f7ec48dc1baacfbc4..a7bfc5b9bd5cf88e5486f3bc8b36fdb958a6473a 100644 (file)
--- a/src/vm/access.cpp
+++ b/src/vm/access.cpp
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/vm/annotation.c b/src/vm/annotation.c
index 373187ea08704c01c15103f17f971139dcd75564..6363970b8421381f39ab73fe969aad6fb9bab52f 100644 (file)
--- a/src/vm/annotation.c
+++ b/src/vm/annotation.c
@@ -30,7 +30,7 @@
 
 #include "native/llni.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/logging.hpp"
 

diff --git a/src/vm/assertion.cpp b/src/vm/assertion.cpp
index 7252aa320ac0bfd6cb788ed6ff155e6e9bec0ce5..ada17e4d0f096538605257c1ae8eb49d218c2b04 100644 (file)
--- a/src/vm/assertion.cpp
+++ b/src/vm/assertion.cpp
@@ -29,7 +29,7 @@
 
 #include <cstddef>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/list.hpp"
 

diff --git a/src/vm/class.cpp b/src/vm/class.cpp
index ec8a9538bf336cf5b4036f90ea5999307c7edec9..9ab89073c74ad911438843ba633582f881431cf4 100644 (file)
--- a/src/vm/class.cpp
+++ b/src/vm/class.cpp
@@ -34,7 +34,7 @@
 
 #include "arch.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/vm/classcache.cpp b/src/vm/classcache.cpp
index 7f128a4ebced0ac1ab24d45a1d7bb1ee1de93397..834527e7df8e91148fea6e6418dd8761894d0ab0 100644 (file)
--- a/src/vm/classcache.cpp
+++ b/src/vm/classcache.cpp
@@ -29,7 +29,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 #include "threads/mutex.hpp"

diff --git a/src/vm/descriptor.cpp b/src/vm/descriptor.cpp
index f939c60129416f8ad34bab9092ad0ca0f2d7ac90..d8e0e3443ddc4ba3fba393dba016bf5b16b52b1d 100644 (file)
--- a/src/vm/descriptor.cpp
+++ b/src/vm/descriptor.cpp
@@ -31,7 +31,7 @@
 
 #include "md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/descriptor.hpp"
 #include "vm/exceptions.hpp"

diff --git a/src/vm/exceptions.cpp b/src/vm/exceptions.cpp
index 5f01f221ec791b015e8ce58e33dd7847429057a4..332fca04b15e1c1304b1921a9b7c292fc84a96d3 100644 (file)
--- a/src/vm/exceptions.cpp
+++ b/src/vm/exceptions.cpp
@@ -35,7 +35,7 @@
 
 #include "md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 #include "native/native.hpp"

diff --git a/src/vm/field.cpp b/src/vm/field.cpp
index c2ffe827b7271a49d2ccceb257062840dece4c9c..7968d28dbc12cc6025fbdfc120b2084ea2b83421 100644 (file)
--- a/src/vm/field.cpp
+++ b/src/vm/field.cpp
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/vm/finalizer.cpp b/src/vm/finalizer.cpp
index 690a09ac5764568368dfd9e80d19065c4a2eaae2..cd14c484e4d6e0f68e349e09f379fc0f322976f3 100644 (file)
--- a/src/vm/finalizer.cpp
+++ b/src/vm/finalizer.cpp
@@ -29,7 +29,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/condition.hpp"
 #include "threads/mutex.hpp"

diff --git a/src/vm/javaobjects.hpp b/src/vm/javaobjects.hpp
index f53021823dc92506107df2aba9a4c5834c4520e8..ce525c956cc7a79d73cd3fbee26ca6b7e87f3d16 100644 (file)
--- a/src/vm/javaobjects.hpp
+++ b/src/vm/javaobjects.hpp
@@ -29,7 +29,7 @@
 
 #include <stdint.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/vm/jit/allocator/liveness.c b/src/vm/jit/allocator/liveness.c
index 7b97c66c51db00adfbabe133c5ac23d7cc7943bf..8e748688741ac3ee07735494245892cd961d84ba 100644 (file)
--- a/src/vm/jit/allocator/liveness.c
+++ b/src/vm/jit/allocator/liveness.c
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/logging.hpp"
 #include "toolbox/worklist.h"

diff --git a/src/vm/jit/allocator/lsra.c b/src/vm/jit/allocator/lsra.c
index 6e650a9d3d0ef915addf4c8466497b05b2f10d07..c5e1ad29997dfec1bce10a2388cf75e037d11484 100644 (file)
--- a/src/vm/jit/allocator/lsra.c
+++ b/src/vm/jit/allocator/lsra.c
@@ -35,7 +35,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/logging.hpp"
 

diff --git a/src/vm/jit/allocator/simplereg.c b/src/vm/jit/allocator/simplereg.c
index f852229bf0b426b63f880ffa5ba7d9ab80314d06..f3390ba045c9e96125824b126f2ad9b2ab5b3900 100644 (file)
--- a/src/vm/jit/allocator/simplereg.c
+++ b/src/vm/jit/allocator/simplereg.c
@@ -33,7 +33,7 @@
 #include "arch.h"
 #include "md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/jit/builtin.hpp"
 #include "vm/exceptions.hpp"

diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c
index bb5f050f82ced2be5400d5c93ba7bafe8b08e500..2c14d21fea8c37cc2b8509360a1048d68afa948d 100644 (file)
--- a/src/vm/jit/alpha/codegen.c
+++ b/src/vm/jit/alpha/codegen.c
@@ -36,7 +36,7 @@
 #include "vm/jit/alpha/arch.h"
 #include "vm/jit/alpha/codegen.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/localref.hpp"
 #include "native/native.hpp"

diff --git a/src/vm/jit/alpha/emit.c b/src/vm/jit/alpha/emit.c
index 8bf59e90e858c4fce000427a83bc9bb62b1c70b9..96fb6f0be0a72427f95e41a37e9ca06be35828b6 100644 (file)
--- a/src/vm/jit/alpha/emit.c
+++ b/src/vm/jit/alpha/emit.c
@@ -33,7 +33,7 @@
 
 #include "vm/jit/alpha/codegen.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 

diff --git a/src/vm/jit/alpha/patcher.c b/src/vm/jit/alpha/patcher.c
index 6d3c5fdf4d6697f33a7aa17da8a192359732f0d0..2e0aeaa95c7131d43563e28f650e53ab92a12534 100644 (file)
--- a/src/vm/jit/alpha/patcher.c
+++ b/src/vm/jit/alpha/patcher.c
@@ -31,7 +31,7 @@
 
 #include "vm/jit/alpha/md.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/argument.cpp b/src/vm/jit/argument.cpp
index 6b1d37d3de3e779ce33b90401ca989235d49ceb0..5ee7ca6d5b22e5b8d62acb6a222f05f38402a7bf 100644 (file)
--- a/src/vm/jit/argument.cpp
+++ b/src/vm/jit/argument.cpp
@@ -30,7 +30,7 @@
 
 #include "arch.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/vm/jit/arm/codegen.c b/src/vm/jit/arm/codegen.c
index 0095d45d892c5c941fca4eabc866a4f2fc668450..bc8c777a37e01748f1d75f37b0e6cde234a72717 100644 (file)
--- a/src/vm/jit/arm/codegen.c
+++ b/src/vm/jit/arm/codegen.c
@@ -35,7 +35,7 @@
 #include "vm/jit/arm/arch.h"
 #include "vm/jit/arm/codegen.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/localref.hpp"
 #include "native/native.hpp"

diff --git a/src/vm/jit/arm/emit.c b/src/vm/jit/arm/emit.c
index df595f0230da0c8245a42e771e232d3b151af188..c6c922c2131a23f032395369989bd6a03925ca12 100644 (file)
--- a/src/vm/jit/arm/emit.c
+++ b/src/vm/jit/arm/emit.c
@@ -34,7 +34,7 @@
 
 #include "vm/jit/arm/codegen.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 

diff --git a/src/vm/jit/arm/patcher.c b/src/vm/jit/arm/patcher.c
index 7dcd3c44d85accfd6f4dc2b47445a9de1e694fd6..93432e094e5ee13cce25243c11f3f69c6696580e 100644 (file)
--- a/src/vm/jit/arm/patcher.c
+++ b/src/vm/jit/arm/patcher.c
@@ -33,7 +33,7 @@
 
 #include "vm/jit/arm/md.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/builtin.cpp b/src/vm/jit/builtin.cpp
index 088dcdf3534b8d2b4479f7760a7c46e9bcec048f..9e927c39bc2e4ed299dcea29c3a4fa02d9211c42 100644 (file)
--- a/src/vm/jit/builtin.cpp
+++ b/src/vm/jit/builtin.cpp
@@ -48,7 +48,7 @@
 #endif
 
 #include "mm/gc.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/vm/jit/cfg.c b/src/vm/jit/cfg.c
index 4772b95f2f71d984b7cb776122ff305233e7527e..63e3821c4b07f2cfd01c600f38b79f2564ce3f60 100644 (file)
--- a/src/vm/jit/cfg.c
+++ b/src/vm/jit/cfg.c
@@ -30,7 +30,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/global.h"
 

diff --git a/src/vm/jit/code.cpp b/src/vm/jit/code.cpp
index b39852d2ed7a8f20024421d435153fc70bb2bb25..53dec1fd2485d6a1b2cedbbaf02b19869321a5a8 100644 (file)
--- a/src/vm/jit/code.cpp
+++ b/src/vm/jit/code.cpp
@@ -30,7 +30,7 @@
 
 #include "arch.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/options.h"
 #include "vm/vm.hpp"

diff --git a/src/vm/jit/codegen-common.cpp b/src/vm/jit/codegen-common.cpp
index 606cb2f059f94ab3d14c18bb8e05d767a454d820..218c2537f9b85a4c2cd314b8f1c09f0468ba06ad 100644 (file)
--- a/src/vm/jit/codegen-common.cpp
+++ b/src/vm/jit/codegen-common.cpp
@@ -51,7 +51,7 @@
 #include "md.h"
 #include "md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/avl.h"
 #include "toolbox/list.hpp"

diff --git a/src/vm/jit/disass-common.c b/src/vm/jit/disass-common.c
index f3636f88d1118d9635bb60741de06f9ffb065593..75ebe3b3dd1a76844589cd136f4b28af8d496ca8 100644 (file)
--- a/src/vm/jit/disass-common.c
+++ b/src/vm/jit/disass-common.c
@@ -33,7 +33,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/jit/disass.h"
 

diff --git a/src/vm/jit/dseg.c b/src/vm/jit/dseg.c
index b66da4bd4c3ed83bfe60b8ffedcbe78056ab76cc..92129f4112ca012c6d99a53b7ac62461dda04642 100644 (file)
--- a/src/vm/jit/dseg.c
+++ b/src/vm/jit/dseg.c
@@ -29,7 +29,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/options.h"
 

diff --git a/src/vm/jit/exceptiontable.c b/src/vm/jit/exceptiontable.c
index 9130543d24762d806416a9e9774bd7369b3ddd33..7745c7ff358f64dfec685b8f54bee1f2c8eee07c 100644 (file)
--- a/src/vm/jit/exceptiontable.c
+++ b/src/vm/jit/exceptiontable.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/jit/code.hpp"
 #include "vm/jit/exceptiontable.h"

diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c
index b5dbe1b322ef39eef90e1e3e98a73c4069b00c0c..7ac8e26e90e53a4fe4eb1a44f439d722daed0732 100644 (file)
--- a/src/vm/jit/i386/codegen.c
+++ b/src/vm/jit/i386/codegen.c
@@ -36,7 +36,7 @@
 #include "vm/jit/i386/codegen.h"
 #include "vm/jit/i386/emit.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/localref.hpp"
 #include "native/native.hpp"

diff --git a/src/vm/jit/i386/emit.c b/src/vm/jit/i386/emit.c
index ca730f3b60a944af9ec7af715c3196a8bb11b25f..784942aa7ffcbafa5c2788821a49e693fff9d6d5 100644 (file)
--- a/src/vm/jit/i386/emit.c
+++ b/src/vm/jit/i386/emit.c
@@ -33,7 +33,7 @@
 #include "vm/jit/i386/emit.h"
 #include "vm/jit/i386/md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 

diff --git a/src/vm/jit/i386/patcher.c b/src/vm/jit/i386/patcher.c
index fa55465e22c61bb36e6f079f164f252b34c418bc..ff67f972a743a33977ee042a20b19a6bcf58cfb2 100644 (file)
--- a/src/vm/jit/i386/patcher.c
+++ b/src/vm/jit/i386/patcher.c
@@ -32,7 +32,7 @@
 #include "vm/jit/i386/codegen.h"
 #include "vm/jit/i386/md.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/inline/inline.cpp b/src/vm/jit/inline/inline.cpp
index a796ae2485f0b4098b4e60cfc5d55a7c56dddda5..721e143d4654fcf7b36f31983b7dc5dd9d5f32b3 100644 (file)
--- a/src/vm/jit/inline/inline.cpp
+++ b/src/vm/jit/inline/inline.cpp
@@ -32,7 +32,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 #include "threads/mutex.hpp"

diff --git a/src/vm/jit/intrp/codegen.c b/src/vm/jit/intrp/codegen.c
index 4fbca4a70d15856dfe575b7af0675374fcef8cea..0e477cc37a270dd6302ef42cd2f3ab5a4a66d481 100644 (file)
--- a/src/vm/jit/intrp/codegen.c
+++ b/src/vm/jit/intrp/codegen.c
@@ -43,7 +43,7 @@
 #include "vm/jit/intrp/codegen.h"
 #include "vm/jit/intrp/intrp.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/intrp/dynamic-super.c b/src/vm/jit/intrp/dynamic-super.c
index dba9173bf0863318d7f389b70474824751a7a146..db0baf5ba6563a131ab7ca6242cca322d8cf2d52 100644 (file)
--- a/src/vm/jit/intrp/dynamic-super.c
+++ b/src/vm/jit/intrp/dynamic-super.c
@@ -36,7 +36,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 

diff --git a/src/vm/jit/intrp/engine.c b/src/vm/jit/intrp/engine.c
index a09239243c2e1b46069a6a370a0cfcefe7d92e5e..118883f720c09c21215ae8d55979395389073968 100644 (file)
--- a/src/vm/jit/intrp/engine.c
+++ b/src/vm/jit/intrp/engine.c
@@ -37,7 +37,7 @@
 
 #include "md-abi.h"                           /* required for TRACE_ARGS_NUM */
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/thread.hpp"
 

diff --git a/src/vm/jit/intrp/patcher.c b/src/vm/jit/intrp/patcher.c
index 518c757b167aa39bdd85e7b37ad561993d5679f5..530e38e961df18815c5fbcac4e63ad08a27a6d0d 100644 (file)
--- a/src/vm/jit/intrp/patcher.c
+++ b/src/vm/jit/intrp/patcher.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/jit.cpp b/src/vm/jit/jit.cpp
index ffd51344b0f3bcf65345c402e790b31eb28f4cfe..2da94922a2cccd49e8a876dcb7ae6a67ecb8ba07 100644 (file)
--- a/src/vm/jit/jit.cpp
+++ b/src/vm/jit/jit.cpp
@@ -32,7 +32,7 @@
 
 #include "md.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/linenumbertable.cpp b/src/vm/jit/linenumbertable.cpp
index 379f6de8ad79f3c424704e1a135d1a5db12ea57c..7a19b1dfb91701f4497471c999d677859039eee2 100644 (file)
--- a/src/vm/jit/linenumbertable.cpp
+++ b/src/vm/jit/linenumbertable.cpp
@@ -30,7 +30,7 @@
 
 #include <algorithm>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/list.hpp"
 

diff --git a/src/vm/jit/loop/analyze.c b/src/vm/jit/loop/analyze.c
index fe4d4996bfd165d3629c60525d07f887356c878f..4bf02301d492c826fb1f37e98998a742d1c0d525 100644 (file)
--- a/src/vm/jit/loop/analyze.c
+++ b/src/vm/jit/loop/analyze.c
@@ -32,7 +32,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "toolbox/logging.hpp"
 
 #include "vm/jit/jit.hpp"

diff --git a/src/vm/jit/loop/graph.c b/src/vm/jit/loop/graph.c
index 7e26d34336c32be6e36b597149c0eca270d654be..9c420e5b842c978b9d98c0d694892c67deea9a82 100644 (file)
--- a/src/vm/jit/loop/graph.c
+++ b/src/vm/jit/loop/graph.c
@@ -36,7 +36,7 @@
 
 #include <assert.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "toolbox/logging.hpp"
 #include "vm/jit/jit.hpp"
 #include "vm/jit/loop/graph.h"

diff --git a/src/vm/jit/loop/loop.c b/src/vm/jit/loop/loop.c
index db7a0ebe6cf86ae77fb33d5f70371bd29cde8c16..2a50956f0be31f4bb6316b80767adb6881ae8fc2 100644 (file)
--- a/src/vm/jit/loop/loop.c
+++ b/src/vm/jit/loop/loop.c
@@ -40,7 +40,7 @@
 /*  #include <stdio.h> */
 #include <stdlib.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "toolbox/logging.hpp"
 #include "vm/global.h" 
 #include "vm/jit/jit.hpp"      

diff --git a/src/vm/jit/loop/tracing.c b/src/vm/jit/loop/tracing.c
index b2e295e6bae6245347f063701aec4752b2108eb9..78c4fab34a38b4f931dffd416023e444e5f826c3 100644 (file)
--- a/src/vm/jit/loop/tracing.c
+++ b/src/vm/jit/loop/tracing.c
@@ -34,7 +34,7 @@
 */
 
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "vm/jit/builtin.hpp"
 #include "vm/resolve.hpp"
 #include "vm/jit/loop/loop.h"

diff --git a/src/vm/jit/m68k/codegen.c b/src/vm/jit/m68k/codegen.c
index a6ad45abeef0244cfe0ed521ba3f4dd8acdce5fb..5c46894032a1423a32348317ed8de6b93f14b8be 100644 (file)
--- a/src/vm/jit/m68k/codegen.c
+++ b/src/vm/jit/m68k/codegen.c
@@ -34,7 +34,7 @@
 #include "vm/jit/m68k/codegen.h"
 #include "vm/jit/m68k/emit.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/localref.hpp"
 #include "native/native.hpp"

diff --git a/src/vm/jit/m68k/emit.c b/src/vm/jit/m68k/emit.c
index 81fc1288f2d5ac61e799535cf29cbfecaccc7ccd..63d74a8e6f5fed954cc43ca0bbcbdddbddd6102d 100644 (file)
--- a/src/vm/jit/m68k/emit.c
+++ b/src/vm/jit/m68k/emit.c
@@ -30,7 +30,7 @@
 #include "vm/jit/m68k/codegen.h"
 #include "vm/jit/m68k/emit.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/jit/builtin.hpp"
 

diff --git a/src/vm/jit/m68k/patcher.c b/src/vm/jit/m68k/patcher.c
index 186e7dcdf20bc490cf5d3d9bafa21a99d2d74e05..1bea411e74fadbe3f0a40f77ed81a2bb9ce33807 100644 (file)
--- a/src/vm/jit/m68k/patcher.c
+++ b/src/vm/jit/m68k/patcher.c
@@ -31,7 +31,7 @@
 
 #include "vm/jit/m68k/md.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "native/native.hpp"
 
 #include "vm/jit/builtin.hpp"

diff --git a/src/vm/jit/methodtree.c b/src/vm/jit/methodtree.c
index 0cb513794b8f5998e0979b414544f812b6356bea..2d125364af7662db83fec266a87d513d0e53463c 100644 (file)
--- a/src/vm/jit/methodtree.c
+++ b/src/vm/jit/methodtree.c
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/avl.h"
 

diff --git a/src/vm/jit/mips/codegen.c b/src/vm/jit/mips/codegen.c
index e81137a706df83df1b9f9581ae93a76d7d8efd1a..7fac7239123a0ac7950dab501895bae3951acce0 100644 (file)
--- a/src/vm/jit/mips/codegen.c
+++ b/src/vm/jit/mips/codegen.c
@@ -35,7 +35,7 @@
 #include "vm/jit/mips/arch.h"
 #include "vm/jit/mips/codegen.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/localref.hpp"
 #include "native/native.hpp"

diff --git a/src/vm/jit/mips/emit.c b/src/vm/jit/mips/emit.c
index fb41435ebd8bf88e3c02f9827346a2d2d3765c7f..98e9b451fe4c21059433141c593cf52245bc19ae 100644 (file)
--- a/src/vm/jit/mips/emit.c
+++ b/src/vm/jit/mips/emit.c
@@ -32,7 +32,7 @@
 #include "vm/jit/mips/codegen.h"
 #include "vm/jit/mips/md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 

diff --git a/src/vm/jit/mips/linux/md-os.c b/src/vm/jit/mips/linux/md-os.c
index f7b6601de5b8556c29b47905d88115ebc1df5156..2f2bee2df761a8a0ab10cc5659e6d7ce4833b587 100644 (file)
--- a/src/vm/jit/mips/linux/md-os.c
+++ b/src/vm/jit/mips/linux/md-os.c
@@ -38,7 +38,7 @@
 #include "vm/jit/mips/md-abi.h"
 
 #include "mm/gc.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/signallocal.h"
 #include "vm/os.hpp"

diff --git a/src/vm/jit/mips/md-abi.c b/src/vm/jit/mips/md-abi.c
index 663aa91f7cb711965a36e4d613b0da09d7717e3b..da2af84aaae52957cb26bee8dd77ec23638f0339 100644 (file)
--- a/src/vm/jit/mips/md-abi.c
+++ b/src/vm/jit/mips/md-abi.c
@@ -32,7 +32,7 @@
 
 #include "vm/jit/mips/md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/descriptor.hpp"
 #include "vm/global.h"

diff --git a/src/vm/jit/mips/patcher.c b/src/vm/jit/mips/patcher.c
index a5a5785b11810fa80ac1a1a8d2e5090f669822bb..d36ea67f3bc55ebb65f9e5963bdf3ea02056e1d1 100644 (file)
--- a/src/vm/jit/mips/patcher.c
+++ b/src/vm/jit/mips/patcher.c
@@ -31,7 +31,7 @@
 #include "vm/jit/mips/codegen.h"
 #include "vm/jit/mips/md.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/oprofile-agent.cpp b/src/vm/jit/oprofile-agent.cpp
index 36e97a77f99a7bcfd8723c4b88a97690fe8309d7..9c6f44ee4c3b264e94da04b39ef6c4be4c4040d2 100644 (file)
--- a/src/vm/jit/oprofile-agent.cpp
+++ b/src/vm/jit/oprofile-agent.cpp
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/jit/code.hpp"
 #include "vm/jit/oprofile-agent.hpp"

diff --git a/src/vm/jit/optimizing/bytecode_escape.c b/src/vm/jit/optimizing/bytecode_escape.c
index 444503fa7d03505b50b74c156bc74668a14933ad..722e2f04132fb5aac88bed890cf1d3ae92ca4791 100644 (file)
--- a/src/vm/jit/optimizing/bytecode_escape.c
+++ b/src/vm/jit/optimizing/bytecode_escape.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 
 #include "mm/dumpmemory.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/bitvector.h"
 

diff --git a/src/vm/jit/optimizing/dominators.cpp b/src/vm/jit/optimizing/dominators.cpp
index 9fe830b3f8ed74d3c2dc2740634d4c6f6ebbb4ee..f2cb5c9c4462e70097d4d6e0e2d241586e7be204 100644 (file)
--- a/src/vm/jit/optimizing/dominators.cpp
+++ b/src/vm/jit/optimizing/dominators.cpp
@@ -27,7 +27,7 @@
 
 #include "config.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/bitvector.h"
 

diff --git a/src/vm/jit/optimizing/graph.c b/src/vm/jit/optimizing/graph.c
index fdde38c0c9fa9ff75a0b245758ccaf3f9e69cce7..12a8ecfbdc2ed73f377a09f66f5500c932c35a86 100644 (file)
--- a/src/vm/jit/optimizing/graph.c
+++ b/src/vm/jit/optimizing/graph.c
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/bitvector.h"
 

diff --git a/src/vm/jit/optimizing/lifetimes.c b/src/vm/jit/optimizing/lifetimes.c
index 8abc257417b2040f789d205e178d9a2db701f732..317ae077f42a4157e973777df6ffe3e3c92eb452 100644 (file)
--- a/src/vm/jit/optimizing/lifetimes.c
+++ b/src/vm/jit/optimizing/lifetimes.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/bitvector.h"
 #include "toolbox/worklist.h"

diff --git a/src/vm/jit/optimizing/lsra.c b/src/vm/jit/optimizing/lsra.c
index 147b8e03f0d96589fb3f52d04e58f942f1717633..0c43e2c45dac783f4f6d77b957f9afe5ff5d9c6d 100644 (file)
--- a/src/vm/jit/optimizing/lsra.c
+++ b/src/vm/jit/optimizing/lsra.c
@@ -31,7 +31,7 @@
 #include "arch.h"
 #include "md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/bitvector.h"
 

diff --git a/src/vm/jit/optimizing/profile.c b/src/vm/jit/optimizing/profile.c
index e397be6021bf31dc2313016d4226fadc7191a265..ea81010678fd9687b4a2c9eedd0dd736e67fdef3 100644 (file)
--- a/src/vm/jit/optimizing/profile.c
+++ b/src/vm/jit/optimizing/profile.c
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/threadlist.hpp"
 #include "threads/thread.hpp"

diff --git a/src/vm/jit/optimizing/recompiler.cpp b/src/vm/jit/optimizing/recompiler.cpp
index 4f3d5242620b67f44ffe68e4489763e611596a73..29fdc80d9f72c25977930d110be5bf428b5da9ec 100644 (file)
--- a/src/vm/jit/optimizing/recompiler.cpp
+++ b/src/vm/jit/optimizing/recompiler.cpp
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/condition.hpp"
 #include "threads/mutex.hpp"

diff --git a/src/vm/jit/optimizing/reorder.c b/src/vm/jit/optimizing/reorder.c
index 2b135943f62a20f0473c95bf7340dfa646c8a183..3dd1819332d444339086b803614b9b6f178868af 100644 (file)
--- a/src/vm/jit/optimizing/reorder.c
+++ b/src/vm/jit/optimizing/reorder.c
@@ -37,7 +37,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "vm/jit/jit.hpp"
 
 

diff --git a/src/vm/jit/optimizing/ssa.c b/src/vm/jit/optimizing/ssa.c
index 357f323f6a9d3a8e1d2d2cd2fce0d6024b3a4d73..dd70dac52f9b42b881ae08d7760cfb97363b8443 100644 (file)
--- a/src/vm/jit/optimizing/ssa.c
+++ b/src/vm/jit/optimizing/ssa.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/bitvector.h"
 #include "toolbox/worklist.h"

diff --git a/src/vm/jit/optimizing/ssa2.c b/src/vm/jit/optimizing/ssa2.c
index ad1038a853d2902b2a48a6aa5f18f49585d3250d..07c89e32440f6071b9318d9f48befed406403f9e 100644 (file)
--- a/src/vm/jit/optimizing/ssa2.c
+++ b/src/vm/jit/optimizing/ssa2.c
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/bitvector.h"
 #include "toolbox/set.h"

diff --git a/src/vm/jit/optimizing/ssa3.c b/src/vm/jit/optimizing/ssa3.c
index 3391d41dd4d2223fb82a4487d2f64b32b9da9861..88d9f95f503323f2cdc92e572adb1758f47e88e1 100644 (file)
--- a/src/vm/jit/optimizing/ssa3.c
+++ b/src/vm/jit/optimizing/ssa3.c
@@ -43,7 +43,7 @@
 
 #include "vm/jit/jit.hpp"
 #include "vm/global.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "mm/dumpmemory.hpp"
 #include "toolbox/list.hpp"
 

diff --git a/src/vm/jit/optimizing/ssa_phi.c b/src/vm/jit/optimizing/ssa_phi.c
index e79b1654d7be1452270a65c824c339a069977198..c21c06a962166b8dd5abde85ac250cc082b4f3c5 100644 (file)
--- a/src/vm/jit/optimizing/ssa_phi.c
+++ b/src/vm/jit/optimizing/ssa_phi.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/bitvector.h"
 #include "toolbox/worklist.h"

diff --git a/src/vm/jit/optimizing/ssa_rename.c b/src/vm/jit/optimizing/ssa_rename.c
index 87fdd130f76934a7e717f966a38113915dfb6158..98ae0d4c09c943b263db58f3d750449414a65dce 100644 (file)
--- a/src/vm/jit/optimizing/ssa_rename.c
+++ b/src/vm/jit/optimizing/ssa_rename.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/bitvector.h"
 #include "toolbox/worklist.h"

diff --git a/src/vm/jit/parse.cpp b/src/vm/jit/parse.cpp
index 528b7ed1feb9dfa88347d85a5700b6f13ba961b7..49fa5c2bcd570c4c86b609b12327a378b35c6059 100644 (file)
--- a/src/vm/jit/parse.cpp
+++ b/src/vm/jit/parse.cpp
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/patcher-common.cpp b/src/vm/jit/patcher-common.cpp
index d2cb69f5ab444e9d81caebff28efa8409a9b7672..b4386ada1df60a584030777d65b829f9de6520fa 100644 (file)
--- a/src/vm/jit/patcher-common.cpp
+++ b/src/vm/jit/patcher-common.cpp
@@ -35,7 +35,7 @@
 #include "codegen.h"                   /* for PATCHER_NOPS */
 #include "md.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/powerpc/codegen.c b/src/vm/jit/powerpc/codegen.c
index dcfc0482e276bfe38417c7cbebd7ecc8ca58ab41..555f0cf8350dcdb650de97d349e35ab4fa183d28 100644 (file)
--- a/src/vm/jit/powerpc/codegen.c
+++ b/src/vm/jit/powerpc/codegen.c
@@ -36,7 +36,7 @@
 #include "vm/jit/powerpc/arch.h"
 #include "vm/jit/powerpc/codegen.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/localref.hpp"
 #include "native/native.hpp"

diff --git a/src/vm/jit/powerpc/emit.c b/src/vm/jit/powerpc/emit.c
index 66221d67d115adbbdcd0aeec1ce1697bb31027db..9569377aad1d700a664beea758decf578d318057 100644 (file)
--- a/src/vm/jit/powerpc/emit.c
+++ b/src/vm/jit/powerpc/emit.c
@@ -34,7 +34,7 @@
 
 #include "vm/jit/powerpc/codegen.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 

diff --git a/src/vm/jit/powerpc/patcher.c b/src/vm/jit/powerpc/patcher.c
index a4fc722b1de7077f4e5689b3c2918b3580021e45..b62294b5d948cf29ef1b1518351e43acec976137 100644 (file)
--- a/src/vm/jit/powerpc/patcher.c
+++ b/src/vm/jit/powerpc/patcher.c
@@ -33,7 +33,7 @@
 
 #include "vm/jit/powerpc/md.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c
index 6de89aaf0b6c5c16d65127a5f882d02e4e68a968..7c609638f81d49574abc9c015c5ecee2967a24bf 100644 (file)
--- a/src/vm/jit/powerpc64/codegen.c
+++ b/src/vm/jit/powerpc64/codegen.c
@@ -37,7 +37,7 @@
 #include "vm/jit/powerpc64/arch.h"
 #include "vm/jit/powerpc64/codegen.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/localref.hpp"
 #include "native/native.hpp"

diff --git a/src/vm/jit/powerpc64/emit.c b/src/vm/jit/powerpc64/emit.c
index 4e7a37f718c21b0200688098c29e828f78dc7257..0888baefe8a7696ca8e8db354b53a15ae67eec4d 100644 (file)
--- a/src/vm/jit/powerpc64/emit.c
+++ b/src/vm/jit/powerpc64/emit.c
@@ -29,7 +29,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "md-abi.h"
 #include "vm/jit/powerpc64/codegen.h"

diff --git a/src/vm/jit/powerpc64/patcher.c b/src/vm/jit/powerpc64/patcher.c
index 9e1799c2296270d680a9243dd4d27786a04991a6..c923f84484df325666cd3cf0e4b6e3ea77fe15b8 100644 (file)
--- a/src/vm/jit/powerpc64/patcher.c
+++ b/src/vm/jit/powerpc64/patcher.c
@@ -33,7 +33,7 @@
 
 #include "vm/jit/powerpc64/md.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/reg.c b/src/vm/jit/reg.c
index 3829d98651bcb3169a3434c88c365f9a35ed9cf6..8dff2425134056e04f727d2b2641da7edee7dede 100644 (file)
--- a/src/vm/jit/reg.c
+++ b/src/vm/jit/reg.c
@@ -34,7 +34,7 @@
 #include "arch.h"
 #include "md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "vm/jit/abi.h"
 #include "vm/jit/reg.h"
 

diff --git a/src/vm/jit/replace.cpp b/src/vm/jit/replace.cpp
index b0644f1317f091dcfdba349001fd68507eb2ac39..94b0b1edb06932ddf640baee19d618a033c03082 100644 (file)
--- a/src/vm/jit/replace.cpp
+++ b/src/vm/jit/replace.cpp
@@ -38,7 +38,7 @@
 #endif
 
 #include "mm/dumpmemory.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/thread.hpp"
 

diff --git a/src/vm/jit/s390/codegen.c b/src/vm/jit/s390/codegen.c
index f69e661fb8f8a64fc5a4d8cccc5442923820b369..b2780c05b58b1f3705da23e56a1a428e916b49ca 100644 (file)
--- a/src/vm/jit/s390/codegen.c
+++ b/src/vm/jit/s390/codegen.c
@@ -37,7 +37,7 @@
 #include "native/localref.hpp"
 #include "native/native.hpp"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 

diff --git a/src/vm/jit/s390/emit.c b/src/vm/jit/s390/emit.c
index ef5c2289c0135f08b54fb810b268fa5aa0ee566a..f4ed94218354bd2aee426b0a7943eb657343e3ac 100644 (file)
--- a/src/vm/jit/s390/emit.c
+++ b/src/vm/jit/s390/emit.c
@@ -31,7 +31,7 @@
 #include "vm/jit/s390/emit.h"
 #include "vm/jit/s390/md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 

diff --git a/src/vm/jit/s390/patcher.c b/src/vm/jit/s390/patcher.c
index 1add8371907da523544b80c3f0dbe8479616def7..21054fd8aae3102c027ca278973e71d5a2810de4 100644 (file)
--- a/src/vm/jit/s390/patcher.c
+++ b/src/vm/jit/s390/patcher.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "native/native.hpp"
 
 #include "vm/jit/builtin.hpp"

diff --git a/src/vm/jit/schedule/schedule.c b/src/vm/jit/schedule/schedule.c
index 894821011cf8f1a252cdc7d3172dbcd8cd881df6..294e4d802a5e99cb1c629f59dd8a28e494a15dd4 100644 (file)
--- a/src/vm/jit/schedule/schedule.c
+++ b/src/vm/jit/schedule/schedule.c
@@ -40,7 +40,7 @@
 
 #include "disass.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include "vm/options.h"
 #include "vm/statistics.h"
 #include "vm/jit/schedule/schedule.h"

diff --git a/src/vm/jit/show.cpp b/src/vm/jit/show.cpp
index e0ba2a3cfaa9de1257e145af3606709e6216a40f..2019644e43fd30c238b8e11f06b90d5b787e8658 100644 (file)
--- a/src/vm/jit/show.cpp
+++ b/src/vm/jit/show.cpp
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 

diff --git a/src/vm/jit/sparc64/codegen.c b/src/vm/jit/sparc64/codegen.c
index b048fbe3272e933413752b0fe8aa8da7966f299d..1de656e749b74e8aefc6ce82f545b00b1dfbc682 100644 (file)
--- a/src/vm/jit/sparc64/codegen.c
+++ b/src/vm/jit/sparc64/codegen.c
@@ -37,7 +37,7 @@
 #include "vm/jit/sparc64/codegen.h"
 #include "vm/jit/sparc64/emit.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/localref.hpp"
 #include "native/native.hpp"

diff --git a/src/vm/jit/sparc64/emit.c b/src/vm/jit/sparc64/emit.c
index e7f8f379e6b21bfebf2ecf4a2e1fb8b8d7bcd2dd..0c71d11a786dad601fb80cc9fea719a3fc1f54f4 100644 (file)
--- a/src/vm/jit/sparc64/emit.c
+++ b/src/vm/jit/sparc64/emit.c
@@ -33,7 +33,7 @@
 #include "vm/jit/sparc64/md-abi.h"
 #include "vm/jit/sparc64/emit.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/jit/builtin.hpp"
 #include "vm/options.h"

diff --git a/src/vm/jit/sparc64/md-abi.c b/src/vm/jit/sparc64/md-abi.c
index edcf00a18208cd5bc9284aef8dc8eb688af65898..3218d422894bf39f9fb9d195a57845d2a48255e7 100644 (file)
--- a/src/vm/jit/sparc64/md-abi.c
+++ b/src/vm/jit/sparc64/md-abi.c
@@ -35,7 +35,7 @@
 #include "vm/jit/stack.h"
 
 /* temp */
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 #include <assert.h>
 
 

diff --git a/src/vm/jit/sparc64/patcher.c b/src/vm/jit/sparc64/patcher.c
index c36a5abc7bcdcfe40e5d19a978642b0d8a3fe49f..61043c3c2811ecdf43a96533739e244042cd482d 100644 (file)
--- a/src/vm/jit/sparc64/patcher.c
+++ b/src/vm/jit/sparc64/patcher.c
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/jit/sparc64/codegen.h"
 #include "vm/jit/sparc64/md.h"

diff --git a/src/vm/jit/stack.c b/src/vm/jit/stack.c
index 4f464039161473e25028d8e90f3dc5be987bdd32..06ff37115626da6f2912bdc61d1b873756025f46 100644 (file)
--- a/src/vm/jit/stack.c
+++ b/src/vm/jit/stack.c
@@ -33,7 +33,7 @@
 #include "arch.h"
 #include "md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/stacktrace.cpp b/src/vm/jit/stacktrace.cpp
index d39ca2938413e7988ceb84ed2fe2903d25ed2d89..514c2fd08ae38809c1052e6f5b7baf8458bb8971 100644 (file)
--- a/src/vm/jit/stacktrace.cpp
+++ b/src/vm/jit/stacktrace.cpp
@@ -35,7 +35,7 @@
 #include "md.h"
 
 #include "mm/gc.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/jit/stacktrace.hpp"
 

diff --git a/src/vm/jit/trace.cpp b/src/vm/jit/trace.cpp
index ad0bd72a92829868401c4cbafec5e09756af96be..98667f76cc0692b9ef3a08a1fd9e5dcbbe01f98a 100644 (file)
--- a/src/vm/jit/trace.cpp
+++ b/src/vm/jit/trace.cpp
@@ -30,7 +30,7 @@
 #include "arch.h"
 #include "md-abi.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/vm/jit/trap.c b/src/vm/jit/trap.c
index 396f2db62a947d8944669e1e334b8b2e09af2a07..a5ab45182a04089a685ee0ce89b04447b757ab09 100644 (file)
--- a/src/vm/jit/trap.c
+++ b/src/vm/jit/trap.c
@@ -32,7 +32,7 @@
 #include "md.h"
 #include "md-trap.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/vm/jit/verify/typecheck-stackbased.cpp b/src/vm/jit/verify/typecheck-stackbased.cpp
index 8ac6267b802f65a9dbff59bddd52761a238fc15d..6d0566268cc0e3fa32c3a98cb8e791fcfc9387e9 100644 (file)
--- a/src/vm/jit/verify/typecheck-stackbased.cpp
+++ b/src/vm/jit/verify/typecheck-stackbased.cpp
@@ -30,7 +30,7 @@
 #include "vm/types.h"
 
 #include "vm/jit/builtin.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/array.hpp"
 #include "vm/exceptions.hpp"

diff --git a/src/vm/jit/verify/typecheck-typeinferer.cpp b/src/vm/jit/verify/typecheck-typeinferer.cpp
index 51d60932c414c75d2cb2ea474adc8587509fc6ab..4f69f8e3e2000b3e6d1b92e4dc288990f9f7914b 100644 (file)
--- a/src/vm/jit/verify/typecheck-typeinferer.cpp
+++ b/src/vm/jit/verify/typecheck-typeinferer.cpp
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/verify/typecheck.cpp b/src/vm/jit/verify/typecheck.cpp
index 0e0967bec5db166af817c68e2ff9e770dd517390..d4687166af45f9eb6814a8d46582a857b04d1c86 100644 (file)
--- a/src/vm/jit/verify/typecheck.cpp
+++ b/src/vm/jit/verify/typecheck.cpp
@@ -141,7 +141,7 @@ error reporting.
 
 #ifdef ENABLE_VERIFIER
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/jit/verify/typeinfo.cpp b/src/vm/jit/verify/typeinfo.cpp
index cbc6e5ca85c9547c72a3460da2ee3bf6d4b7f7b9..caff9d406d4eabf622acbbe4ed75e2e4fb3f3d71 100644 (file)
--- a/src/vm/jit/verify/typeinfo.cpp
+++ b/src/vm/jit/verify/typeinfo.cpp
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "toolbox/logging.hpp"
 

diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c
index 18e86af090d752928ae9b0e0fbf5c9f3b3a4eb3c..ef10ece73831c46db9e6909b6598a9d99a771a3a 100644 (file)
--- a/src/vm/jit/x86_64/codegen.c
+++ b/src/vm/jit/x86_64/codegen.c
@@ -37,7 +37,7 @@
 #include "vm/jit/x86_64/codegen.h"
 #include "vm/jit/x86_64/emit.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/localref.hpp"
 #include "native/native.hpp"

diff --git a/src/vm/jit/x86_64/emit.c b/src/vm/jit/x86_64/emit.c
index 906a01e89d213e52f76d8435c77c2949852174c2..60b37d9163dac1c14db1cae54b621d4f8f3b26bb 100644 (file)
--- a/src/vm/jit/x86_64/emit.c
+++ b/src/vm/jit/x86_64/emit.c
@@ -33,7 +33,7 @@
 #include "vm/jit/x86_64/codegen.h"
 #include "vm/jit/x86_64/emit.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/lock.hpp"
 

diff --git a/src/vm/jit/x86_64/patcher.c b/src/vm/jit/x86_64/patcher.c
index 32008300ec1111a032adfaa2beb18ff5375101e1..fa0c0b296d264b0bc990bf92bf4ed17bb3cf5197 100644 (file)
--- a/src/vm/jit/x86_64/patcher.c
+++ b/src/vm/jit/x86_64/patcher.c
@@ -32,7 +32,7 @@
 #include "vm/jit/x86_64/codegen.h"
 #include "vm/jit/x86_64/md.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/linker.cpp b/src/vm/linker.cpp
index 91946c1d163055f471e5d353e44a5a45e23647ba..84672cfb16cbf46a3587656e5ff220fe453dd858 100644 (file)
--- a/src/vm/linker.cpp
+++ b/src/vm/linker.cpp
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/native.hpp"
 

diff --git a/src/vm/loader.cpp b/src/vm/loader.cpp
index 5fe8d61b72636990c399ef95295b1536907b5140..c0094bf06dbe54f4e5805fbe40bdbcbbc2b1f2d3 100644 (file)
--- a/src/vm/loader.cpp
+++ b/src/vm/loader.cpp
@@ -32,7 +32,7 @@
 #include "vm/types.h"
 
 #include "mm/dumpmemory.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/vm/method.cpp b/src/vm/method.cpp
index 59cafe93498863b05ff48ddca47e6add7ff9ecb0..21f542400075da4e55c13da38236e24826c61996 100644 (file)
--- a/src/vm/method.cpp
+++ b/src/vm/method.cpp
@@ -31,7 +31,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/vm/options.c b/src/vm/options.c
index 3c3bace7016621d07fa95fe0ddd201a9e4549b13..b5b88a710336ff78ef428488af5da03a10489230 100644 (file)
--- a/src/vm/options.c
+++ b/src/vm/options.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/options.h"
 #include "vm/os.hpp"

diff --git a/src/vm/package.cpp b/src/vm/package.cpp
index a112aca2f7d95045bea1a33d1acd41fabc8d4a81..f5287bf15b0841dd06696348086e1ca4fb0df4f5 100644 (file)
--- a/src/vm/package.cpp
+++ b/src/vm/package.cpp
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/options.h"
 #include "vm/package.hpp"

diff --git a/src/vm/properties.cpp b/src/vm/properties.cpp
index f5b66db4d3b487236a19f6461e24ebd148877eba..e2f3858388d5e1cb33a64280c60d52102efe0ce4 100644 (file)
--- a/src/vm/properties.cpp
+++ b/src/vm/properties.cpp
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <sys/utsname.h>
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/vm/resolve.cpp b/src/vm/resolve.cpp
index 58c7f874337ffa84546786f881595e5a1eb28f33..80d8a4a11561bb371c8d4cf016a8f91d3a2224ab 100644 (file)
--- a/src/vm/resolve.cpp
+++ b/src/vm/resolve.cpp
@@ -29,7 +29,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/access.hpp"
 #include "vm/classcache.hpp"

diff --git a/src/vm/rt-timing.c b/src/vm/rt-timing.c
index 2064de2d02d0a2c5732b146baba78bf1c5a38f44..04384f85307f1486adc1fc85a4cd97935ef9bde1 100644 (file)
--- a/src/vm/rt-timing.c
+++ b/src/vm/rt-timing.c
@@ -32,7 +32,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/global.h"
 #include "vm/rt-timing.h"

diff --git a/src/vm/rt-timing.h b/src/vm/rt-timing.h
index 26d31a41b267a337c5e97e14996d0db860d4e082..0c18ac0a5f0d6098aea182cb6c58c7a8518de562 100644 (file)
--- a/src/vm/rt-timing.h
+++ b/src/vm/rt-timing.h
@@ -34,7 +34,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/global.h"
 

diff --git a/src/vm/signal.c b/src/vm/signal.c
index ed7d495e4d9273953ea74f2f25532f09e509fdbc..73ccb0760aee4c31190fb27bebe5a8754042e61a 100644 (file)
--- a/src/vm/signal.c
+++ b/src/vm/signal.c
@@ -40,7 +40,7 @@
 #include "arch.h"
 
 #if defined(ENABLE_GC_BOEHM)
-# include "mm/memory.h"
+# include "mm/memory.hpp"
 #endif
 
 #include "threads/thread.hpp"

diff --git a/src/vm/stackmap.c b/src/vm/stackmap.c
index 87117d05e8f6dc3a6590b4da9be4c53286bb178a..d4886be3460dcf0feb0ab4602b9be08f01becd52 100644 (file)
--- a/src/vm/stackmap.c
+++ b/src/vm/stackmap.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/class.hpp"
 #include "vm/exceptions.hpp"

diff --git a/src/vm/string.cpp b/src/vm/string.cpp
index 184f8f66cf742b936a148e9e9b386598f2a4259a..632f69e040da2314fe6adae59b1bbb039173f403 100644 (file)
--- a/src/vm/string.cpp
+++ b/src/vm/string.cpp
@@ -33,7 +33,7 @@
 
 #include "vm/global.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 

diff --git a/src/vm/suck.cpp b/src/vm/suck.cpp
index c109080221d54b9ad36a4e6aec8252df511926fe..1c801c5636fb2756ec89acb067fdc5ed7e0d8247 100644 (file)
--- a/src/vm/suck.cpp
+++ b/src/vm/suck.cpp
@@ -32,7 +32,7 @@
 
 #include "arch.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/mutex.hpp"
 

diff --git a/src/vm/utf8.c b/src/vm/utf8.c
index 1d7d7605fae6a4565acb47c69aabb3e3eb8c4479..ccc5e0f745e407d7aa730363b51527ce12adbd2a 100644 (file)
--- a/src/vm/utf8.c
+++ b/src/vm/utf8.c
@@ -30,7 +30,7 @@
 
 #include "vm/types.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "threads/mutex.hpp"
 

diff --git a/src/vm/vm.cpp b/src/vm/vm.cpp
index a1fae8b9fc8cc13e2d36d326a16557c8976daaaa..b9608923b3d4243e68e080f76dd17ff686c60e90 100644 (file)
--- a/src/vm/vm.cpp
+++ b/src/vm/vm.cpp
@@ -43,7 +43,7 @@
 #include "mm/codememory.h"
 #include "mm/dumpmemory.hpp"
 #include "mm/gc.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/jni.hpp"
 #include "native/llni.h"
@@ -692,7 +692,7 @@ VM::VM(JavaVMInitArgs* vm_args)
        _jnienv = new JNIEnv();
 
 #if defined(ENABLE_JNI)
-       _jnienv->functions = &_Jv_JNINativeInterface;
+       _jnienv->p = &_Jv_JNINativeInterface;
 #endif
 
        /* actually create the JVM */

diff --git a/src/vm/zip.cpp b/src/vm/zip.cpp
index 09cd10a2a5adb8543658f3a4bf9b338337c1a97a..601e31d08c7564996f3d67cdc1510b6e571c8cd6 100644 (file)
--- a/src/vm/zip.cpp
+++ b/src/vm/zip.cpp
@@ -37,7 +37,7 @@
 #include "vm/descriptor.hpp" /* needed to prevent circular dependency */
 #include "toolbox/hashtable.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "vm/global.h"
 #include "vm/suck.hpp"