[msbuild] bump to xplat-master branch HEAD

[mono.git] / mono / metadata / jit-info.c

diff --git a/mono/metadata/jit-info.c b/mono/metadata/jit-info.c
index 50ca4e7e31daf8e432c9e05972421ab9a01ddf97..085fb67a3759d029dbfafca2fab6a61251d04c7c 100644 (file)
--- a/mono/metadata/jit-info.c
+++ b/mono/metadata/jit-info.c
@@ -62,21 +62,7 @@ static MonoJitInfoFindInAot jit_info_find_in_aot_func = NULL;
 static int
 jit_info_table_num_elements (MonoJitInfoTable *table)
 {
-       int i;
-       int num_elements = 0;
-
-       for (i = 0; i < table->num_chunks; ++i) {
-               MonoJitInfoTableChunk *chunk = table->chunks [i];
-               int chunk_num_elements = chunk->num_elements;
-               int j;
-
-               for (j = 0; j < chunk_num_elements; ++j) {
-                       if (!IS_JIT_INFO_TOMBSTONE (chunk->data [j]))
-                               ++num_elements;
-               }
-       }
-
-       return num_elements;
+       return table->num_valid;
 }
 
 static MonoJitInfoTableChunk*
@@ -96,6 +82,7 @@ mono_jit_info_table_new (MonoDomain *domain)
        table->domain = domain;
        table->num_chunks = 1;
        table->chunks [0] = jit_info_table_new_chunk ();
+       table->num_valid = 0;
 
        return table;
 }
@@ -397,6 +384,7 @@ jit_info_table_realloc (MonoJitInfoTable *old)
        result = (MonoJitInfoTable *)g_malloc (MONO_SIZEOF_JIT_INFO_TABLE + sizeof (MonoJitInfoTableChunk*) * num_chunks);
        result->domain = old->domain;
        result->num_chunks = num_chunks;
+       result->num_valid = old->num_valid;
 
        for (i = 0; i < num_chunks; ++i)
                result->chunks [i] = jit_info_table_new_chunk ();
@@ -469,6 +457,7 @@ jit_info_table_copy_and_split_chunk (MonoJitInfoTable *table, MonoJitInfoTableCh
 
        new_table->domain = table->domain;
        new_table->num_chunks = table->num_chunks + 1;
+       new_table->num_valid = table->num_valid;
 
        j = 0;
        for (i = 0; i < table->num_chunks; ++i) {
@@ -517,6 +506,7 @@ jit_info_table_copy_and_purify_chunk (MonoJitInfoTable *table, MonoJitInfoTableC
 
        new_table->domain = table->domain;
        new_table->num_chunks = table->num_chunks;
+       new_table->num_valid = table->num_valid;
 
        j = 0;
        for (i = 0; i < table->num_chunks; ++i) {
@@ -651,6 +641,8 @@ jit_info_table_add (MonoDomain *domain, MonoJitInfoTable *volatile *table_ptr, M
        chunk->last_code_end = (gint8*)chunk->data [chunk->num_elements - 1]->code_start
                + chunk->data [chunk->num_elements - 1]->code_size;
 
+       ++table->num_valid;
+
        /* Debugging code, should be removed. */
        //jit_info_table_check (table);
 }
@@ -732,6 +724,7 @@ jit_info_table_remove (MonoJitInfoTable *table, MonoJitInfo *ji)
        g_assert (chunk->data [pos] == ji);
 
        chunk->data [pos] = mono_jit_info_make_tombstone (chunk, ji);
+       --table->num_valid;
 
        /* Debugging code, should be removed. */
        //jit_info_table_check (table);
@@ -801,6 +794,8 @@ mono_jit_info_size (MonoJitInfoFlags flags, int num_clauses, int num_holes)
                size += sizeof (MonoArchEHJitInfo);
        if (flags & JIT_INFO_HAS_THUNK_INFO)
                size += sizeof (MonoThunkJitInfo);
+       if (flags & JIT_INFO_HAS_UNWIND_INFO)
+               size += sizeof (MonoUnwindJitInfo);
        return size;
 }
 
@@ -820,6 +815,8 @@ mono_jit_info_init (MonoJitInfo *ji, MonoMethod *method, guint8 *code, int code_
                ji->has_arch_eh_info = 1;
        if (flags & JIT_INFO_HAS_THUNK_INFO)
                ji->has_thunk_info = 1;
+       if (flags & JIT_INFO_HAS_UNWIND_INFO)
+               ji->has_unwind_info = 1;
 }
 
 /**
@@ -996,3 +993,22 @@ mono_jit_info_get_thunk_info (MonoJitInfo *ji)
                return NULL;
        }
 }
+
+MonoUnwindJitInfo*
+mono_jit_info_get_unwind_info (MonoJitInfo *ji)
+{
+       if (ji->has_unwind_info) {
+               char *ptr = (char*)&ji->clauses [ji->num_clauses];
+               if (ji->has_generic_jit_info)
+                       ptr += sizeof (MonoGenericJitInfo);
+               if (ji->has_try_block_holes)
+                       ptr += try_block_hole_table_size (ji);
+               if (ji->has_arch_eh_info)
+                       ptr += sizeof (MonoArchEHJitInfo);
+               if (ji->has_thunk_info)
+                       ptr += sizeof (MonoThunkJitInfo);
+               return (MonoUnwindJitInfo*)ptr;
+       } else {
+               return NULL;
+       }
+}