Removed mono_debugger_create_notification_function() from here.

[mono.git] / mono / metadata / object.h

diff --git a/mono/metadata/object.h b/mono/metadata/object.h
index c36f8ee1a6ae437d7095304d07a3ffc21411153d..2fe5331df56e4903162bdb229336c715cd4b2e32 100644 (file)
--- a/mono/metadata/object.h
+++ b/mono/metadata/object.h
@@ -3,6 +3,8 @@
 
 #include <mono/metadata/class.h>
 
+G_BEGIN_DECLS
+
 typedef guchar MonoBoolean;
 
 typedef struct _MonoReflectionMethod MonoReflectionMethod;
@@ -54,8 +56,13 @@ typedef void     (*MonoMainThreadFunc)    (gpointer user_data);
 #define mono_object_class(obj) (((MonoObject*)(obj))->vtable->klass)
 #define mono_object_domain(obj) (((MonoObject*)(obj))->vtable->domain)
 
+#define MONO_OBJECT_SETREF(obj,fieldname,value) do {   \
+               mono_gc_wbarrier_set_field ((MonoObject*)(obj), &((obj)->fieldname), (MonoObject*)value);       \
+               /*(obj)->fieldname = (value);*/ \
+       } while (0)
+
 #define mono_array_length(array) ((array)->max_length)
-#define mono_array_addr(array,type,index) ((type*) mono_array_addr_with_size (array, sizeof (type), index))
+#define mono_array_addr(array,type,index) ((type*)(gpointer) mono_array_addr_with_size (array, sizeof (type), index))
 #define mono_array_addr_with_size(array,size,index) ( ((char*)(array)->vector) + (size) * (index) )
 #define mono_array_get(array,type,index) ( *(type*)mono_array_addr ((array), type, (index)) ) 
 #define mono_array_set(array,type,index,value) \
@@ -63,6 +70,18 @@ typedef void     (*MonoMainThreadFunc)    (gpointer user_data);
                type *__p = (type *) mono_array_addr ((array), type, (index));  \
                *__p = (value); \
        } while (0)
+#define mono_array_setref(array,index,value)   \
+       do {    \
+               gpointer *__p = (gpointer *) mono_array_addr ((array), gpointer, (index));      \
+               mono_gc_wbarrier_set_arrayref ((array), __p, (MonoObject*)(value));     \
+               /* *__p = (value);*/    \
+       } while (0)
+#define mono_array_memcpy_refs(dest,destidx,src,srcidx,count)  \
+       do {    \
+               gpointer *__p = (gpointer *) mono_array_addr ((dest), gpointer, (destidx));     \
+               mono_gc_wbarrier_arrayref_copy ((dest), __p, (count));  \
+               memmove (__p, mono_array_addr ((src), gpointer, (srcidx)), (count) * sizeof (gpointer));        \
+       } while (0)
 
 #define mono_string_chars(s) ((gunichar2*)(s)->chars)
 #define mono_string_length(s) ((s)->length)
@@ -135,9 +154,18 @@ mono_string_equal           (MonoString *s1, MonoString *s2);
 guint
 mono_string_hash            (MonoString *s);
 
+int
+mono_object_hash            (MonoObject* obj);
+
 MonoObject *
 mono_value_box             (MonoDomain *domain, MonoClass *klass, gpointer val);
 
+void
+mono_value_copy             (gpointer dest, gpointer src, MonoClass *klass);
+
+void
+mono_value_copy_array       (MonoArray *dest, int dest_idx, gpointer src, int count);
+
 MonoDomain*
 mono_object_get_domain      (MonoObject *obj);
 
@@ -279,5 +307,14 @@ guint32      mono_gchandle_new_weakref (MonoObject *obj, gboolean track_resurrec
 MonoObject*  mono_gchandle_get_target  (guint32 gchandle);
 void         mono_gchandle_free        (guint32 gchandle);
 
+/* GC write barriers support */
+void mono_gc_wbarrier_set_field     (MonoObject *obj, gpointer field_ptr, MonoObject* value);
+void mono_gc_wbarrier_set_arrayref  (MonoArray *arr, gpointer slot_ptr, MonoObject* value);
+void mono_gc_wbarrier_arrayref_copy (MonoArray *arr, gpointer slot_ptr, int count);
+void mono_gc_wbarrier_generic_store (gpointer ptr, MonoObject* value);
+void mono_gc_wbarrier_value_copy    (gpointer dest, gpointer src, int count, MonoClass *klass);
+
+G_END_DECLS
+
 #endif