X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fobject.h;h=2fe5331df56e4903162bdb229336c715cd4b2e32;hb=d500a604e1bfd87b5e3273785fb5ea3df76acc55;hp=4629eda277f7a46f90321dec261aa91de5eacae4;hpb=7904733e7bf462b0c98ea7b2e40b129e25b3854f;p=mono.git

diff --git a/mono/metadata/object.h b/mono/metadata/object.h
index 4629eda277f..2fe5331df56 100644
--- 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;
@@ -18,6 +20,8 @@ typedef struct _MonoThreadsSync MonoThreadsSync;
 typedef struct _MonoThread MonoThread;
 typedef struct _MonoDynamicAssembly MonoDynamicAssembly;
 typedef struct _MonoDynamicImage MonoDynamicImage;
+typedef struct _MonoReflectionMethodBody MonoReflectionMethodBody;
+typedef struct _MonoAppContext MonoAppContext;
 
 typedef struct {
 	MonoVTable *vtable;
@@ -47,14 +51,18 @@ typedef struct {
 
 typedef MonoObject* (*MonoInvokeFunc)	     (MonoMethod *method, void *obj, void **params, MonoObject **exc);
 typedef gpointer    (*MonoCompileFunc)	     (MonoMethod *method);
-typedef void        (*MonoFreeMethodFunc)	 (MonoMethod *method);
 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) ( ((char*)(array)->vector) + 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)	\
@@ -62,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)
@@ -79,9 +99,6 @@ mono_object_new_fast	    (MonoVTable *vtable);
 MonoObject *
 mono_object_new_alloc_specific (MonoVTable *vtable);
 
-void*
-mono_class_get_allocation_ftn (MonoVTable *vtable, gboolean *pass_size_in_words);
-
 MonoObject *
 mono_object_new_from_token  (MonoDomain *domain, MonoImage *image, guint32 token);
 
@@ -131,9 +148,24 @@ mono_string_to_utf16	    (MonoString *string_obj);
 MonoString *
 mono_string_from_utf16	    (gunichar2 *data);
 
+gboolean
+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);
 
@@ -161,6 +193,9 @@ mono_monitor_try_enter       (MonoObject *obj, guint32 ms);
 gboolean
 mono_monitor_enter           (MonoObject *obj);
 
+guint
+mono_object_get_size         (MonoObject *o);
+
 void 
 mono_monitor_exit            (MonoObject *obj);
 
@@ -228,15 +263,9 @@ mono_print_unhandled_exception (MonoObject *exc);
 gpointer 
 mono_compile_method	   (MonoMethod *method);
 
-void
-mono_runtime_free_method (MonoMethod *method);
-
 MonoRemoteClass*
 mono_remote_class (MonoDomain *domain, MonoString *class_name, MonoClass *proxy_class);
 
-void
-mono_upgrade_remote_class (MonoDomain *domain, MonoRemoteClass *remote_class, MonoClass *klass);
-
 /* accessors for fields and properties */
 void
 mono_field_set_value (MonoObject *obj, MonoClassField *field, void *value);
@@ -278,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