X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Famd64-windows-tdep.c;h=296bdb2710eddf6245ba99349d45aab54db76148;hb=395b0d8a3fdd8915a4897b9b925d56fa42745dcc;hp=c09262a831bca5ba46ec7d7a64262e31eac5abfd;hpb=20c2e3e0a3f61aa9f1ee50618a969e0b51225be3;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c index c09262a831..296bdb2710 100644 --- a/gdb/amd64-windows-tdep.c +++ b/gdb/amd64-windows-tdep.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2013 Free Software Foundation, Inc. +/* Copyright (C) 2009-2015 Free Software Foundation, Inc. This file is part of GDB. @@ -18,8 +18,6 @@ #include "defs.h" #include "osabi.h" #include "amd64-tdep.h" -#include "solib.h" -#include "solib-target.h" #include "gdbtypes.h" #include "gdbcore.h" #include "regcache.h" @@ -38,8 +36,8 @@ static int amd64_windows_dummy_call_integer_regs[] = { AMD64_RCX_REGNUM, /* %rcx */ AMD64_RDX_REGNUM, /* %rdx */ - 8, /* %r8 */ - 9 /* %r9 */ + AMD64_R8_REGNUM, /* %r8 */ + AMD64_R9_REGNUM /* %r9 */ }; /* Return nonzero if an argument of type TYPE should be passed @@ -160,7 +158,7 @@ amd64_windows_push_arguments (struct regcache *regcache, int nargs, { int reg_idx = 0; int i; - struct value **stack_args = alloca (nargs * sizeof (struct value *)); + struct value **stack_args = XALLOCAVEC (struct value *, nargs); int num_stack_args = 0; int num_elements = 0; int element = 0; @@ -171,7 +169,7 @@ amd64_windows_push_arguments (struct regcache *regcache, int nargs, in inferior memory. So use a copy of the ARGS table, to avoid modifying the original one. */ { - struct value **args1 = alloca (nargs * sizeof (struct value *)); + struct value **args1 = XALLOCAVEC (struct value *, nargs); memcpy (args1, args, nargs * sizeof (struct value *)); sp = amd64_windows_adjust_args_passed_by_pointer (args1, nargs, sp); @@ -357,8 +355,8 @@ amd64_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) call_dest = pc + 5 + extract_signed_integer (buf, 4, byte_order); s = lookup_minimal_symbol_by_pc (call_dest); if (s.minsym != NULL - && SYMBOL_LINKAGE_NAME (s.minsym) != NULL - && strcmp (SYMBOL_LINKAGE_NAME (s.minsym), "__main") == 0) + && MSYMBOL_LINKAGE_NAME (s.minsym) != NULL + && strcmp (MSYMBOL_LINKAGE_NAME (s.minsym), "__main") == 0) pc += 5; } } @@ -623,9 +621,47 @@ amd64_windows_frame_decode_insns (struct frame_info *this_frame, CORE_ADDR cur_sp = cache->sp; struct gdbarch *gdbarch = get_frame_arch (this_frame); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); - int j; + int first = 1; + + /* There are at least 3 possibilities to share an unwind info entry: + 1. Two different runtime_function entries (in .pdata) can point to the + same unwind info entry. There is no such indication while unwinding, + so we don't really care about that case. We suppose this scheme is + used to save memory when the unwind entries are exactly the same. + 2. Chained unwind_info entries, with no unwind codes (no prologue). + There is a major difference with the previous case: the pc range for + the function is different (in case 1, the pc range comes from the + runtime_function entry; in case 2, the pc range for the chained entry + comes from the first unwind entry). Case 1 cannot be used instead as + the pc is not in the prologue. This case is officially documented. + (There might be unwind code in the first unwind entry to handle + additional unwinding). GCC (at least until gcc 5.0) doesn't chain + entries. + 3. Undocumented unwind info redirection. Hard to know the exact purpose, + so it is considered as a memory optimization of case 2. + */ + + if (unwind_info & 1) + { + /* Unofficially documented unwind info redirection, when UNWIND_INFO + address is odd (http://www.codemachine.com/article_x64deepdive.html). + */ + struct external_pex64_runtime_function d; + CORE_ADDR sa, ea; + + if (target_read_memory (cache->image_base + (unwind_info & ~1), + (gdb_byte *) &d, sizeof (d)) != 0) + return; + + cache->start_rva + = extract_unsigned_integer (d.rva_BeginAddress, 4, byte_order); + cache->end_rva + = extract_unsigned_integer (d.rva_EndAddress, 4, byte_order); + unwind_info + = extract_unsigned_integer (d.rva_UnwindData, 4, byte_order); + } - for (j = 0; ; j++) + while (1) { struct external_pex64_unwind_info ex_ui; /* There are at most 256 16-bit unwind insns. */ @@ -635,6 +671,7 @@ amd64_windows_frame_decode_insns (struct frame_info *this_frame, unsigned char codes_count; unsigned char frame_reg; unsigned char frame_off; + CORE_ADDR start; /* Read and decode header. */ if (target_read_memory (cache->image_base + unwind_info, @@ -651,15 +688,17 @@ amd64_windows_frame_decode_insns (struct frame_info *this_frame, ex_ui.CountOfCodes, ex_ui.FrameRegisterOffset); /* Check version. */ - if (PEX64_UWI_VERSION (ex_ui.Version_Flags) != 1) + if (PEX64_UWI_VERSION (ex_ui.Version_Flags) != 1 + && PEX64_UWI_VERSION (ex_ui.Version_Flags) != 2) return; - if (j == 0 - && (cache->pc >= - cache->image_base + cache->start_rva + ex_ui.SizeOfPrologue)) + start = cache->image_base + cache->start_rva; + if (first + && !(cache->pc >= start && cache->pc < start + ex_ui.SizeOfPrologue)) { - /* Not in the prologue. We want to detect if the PC points to an - epilogue. If so, the epilogue detection+decoding function is + /* We want to detect if the PC points to an epilogue. This needs + to be checked only once, and an epilogue can be anywhere but in + the prologue. If so, the epilogue detection+decoding function is sufficient. Otherwise, the unwinder will consider that the PC is in the body of the function and will need to decode unwind info. */ @@ -698,23 +737,38 @@ amd64_windows_frame_decode_insns (struct frame_info *this_frame, return; end_insns = &insns[codes_count * 2]; - for (p = insns; p < end_insns; p += 2) + p = insns; + + /* Skip opcodes 6 of version 2. This opcode is not documented. */ + if (PEX64_UWI_VERSION (ex_ui.Version_Flags) == 2) { - int reg; + for (; p < end_insns; p += 2) + if (PEX64_UNWCODE_CODE (p[1]) != 6) + break; + } - if (frame_debug) - fprintf_unfiltered - (gdb_stdlog, " op #%u: off=0x%02x, insn=0x%02x\n", - (unsigned) (p - insns), p[0], p[1]); + for (; p < end_insns; p += 2) + { + int reg; - /* Virtually execute the operation. */ - if (cache->pc >= cache->image_base + cache->start_rva + p[0]) + /* Virtually execute the operation if the pc is after the + corresponding instruction (that does matter in case of break + within the prologue). Note that for chained info (!first), the + prologue has been fully executed. */ + if (cache->pc >= start + p[0] || cache->pc < start) { + if (frame_debug) + fprintf_unfiltered + (gdb_stdlog, " op #%u: off=0x%02x, insn=0x%02x\n", + (unsigned) (p - insns), p[0], p[1]); + /* If there is no frame registers defined, the current value of rsp is used instead. */ if (frame_reg == 0) save_addr = cur_sp; + reg = -1; + switch (PEX64_UNWCODE_CODE (p[1])) { case UWOP_PUSH_NONVOL: @@ -742,12 +796,12 @@ amd64_windows_frame_decode_insns (struct frame_info *this_frame, case UWOP_SAVE_NONVOL: reg = amd64_windows_w2gdb_regnum[PEX64_UNWCODE_INFO (p[1])]; cache->prev_reg_addr[reg] = save_addr - - 8 * extract_unsigned_integer (p + 2, 2, byte_order); + + 8 * extract_unsigned_integer (p + 2, 2, byte_order); break; case UWOP_SAVE_NONVOL_FAR: reg = amd64_windows_w2gdb_regnum[PEX64_UNWCODE_INFO (p[1])]; cache->prev_reg_addr[reg] = save_addr - - 8 * extract_unsigned_integer (p + 2, 4, byte_order); + + 8 * extract_unsigned_integer (p + 2, 4, byte_order); break; case UWOP_SAVE_XMM128: cache->prev_xmm_addr[PEX64_UNWCODE_INFO (p[1])] = @@ -778,6 +832,13 @@ amd64_windows_frame_decode_insns (struct frame_info *this_frame, default: return; } + + /* Display address where the register was saved. */ + if (frame_debug && reg >= 0) + fprintf_unfiltered + (gdb_stdlog, " [reg %s at %s]\n", + gdbarch_register_name (gdbarch, reg), + paddress (gdbarch, cache->prev_reg_addr[reg])); } /* Adjust with the length of the opcode. */ @@ -809,25 +870,44 @@ amd64_windows_frame_decode_insns (struct frame_info *this_frame, } } if (PEX64_UWI_FLAGS (ex_ui.Version_Flags) != UNW_FLAG_CHAININFO) - break; + { + /* End of unwind info. */ + break; + } else { /* Read the chained unwind info. */ struct external_pex64_runtime_function d; CORE_ADDR chain_vma; + /* Not anymore the first entry. */ + first = 0; + + /* Stay aligned on word boundary. */ chain_vma = cache->image_base + unwind_info - + sizeof (ex_ui) + ((codes_count + 1) & ~1) * 2 + 8; + + sizeof (ex_ui) + ((codes_count + 1) & ~1) * 2; if (target_read_memory (chain_vma, (gdb_byte *) &d, sizeof (d)) != 0) return; + /* Decode begin/end. This may be different from .pdata index, as + an unwind info may be shared by several functions (in particular + if many functions have the same prolog and handler. */ cache->start_rva = extract_unsigned_integer (d.rva_BeginAddress, 4, byte_order); cache->end_rva = extract_unsigned_integer (d.rva_EndAddress, 4, byte_order); unwind_info = extract_unsigned_integer (d.rva_UnwindData, 4, byte_order); + + if (frame_debug) + fprintf_unfiltered + (gdb_stdlog, + "amd64_windows_frame_decodes_insn (next in chain):" + " unwind_data=%s, start_rva=%s, end_rva=%s\n", + paddress (gdbarch, unwind_info), + paddress (gdbarch, cache->start_rva), + paddress (gdbarch, cache->end_rva)); } /* Allow the user to break this loop. */ @@ -922,25 +1002,6 @@ amd64_windows_find_unwind_info (struct gdbarch *gdbarch, CORE_ADDR pc, "amd64_windows_find_unwind_data: image_base=%s, unwind_data=%s\n", paddress (gdbarch, base), paddress (gdbarch, *unwind_info)); - if (*unwind_info & 1) - { - /* Unofficially documented unwind info redirection, when UNWIND_INFO - address is odd (http://www.codemachine.com/article_x64deepdive.html). - */ - struct external_pex64_runtime_function d; - CORE_ADDR sa, ea; - - if (target_read_memory (base + (*unwind_info & ~1), - (gdb_byte *) &d, sizeof (d)) != 0) - return -1; - - *start_rva = - extract_unsigned_integer (d.rva_BeginAddress, 4, byte_order); - *end_rva = extract_unsigned_integer (d.rva_EndAddress, 4, byte_order); - *unwind_info = - extract_unsigned_integer (d.rva_UnwindData, 4, byte_order); - - } return 0; } @@ -964,7 +1025,7 @@ amd64_windows_frame_cache (struct frame_info *this_frame, void **this_cache) CORE_ADDR unwind_info = 0; if (*this_cache) - return *this_cache; + return (struct amd64_windows_frame_cache *) *this_cache; cache = FRAME_OBSTACK_ZALLOC (struct amd64_windows_frame_cache); *this_cache = cache; @@ -1135,12 +1196,12 @@ amd64_windows_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc) = (indirect_addr ? lookup_minimal_symbol_by_pc (indirect_addr).minsym : NULL); - const char *symname = indsym ? SYMBOL_LINKAGE_NAME (indsym) : NULL; + const char *symname = indsym ? MSYMBOL_LINKAGE_NAME (indsym) : NULL; if (symname) { - if (strncmp (symname, "__imp_", 6) == 0 - || strncmp (symname, "_imp_", 5) == 0) + if (startswith (symname, "__imp_") + || startswith (symname, "_imp_")) destination = read_memory_unsigned_integer (indirect_addr, 8, byte_order); } @@ -1177,6 +1238,8 @@ amd64_windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) amd64_init_abi (info, gdbarch); + windows_init_abi (info, gdbarch); + /* On Windows, "long"s are only 32bit. */ set_gdbarch_long_bit (gdbarch, 32); @@ -1187,14 +1250,9 @@ amd64_windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_skip_trampoline_code (gdbarch, amd64_windows_skip_trampoline_code); - set_gdbarch_iterate_over_objfiles_in_search_order - (gdbarch, windows_iterate_over_objfiles_in_search_order); - set_gdbarch_skip_prologue (gdbarch, amd64_windows_skip_prologue); set_gdbarch_auto_wide_charset (gdbarch, amd64_windows_auto_wide_charset); - - set_solib_ops (gdbarch, &solib_target_so_ops); } /* -Wmissing-prototypes */