projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2261 from BrzVlad/fix-arm-fast-tls-master
[mono.git]
/
mono
/
mini
/
unwind.c
diff --git
a/mono/mini/unwind.c
b/mono/mini/unwind.c
index 1fbd5c9f63bbfed5c3b6bf580c31fb63a4770743..82f14d7882255940ad311339fbe8c50073075a1b 100644
(file)
--- a/
mono/mini/unwind.c
+++ b/
mono/mini/unwind.c
@@
-41,8
+41,8
@@
static GSList *cached_info_list;
/* Statistics */
static int unwind_info_size;
/* Statistics */
static int unwind_info_size;
-#define unwind_lock() mono_mutex_lock (&unwind_mutex)
-#define unwind_unlock() mono_mutex_unlock (&unwind_mutex)
+#define unwind_lock() mono_
os_
mutex_lock (&unwind_mutex)
+#define unwind_unlock() mono_
os_
mutex_unlock (&unwind_mutex)
#ifdef TARGET_AMD64
static int map_hw_reg_to_dwarf_reg [] = { 0, 2, 1, 3, 7, 6, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
#ifdef TARGET_AMD64
static int map_hw_reg_to_dwarf_reg [] = { 0, 2, 1, 3, 7, 6, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
@@
-361,7
+361,7
@@
mono_unwind_ops_encode_full (GSList *unwind_ops, guint32 *out_len, gboolean enab
for (; l; l = l->next) {
int reg;
for (; l; l = l->next) {
int reg;
- op = l->data;
+ op =
(MonoUnwindOp *)
l->data;
/* Convert the register from the hw encoding to the dwarf encoding */
reg = mono_hw_reg_to_dwarf_reg (op->reg);
/* Convert the register from the hw encoding to the dwarf encoding */
reg = mono_hw_reg_to_dwarf_reg (op->reg);
@@
-446,7
+446,7
@@
mono_unwind_ops_encode_full (GSList *unwind_ops, guint32 *out_len, gboolean enab
g_assert (p - buf < 4096);
*out_len = p - buf;
g_assert (p - buf < 4096);
*out_len = p - buf;
- res = g_malloc (p - buf);
+ res =
(guint8 *)
g_malloc (p - buf);
memcpy (res, buf, p - buf);
return res;
}
memcpy (res, buf, p - buf);
return res;
}
@@
-632,7
+632,7
@@
mono_unwind_frame (guint8 *unwind_info, guint32 unwind_info_len,
void
mono_unwind_init (void)
{
void
mono_unwind_init (void)
{
- mono_mutex_init_recursive (&unwind_mutex);
+ mono_
os_
mutex_init_recursive (&unwind_mutex);
mono_counters_register ("Unwind info size", MONO_COUNTER_JIT | MONO_COUNTER_INT, &unwind_info_size);
}
mono_counters_register ("Unwind info size", MONO_COUNTER_JIT | MONO_COUNTER_INT, &unwind_info_size);
}
@@
-642,7
+642,7
@@
mono_unwind_cleanup (void)
{
int i;
{
int i;
- mono_mutex_destroy (&unwind_mutex);
+ mono_
os_
mutex_destroy (&unwind_mutex);
if (!cached_info)
return;
if (!cached_info)
return;
@@
-688,7
+688,7
@@
mono_cache_unwind_info (guint8 *unwind_info, guint32 unwind_info_len)
}
}
}
}
- info = g_malloc (sizeof (MonoUnwindInfo) + unwind_info_len);
+ info =
(MonoUnwindInfo *)
g_malloc (sizeof (MonoUnwindInfo) + unwind_info_len);
info->len = unwind_info_len;
memcpy (&info->info, unwind_info, unwind_info_len);
info->len = unwind_info_len;
memcpy (&info->info, unwind_info, unwind_info_len);
@@
-881,11
+881,11
@@
decode_lsda (guint8 *lsda, guint8 *code, MonoJitExceptionInfo **ex_info, guint32
p = (guint8*)ALIGN_TO ((mgreg_t)p, 4);
if (ex_info) {
p = (guint8*)ALIGN_TO ((mgreg_t)p, 4);
if (ex_info) {
- *ex_info = g_malloc0 (ncall_sites * sizeof (MonoJitExceptionInfo));
+ *ex_info =
(MonoJitExceptionInfo *)
g_malloc0 (ncall_sites * sizeof (MonoJitExceptionInfo));
*ex_info_len = ncall_sites;
}
if (type_info)
*ex_info_len = ncall_sites;
}
if (type_info)
- *type_info = g_malloc0 (ncall_sites * sizeof (gpointer));
+ *type_info =
(gpointer *)
g_malloc0 (ncall_sites * sizeof (gpointer));
for (i = 0; i < ncall_sites; ++i) {
int block_start_offset, block_size, landing_pad;
for (i = 0; i < ncall_sites; ++i) {
int block_start_offset, block_size, landing_pad;
@@
-1058,7
+1058,7
@@
mono_unwind_decode_fde (guint8 *fde, guint32 *out_len, guint32 *code_len, MonoJi
g_assert (return_reg == DWARF_PC_REG);
buf_len = (cie + cie_len + 4 - cie_cfi) + (fde + fde_len + 4 - fde_cfi);
g_assert (return_reg == DWARF_PC_REG);
buf_len = (cie + cie_len + 4 - cie_cfi) + (fde + fde_len + 4 - fde_cfi);
- buf = g_malloc0 (buf_len);
+ buf =
(guint8 *)
g_malloc0 (buf_len);
i = 0;
p = cie_cfi;
i = 0;
p = cie_cfi;
@@
-1084,7
+1084,7
@@
mono_unwind_decode_fde (guint8 *fde, guint32 *out_len, guint32 *code_len, MonoJi
*out_len = i;
*out_len = i;
- return g_realloc (buf, i);
+ return
(guint8 *)
g_realloc (buf, i);
}
/*
}
/*
@@
-1158,7
+1158,7
@@
mono_unwind_decode_llvm_mono_fde (guint8 *fde, int fde_len, guint8 *cie, guint8
cie_cfi_len = p - cie_cfi;
fde_cfi_len = (fde + fde_len - fde_cfi);
cie_cfi_len = p - cie_cfi;
fde_cfi_len = (fde + fde_len - fde_cfi);
- buf = g_malloc0 (cie_cfi_len + fde_cfi_len);
+ buf =
(guint8 *)
g_malloc0 (cie_cfi_len + fde_cfi_len);
memcpy (buf, cie_cfi, cie_cfi_len);
memcpy (buf + cie_cfi_len, fde_cfi, fde_cfi_len);
memcpy (buf, cie_cfi, cie_cfi_len);
memcpy (buf + cie_cfi_len, fde_cfi, fde_cfi_len);