X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386-tdep.c;h=a19fc62e8d4ac3801c653bf810876184e2ca9a2d;hb=ddf5db90a175756b3a5c39ee87d549d9f9d09d28;hp=00c1f8d7499818b09e6fd4f85ecd397ba0c04ca8;hpb=7d7571f0c14b4673ca95f6dc31d6f07d429e6697;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 00c1f8d749..a19fc62e8d 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -1,6 +1,6 @@ /* Intel 386 target-dependent stuff. - Copyright (C) 1988-2019 Free Software Foundation, Inc. + Copyright (C) 1988-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -46,7 +46,7 @@ #include "remote.h" #include "i386-tdep.h" #include "i387-tdep.h" -#include "common/x86-xstate.h" +#include "gdbsupport/x86-xstate.h" #include "x86-tdep.h" #include "record.h" @@ -1505,7 +1505,7 @@ struct i386_insn i386_frame_setup_skip_insns[] = /* Check for `mov imm32, r32'. Note that there is an alternative encoding for `mov m32, %eax'. - ??? Should we handle SIB adressing here? + ??? Should we handle SIB addressing here? ??? Should we handle 16-bit operand-sizes here? */ /* `movl m32, %eax' */ @@ -1622,7 +1622,7 @@ i386_analyze_frame_setup (struct gdbarch *gdbarch, /* Check for some special instructions that might be migrated by GCC into the prologue and skip them. At this point in the prologue, code should only touch the scratch registers %eax, - %ecx and %edx, so while the number of posibilities is sheer, + %ecx and %edx, so while the number of possibilities is sheer, it is limited. Make sure we only skip these instructions if we later see the @@ -1948,8 +1948,8 @@ i386_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) call_dest = call_dest & 0xffffffffU; s = lookup_minimal_symbol_by_pc (call_dest); if (s.minsym != NULL - && MSYMBOL_LINKAGE_NAME (s.minsym) != NULL - && strcmp (MSYMBOL_LINKAGE_NAME (s.minsym), "__main") == 0) + && s.minsym->linkage_name () != NULL + && strcmp (s.minsym->linkage_name (), "__main") == 0) pc += 5; } } @@ -2956,7 +2956,7 @@ i386_return_value (struct gdbarch *gdbarch, struct value *function, || code == TYPE_CODE_UNION || code == TYPE_CODE_ARRAY) && !i386_reg_struct_return_p (gdbarch, type)) - /* Complex double and long double uses the struct return covention. */ + /* Complex double and long double uses the struct return convention. */ || (code == TYPE_CODE_COMPLEX && TYPE_LENGTH (type) == 16) || (code == TYPE_CODE_COMPLEX && TYPE_LENGTH (type) == 24) /* 128-bit decimal float uses the struct return convention. */ @@ -3933,7 +3933,7 @@ i386_pe_skip_trampoline_code (struct frame_info *frame, read_memory_unsigned_integer (pc + 2, 4, byte_order); struct minimal_symbol *indsym = indirect ? lookup_minimal_symbol_by_pc (indirect).minsym : 0; - const char *symname = indsym ? MSYMBOL_LINKAGE_NAME (indsym) : 0; + const char *symname = indsym ? indsym->linkage_name () : 0; if (symname) { @@ -4389,27 +4389,24 @@ i386_stap_parse_special_token (struct gdbarch *gdbarch, /* Implementation of 'gdbarch_stap_adjust_register', as defined in gdbarch.h. */ -static void +static std::string i386_stap_adjust_register (struct gdbarch *gdbarch, struct stap_parse_info *p, - std::string ®name, int regnum) + const std::string ®name, int regnum) { static const std::unordered_set reg_assoc = { "ax", "bx", "cx", "dx", "si", "di", "bp", "sp" }; - if (register_size (gdbarch, regnum) >= TYPE_LENGTH (p->arg_type)) - { - /* If we're dealing with a register whose size is greater or - equal than the size specified by the "[-]N@" prefix, then we - don't need to do anything. */ - return; - } + /* If we are dealing with a register whose size is less than the size + specified by the "[-]N@" prefix, and it is one of the registers that + we know has an extended variant available, then use the extended + version of the register instead. */ + if (register_size (gdbarch, regnum) < TYPE_LENGTH (p->arg_type) + && reg_assoc.find (regname) != reg_assoc.end ()) + return "e" + regname; - if (reg_assoc.find (regname) != reg_assoc.end ()) - { - /* Use the extended version of the register. */ - regname = "e" + regname; - } + /* Otherwise, just use the requested register. */ + return regname; } @@ -8180,7 +8177,7 @@ i386_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr, length LEN in bits. If non-NULL, NAME is the name of its type. If no suitable type is found, return NULL. */ -const struct floatformat ** +static const struct floatformat ** i386_floatformat_for_type (struct gdbarch *gdbarch, const char *name, int len) { @@ -8914,7 +8911,7 @@ i386_mpx_print_bounds (const CORE_ADDR bt_entry[4]) size = (size > -1 ? size + 1 : size); uiout->text (", size = "); - uiout->field_fmt ("size", "%s", plongest (size)); + uiout->field_string ("size", plongest (size)); uiout->text (", metadata = "); uiout->field_core_addr ("metadata", gdbarch, bt_entry[3]); @@ -9098,28 +9095,4 @@ Show Intel Memory Protection Extensions specific variables."), /* Tell remote stub that we support XML target description. */ register_remote_support_xml ("i386"); - -#if GDB_SELF_TEST - struct - { - const char *xml; - uint64_t mask; - } xml_masks[] = { - { "i386/i386.xml", X86_XSTATE_SSE_MASK }, - { "i386/i386-mmx.xml", X86_XSTATE_X87_MASK }, - { "i386/i386-avx.xml", X86_XSTATE_AVX_MASK }, - { "i386/i386-mpx.xml", X86_XSTATE_MPX_MASK }, - { "i386/i386-avx-mpx.xml", X86_XSTATE_AVX_MPX_MASK }, - { "i386/i386-avx-avx512.xml", X86_XSTATE_AVX_AVX512_MASK }, - { "i386/i386-avx-mpx-avx512-pku.xml", - X86_XSTATE_AVX_MPX_AVX512_PKU_MASK }, - }; - - for (auto &a : xml_masks) - { - auto tdesc = i386_target_description (a.mask, false); - - selftests::record_xml_tdesc (a.xml, tdesc); - } -#endif /* GDB_SELF_TEST */ }