X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386-tdep.c;h=a19fc62e8d4ac3801c653bf810876184e2ca9a2d;hb=873657b9e824943ae44c12966c29cbbcd21c986f;hp=10f26ad976832a72d4428d5fc064c495acf88943;hpb=cf84fa6bcf514157df8343d32885050bafc396f7;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 10f26ad976..a19fc62e8d 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -1,6 +1,6 @@ /* Intel 386 target-dependent stuff. - Copyright (C) 1988-2018 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 "x86-xstate.h" +#include "gdbsupport/x86-xstate.h" #include "x86-tdep.h" #include "record.h" @@ -64,6 +64,7 @@ #include "parser-defs.h" #include #include +#include /* Register names. */ @@ -1504,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' */ @@ -1621,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 @@ -1947,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; } } @@ -2082,16 +2083,15 @@ i386_frame_cache (struct frame_info *this_frame, void **this_cache) cache = i386_alloc_frame_cache (); *this_cache = cache; - TRY + try { i386_frame_cache_1 (this_frame, cache); } - CATCH (ex, RETURN_MASK_ERROR) + catch (const gdb_exception_error &ex) { if (ex.error != NOT_AVAILABLE_ERROR) - throw_exception (ex); + throw; } - END_CATCH return cache; } @@ -2252,7 +2252,7 @@ i386_epilogue_frame_cache (struct frame_info *this_frame, void **this_cache) cache = i386_alloc_frame_cache (); *this_cache = cache; - TRY + try { cache->pc = get_frame_func (this_frame); @@ -2266,12 +2266,11 @@ i386_epilogue_frame_cache (struct frame_info *this_frame, void **this_cache) cache->base_p = 1; } - CATCH (ex, RETURN_MASK_ERROR) + catch (const gdb_exception_error &ex) { if (ex.error != NOT_AVAILABLE_ERROR) - throw_exception (ex); + throw; } - END_CATCH return cache; } @@ -2438,7 +2437,7 @@ i386_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) cache = i386_alloc_frame_cache (); - TRY + try { get_frame_register (this_frame, I386_ESP_REGNUM, buf); cache->base = extract_unsigned_integer (buf, 4, byte_order) - 4; @@ -2462,12 +2461,11 @@ i386_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) cache->base_p = 1; } - CATCH (ex, RETURN_MASK_ERROR) + catch (const gdb_exception_error &ex) { if (ex.error != NOT_AVAILABLE_ERROR) - throw_exception (ex); + throw; } - END_CATCH *this_cache = cache; return cache; @@ -2958,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. */ @@ -3935,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) { @@ -4036,10 +4034,10 @@ i386_stap_is_single_operand (struct gdbarch *gdbarch, const char *s) This function parses operands of the form `-8+3+1(%rbp)', which must be interpreted as `*(-8 + 3 - 1 + (void *) $eax)'. - Return 1 if the operand was parsed successfully, zero + Return true if the operand was parsed successfully, false otherwise. */ -static int +static bool i386_stap_parse_special_token_triplet (struct gdbarch *gdbarch, struct stap_parse_info *p) { @@ -4047,7 +4045,7 @@ i386_stap_parse_special_token_triplet (struct gdbarch *gdbarch, if (isdigit (*s) || *s == '-' || *s == '+') { - int got_minus[3]; + bool got_minus[3]; int i; long displacements[3]; const char *start; @@ -4056,17 +4054,17 @@ i386_stap_parse_special_token_triplet (struct gdbarch *gdbarch, struct stoken str; char *endp; - got_minus[0] = 0; + got_minus[0] = false; if (*s == '+') ++s; else if (*s == '-') { ++s; - got_minus[0] = 1; + got_minus[0] = true; } if (!isdigit ((unsigned char) *s)) - return 0; + return false; displacements[0] = strtol (s, &endp, 10); s = endp; @@ -4074,20 +4072,20 @@ i386_stap_parse_special_token_triplet (struct gdbarch *gdbarch, if (*s != '+' && *s != '-') { /* We are not dealing with a triplet. */ - return 0; + return false; } - got_minus[1] = 0; + got_minus[1] = false; if (*s == '+') ++s; else { ++s; - got_minus[1] = 1; + got_minus[1] = true; } if (!isdigit ((unsigned char) *s)) - return 0; + return false; displacements[1] = strtol (s, &endp, 10); s = endp; @@ -4095,26 +4093,26 @@ i386_stap_parse_special_token_triplet (struct gdbarch *gdbarch, if (*s != '+' && *s != '-') { /* We are not dealing with a triplet. */ - return 0; + return false; } - got_minus[2] = 0; + got_minus[2] = false; if (*s == '+') ++s; else { ++s; - got_minus[2] = 1; + got_minus[2] = true; } if (!isdigit ((unsigned char) *s)) - return 0; + return false; displacements[2] = strtol (s, &endp, 10); s = endp; if (*s != '(' || s[1] != '%') - return 0; + return false; s += 2; start = s; @@ -4123,7 +4121,7 @@ i386_stap_parse_special_token_triplet (struct gdbarch *gdbarch, ++s; if (*s++ != ')') - return 0; + return false; len = s - start - 1; regname = (char *) alloca (len + 1); @@ -4170,10 +4168,10 @@ i386_stap_parse_special_token_triplet (struct gdbarch *gdbarch, p->arg = s; - return 1; + return true; } - return 0; + return false; } /* Helper function for i386_stap_parse_special_token. @@ -4182,10 +4180,10 @@ i386_stap_parse_special_token_triplet (struct gdbarch *gdbarch, (register index * size) + offset', as represented in `(%rcx,%rax,8)', or `[OFFSET](BASE_REG,INDEX_REG[,SIZE])'. - Return 1 if the operand was parsed successfully, zero + Return true if the operand was parsed successfully, false otherwise. */ -static int +static bool i386_stap_parse_special_token_three_arg_disp (struct gdbarch *gdbarch, struct stap_parse_info *p) { @@ -4193,9 +4191,9 @@ i386_stap_parse_special_token_three_arg_disp (struct gdbarch *gdbarch, if (isdigit (*s) || *s == '(' || *s == '-' || *s == '+') { - int offset_minus = 0; + bool offset_minus = false; long offset = 0; - int size_minus = 0; + bool size_minus = false; long size = 0; const char *start; char *base; @@ -4209,11 +4207,11 @@ i386_stap_parse_special_token_three_arg_disp (struct gdbarch *gdbarch, else if (*s == '-') { ++s; - offset_minus = 1; + offset_minus = true; } if (offset_minus && !isdigit (*s)) - return 0; + return false; if (isdigit (*s)) { @@ -4224,7 +4222,7 @@ i386_stap_parse_special_token_three_arg_disp (struct gdbarch *gdbarch, } if (*s != '(' || s[1] != '%') - return 0; + return false; s += 2; start = s; @@ -4233,7 +4231,7 @@ i386_stap_parse_special_token_three_arg_disp (struct gdbarch *gdbarch, ++s; if (*s != ',' || s[1] != '%') - return 0; + return false; len_base = s - start; base = (char *) alloca (len_base + 1); @@ -4260,7 +4258,7 @@ i386_stap_parse_special_token_three_arg_disp (struct gdbarch *gdbarch, index, p->saved_arg); if (*s != ',' && *s != ')') - return 0; + return false; if (*s == ',') { @@ -4272,14 +4270,14 @@ i386_stap_parse_special_token_three_arg_disp (struct gdbarch *gdbarch, else if (*s == '-') { ++s; - size_minus = 1; + size_minus = true; } size = strtol (s, &endp, 10); s = endp; if (*s != ')') - return 0; + return false; } ++s; @@ -4333,10 +4331,10 @@ i386_stap_parse_special_token_three_arg_disp (struct gdbarch *gdbarch, p->arg = s; - return 1; + return true; } - return 0; + return false; } /* Implementation of `gdbarch_stap_parse_special_token', as defined in @@ -4388,6 +4386,29 @@ i386_stap_parse_special_token (struct gdbarch *gdbarch, return 0; } +/* Implementation of 'gdbarch_stap_adjust_register', as defined in + gdbarch.h. */ + +static std::string +i386_stap_adjust_register (struct gdbarch *gdbarch, struct stap_parse_info *p, + const std::string ®name, int regnum) +{ + static const std::unordered_set reg_assoc + = { "ax", "bx", "cx", "dx", + "si", "di", "bp", "sp" }; + + /* 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; + + /* Otherwise, just use the requested register. */ + return regname; +} + /* gdbarch gnu_triplet_regexp method. Both arches are acceptable as GDB always @@ -4436,6 +4457,8 @@ i386_elf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) i386_stap_is_single_operand); set_gdbarch_stap_parse_special_token (gdbarch, i386_stap_parse_special_token); + set_gdbarch_stap_adjust_register (gdbarch, + i386_stap_adjust_register); set_gdbarch_in_indirect_branch_thunk (gdbarch, i386_in_indirect_branch_thunk); @@ -8154,14 +8177,16 @@ 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) { if (len == 128 && name) if (strcmp (name, "__float128") == 0 || strcmp (name, "_Float128") == 0 - || strcmp (name, "complex _Float128") == 0) + || strcmp (name, "complex _Float128") == 0 + || strcmp (name, "complex(kind=16)") == 0 + || strcmp (name, "real(kind=16)") == 0) return floatformats_ia64_quad; return default_floatformat_for_type (gdbarch, name, len); @@ -8175,7 +8200,7 @@ i386_validate_tdesc_p (struct gdbarch_tdep *tdep, const struct tdesc_feature *feature_core; const struct tdesc_feature *feature_sse, *feature_avx, *feature_mpx, - *feature_avx512, *feature_pkeys; + *feature_avx512, *feature_pkeys, *feature_segments; int i, num_regs, valid_p; if (! tdesc_has_registers (tdesc)) @@ -8198,6 +8223,9 @@ i386_validate_tdesc_p (struct gdbarch_tdep *tdep, /* Try AVX512 registers. */ feature_avx512 = tdesc_find_feature (tdesc, "org.gnu.gdb.i386.avx512"); + /* Try segment base registers. */ + feature_segments = tdesc_find_feature (tdesc, "org.gnu.gdb.i386.segments"); + /* Try PKEYS */ feature_pkeys = tdesc_find_feature (tdesc, "org.gnu.gdb.i386.pkeys"); @@ -8307,6 +8335,16 @@ i386_validate_tdesc_p (struct gdbarch_tdep *tdep, tdep->mpx_register_names[i]); } + if (feature_segments) + { + if (tdep->fsbase_regnum < 0) + tdep->fsbase_regnum = I386_FSBASE_REGNUM; + valid_p &= tdesc_numbered_register (feature_segments, tdesc_data, + tdep->fsbase_regnum, "fs_base"); + valid_p &= tdesc_numbered_register (feature_segments, tdesc_data, + tdep->fsbase_regnum + 1, "gs_base"); + } + if (feature_pkeys) { tdep->xcr0 |= X86_XSTATE_PKRU; @@ -8348,7 +8386,7 @@ i386_type_align (struct gdbarch *gdbarch, struct type *type) return 4; } - return TYPE_LENGTH (type); + return 0; } @@ -8543,14 +8581,14 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Even though the default ABI only includes general-purpose registers, floating-point registers and the SSE registers, we have to leave a gap for the upper AVX, MPX and AVX512 registers. */ - set_gdbarch_num_regs (gdbarch, I386_PKEYS_NUM_REGS); + set_gdbarch_num_regs (gdbarch, I386_NUM_REGS); set_gdbarch_gnu_triplet_regexp (gdbarch, i386_gnu_triplet_regexp); /* Get the x86 target description from INFO. */ tdesc = info.target_desc; if (! tdesc_has_registers (tdesc)) - tdesc = i386_target_description (X86_XSTATE_SSE_MASK); + tdesc = i386_target_description (X86_XSTATE_SSE_MASK, false); tdep->tdesc = tdesc; tdep->num_core_regs = I386_NUM_GREGS + I387_NUM_REGS; @@ -8592,6 +8630,9 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep->pkru_regnum = -1; tdep->num_pkeys_regs = 0; + /* No segment base registers. */ + tdep->fsbase_regnum = -1; + tdesc_data = tdesc_data_alloc (); set_gdbarch_relocate_instruction (gdbarch, i386_relocate_instruction); @@ -8717,20 +8758,21 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Return the target description for a specified XSAVE feature mask. */ const struct target_desc * -i386_target_description (uint64_t xcr0) +i386_target_description (uint64_t xcr0, bool segments) { static target_desc *i386_tdescs \ - [2/*SSE*/][2/*AVX*/][2/*MPX*/][2/*AVX512*/][2/*PKRU*/] = {}; + [2/*SSE*/][2/*AVX*/][2/*MPX*/][2/*AVX512*/][2/*PKRU*/][2/*segments*/] = {}; target_desc **tdesc; tdesc = &i386_tdescs[(xcr0 & X86_XSTATE_SSE) ? 1 : 0] [(xcr0 & X86_XSTATE_AVX) ? 1 : 0] [(xcr0 & X86_XSTATE_MPX) ? 1 : 0] [(xcr0 & X86_XSTATE_AVX512) ? 1 : 0] - [(xcr0 & X86_XSTATE_PKRU) ? 1 : 0]; + [(xcr0 & X86_XSTATE_PKRU) ? 1 : 0] + [segments ? 1 : 0]; if (*tdesc == NULL) - *tdesc = i386_create_target_description (xcr0, false); + *tdesc = i386_create_target_description (xcr0, false, segments); return *tdesc; } @@ -8869,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]); @@ -9053,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); - - selftests::record_xml_tdesc (a.xml, tdesc); - } -#endif /* GDB_SELF_TEST */ }