/* 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 };
-#define NUM_REGS AMD64_NREG
+#define NUM_DWARF_REGS AMD64_NREG
#define DWARF_DATA_ALIGN (-8)
#define DWARF_PC_REG (mono_hw_reg_to_dwarf_reg (AMD64_RIP))
#elif defined(TARGET_ARM)
// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0040a/IHI0040A_aadwarf.pdf
/* Assign d8..d15 to hregs 16..24 (dwarf regs 264..271) */
static int map_hw_reg_to_dwarf_reg [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 264, 265, 266, 267, 268, 269, 270, 271 };
-#define NUM_REGS 272
+#define NUM_DWARF_REGS 272
#define DWARF_DATA_ALIGN (-4)
#define DWARF_PC_REG (mono_hw_reg_to_dwarf_reg (ARMREG_LR))
#define IS_DOUBLE_REG(dwarf_reg) (((dwarf_reg) >= 264) && ((dwarf_reg) <= 271))
#elif defined(TARGET_ARM64)
-#define NUM_REGS 96
+#define NUM_DWARF_REGS 96
#define DWARF_DATA_ALIGN (-8)
/* LR */
#define DWARF_PC_REG 30
*/
static int map_hw_reg_to_dwarf_reg [] = { 0, 1, 2, 3, 5, 4, 6, 7, 8 };
/* + 1 is for IP */
-#define NUM_REGS X86_NREG + 1
+#define NUM_DWARF_REGS (X86_NREG + 1)
#define DWARF_DATA_ALIGN (-4)
#define DWARF_PC_REG (mono_hw_reg_to_dwarf_reg (X86_NREG))
#elif defined (TARGET_POWERPC)
9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31 };
-#define NUM_REGS 110
+#define NUM_DWARF_REGS 110
#define DWARF_DATA_ALIGN (-(gint32)sizeof (mgreg_t))
#define DWARF_PC_REG 108
#elif defined (TARGET_S390X)
static int map_hw_reg_to_dwarf_reg [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
-#define NUM_REGS 16
+#define NUM_DWARF_REGS 16
#define DWARF_DATA_ALIGN (-8)
#define DWARF_PC_REG (mono_hw_reg_to_dwarf_reg (14))
#elif defined (TARGET_MIPS)
16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31
};
-#define NUM_REGS 32
+#define NUM_DWARF_REGS 32
#define DWARF_DATA_ALIGN (-(gint32)sizeof (mgreg_t))
#define DWARF_PC_REG (mono_hw_reg_to_dwarf_reg (mips_ra))
#else
static int map_hw_reg_to_dwarf_reg [16];
-#define NUM_REGS 16
+#define NUM_DWARF_REGS 16
#define DWARF_DATA_ALIGN 0
#define DWARF_PC_REG -1
#endif
+#define NUM_HW_REGS (sizeof (map_hw_reg_to_dwarf_reg) / sizeof (int))
+
#ifndef IS_DOUBLE_REG
-#define IS_DOUBLE_REG(dwarf_reg) 0
+#define IS_DOUBLE_REG(dwarf_reg) (dwarf_reg ? 0 : 0)
#endif
static gboolean dwarf_reg_to_hw_reg_inited;
-static int map_dwarf_reg_to_hw_reg [NUM_REGS];
+static int map_dwarf_reg_to_hw_reg [NUM_DWARF_REGS];
/*
* mono_hw_reg_to_dwarf_reg:
if (reg == ppc_lr)
return 108;
else
- g_assert (reg < NUM_REGS);
+ g_assert (reg < NUM_HW_REGS);
#endif
- if (NUM_REGS == 0) {
+ if (NUM_HW_REGS == 0) {
g_assert_not_reached ();
return -1;
} else {
{
int i;
- g_assert (NUM_REGS > 0);
- for (i = 0; i < sizeof (map_hw_reg_to_dwarf_reg) / sizeof (int); ++i) {
+ g_assert (NUM_HW_REGS > 0);
+ for (i = 0; i < NUM_HW_REGS; ++i) {
map_dwarf_reg_to_hw_reg [mono_hw_reg_to_dwarf_reg (i)] = i;
}
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);
while (op->when > loc) {
if (op->when - loc > 65536) {
*p ++ = DW_CFA_advance_loc4;
- *(guint32*)p = (guint32)(op->when - loc);
+ guint32 v = (guint32)(op->when - loc);
+ memcpy (p, &v, 4);
g_assert (read32 (p) == (guint32)(op->when - loc));
p += 4;
loc = op->when;
} else if (op->when - loc > 256) {
*p ++ = DW_CFA_advance_loc2;
- *(guint16*)p = (guint16)(op->when - loc);
+ guint16 v = (guint16)(op->when - loc);
+ memcpy (p, &v, 2);
g_assert (read16 (p) == (guint32)(op->when - loc));
p += 2;
loc = op->when;
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;
}
}
typedef struct {
- Loc locations [NUM_REGS];
- guint8 reg_saved [NUM_REGS];
+ Loc locations [NUM_HW_REGS];
+ guint8 reg_saved [NUM_HW_REGS];
int cfa_reg, cfa_offset;
} UnwindState;
mgreg_t **save_locations, int save_locations_len,
guint8 **out_cfa)
{
- Loc locations [NUM_REGS];
- guint8 reg_saved [NUM_REGS];
- int i, pos, reg, cfa_reg = -1, cfa_offset = 0, offset;
+ Loc locations [NUM_HW_REGS];
+ guint8 reg_saved [NUM_HW_REGS];
+ int pos, reg, hwreg, cfa_reg = -1, cfa_offset = 0, offset;
guint8 *p;
guint8 *cfa_val;
UnwindState state_stack [1];
p ++;
break;
case DW_CFA_offset:
- reg = *p & 0x3f;
+ hwreg = mono_dwarf_reg_to_hw_reg (*p & 0x3f);
p ++;
- reg_saved [reg] = TRUE;
- locations [reg].loc_type = LOC_OFFSET;
- locations [reg].offset = decode_uleb128 (p, &p) * DWARF_DATA_ALIGN;
+ reg_saved [hwreg] = TRUE;
+ locations [hwreg].loc_type = LOC_OFFSET;
+ locations [hwreg].offset = decode_uleb128 (p, &p) * DWARF_DATA_ALIGN;
break;
case 0: {
int ext_op = *p;
break;
case DW_CFA_offset_extended_sf:
reg = decode_uleb128 (p, &p);
+ hwreg = mono_dwarf_reg_to_hw_reg (reg);
offset = decode_sleb128 (p, &p);
- g_assert (reg < NUM_REGS);
- reg_saved [reg] = TRUE;
- locations [reg].loc_type = LOC_OFFSET;
- locations [reg].offset = offset * DWARF_DATA_ALIGN;
+ g_assert (reg < NUM_DWARF_REGS);
+ reg_saved [hwreg] = TRUE;
+ locations [hwreg].loc_type = LOC_OFFSET;
+ locations [hwreg].offset = offset * DWARF_DATA_ALIGN;
break;
case DW_CFA_offset_extended:
reg = decode_uleb128 (p, &p);
+ hwreg = mono_dwarf_reg_to_hw_reg (reg);
offset = decode_uleb128 (p, &p);
- g_assert (reg < NUM_REGS);
- reg_saved [reg] = TRUE;
- locations [reg].loc_type = LOC_OFFSET;
- locations [reg].offset = offset * DWARF_DATA_ALIGN;
+ g_assert (reg < NUM_DWARF_REGS);
+ reg_saved [hwreg] = TRUE;
+ locations [hwreg].loc_type = LOC_OFFSET;
+ locations [hwreg].offset = offset * DWARF_DATA_ALIGN;
break;
case DW_CFA_same_value:
- reg = decode_uleb128 (p, &p);
- locations [reg].loc_type = LOC_SAME;
+ hwreg = mono_dwarf_reg_to_hw_reg (decode_uleb128 (p, &p));
+ locations [hwreg].loc_type = LOC_SAME;
break;
case DW_CFA_advance_loc1:
pos += *p;
g_assert (cfa_reg != -1);
cfa_val = (guint8*)regs [mono_dwarf_reg_to_hw_reg (cfa_reg)] + cfa_offset;
- for (i = 0; i < NUM_REGS; ++i) {
- if (reg_saved [i] && locations [i].loc_type == LOC_OFFSET) {
- int hreg = mono_dwarf_reg_to_hw_reg (i);
- g_assert (hreg < nregs);
- if (IS_DOUBLE_REG (i))
- regs [hreg] = *(guint64*)(cfa_val + locations [i].offset);
+ for (hwreg = 0; hwreg < NUM_HW_REGS; ++hwreg) {
+ if (reg_saved [hwreg] && locations [hwreg].loc_type == LOC_OFFSET) {
+ int dwarfreg = mono_hw_reg_to_dwarf_reg (hwreg);
+ g_assert (hwreg < nregs);
+ if (IS_DOUBLE_REG (dwarfreg))
+ regs [hwreg] = *(guint64*)(cfa_val + locations [hwreg].offset);
else
- regs [hreg] = *(mgreg_t*)(cfa_val + locations [i].offset);
- if (save_locations && hreg < save_locations_len)
- save_locations [hreg] = (mgreg_t*)(cfa_val + locations [i].offset);
+ regs [hwreg] = *(mgreg_t*)(cfa_val + locations [hwreg].offset);
+ if (save_locations && hwreg < save_locations_len)
+ save_locations [hwreg] = (mgreg_t*)(cfa_val + locations [hwreg].offset);
}
}
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);
}
{
int i;
- mono_mutex_destroy (&unwind_mutex);
+ mono_os_mutex_destroy (&unwind_mutex);
if (!cached_info)
return;
g_free (cached);
}
-
g_free (cached_info);
+
+ for (GSList *cursor = cached_info_list; cursor != NULL; cursor = cursor->next)
+ g_free (cursor->data);
+
+ g_slist_free (cached_info_list);
}
/*
}
}
- 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);
mono_memory_barrier ();
- cached_info = new_table;
-
cached_info_list = g_slist_prepend (cached_info_list, cached_info);
+ cached_info = new_table;
+
cached_info_size *= 2;
}
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)
- *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;
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;
*out_len = i;
- return g_realloc (buf, i);
+ return (guint8 *)g_realloc (buf, i);
}
/*
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);