2009-12-02 Rodrigo Kumpera <rkumpera@novell.com>

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

diff --git a/mono/metadata/object.h b/mono/metadata/object.h
index cf13a856c1eb06af2c07fd7c490230f0a5127a14..43e4003675ef4c0f628d4fe48f740ed673788f5a 100644 (file)
--- a/mono/metadata/object.h
+++ b/mono/metadata/object.h
@@ -30,17 +30,19 @@ typedef struct {
 
 #ifdef MONO_BIG_ARRAYS
 typedef guint64 mono_array_size_t;
+typedef gint64 mono_array_lower_bound_t;
 #define MONO_ARRAY_MAX_INDEX G_MAXINT64
 #define MONO_ARRAY_MAX_SIZE  G_MAXUINT64
 #else
 typedef guint32 mono_array_size_t;
-#define MONO_ARRAY_MAX_INDEX G_MAXINT32
-#define MONO_ARRAY_MAX_SIZE  G_MAXUINT32
+typedef gint32 mono_array_lower_bound_t;
+#define MONO_ARRAY_MAX_INDEX ((gint32) 0x7fffffff)
+#define MONO_ARRAY_MAX_SIZE  ((guint32) 0xffffffff)
 #endif
 
 typedef struct {
        mono_array_size_t length;
-       mono_array_size_t lower_bound;
+       mono_array_lower_bound_t lower_bound;
 } MonoArrayBounds;
 
 typedef struct {
@@ -94,8 +96,8 @@ typedef void      (*MonoMainThreadFunc)    (gpointer user_data);
 #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));        \
+               gpointer *__s = mono_array_addr ((src), gpointer, (srcidx));    \
+               mono_gc_wbarrier_arrayref_copy (__p, __s, (count));     \
        } while (0)
 
 #define mono_string_chars(s) ((gunichar2*)(s)->chars)
@@ -118,14 +120,14 @@ MonoObject *
 mono_object_new_from_token  (MonoDomain *domain, MonoImage *image, guint32 token);
 
 MonoArray*
-mono_array_new             (MonoDomain *domain, MonoClass *eclass, guint32 n);
+mono_array_new             (MonoDomain *domain, MonoClass *eclass, mono_array_size_t n);
 
 MonoArray*
 mono_array_new_full        (MonoDomain *domain, MonoClass *array_class,
-                            guint32 *lengths, guint32 *lower_bounds);
+                            mono_array_size_t *lengths, mono_array_size_t *lower_bounds);
 
 MonoArray *
-mono_array_new_specific            (MonoVTable *vtable, guint32 n);
+mono_array_new_specific            (MonoVTable *vtable, mono_array_size_t n);
 
 MonoArray*
 mono_array_clone           (MonoArray *array);
@@ -328,10 +330,11 @@ 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_arrayref_copy (gpointer dest_ptr, gpointer src_ptr, int count);
 void mono_gc_wbarrier_generic_store (gpointer ptr, MonoObject* value);
+void mono_gc_wbarrier_generic_nostore (gpointer ptr);
 void mono_gc_wbarrier_value_copy    (gpointer dest, gpointer src, int count, MonoClass *klass);
-void mono_gc_wbarrier_object        (MonoObject* obj);
+void mono_gc_wbarrier_object_copy   (MonoObject* obj, MonoObject *src);
 
 G_END_DECLS