X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fnull-gc.c;h=d98df2bd17473a3e97d10aafe600d9fc57004fe2;hb=9780433f58075bbe37cbf25eacc0e8b2cad647e3;hp=2041dba851885a56f96325ef4211024e643b5ee5;hpb=086fafc2fdc0b214c9020af8cfc33b00546173ab;p=mono.git

diff --git a/mono/metadata/null-gc.c b/mono/metadata/null-gc.c
index 2041dba8518..d98df2bd174 100644
--- a/mono/metadata/null-gc.c
+++ b/mono/metadata/null-gc.c
@@ -1,6 +1,8 @@
 /*
  * null-gc.c: GC implementation using malloc: will leak everything, just for testing.
  *
+ * Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
+ * Copyright 2004-2009 Novell, Inc (http://www.novell.com)
  */
 
 #include "config.h"
@@ -44,13 +46,13 @@ mono_gc_add_memory_pressure (gint64 value)
 }
 
 /* maybe track the size, not important, though */
-gint64
+int64_t
 mono_gc_get_used_size (void)
 {
 	return 1024*1024;
 }
 
-gint64
+int64_t
 mono_gc_get_heap_size (void)
 {
 	return 2*1024*1024;
@@ -101,7 +103,7 @@ mono_gc_deregister_root (char* addr)
 }
 
 void
-mono_gc_weak_link_add (void **link_addr, MonoObject *obj)
+mono_gc_weak_link_add (void **link_addr, MonoObject *obj, gboolean track)
 {
 	*link_addr = obj;
 }
@@ -167,9 +169,9 @@ mono_gc_wbarrier_set_arrayref (MonoArray *arr, gpointer slot_ptr, MonoObject* va
 }
 
 void
-mono_gc_wbarrier_arrayref_copy (MonoArray *arr, gpointer slot_ptr, int count)
+mono_gc_wbarrier_arrayref_copy (gpointer dest_ptr, gpointer src_ptr, int count)
 {
-	/* no need to do anything */
+	memmove (dest_ptr, src_ptr, count * sizeof (gpointer));
 }
 
 void
@@ -178,14 +180,23 @@ mono_gc_wbarrier_generic_store (gpointer ptr, MonoObject* value)
 	*(void**)ptr = value;
 }
 
+void
+mono_gc_wbarrier_generic_nostore (gpointer ptr)
+{
+}
+
 void
 mono_gc_wbarrier_value_copy (gpointer dest, gpointer src, int count, MonoClass *klass)
 {
+	memmove (dest, src, count * mono_class_value_size (klass, NULL));
 }
 
 void
-mono_gc_wbarrier_object (MonoObject* obj)
+mono_gc_wbarrier_object_copy (MonoObject* obj, MonoObject *src)
 {
+	/* do not copy the sync state */
+	memcpy ((char*)obj + sizeof (MonoObject), (char*)src + sizeof (MonoObject),
+			mono_object_class (obj)->instance_size - sizeof (MonoObject));
 }
 
 MonoMethod*
@@ -194,10 +205,10 @@ mono_gc_get_managed_allocator (MonoVTable *vtable, gboolean for_box)
 	return NULL;
 }
 
-int
-mono_gc_get_managed_allocator_type (MonoMethod *managed_alloc)
+MonoMethod*
+mono_gc_get_managed_array_allocator (MonoVTable *vtable, int rank)
 {
-	return -1;
+	return NULL;
 }
 
 MonoMethod*
@@ -212,5 +223,50 @@ mono_gc_get_managed_allocator_types (void)
 	return 0;
 }
 
+void
+mono_gc_add_weak_track_handle (MonoObject *obj, guint32 gchandle)
+{
+}
+
+void
+mono_gc_change_weak_track_handle (MonoObject *old_obj, MonoObject *obj, guint32 gchandle)
+{
+}
+
+void
+mono_gc_remove_weak_track_handle (guint32 gchandle)
+{
+}
+
+GSList*
+mono_gc_remove_weak_track_object (MonoDomain *domain, MonoObject *obj)
+{
+	return NULL;
+}
+
+void
+mono_gc_clear_domain (MonoDomain *domain)
+{
+}
+
+int
+mono_gc_get_suspend_signal (void)
+{
+	return -1;
+}
+
+MonoMethod*
+mono_gc_get_write_barrier (void)
+{
+	g_assert_not_reached ();
+	return NULL;
+}
+
+void*
+mono_gc_invoke_with_gc_lock (MonoGCLockedCallbackFunc func, void *data)
+{
+	return func (data);
+}
+
 #endif