X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=libjava%2Finclude%2Fboehm-gc.h;h=e7802b68035cc0e08df3f70171cdea7c3028fcc4;hb=9a060b37a175859748dce4d4cb7265642b0ea848;hp=6081a8981bf1fa79009bc90951ac1f5699949d3e;hpb=ee9dd3721be68b9fa63dea9aa5a1d86e66958cde;p=gcc.git

diff --git a/libjava/include/boehm-gc.h b/libjava/include/boehm-gc.h
index 6081a8981bf..e7802b68035 100644
--- a/libjava/include/boehm-gc.h
+++ b/libjava/include/boehm-gc.h
@@ -1,7 +1,7 @@
 // -*- c++ -*-
 // boehm-gc.h - Defines for Boehm collector.
 
-/* Copyright (C) 1998, 1999  Cygnus Solutions
+/* Copyright (C) 1998, 1999, 2002, 2004  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -12,13 +12,74 @@ details.  */
 #ifndef __JV_BOEHM_GC__
 #define __JV_BOEHM_GC__
 
-#define JV_MARKOBJ_DECL void *_Jv_MarkObj (void *, void *, void *, void *)
-#define JV_MARKARRAY_DECL void *_Jv_MarkArray (void *, void *, void *, void *)
+#define JV_MARKOBJ_DECL void *::_Jv_MarkObj (void *, void *, void *, void *)
+#define JV_MARKARRAY_DECL void *::_Jv_MarkArray (void *, void *, void *, void *)
 
 extern "C"
 {
-  JV_MARKOBJ_DECL;
-  JV_MARKARRAY_DECL;
-};
+  void *_Jv_MarkObj (void *, void *, void *, void *);
+  void *_Jv_MarkArray (void *, void *, void *, void *);
+}
+
+// Enough stuff to inline _Jv_AllocObj.  Ugly.
+#include <gcj/javaprims.h>
+#include <java/lang/Class.h>
+#include <string.h>
+
+#include <gc_ext_config.h> // for THREAD_LOCAL_ALLOC
+
+extern "C" void * GC_gcj_malloc(size_t, void *);
+extern "C" void * GC_malloc_atomic(size_t);
+#ifdef THREAD_LOCAL_ALLOC
+extern "C" void * GC_local_gcj_malloc(size_t, void *);
+extern "C" void * GC_local_malloc_atomic(size_t);
+#endif
+
+#ifndef LIBGCJ_GC_DEBUG
+
+inline void *
+_Jv_AllocObj (jsize size, jclass klass)
+{
+  // This should call GC_GCJ_MALLOC, but that would involve
+  // including gc.h.
+#ifdef THREAD_LOCAL_ALLOC
+  return GC_local_gcj_malloc (size, klass->vtable);
+#else 
+  return GC_gcj_malloc (size, klass->vtable);
+#endif
+}
+
+inline void *
+_Jv_AllocPtrFreeObj (jsize size, jclass klass)
+{
+#ifdef JV_HASH_SYNCHRONIZATION
+# ifdef THREAD_LOCAL_ALLOC
+    void * obj = GC_local_malloc_atomic(size);
+# else
+    void * obj = GC_malloc_atomic(size);
+# endif
+  *((_Jv_VTable **) obj) = klass->vtable;
+#else
+# ifdef THREAD_LOCAL_ALLOC
+    void * obj = GC_local_gcj_malloc(size, klass->vtable);
+# else
+    void * obj = GC_gcj_malloc(size, klass->vtable);
+# endif
+#endif
+  return obj;
+}
+
+#else /* LIBGCJ_GC_DEBUG */
+
+void *
+_Jv_AllocObj (jsize size, jclass klass);
+
+void *
+_Jv_AllocPtrFreeObj (jsize size, jclass klass);
+
+#endif /* LIBGCJ_GC_DEBUG */
+
+// _Jv_AllocBytes (jsize size) should go here, too.  But clients don't
+// usually include this header.
 
 #endif /* __JV_BOEHM_GC__ */