Fix a bug introduced by the last change to mono_marshal_get_virtual_stelemref ()...

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

diff --git a/mono/metadata/null-gc.c b/mono/metadata/null-gc.c
index 6b1642b5ada2d7ef863c9f4dbd166a055d63d9a7..7f37edaad32ad09c0efaa512e07f4875ab9e5dae 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;
@@ -80,6 +80,12 @@ mono_gc_register_thread (void *baseptr)
        return TRUE;
 }
 
+int
+mono_gc_walk_heap (int flags, MonoGCReferences callback, void *data)
+{
+       return 1;
+}
+
 gboolean
 mono_object_is_alive (MonoObject* o)
 {
@@ -103,7 +109,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;
 }
@@ -144,6 +150,12 @@ mono_gc_make_descr_from_bitmap (gsize *bitmap, int numbits)
        return NULL;
 }
 
+void*
+mono_gc_make_root_descr_all_refs (int numbits)
+{
+       return NULL;
+}
+
 void*
 mono_gc_alloc_fixed (size_t size, void *descr)
 {
@@ -169,9 +181,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 +192,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 +217,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*
@@ -214,5 +235,119 @@ mono_gc_get_managed_allocator_types (void)
        return 0;
 }
 
+const char *
+mono_gc_get_gc_name (void)
+{
+       return "null";
+}
+
+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);
+}
+
+char*
+mono_gc_get_description (void)
+{
+       return g_strdup (DEFAULT_GC_NAME);
+}
+
+void
+mono_gc_set_desktop_mode (void)
+{
+}
+
+gboolean
+mono_gc_is_moving (void)
+{
+       return FALSE;
+}
+
+gboolean
+mono_gc_is_disabled (void)
+{
+       return FALSE;
+}
+
+void
+mono_gc_wbarrier_value_copy_bitmap (gpointer _dest, gpointer _src, int size, unsigned bitmap)
+{
+       g_assert_not_reached ();
+}
+
+guint8*
+mono_gc_get_card_table (int *shift_bits, gpointer *card_mask)
+{
+       g_assert_not_reached ();
+       return NULL;
+}
+
+void*
+mono_gc_get_nursery (int *shift_bits, size_t *size)
+{
+       return NULL;
+}
+
+#ifndef HOST_WIN32
+
+int
+mono_gc_pthread_create (pthread_t *new_thread, const pthread_attr_t *attr, void *(*start_routine)(void *), void *arg)
+{
+       return pthread_create (new_thread, attr, start_routine, arg);
+}
+
+int
+mono_gc_pthread_join (pthread_t thread, void **retval)
+{
+       return pthread_join (thread, retval);
+}
+
+int
+mono_gc_pthread_detach (pthread_t thread)
+{
+       return pthread_detach (thread);
+}
+
 #endif
 
+#endif