Author: lupus
Date: 2007-01-16 05:30:18 -0500 (Tue, 16 Jan 2007)
New Revision: 71117

Added:
   trunk/mono/mono/mini/patch-info.h
Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/Makefile.am
   trunk/mono/mono/mini/aot-compiler.c
   trunk/mono/mono/mini/mini.h
Log:


Tue Jan 16 11:28:45 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>

        * mini.h, patch-info.h, Makefile.am, aot-compiler.c: reduce
        relocations and put the patch info names close to the enum definition.



Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2007-01-16 10:17:43 UTC (rev 71116)
+++ trunk/mono/mono/mini/ChangeLog      2007-01-16 10:30:18 UTC (rev 71117)
@@ -1,3 +1,9 @@
+
+Tue Jan 16 11:28:45 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
+
+       * mini.h, patch-info.h, Makefile.am, aot-compiler.c: reduce
+       relocations and put the patch info names close to the enum definition.
+
 2007-01-15 Mark Mason <[EMAIL PROTECTED]>
 
        * basic.cs, exceptions.cs: break up large tests to increase 
debugability.

Modified: trunk/mono/mono/mini/Makefile.am
===================================================================
--- trunk/mono/mono/mini/Makefile.am    2007-01-16 10:17:43 UTC (rev 71116)
+++ trunk/mono/mono/mini/Makefile.am    2007-01-16 10:30:18 UTC (rev 71117)
@@ -193,6 +193,7 @@
        jit-icalls.c \
        trace.c         \
        trace.h         \
+       patch-info.h    \
        mini-ops.h      \
        mini-arch.h     \
        dominators.c    \

Modified: trunk/mono/mono/mini/aot-compiler.c
===================================================================
--- trunk/mono/mono/mini/aot-compiler.c 2007-01-16 10:17:43 UTC (rev 71116)
+++ trunk/mono/mono/mini/aot-compiler.c 2007-01-16 10:30:18 UTC (rev 71117)
@@ -134,41 +134,46 @@
 #endif
 } MonoAotCompile;
 
-/* Keep in synch with MonoJumpInfoType */
-static const char* patch_types [] = {
-       "bb",
-       "abs",
-       "label",
-       "method",
-       "method_jump",
-       "method_rel",
-       "methodconst",
-       "internal_method",
-       "switch",
-       "exc",
-       "exc_name",
-       "class",
-       "image",
-       "field",
-       "vtable",
-       "class_init",
-       "sflda",
-       "ldstr",
-       "ldtoken",
-       "type_from_handle",
-       "r4",
-       "r8",
-       "ip",
-       "iid",
-       "adjusted_iid",
-       "bb_ovf",
-       "exc_ovf",
-       "wrapper",
-       "got_offset",
-       "declsec",
-       "none"
+#ifdef HAVE_ARRAY_ELEM_INIT
+#define MSGSTRFIELD(line) MSGSTRFIELD1(line)
+#define MSGSTRFIELD1(line) str##line
+static const struct msgstr_t {
+#define PATCH_INFO(a,b) char MSGSTRFIELD(__LINE__) [sizeof (b)];
+#include "patch-info.h"
+#undef PATCH_INFO
+} opstr = {
+#define PATCH_INFO(a,b) b,
+#include "patch-info.h"
+#undef PATCH_INFO
 };
+static const gint16 opidx [] = {
+#define PATCH_INFO(a,b) [MONO_PATCH_INFO_ ## a] = offsetof (struct msgstr_t, 
MSGSTRFIELD(__LINE__)),
+#include "patch-info.h"
+#undef PATCH_INFO
+};
 
+static const char*
+get_patch_name (int info)
+{
+       return (const char*)&opstr + opidx [info];
+}
+
+#else
+#define PATCH_INFO(a,b) b,
+static const char* const
+patch_types [MONO_PATCH_INFO_NUM + 1] = {
+#include "patch-info.h"
+       NULL
+};
+
+static const char*
+get_patch_name (int info)
+{
+       return patch_types [info];
+}
+
+#endif
+
 static gboolean 
 is_got_patch (MonoJumpInfoType patch_type)
 {
@@ -2146,7 +2151,7 @@
                for (pindex = 0; pindex < patches->len; ++pindex) {
                        patch_info = g_ptr_array_index (patches, pindex);
                        if (patch_info->type != MONO_PATCH_INFO_NONE) {
-                               printf ("\t%s", patch_types [patch_info->type]);
+                               printf ("\t%s", get_patch_name 
(patch_info->type));
                                if (patch_info->type == MONO_PATCH_INFO_VTABLE)
                                        printf (": %s\n", 
patch_info->data.klass->name);
                                else
@@ -3314,7 +3319,7 @@
        printf ("GOT slot distribution:\n");
        for (i = 0; i < MONO_PATCH_INFO_NONE; ++i)
                if (acfg->stats.got_slot_types [i])
-                       printf ("\t%s: %d\n", patch_types [i], 
acfg->stats.got_slot_types [i]);
+                       printf ("\t%s: %d\n", get_patch_name (i), 
acfg->stats.got_slot_types [i]);
 
        return 0;
 }

Modified: trunk/mono/mono/mini/mini.h
===================================================================
--- trunk/mono/mono/mini/mini.h 2007-01-16 10:17:43 UTC (rev 71116)
+++ trunk/mono/mono/mini/mini.h 2007-01-16 10:30:18 UTC (rev 71117)
@@ -441,37 +441,10 @@
 } MonoJitTlsData;
 
 typedef enum {
-       MONO_PATCH_INFO_BB,
-       MONO_PATCH_INFO_ABS,
-       MONO_PATCH_INFO_LABEL,
-       MONO_PATCH_INFO_METHOD,
-       MONO_PATCH_INFO_METHOD_JUMP,
-       MONO_PATCH_INFO_METHOD_REL,
-       MONO_PATCH_INFO_METHODCONST,
-       MONO_PATCH_INFO_INTERNAL_METHOD,
-       MONO_PATCH_INFO_SWITCH,
-       MONO_PATCH_INFO_EXC,
-       MONO_PATCH_INFO_EXC_NAME,
-       MONO_PATCH_INFO_CLASS,
-       MONO_PATCH_INFO_IMAGE,
-       MONO_PATCH_INFO_FIELD,
-       MONO_PATCH_INFO_VTABLE,
-       MONO_PATCH_INFO_CLASS_INIT,
-       MONO_PATCH_INFO_SFLDA,
-       MONO_PATCH_INFO_LDSTR,
-       MONO_PATCH_INFO_LDTOKEN,
-       MONO_PATCH_INFO_TYPE_FROM_HANDLE,
-       MONO_PATCH_INFO_R4,
-       MONO_PATCH_INFO_R8,
-       MONO_PATCH_INFO_IP,
-       MONO_PATCH_INFO_IID,
-       MONO_PATCH_INFO_ADJUSTED_IID,
-       MONO_PATCH_INFO_BB_OVF,
-       MONO_PATCH_INFO_EXC_OVF,
-       MONO_PATCH_INFO_WRAPPER,
-       MONO_PATCH_INFO_GOT_OFFSET,
-       MONO_PATCH_INFO_DECLSEC,
-       MONO_PATCH_INFO_NONE
+#define PATCH_INFO(a,b) MONO_PATCH_INFO_ ## a,
+#include "patch-info.h"
+#undef PATCH_INFO
+       MONO_PATCH_INFO_NUM
 } MonoJumpInfoType;
 
 /*

Added: trunk/mono/mono/mini/patch-info.h
===================================================================
--- trunk/mono/mono/mini/patch-info.h   2007-01-16 10:17:43 UTC (rev 71116)
+++ trunk/mono/mono/mini/patch-info.h   2007-01-16 10:30:18 UTC (rev 71117)
@@ -0,0 +1,32 @@
+PATCH_INFO(BB, "bb")
+PATCH_INFO(ABS, "abs")
+PATCH_INFO(LABEL, "label")
+PATCH_INFO(METHOD, "method")
+PATCH_INFO(METHOD_JUMP, "method_jump")
+PATCH_INFO(METHOD_REL, "method_rel")
+PATCH_INFO(METHODCONST, "methodconst")
+PATCH_INFO(INTERNAL_METHOD, "internal_method")
+PATCH_INFO(SWITCH, "switch")
+PATCH_INFO(EXC, "exc")
+PATCH_INFO(EXC_NAME, "exc_name")
+PATCH_INFO(CLASS, "class")
+PATCH_INFO(IMAGE, "image")
+PATCH_INFO(FIELD, "field")
+PATCH_INFO(VTABLE, "vtable")
+PATCH_INFO(CLASS_INIT, "class_init")
+PATCH_INFO(SFLDA, "sflda")
+PATCH_INFO(LDSTR, "ldstr")
+PATCH_INFO(LDTOKEN, "ldtoken")
+PATCH_INFO(TYPE_FROM_HANDLE, "type_from_handle")
+PATCH_INFO(R4, "r4")
+PATCH_INFO(R8, "r8")
+PATCH_INFO(IP, "ip")
+PATCH_INFO(IID, "iid")
+PATCH_INFO(ADJUSTED_IID, "adjusted_iid")
+PATCH_INFO(BB_OVF, "bb_ovf")
+PATCH_INFO(EXC_OVF, "exc_ovf")
+PATCH_INFO(WRAPPER, "wrapper")
+PATCH_INFO(GOT_OFFSET, "got_offset")
+PATCH_INFO(DECLSEC, "declsec")
+PATCH_INFO(RVA, "rva")
+PATCH_INFO(NONE, "none")

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to