[jit] Allocate the thunks area next to the method code if the backend can compute...

[mono.git] / mono / mini / unwind.c

diff --git a/mono/mini/unwind.c b/mono/mini/unwind.c
index 517c7fbc827254c0428a129debcb42d99fa3c318..17bf3ad8962d35d90c07c8602049fe59a2b73a9b 100644 (file)
--- a/mono/mini/unwind.c
+++ b/mono/mini/unwind.c
@@ -68,16 +68,11 @@ static int map_hw_reg_to_dwarf_reg [] = {
        72, 73, 74, 75, 76, 77, 78, 79,
 };
 #elif defined (TARGET_X86)
-#ifdef __APPLE__
 /*
- * LLVM seems to generate unwind info where esp is encoded as 5, and ebp as 4, ie see this line:
- *   def ESP : RegisterWithSubRegs<"esp", [SP]>, DwarfRegNum<[-2, 5, 4]>;
- * in lib/Target/X86/X86RegisterInfo.td in the llvm sources.
+ * ebp and esp are swapped:
+ * http://lists.cs.uiuc.edu/pipermail/lldb-dev/2014-January/003101.html
  */
 static int map_hw_reg_to_dwarf_reg [] = { 0, 1, 2, 3, 5, 4, 6, 7, 8 };
-#else
-static int map_hw_reg_to_dwarf_reg [] = { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
-#endif
 /* + 1 is for IP */
 #define NUM_REGS X86_NREG + 1
 #define DWARF_DATA_ALIGN (-4)
@@ -349,9 +344,10 @@ mono_unwind_ops_encode (GSList *unwind_ops, guint32 *out_len)
        GSList *l;
        MonoUnwindOp *op;
        int loc;
-       guint8 *buf, *p, *res;
+       guint8 buf [4096];
+       guint8 *p, *res;
 
-       p = buf = g_malloc0 (4096);
+       p = buf;
 
        loc = 0;
        l = unwind_ops;
@@ -443,7 +439,6 @@ mono_unwind_ops_encode (GSList *unwind_ops, guint32 *out_len)
        *out_len = p - buf;
        res = g_malloc (p - buf);
        memcpy (res, buf, p - buf);
-       g_free (buf);
        return res;
 }
 
@@ -682,14 +677,13 @@ mono_cache_unwind_info (guint8 *unwind_info, guint32 unwind_info_len)
        i = cached_info_next;
        
        if (cached_info_next >= cached_info_size) {
-               MonoUnwindInfo **old_table, **new_table;
+               MonoUnwindInfo **new_table;
 
                /*
                 * Avoid freeing the old table so mono_get_cached_unwind_info ()
                 * doesn't need locks/hazard pointers.
                 */
 
-               old_table = cached_info;
                new_table = g_new0 (MonoUnwindInfo*, cached_info_size * 2);
 
                memcpy (new_table, cached_info, cached_info_size * sizeof (MonoUnwindInfo*));
@@ -915,7 +909,7 @@ guint8*
 mono_unwind_decode_fde (guint8 *fde, guint32 *out_len, guint32 *code_len, MonoJitExceptionInfo **ex_info, guint32 *ex_info_len, gpointer **type_info, int *this_reg, int *this_offset)
 {
        guint8 *p, *cie, *fde_current, *fde_aug = NULL, *code, *fde_cfi, *cie_cfi;
-       gint32 fde_len, cie_offset, pc_begin, pc_range, aug_len, fde_data_len;
+       gint32 fde_len, cie_offset, pc_begin, pc_range, aug_len;
        gint32 cie_len, cie_id, cie_version, code_align, data_align, return_reg;
        gint32 i, cie_aug_len, buf_len;
        char *cie_aug_str;
@@ -926,6 +920,8 @@ mono_unwind_decode_fde (guint8 *fde, guint32 *out_len, guint32 *code_len, MonoJi
         * http://refspecs.freestandards.org/LSB_3.0.0/LSB-Core-generic/LSB-Core-generic/ehframechpt.html
         */
 
+       /* This is generated by JITDwarfEmitter::EmitEHFrame () */
+
        *type_info = NULL;
        *this_reg = -1;
        *this_offset = -1;
@@ -1010,7 +1006,6 @@ mono_unwind_decode_fde (guint8 *fde, guint32 *out_len, guint32 *code_len, MonoJi
                aug_len = 0;
        }
        fde_cfi = p;
-       fde_data_len = fde + 4 + fde_len - p;
 
        if (code_len)
                *code_len = pc_range;
@@ -1094,7 +1089,7 @@ mono_unwind_decode_llvm_mono_fde (guint8 *fde, int fde_len, guint8 *cie, guint8
        res->this_reg = -1;
        res->this_offset = -1;
 
-       /* fde points to data emitted by LLVM in DwarfException::EmitMonoEHFrame () */
+       /* fde points to data emitted by LLVM in DwarfMonoException::EmitMonoEHFrame () */
        p = fde;
        has_aug = *p;
        p ++;