Author: lupus
Date: 2007-01-16 06:47:02 -0500 (Tue, 16 Jan 2007)
New Revision: 71118
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/aot-compiler.c
trunk/mono/mono/mini/aot-runtime.c
trunk/mono/mono/mini/mini.c
Log:
Tue Jan 16 12:42:40 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
* mini.c, aot-runtime.c, aot-compiler.c: enable aot compilation of
array initialization and make it conditional on the intrins option.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2007-01-16 10:30:18 UTC (rev 71117)
+++ trunk/mono/mono/mini/ChangeLog 2007-01-16 11:47:02 UTC (rev 71118)
@@ -1,4 +1,9 @@
+Tue Jan 16 12:42:40 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
+
+ * mini.c, aot-runtime.c, aot-compiler.c: enable aot compilation of
+ array initialization and make it conditional on the intrins option.
+
Tue Jan 16 11:28:45 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
* mini.h, patch-info.h, Makefile.am, aot-compiler.c: reduce
Modified: trunk/mono/mono/mini/aot-compiler.c
===================================================================
--- trunk/mono/mono/mini/aot-compiler.c 2007-01-16 10:30:18 UTC (rev 71117)
+++ trunk/mono/mono/mini/aot-compiler.c 2007-01-16 11:47:02 UTC (rev 71118)
@@ -1934,6 +1934,7 @@
encode_value (patch_info->data.token->token -
MONO_TOKEN_STRING, p, &p);
break;
}
+ case MONO_PATCH_INFO_RVA:
case MONO_PATCH_INFO_DECLSEC:
case MONO_PATCH_INFO_LDTOKEN:
case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
@@ -2803,6 +2804,7 @@
case MONO_PATCH_INFO_DECLSEC:
case MONO_PATCH_INFO_LDTOKEN:
case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
+ case MONO_PATCH_INFO_RVA:
get_shared_got_offset (acfg, ji);
break;
default:
Modified: trunk/mono/mono/mini/aot-runtime.c
===================================================================
--- trunk/mono/mono/mini/aot-runtime.c 2007-01-16 10:30:18 UTC (rev 71117)
+++ trunk/mono/mono/mini/aot-runtime.c 2007-01-16 11:47:02 UTC (rev 71118)
@@ -1218,6 +1218,7 @@
goto cleanup;
ji->data.token = mono_jump_info_token_new (mp, image,
MONO_TOKEN_STRING + decode_value (p, &p));
break;
+ case MONO_PATCH_INFO_RVA:
case MONO_PATCH_INFO_DECLSEC:
case MONO_PATCH_INFO_LDTOKEN:
case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2007-01-16 10:30:18 UTC (rev 71117)
+++ trunk/mono/mono/mini/mini.c 2007-01-16 11:47:02 UTC (rev 71118)
@@ -3773,7 +3773,7 @@
* sequence and return the pointer to the data and the size.
*/
static const char*
-initialize_array_data (MonoMethod *method, unsigned char *ip, MonoInst
*newarr, int *out_size)
+initialize_array_data (MonoMethod *method, gboolean aot, unsigned char *ip,
MonoInst *newarr, int *out_size)
{
/*
* newarr[System.Int32]
@@ -3822,6 +3822,9 @@
mono_metadata_field_info (method->klass->image, field_index -
1, NULL, &rva, NULL);
data_ptr = mono_image_rva_map (method->klass->image, rva);
/*g_print ("field: 0x%08x, rva: %d, rva_ptr: %p\n", read32 (ip
+ 2), rva, data_ptr);*/
+ /* for aot code we do the lookup on load */
+ if (aot && data_ptr)
+ return GUINT_TO_POINTER (rva);
return data_ptr;
}
return NULL;
@@ -6426,7 +6429,13 @@
NEW_TEMPSTORE (cfg, store, temp->inst_c0, ins);
store->cil_code = ins->cil_code;
MONO_ADD_INS (bblock, store);
- if (ip_in_bb (cfg, bblock, ip + 6) && (data_ptr
= initialize_array_data (method, ip, ins, &data_size))) {
+ /*
+ * we inline/optimize the initialization
sequence if possible.
+ * we should also allocate the array as not
cleared, since we spend as much time clearing to 0 as initializing
+ * for small sizes open code the memcpy
+ * ensure the rva field is big enough
+ */
+ if ((cfg->opt & MONO_OPT_INTRINS) && ip_in_bb
(cfg, bblock, ip + 6) && (data_ptr = initialize_array_data (method,
cfg->compile_aot, ip, ins, &data_size))) {
MonoMethod *memcpy_method =
get_memcpy_method ();
MonoInst *data_offset, *add;
MonoInst *iargs [3];
@@ -6439,13 +6448,12 @@
add->inst_right = data_offset;
add->cil_code = ip;
iargs [0] = add;
- NEW_PCONST (cfg, iargs [1], data_ptr);
+ if (cfg->compile_aot) {
+ NEW_AOTCONST_TOKEN (cfg, iargs
[1], MONO_PATCH_INFO_RVA, method->klass->image, GPOINTER_TO_UINT(data_ptr),
STACK_PTR, NULL);
+ } else {
+ NEW_PCONST (cfg, iargs [1],
data_ptr);
+ }
mono_emit_method_call_spilled (cfg,
bblock, memcpy_method, memcpy_method->signature, iargs, ip, NULL);
- /*
- * we should also allocate the array as
not cleared, since we spend as much time clearing to 0 as initializing
- * for small sizes open code the memcpy
- * ensure the rva field is big enough
- */
ip += 11;
}
NEW_TEMPLOAD (cfg, load, temp->inst_c0);
@@ -8800,6 +8808,7 @@
memcpy (res, patch_info, sizeof (MonoJumpInfo));
switch (patch_info->type) {
+ case MONO_PATCH_INFO_RVA:
case MONO_PATCH_INFO_LDSTR:
case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
case MONO_PATCH_INFO_LDTOKEN:
@@ -8824,6 +8833,7 @@
const MonoJumpInfo *ji = (MonoJumpInfo*)data;
switch (ji->type) {
+ case MONO_PATCH_INFO_RVA:
case MONO_PATCH_INFO_LDSTR:
case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
case MONO_PATCH_INFO_LDTOKEN:
@@ -8851,6 +8861,7 @@
return 0;
switch (ji1->type) {
+ case MONO_PATCH_INFO_RVA:
case MONO_PATCH_INFO_LDSTR:
case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
case MONO_PATCH_INFO_LDTOKEN:
@@ -8968,6 +8979,9 @@
target = (char*)vtable->data + patch_info->data.field->offset;
break;
}
+ case MONO_PATCH_INFO_RVA:
+ target = mono_image_rva_map (patch_info->data.token->image,
patch_info->data.token->token);
+ break;
case MONO_PATCH_INFO_R4:
case MONO_PATCH_INFO_R8:
target = patch_info->data.target;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches