X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fobject.h;h=ee367d0ad745b16169ef14367bb5b4a05c87fc6e;hb=14120442096a81fb5973fd6b4f4e9bc2ac54ad64;hp=160de518e4e4bbb935aa17482232c07f8d7f51b1;hpb=948dbf8d4581ac17f5420cc4f7dc375e3c502576;p=mono.git diff --git a/mono/metadata/object.h b/mono/metadata/object.h index 160de518e4e..ee367d0ad74 100644 --- a/mono/metadata/object.h +++ b/mono/metadata/object.h @@ -2,11 +2,14 @@ #define _MONO_CLI_OBJECT_H_ #include +#include -G_BEGIN_DECLS +MONO_BEGIN_DECLS -typedef guchar MonoBoolean; +typedef mono_byte MonoBoolean; +typedef struct _MonoString MonoString; +typedef struct _MonoArray MonoArray; typedef struct _MonoReflectionMethod MonoReflectionMethod; typedef struct _MonoReflectionAssembly MonoReflectionAssembly; typedef struct _MonoReflectionModule MonoReflectionModule; @@ -28,41 +31,21 @@ typedef struct { MonoThreadsSync *synchronisation; } MonoObject; -typedef struct { - guint32 length; - guint32 lower_bound; -} MonoArrayBounds; - -typedef struct { - MonoObject obj; - /* bounds is NULL for szarrays */ - MonoArrayBounds *bounds; - /* total number of elements of the array */ - guint32 max_length; - /* we use double to ensure proper alignment on platforms that need it */ - double vector [MONO_ZERO_LEN_ARRAY]; -} MonoArray; - -typedef struct { - MonoObject object; - gint32 length; - gunichar2 chars [MONO_ZERO_LEN_ARRAY]; -} MonoString; - typedef MonoObject* (*MonoInvokeFunc) (MonoMethod *method, void *obj, void **params, MonoObject **exc); -typedef gpointer (*MonoCompileFunc) (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) +typedef void* (*MonoCompileFunc) (MonoMethod *method); +typedef void (*MonoMainThreadFunc) (void* user_data); #define MONO_OBJECT_SETREF(obj,fieldname,value) do { \ - (obj)->fieldname = (value); \ + 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*)(gpointer) mono_array_addr_with_size (array, sizeof (type), index)) -#define mono_array_addr_with_size(array,size,index) ( ((char*)(array)->vector) + (size) * (index) ) +/* This should be used if 's' can reside on the heap */ +#define MONO_STRUCT_SETREF(s,field,value) do { \ + mono_gc_wbarrier_generic_store (&((s)->field), (MonoObject*)(value)); \ + } while (0) + +#define mono_array_addr(array,type,index) ((type*)(void*) mono_array_addr_with_size (array, sizeof (type), index)) #define mono_array_get(array,type,index) ( *(type*)mono_array_addr ((array), type, (index)) ) #define mono_array_set(array,type,index,value) \ do { \ @@ -71,16 +54,19 @@ typedef void (*MonoMainThreadFunc) (gpointer user_data); } while (0) #define mono_array_setref(array,index,value) \ do { \ - gpointer *__p = (gpointer *) mono_array_addr ((array), gpointer, (index)); \ - *__p = (value); \ + void **__p = (void **) mono_array_addr ((array), void*, (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 { \ - memmove (mono_array_addr ((dest), gpointer, (destidx)), mono_array_addr ((src), gpointer, (srcidx)), (count) * sizeof (gpointer)); \ + void **__p = (void **) mono_array_addr ((dest), void*, (destidx)); \ + void **__s = mono_array_addr ((src), void*, (srcidx)); \ + mono_gc_wbarrier_arrayref_copy (__p, __s, (count)); \ } while (0) -#define mono_string_chars(s) ((gunichar2*)(s)->chars) -#define mono_string_length(s) ((s)->length) +mono_unichar2 *mono_string_chars (MonoString *s); +int mono_string_length (MonoString *s); MonoObject * mono_object_new (MonoDomain *domain, MonoClass *klass); @@ -96,29 +82,35 @@ MonoObject * mono_object_new_alloc_specific (MonoVTable *vtable); MonoObject * -mono_object_new_from_token (MonoDomain *domain, MonoImage *image, guint32 token); +mono_object_new_from_token (MonoDomain *domain, MonoImage *image, uint32_t token); MonoArray* -mono_array_new (MonoDomain *domain, MonoClass *eclass, guint32 n); +mono_array_new (MonoDomain *domain, MonoClass *eclass, uintptr_t n); MonoArray* mono_array_new_full (MonoDomain *domain, MonoClass *array_class, - guint32 *lengths, guint32 *lower_bounds); + uintptr_t *lengths, intptr_t *lower_bounds); MonoArray * -mono_array_new_specific (MonoVTable *vtable, guint32 n); +mono_array_new_specific (MonoVTable *vtable, uintptr_t n); MonoArray* mono_array_clone (MonoArray *array); +char* +mono_array_addr_with_size (MonoArray *array, int size, uintptr_t idx); + +uintptr_t +mono_array_length (MonoArray *array); + MonoString* -mono_string_new_utf16 (MonoDomain *domain, const guint16 *text, gint32 len); +mono_string_new_utf16 (MonoDomain *domain, const mono_unichar2 *text, int32_t len); MonoString* -mono_string_new_size (MonoDomain *domain, gint32 len); +mono_string_new_size (MonoDomain *domain, int32_t len); MonoString* -mono_ldstr (MonoDomain *domain, MonoImage *image, guint32 str_index); +mono_ldstr (MonoDomain *domain, MonoImage *image, uint32_t str_index); MonoString* mono_string_is_interned (MonoString *str); @@ -133,34 +125,40 @@ MonoString* mono_string_new_wrapper (const char *text); MonoString* -mono_string_new_len (MonoDomain *domain, const char *text, guint length); +mono_string_new_len (MonoDomain *domain, const char *text, unsigned int length); char * mono_string_to_utf8 (MonoString *string_obj); -gunichar2 * +char * +mono_string_to_utf8_checked (MonoString *string_obj, MonoError *error); + +mono_unichar2 * mono_string_to_utf16 (MonoString *string_obj); MonoString * -mono_string_from_utf16 (gunichar2 *data); +mono_string_from_utf16 (mono_unichar2 *data); -gboolean +mono_bool mono_string_equal (MonoString *s1, MonoString *s2); -guint +unsigned int mono_string_hash (MonoString *s); int mono_object_hash (MonoObject* obj); +MonoString * +mono_object_to_string (MonoObject *obj, MonoObject **exc); + MonoObject * -mono_value_box (MonoDomain *domain, MonoClass *klass, gpointer val); +mono_value_box (MonoDomain *domain, MonoClass *klass, void* val); void -mono_value_copy (gpointer dest, gpointer src, MonoClass *klass); +mono_value_copy (void* dest, void* src, MonoClass *klass); void -mono_value_copy_array (MonoArray *dest, int dest_idx, gpointer src, int count); +mono_value_copy_array (MonoArray *dest, int dest_idx, void* src, int count); MonoDomain* mono_object_get_domain (MonoObject *obj); @@ -168,7 +166,7 @@ mono_object_get_domain (MonoObject *obj); MonoClass* mono_object_get_class (MonoObject *obj); -gpointer +void* mono_object_unbox (MonoObject *obj); MonoObject * @@ -183,13 +181,13 @@ mono_object_isinst_mbyref (MonoObject *obj, MonoClass *klass); MonoObject * mono_object_castclass_mbyref (MonoObject *obj, MonoClass *klass); -gboolean -mono_monitor_try_enter (MonoObject *obj, guint32 ms); +mono_bool +mono_monitor_try_enter (MonoObject *obj, uint32_t ms); -gboolean +mono_bool mono_monitor_enter (MonoObject *obj); -guint +unsigned int mono_object_get_size (MonoObject *o); void @@ -222,13 +220,16 @@ MonoObject* mono_runtime_invoke_array (MonoMethod *method, void *obj, MonoArray *params, MonoObject **exc); +void* +mono_method_get_unmanaged_thunk (MonoMethod *method); + MonoArray* mono_runtime_get_main_args (void); void mono_runtime_exec_managed_code (MonoDomain *domain, MonoMainThreadFunc main_func, - gpointer main_args); + void* main_args); int mono_runtime_run_main (MonoMethod *method, int argc, char* argv[], @@ -238,14 +239,14 @@ int mono_runtime_exec_main (MonoMethod *method, MonoArray *args, MonoObject **exc); -gpointer -mono_load_remote_field (MonoObject *this_obj, MonoClass *klass, MonoClassField *field, gpointer *res); +void* +mono_load_remote_field (MonoObject *this_obj, MonoClass *klass, MonoClassField *field, void **res); MonoObject * mono_load_remote_field_new (MonoObject *this_obj, MonoClass *klass, MonoClassField *field); void -mono_store_remote_field (MonoObject *this_obj, MonoClass *klass, MonoClassField *field, gpointer val); +mono_store_remote_field (MonoObject *this_obj, MonoClass *klass, MonoClassField *field, void* val); void mono_store_remote_field_new (MonoObject *this_obj, MonoClass *klass, MonoClassField *field, MonoObject *arg); @@ -256,12 +257,9 @@ mono_unhandled_exception (MonoObject *exc); void mono_print_unhandled_exception (MonoObject *exc); -gpointer +void* mono_compile_method (MonoMethod *method); -MonoRemoteClass* -mono_remote_class (MonoDomain *domain, MonoString *class_name, MonoClass *proxy_class); - /* accessors for fields and properties */ void mono_field_set_value (MonoObject *obj, MonoClassField *field, void *value); @@ -298,12 +296,21 @@ mono_property_get_value (MonoProperty *prop, void *obj, void **params, MonoObjec * mono_gchandle_get_target () can be used to get the object referenced by both kinds * of handle: for a weakref handle, if an object has been collected, it will return NULL. */ -guint32 mono_gchandle_new (MonoObject *obj, gboolean pinned); -guint32 mono_gchandle_new_weakref (MonoObject *obj, gboolean track_resurrection); -MonoObject* mono_gchandle_get_target (guint32 gchandle); -void mono_gchandle_free (guint32 gchandle); - -G_END_DECLS +uint32_t mono_gchandle_new (MonoObject *obj, mono_bool pinned); +uint32_t mono_gchandle_new_weakref (MonoObject *obj, mono_bool track_resurrection); +MonoObject* mono_gchandle_get_target (uint32_t gchandle); +void mono_gchandle_free (uint32_t gchandle); + +/* GC write barriers support */ +void mono_gc_wbarrier_set_field (MonoObject *obj, void* field_ptr, MonoObject* value); +void mono_gc_wbarrier_set_arrayref (MonoArray *arr, void* slot_ptr, MonoObject* value); +void mono_gc_wbarrier_arrayref_copy (void* dest_ptr, void* src_ptr, int count); +void mono_gc_wbarrier_generic_store (void* ptr, MonoObject* value); +void mono_gc_wbarrier_generic_nostore (void* ptr); +void mono_gc_wbarrier_value_copy (void* dest, void* src, int count, MonoClass *klass); +void mono_gc_wbarrier_object_copy (MonoObject* obj, MonoObject *src); + +MONO_END_DECLS #endif