Author: zoltan
Date: 2007-12-03 08:59:51 -0500 (Mon, 03 Dec 2007)
New Revision: 90542
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/class-internals.h
trunk/mono/mono/metadata/class.c
trunk/mono/mono/metadata/icall-def.h
trunk/mono/mono/metadata/icall.c
Log:
2007-12-03 Zoltan Varga <[EMAIL PROTECTED]>
* icall.c (ves_icall_MonoField_GetRawConstantValue): New icall.
* class.c (mono_class_get_field_default_value): New helper function to
initialize
field->def_type and field->data.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-12-03 08:18:17 UTC (rev 90541)
+++ trunk/mono/mono/metadata/ChangeLog 2007-12-03 13:59:51 UTC (rev 90542)
@@ -1,3 +1,10 @@
+2007-12-03 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * icall.c (ves_icall_MonoField_GetRawConstantValue): New icall.
+
+ * class.c (mono_class_get_field_default_value): New helper function to
initialize
+ field->def_type and field->data.
+
2007-11-30 Zoltan Varga <[EMAIL PROTECTED]>
* icall.c (ves_icall_System_Delegate_SetMulticastInvoke): Use the
delegate trampoline instead of
Modified: trunk/mono/mono/metadata/class-internals.h
===================================================================
--- trunk/mono/mono/metadata/class-internals.h 2007-12-03 08:18:17 UTC (rev
90541)
+++ trunk/mono/mono/metadata/class-internals.h 2007-12-03 13:59:51 UTC (rev
90542)
@@ -639,6 +639,9 @@
gboolean
mono_class_has_special_static_fields (MonoClass *klass) MONO_INTERNAL;
+const char*
+mono_class_get_field_default_value (MonoClassField *field, MonoTypeEnum
*def_type) MONO_INTERNAL;
+
void
mono_install_trampoline (MonoTrampoline func) MONO_INTERNAL;
Modified: trunk/mono/mono/metadata/class.c
===================================================================
--- trunk/mono/mono/metadata/class.c 2007-12-03 08:18:17 UTC (rev 90541)
+++ trunk/mono/mono/metadata/class.c 2007-12-03 13:59:51 UTC (rev 90542)
@@ -4344,6 +4344,33 @@
return 0;
}
+/*
+ * mono_class_get_field_default_value:
+ *
+ * Return the default value of the field as a pointer into the metadata blob.
+ */
+const char*
+mono_class_get_field_default_value (MonoClassField *field, MonoTypeEnum
*def_type)
+{
+ guint32 cindex;
+ guint32 constant_cols [MONO_CONSTANT_SIZE];
+
+ g_assert (field->type->attrs & FIELD_ATTRIBUTE_HAS_DEFAULT);
+
+ if (!field->data) {
+ cindex = mono_metadata_get_constant_index
(field->parent->image, mono_class_get_field_token (field), cindex + 1);
+ g_assert (cindex);
+ g_assert (!(field->type->attrs &
FIELD_ATTRIBUTE_HAS_FIELD_RVA));
+
+ mono_metadata_decode_row (&field->parent->image->tables
[MONO_TABLE_CONSTANT], cindex - 1, constant_cols, MONO_CONSTANT_SIZE);
+ field->def_type = constant_cols [MONO_CONSTANT_TYPE];
+ field->data = (gpointer)mono_metadata_blob_heap
(field->parent->image, constant_cols [MONO_CONSTANT_VALUE]);
+ }
+
+ *def_type = field->def_type;
+ return field->data;
+}
+
guint32
mono_class_get_event_token (MonoEvent *event)
{
Modified: trunk/mono/mono/metadata/icall-def.h
===================================================================
--- trunk/mono/mono/metadata/icall-def.h 2007-12-03 08:18:17 UTC (rev
90541)
+++ trunk/mono/mono/metadata/icall-def.h 2007-12-03 13:59:51 UTC (rev
90542)
@@ -514,8 +514,9 @@
ICALL_TYPE(MFIELD, "System.Reflection.MonoField", MFIELD_1)
ICALL(MFIELD_1, "GetFieldOffset", ves_icall_MonoField_GetFieldOffset)
ICALL(MFIELD_2, "GetParentType", ves_icall_MonoField_GetParentType)
+ICALL(MFIELD_5, "GetRawConstantValue", ves_icall_MonoField_GetRawConstantValue)
ICALL(MFIELD_3, "GetValueInternal", ves_icall_MonoField_GetValueInternal)
-ICALL(MFIELD_4, "SetValueInternal", ves_icall_FieldInfo_SetValueInternal)
+ICALL(MFIELD_4, "SetValueInternal", ves_icall_MonoField_SetValueInternal)
ICALL_TYPE(MGENCM, "System.Reflection.MonoGenericCMethod", MGENCM_1)
ICALL(MGENCM_1, "get_ReflectedType",
ves_icall_MonoGenericMethod_get_ReflectedType)
Modified: trunk/mono/mono/metadata/icall.c
===================================================================
--- trunk/mono/mono/metadata/icall.c 2007-12-03 08:18:17 UTC (rev 90541)
+++ trunk/mono/mono/metadata/icall.c 2007-12-03 13:59:51 UTC (rev 90542)
@@ -1588,7 +1588,7 @@
}
static void
-ves_icall_FieldInfo_SetValueInternal (MonoReflectionField *field, MonoObject
*obj, MonoObject *value)
+ves_icall_MonoField_SetValueInternal (MonoReflectionField *field, MonoObject
*obj, MonoObject *value)
{
MonoClassField *cf = field->field;
gchar *v;
@@ -1668,6 +1668,69 @@
}
}
+static MonoObject *
+ves_icall_MonoField_GetRawConstantValue (MonoReflectionField *this)
+{
+ MonoObject *o = NULL;
+ MonoClassField *field = this->field;
+ MonoClass *klass;
+ MonoDomain *domain = mono_object_domain (this);
+ gchar *v;
+ MonoTypeEnum def_type;
+ const char *def_value;
+
+ MONO_ARCH_SAVE_REGS;
+
+ mono_class_init (field->parent);
+
+ if (!(field->type->attrs & FIELD_ATTRIBUTE_HAS_DEFAULT))
+ mono_raise_exception (mono_get_exception_invalid_operation
(NULL));
+
+ if (field->parent->image->dynamic) {
+ /* FIXME: */
+ g_assert_not_reached ();
+ }
+
+ def_value = mono_class_get_field_default_value (field, &def_type);
+
+ switch (def_type) {
+ case MONO_TYPE_U1:
+ case MONO_TYPE_I1:
+ case MONO_TYPE_BOOLEAN:
+ case MONO_TYPE_U2:
+ case MONO_TYPE_I2:
+ case MONO_TYPE_CHAR:
+ case MONO_TYPE_U:
+ case MONO_TYPE_I:
+ case MONO_TYPE_U4:
+ case MONO_TYPE_I4:
+ case MONO_TYPE_R4:
+ case MONO_TYPE_U8:
+ case MONO_TYPE_I8:
+ case MONO_TYPE_R8: {
+ MonoType *t;
+
+ /* boxed value type */
+ t = g_new0 (MonoType, 1);
+ t->type = def_type;
+ klass = mono_class_from_mono_type (t);
+ g_free (t);
+ o = mono_object_new (domain, klass);
+ v = ((gchar *) o) + sizeof (MonoObject);
+ mono_get_constant_value_from_blob (domain, def_type, def_value,
v);
+ break;
+ }
+ case MONO_TYPE_STRING:
+ case MONO_TYPE_CLASS:
+ mono_get_constant_value_from_blob (domain, def_type, def_value,
&o);
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+
+ return o;
+}
+
static MonoReflectionType*
ves_icall_MonoGenericMethod_get_ReflectedType (MonoReflectionGenericMethod
*rmethod)
{
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches