Merge pull request #601 from knocte/sock_improvements

[mono.git] / mono / mini / mini-codegen.c

diff --git a/mono/mini/mini-codegen.c b/mono/mini/mini-codegen.c
index 22d36cf6546b9aa83df0da7b1c4b5af0a139fc2e..8ef772a1b14c82c2c139ba05f0ea329e46bc9b16 100644 (file)
--- a/mono/mini/mini-codegen.c
+++ b/mono/mini/mini-codegen.c
@@ -411,38 +411,22 @@ typedef struct {
 
 #ifndef DISABLE_LOGGING
 
-static const char*
-info_type_to_str (MonoRgctxInfoType type)
-{
-       switch (type) {
-       case MONO_RGCTX_INFO_STATIC_DATA: return "STATIC_DATA";
-       case MONO_RGCTX_INFO_KLASS: return "KLASS";
-       case MONO_RGCTX_INFO_VTABLE: return "VTABLE";
-       case MONO_RGCTX_INFO_TYPE: return "TYPE";
-       case MONO_RGCTX_INFO_REFLECTION_TYPE: return "REFLECTION_TYPE";
-       case MONO_RGCTX_INFO_METHOD: return "METHOD";
-       case MONO_RGCTX_INFO_GENERIC_METHOD_CODE: return "GENERIC_METHOD_CODE";
-       case MONO_RGCTX_INFO_CLASS_FIELD: return "CLASS_FIELD";
-       case MONO_RGCTX_INFO_METHOD_RGCTX: return "METHOD_RGCTX";
-       case MONO_RGCTX_INFO_METHOD_CONTEXT: return "METHOD_CONTEXT";
-       case MONO_RGCTX_INFO_REMOTING_INVOKE_WITH_CHECK: return "REMOTING_INVOKE_WITH_CHECK";
-       case MONO_RGCTX_INFO_METHOD_DELEGATE_CODE: return "METHOD_DELEGATE_CODE";
-       case MONO_RGCTX_INFO_CAST_CACHE: return "CAST_CACHE";
-       default:
-               return "<UNKNOWN RGCTX INFO TYPE>";
-       }
-}
+static const char* const patch_info_str[] = {
+#define PATCH_INFO(a,b) "" #a,
+#include "patch-info.h"
+#undef PATCH_INFO
+};
 
-static void
-print_ji (MonoJumpInfo *ji)
+void
+mono_print_ji (const MonoJumpInfo *ji)
 {
        switch (ji->type) {
        case MONO_PATCH_INFO_RGCTX_FETCH: {
                MonoJumpInfoRgctxEntry *entry = ji->data.rgctx_entry;
 
                printf ("[RGCTX_FETCH ");
-               print_ji (entry->data);
-               printf (" - %s]", info_type_to_str (entry->info_type));
+               mono_print_ji (entry->data);
+               printf (" - %s]", mono_rgctx_info_type_to_str (entry->info_type));
                break;
        }
        case MONO_PATCH_INFO_METHODCONST: {
@@ -452,7 +436,7 @@ print_ji (MonoJumpInfo *ji)
                break;
        }
        default:
-               printf ("[%d]", ji->type);
+               printf ("[%s]", patch_info_str [ji->type]);
                break;
        }
 }
@@ -633,7 +617,7 @@ mono_print_ins_index (int i, MonoInst *ins)
                        MonoJumpInfo *ji = (MonoJumpInfo*)call->fptr;
 
                        printf (" ");
-                       print_ji (ji);
+                       mono_print_ji (ji);
                } else if (call->fptr) {
                        MonoJitICallInfo *info = mono_find_jit_icall_by_addr (call->fptr);
                        if (info)
@@ -721,6 +705,12 @@ print_regtrack (RegTrack *t, int num)
        }
 }
 #else
+
+void
+mono_print_ji (const MonoJumpInfo *ji)
+{
+}
+
 void
 mono_print_ins_index (int i, MonoInst *ins)
 {