2010-04-19 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / metadata / null-gc.c

diff --git a/mono/metadata/null-gc.c b/mono/metadata/null-gc.c
index d5af7b192dff83c285f6b544502a4d4d5ddc098b..d98df2bd17473a3e97d10aafe600d9fc57004fe2 100644 (file)
--- a/mono/metadata/null-gc.c
+++ b/mono/metadata/null-gc.c
@@ -46,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;
@@ -169,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
@@ -180,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*
@@ -196,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*
@@ -240,5 +249,24 @@ 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