2b863f512d
The current MPX target descriptions assume that MPX is always combined with AVX, however that's not correct. We can have machines with MPX and without AVX; or machines with AVX and without MPX. This patch adds new target descriptions for machines that support both MPX and AVX, as duplicates of the existing MPX descriptions. The following commit will remove AVX from the MPX-only descriptions. 2016-04-16 Walfred Tedeschi <walfred.tedeschi@intel.com> gdb/ChangeLog: * amd64-linux-tdep.c (features/i386/amd64-avx-mpx-linux.c): New include. (amd64_linux_core_read_description): Add case for X86_XSTATE_AVX_MPX_MASK. (_initialize_amd64_linux_tdep): Call initialize_tdesc_amd64_avx_mpx_linux. * amd64-linux-tdep.h (tdesc_amd64_avx_mpx_linux): New definition. * amd64-tdep.c (features/i386/amd64-avx-mpx.c): New include. (amd64_target_description): Add case for X86_XSTATE_AVX_MPX_MASK. (_initialize_amd64_tdep): Call initialize_tdesc_amd64_avx_mpx. * common/x86-xstate.h (X86_XSTATE_MPX_MASK): Remove AVX bits. (X86_XSTATE_AVX_MPX_MASK): New case. * features/Makefile (i386/i386-avx-mpx, i386/i386-avx-mpx-linux) (i386/amd64-avx-mpx, i386/amd64-avx-mpx-linux): New rules. (i386/i386-avx-mpx-expedite, i386/i386-avx-mpx-linux-expedite) (i386/amd64-avx-mpx-expedite, i386/amd64-avx-mpx-linux-expedite): New expedites. * i386-linux-tdep.c (features/i386/i386-avx-mpx-linux.c): New include. (i386_linux_core_read_description): Add case X86_XSTATE_AVX_MPX_MASK. (_initialize_i386_linux_tdep): Call initialize_tdesc_i386_avx_mpx_linux. * i386-linux-tdep.h (tdesc_i386_avx_mpx_linux): New include. * i386-tdep.c (features/i386/i386-avx-mpx.c): New include. (i386_target_description): Add case for X86_XSTATE_AVX_MPX_MASK. * x86-linux-nat.c (x86_linux_read_description): Add case for X86_XSTATE_AVX_MPX_MASK. * features/i386/amd64-avx-mpx-linux.xml: New file. * features/i386/i386-avx-mpx-linux.xml: New file. * features/i386/i386-avx-mpx.xml: New file. * features/i386/amd64-avx-mpx.xml: New file. * features/i386/amd64-avx-mpx-linux.c: Generated. * features/i386/amd64-avx-mpx.c: Generated. * features/i386/i386-avx-mpx-linux.c: Generated. * features/i386/i386-avx-mpx.c: Generated. * regformats/i386/amd64-avx-mpx-linux.dat: Generated. * regformats/i386/amd64-avx-mpx.dat: Generated. * regformats/i386/i386-avx-mpx-linux.dat: Generated. * regformats/i386/i386-avx-mpx.dat: Generated. gdb/gdbserver/ChangeLog: * Makefile.in (clean): Add removal for i386-avx-mpx.c, i386-avx-mpx-linux.c, amd64-avx-mpx.c and amd64-avx-mpx-linux.c. (i386-avx-mpx.c, i386-avx-mpx-linux.c, amd64-avx-mpx.c) (amd64-avx-mpx-linux.c): New rules. (amd64-avx-mpx-linux-ipa.o, i386-avx-mpx-linux-ipa.o): New rule. * configure.srv (srv_i386_regobj): Add i386-avx-mpx.o. (srv_i386_linux_regobj): Add i386-avx-mpx-linux.o. (srv_amd64_regobj): Add amd64-avx-mpx.o. (srv_amd64_linux_regobj): Add amd64-avx-mpx-linux.o. (srv_i386_xmlfiles): Add i386/i386-avx-mpx.xml. (srv_amd64_xmlfiles): Add i386/amd64-avx-mpx.xml. (srv_i386_linux_xmlfiles): Add i386/i386-avx-mpx-linux.xml. (srv_amd64_linux_xmlfiles): Add i386/amd64-avx-mpx-linux.xml. (ipa_i386_linux_regobj): Add i386-avx-mpx-linux-ipa.o. (ipa_amd64_linux_regobj): Add amd64-avx-mpx-linux-ipa.o. * linux-x86-low.c (x86_linux_read_description): Add case for X86_XSTATE_AVX_MPX_MASK. (x86_get_ipa_tdesc_idx): Add cases for avx_mpx. (initialize_low_arch): Call init_registers_amd64_avx_mpx_linux and init_registers_i386_avx_mpx_linux. * linux-i386-ipa.c (get_ipa_tdesc): Add case for avx_mpx. (initialize_low_tracepoint): Call init_registers_i386_avx_mpx_linux. * linux-amd64-ipa.c (get_ipa_tdesc): Add case for avx_mpx. (initialize_low_tracepoint): Call init_registers_amd64_avx_mpx_linux. * linux-x86-tdesc.h (X86_TDESC_AVX_MPX): New enum value. (init_registers_amd64_avx_mpx_linux, tdesc_amd64_avx_mpx_linux) (init_registers_i386_avx_mpx_linux, tdesc_i386_avx_mpx_linux): New declarations.
221 lines
5.6 KiB
C
221 lines
5.6 KiB
C
/* GNU/Linux/x86-64 specific low level interface, for the in-process
|
|
agent library for GDB.
|
|
|
|
Copyright (C) 2010-2016 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "server.h"
|
|
#include <sys/mman.h>
|
|
#include "tracepoint.h"
|
|
#include "linux-x86-tdesc.h"
|
|
|
|
/* Defined in auto-generated file amd64-linux.c. */
|
|
void init_registers_amd64_linux (void);
|
|
extern const struct target_desc *tdesc_amd64_linux;
|
|
|
|
/* fast tracepoints collect registers. */
|
|
|
|
#define FT_CR_RIP 0
|
|
#define FT_CR_EFLAGS 1
|
|
#define FT_CR_R8 2
|
|
#define FT_CR_R9 3
|
|
#define FT_CR_R10 4
|
|
#define FT_CR_R11 5
|
|
#define FT_CR_R12 6
|
|
#define FT_CR_R13 7
|
|
#define FT_CR_R14 8
|
|
#define FT_CR_R15 9
|
|
#define FT_CR_RAX 10
|
|
#define FT_CR_RBX 11
|
|
#define FT_CR_RCX 12
|
|
#define FT_CR_RDX 13
|
|
#define FT_CR_RSI 14
|
|
#define FT_CR_RDI 15
|
|
#define FT_CR_RBP 16
|
|
#define FT_CR_RSP 17
|
|
|
|
static const int x86_64_ft_collect_regmap[] = {
|
|
FT_CR_RAX * 8, FT_CR_RBX * 8, FT_CR_RCX * 8, FT_CR_RDX * 8,
|
|
FT_CR_RSI * 8, FT_CR_RDI * 8, FT_CR_RBP * 8, FT_CR_RSP * 8,
|
|
FT_CR_R8 * 8, FT_CR_R9 * 8, FT_CR_R10 * 8, FT_CR_R11 * 8,
|
|
FT_CR_R12 * 8, FT_CR_R13 * 8, FT_CR_R14 * 8, FT_CR_R15 * 8,
|
|
FT_CR_RIP * 8, FT_CR_EFLAGS * 8
|
|
};
|
|
|
|
#define X86_64_NUM_FT_COLLECT_GREGS \
|
|
(sizeof (x86_64_ft_collect_regmap) / sizeof(x86_64_ft_collect_regmap[0]))
|
|
|
|
void
|
|
supply_fast_tracepoint_registers (struct regcache *regcache,
|
|
const unsigned char *buf)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < X86_64_NUM_FT_COLLECT_GREGS; i++)
|
|
supply_register (regcache, i,
|
|
((char *) buf) + x86_64_ft_collect_regmap[i]);
|
|
}
|
|
|
|
ULONGEST
|
|
get_raw_reg (const unsigned char *raw_regs, int regnum)
|
|
{
|
|
if (regnum >= X86_64_NUM_FT_COLLECT_GREGS)
|
|
return 0;
|
|
|
|
return *(ULONGEST *) (raw_regs + x86_64_ft_collect_regmap[regnum]);
|
|
}
|
|
|
|
#ifdef HAVE_UST
|
|
|
|
#include <ust/processor.h>
|
|
|
|
/* "struct registers" is the UST object type holding the registers at
|
|
the time of the static tracepoint marker call. This doesn't
|
|
contain RIP, but we know what it must have been (the marker
|
|
address). */
|
|
|
|
#define ST_REGENTRY(REG) \
|
|
{ \
|
|
offsetof (struct registers, REG), \
|
|
sizeof (((struct registers *) NULL)->REG) \
|
|
}
|
|
|
|
static struct
|
|
{
|
|
int offset;
|
|
int size;
|
|
} x86_64_st_collect_regmap[] =
|
|
{
|
|
ST_REGENTRY(rax),
|
|
ST_REGENTRY(rbx),
|
|
ST_REGENTRY(rcx),
|
|
ST_REGENTRY(rdx),
|
|
ST_REGENTRY(rsi),
|
|
ST_REGENTRY(rdi),
|
|
ST_REGENTRY(rbp),
|
|
ST_REGENTRY(rsp),
|
|
ST_REGENTRY(r8),
|
|
ST_REGENTRY(r9),
|
|
ST_REGENTRY(r10),
|
|
ST_REGENTRY(r11),
|
|
ST_REGENTRY(r12),
|
|
ST_REGENTRY(r13),
|
|
ST_REGENTRY(r14),
|
|
ST_REGENTRY(r15),
|
|
{ -1, 0 },
|
|
ST_REGENTRY(rflags),
|
|
ST_REGENTRY(cs),
|
|
ST_REGENTRY(ss),
|
|
};
|
|
|
|
#define X86_64_NUM_ST_COLLECT_GREGS \
|
|
(sizeof (x86_64_st_collect_regmap) / sizeof (x86_64_st_collect_regmap[0]))
|
|
|
|
/* GDB's RIP register number. */
|
|
#define AMD64_RIP_REGNUM 16
|
|
|
|
void
|
|
supply_static_tracepoint_registers (struct regcache *regcache,
|
|
const unsigned char *buf,
|
|
CORE_ADDR pc)
|
|
{
|
|
int i;
|
|
unsigned long newpc = pc;
|
|
|
|
supply_register (regcache, AMD64_RIP_REGNUM, &newpc);
|
|
|
|
for (i = 0; i < X86_64_NUM_ST_COLLECT_GREGS; i++)
|
|
if (x86_64_st_collect_regmap[i].offset != -1)
|
|
{
|
|
switch (x86_64_st_collect_regmap[i].size)
|
|
{
|
|
case 8:
|
|
supply_register (regcache, i,
|
|
((char *) buf)
|
|
+ x86_64_st_collect_regmap[i].offset);
|
|
break;
|
|
case 2:
|
|
{
|
|
unsigned long reg
|
|
= * (short *) (((char *) buf)
|
|
+ x86_64_st_collect_regmap[i].offset);
|
|
reg &= 0xffff;
|
|
supply_register (regcache, i, ®);
|
|
}
|
|
break;
|
|
default:
|
|
internal_error (__FILE__, __LINE__,
|
|
"unhandled register size: %d",
|
|
x86_64_st_collect_regmap[i].size);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif /* HAVE_UST */
|
|
|
|
/* Return target_desc to use for IPA, given the tdesc index passed by
|
|
gdbserver. */
|
|
|
|
const struct target_desc *
|
|
get_ipa_tdesc (int idx)
|
|
{
|
|
switch (idx)
|
|
{
|
|
case X86_TDESC_SSE:
|
|
return tdesc_amd64_linux;
|
|
case X86_TDESC_AVX:
|
|
return tdesc_amd64_avx_linux;
|
|
case X86_TDESC_MPX:
|
|
return tdesc_amd64_mpx_linux;
|
|
case X86_TDESC_AVX_MPX:
|
|
return tdesc_amd64_avx_mpx_linux;
|
|
case X86_TDESC_AVX512:
|
|
return tdesc_amd64_avx512_linux;
|
|
default:
|
|
internal_error (__FILE__, __LINE__,
|
|
"unknown ipa tdesc index: %d", idx);
|
|
return tdesc_amd64_linux;
|
|
}
|
|
}
|
|
|
|
/* Allocate buffer for the jump pads. Since we're using 32-bit jumps
|
|
to reach them, and the executable is at low addresses, MAP_32BIT
|
|
works just fine. Shared libraries, being allocated at the top,
|
|
are unfortunately out of luck. */
|
|
|
|
void *
|
|
alloc_jump_pad_buffer (size_t size)
|
|
{
|
|
void *res = mmap (NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC,
|
|
MAP_PRIVATE | MAP_ANONYMOUS | MAP_32BIT, -1, 0);
|
|
|
|
if (res == MAP_FAILED)
|
|
return NULL;
|
|
|
|
return res;
|
|
}
|
|
|
|
void
|
|
initialize_low_tracepoint (void)
|
|
{
|
|
init_registers_amd64_linux ();
|
|
init_registers_amd64_avx_linux ();
|
|
init_registers_amd64_avx_mpx_linux ();
|
|
init_registers_amd64_mpx_linux ();
|
|
init_registers_amd64_avx512_linux ();
|
|
}
|