1b451dda5f
This patch makes thumb2_breakpoint static. When writing this patch, I find the only reason we keep thumb2_breakpoint extern is that it is used as an argument passed to arm_gdbserver_get_next_pcs. However, field arm_thumb2_breakpoint is only used in a null check in thumb_get_next_pcs_raw, so I wonder why do need to pass thumb2_breakpoint to arm_gdbserver_get_next_pcs. thumb2_breakpoint was added by Daniel Jacobowitz in order to support single-step IT block https://sourceware.org/ml/gdb-patches/2010-01/msg00624.html the logic there was if we have 32-bit thumb-2 breakpoint defined, we can safely single-step IT block, otherwise, we can't. Daniel didn't want to use 16-bit thumb BKPT instruction, because it triggers even on instruction which should be executed. Secondly, using 16-bit thumb illegal instruction on top of 32-bit thumb instruction may break the meaning of original IT blocks, because the other 16-bit can be regarded as an instruction. See more explanations from Daniel's kernel patch http://www.spinics.net/lists/arm-kernel/msg80476.html Let us back to this patch, GDB/GDBserver can safely single step IT block if thumb2_breakpoint is defined, but the single step logic doesn't have to know the thumb-2 breakpoint instruction. Only breakpoint insertion mechanism decides to use which breakpoint instruction. In the software single step code, instead of pass thumb2_breakpoint, we can pass a boolean variable has_thumb2_breakpoint indicate whether the target has thumb-2 breakpoint defined, which is equivalent to the original code. Regression tested on arm-linux. No regression. gdb: 2016-01-14 Yao Qi <yao.qi@linaro.org> * arch/arm-get-next-pcs.c (arm_get_next_pcs_ctor): Change argument arm_thumb2_breakpoint to has_thumb2_breakpoint. (thumb_get_next_pcs_raw): Check has_thumb2_breakpoint instead. * arch/arm-get-next-pcs.h (struct arm_get_next_pcs) <arm_thumb2_breakpoint>: Remove. <has_thumb2_breakpoint>: New field. (arm_get_next_pcs_ctor): Update declaration. * arm-linux-tdep.c (arm_linux_software_single_step): Pass 1 to arm_get_next_pcs_ctor. * arm-tdep.c (arm_software_single_step): Pass 0 to arm_get_next_pcs_ctor. gdb/gdbserver: 2016-01-14 Yao Qi <yao.qi@linaro.org> * linux-aarch32-low.c (thumb2_breakpoint): Make it static. * linux-aarch32-low.h (thumb2_breakpoint): Remove declaration. * linux-arm-low.c (arm_gdbserver_get_next_pcs): Pass 1 to arm_get_next_pcs_ctor.
305 lines
7.9 KiB
C
305 lines
7.9 KiB
C
/* Copyright (C) 1995-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 "arch/arm.h"
|
|
#include "linux-low.h"
|
|
#include "linux-aarch32-low.h"
|
|
|
|
#include <sys/ptrace.h>
|
|
/* Don't include elf.h if linux/elf.h got included by gdb_proc_service.h.
|
|
On Bionic elf.h and linux/elf.h have conflicting definitions. */
|
|
#ifndef ELFMAG0
|
|
#include <elf.h>
|
|
#endif
|
|
|
|
/* Correct in either endianness. */
|
|
#define arm_abi_breakpoint 0xef9f0001UL
|
|
|
|
/* For new EABI binaries. We recognize it regardless of which ABI
|
|
is used for gdbserver, so single threaded debugging should work
|
|
OK, but for multi-threaded debugging we only insert the current
|
|
ABI's breakpoint instruction. For now at least. */
|
|
#define arm_eabi_breakpoint 0xe7f001f0UL
|
|
|
|
#if (defined __ARM_EABI__ || defined __aarch64__)
|
|
static const unsigned long arm_breakpoint = arm_eabi_breakpoint;
|
|
#else
|
|
static const unsigned long arm_breakpoint = arm_abi_breakpoint;
|
|
#endif
|
|
|
|
#define arm_breakpoint_len 4
|
|
static const unsigned short thumb_breakpoint = 0xde01;
|
|
#define thumb_breakpoint_len 2
|
|
static const unsigned short thumb2_breakpoint[] = { 0xf7f0, 0xa000 };
|
|
#define thumb2_breakpoint_len 4
|
|
|
|
/* Some older versions of GNU/Linux and Android do not define
|
|
the following macros. */
|
|
#ifndef NT_ARM_VFP
|
|
#define NT_ARM_VFP 0x400
|
|
#endif
|
|
|
|
/* Collect GP registers from REGCACHE to buffer BUF. */
|
|
|
|
void
|
|
arm_fill_gregset (struct regcache *regcache, void *buf)
|
|
{
|
|
int i;
|
|
uint32_t *regs = (uint32_t *) buf;
|
|
|
|
for (i = ARM_A1_REGNUM; i <= ARM_PC_REGNUM; i++)
|
|
collect_register (regcache, i, ®s[i]);
|
|
|
|
collect_register (regcache, ARM_PS_REGNUM, ®s[16]);
|
|
}
|
|
|
|
/* Supply GP registers contents, stored in BUF, to REGCACHE. */
|
|
|
|
void
|
|
arm_store_gregset (struct regcache *regcache, const void *buf)
|
|
{
|
|
int i;
|
|
char zerobuf[8];
|
|
const uint32_t *regs = (const uint32_t *) buf;
|
|
|
|
memset (zerobuf, 0, 8);
|
|
for (i = ARM_A1_REGNUM; i <= ARM_PC_REGNUM; i++)
|
|
supply_register (regcache, i, ®s[i]);
|
|
|
|
for (; i < ARM_PS_REGNUM; i++)
|
|
supply_register (regcache, i, zerobuf);
|
|
|
|
supply_register (regcache, ARM_PS_REGNUM, ®s[16]);
|
|
}
|
|
|
|
/* Collect NUM number of VFP registers from REGCACHE to buffer BUF. */
|
|
|
|
void
|
|
arm_fill_vfpregset_num (struct regcache *regcache, void *buf, int num)
|
|
{
|
|
int i, base;
|
|
|
|
gdb_assert (num == 16 || num == 32);
|
|
|
|
base = find_regno (regcache->tdesc, "d0");
|
|
for (i = 0; i < num; i++)
|
|
collect_register (regcache, base + i, (char *) buf + i * 8);
|
|
|
|
collect_register_by_name (regcache, "fpscr", (char *) buf + 32 * 8);
|
|
}
|
|
|
|
/* Supply NUM number of VFP registers contents, stored in BUF, to
|
|
REGCACHE. */
|
|
|
|
void
|
|
arm_store_vfpregset_num (struct regcache *regcache, const void *buf, int num)
|
|
{
|
|
int i, base;
|
|
|
|
gdb_assert (num == 16 || num == 32);
|
|
|
|
base = find_regno (regcache->tdesc, "d0");
|
|
for (i = 0; i < num; i++)
|
|
supply_register (regcache, base + i, (char *) buf + i * 8);
|
|
|
|
supply_register_by_name (regcache, "fpscr", (char *) buf + 32 * 8);
|
|
}
|
|
|
|
static void
|
|
arm_fill_vfpregset (struct regcache *regcache, void *buf)
|
|
{
|
|
arm_fill_vfpregset_num (regcache, buf, 32);
|
|
}
|
|
|
|
static void
|
|
arm_store_vfpregset (struct regcache *regcache, const void *buf)
|
|
{
|
|
arm_store_vfpregset_num (regcache, buf, 32);
|
|
}
|
|
|
|
/* Register sets with using PTRACE_GETREGSET. */
|
|
|
|
static struct regset_info aarch32_regsets[] = {
|
|
{ PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, 18 * 4,
|
|
GENERAL_REGS,
|
|
arm_fill_gregset, arm_store_gregset },
|
|
{ PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_VFP, 32 * 8 + 4,
|
|
EXTENDED_REGS,
|
|
arm_fill_vfpregset, arm_store_vfpregset },
|
|
NULL_REGSET
|
|
};
|
|
|
|
static struct regsets_info aarch32_regsets_info =
|
|
{
|
|
aarch32_regsets, /* regsets */
|
|
0, /* num_regsets */
|
|
NULL, /* disabled_regsets */
|
|
};
|
|
|
|
struct regs_info regs_info_aarch32 =
|
|
{
|
|
NULL, /* regset_bitmap */
|
|
NULL, /* usrregs */
|
|
&aarch32_regsets_info
|
|
};
|
|
|
|
/* Returns 1 if the current instruction set is thumb, 0 otherwise. */
|
|
|
|
int
|
|
arm_is_thumb_mode (void)
|
|
{
|
|
struct regcache *regcache = get_thread_regcache (current_thread, 1);
|
|
unsigned long cpsr;
|
|
|
|
collect_register_by_name (regcache, "cpsr", &cpsr);
|
|
|
|
if (cpsr & 0x20)
|
|
return 1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/* Returns 1 if there is a software breakpoint at location. */
|
|
|
|
int
|
|
arm_breakpoint_at (CORE_ADDR where)
|
|
{
|
|
if (arm_is_thumb_mode ())
|
|
{
|
|
/* Thumb mode. */
|
|
unsigned short insn;
|
|
|
|
(*the_target->read_memory) (where, (unsigned char *) &insn, 2);
|
|
if (insn == thumb_breakpoint)
|
|
return 1;
|
|
|
|
if (insn == thumb2_breakpoint[0])
|
|
{
|
|
(*the_target->read_memory) (where + 2, (unsigned char *) &insn, 2);
|
|
if (insn == thumb2_breakpoint[1])
|
|
return 1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* ARM mode. */
|
|
unsigned long insn;
|
|
|
|
(*the_target->read_memory) (where, (unsigned char *) &insn, 4);
|
|
if (insn == arm_abi_breakpoint)
|
|
return 1;
|
|
|
|
if (insn == arm_eabi_breakpoint)
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Enum describing the different kinds of breakpoints. */
|
|
enum arm_breakpoint_kinds
|
|
{
|
|
ARM_BP_KIND_THUMB = 2,
|
|
ARM_BP_KIND_THUMB2 = 3,
|
|
ARM_BP_KIND_ARM = 4,
|
|
};
|
|
|
|
/* Implementation of linux_target_ops method "breakpoint_kind_from_pc".
|
|
|
|
Determine the type and size of breakpoint to insert at PCPTR. Uses the
|
|
program counter value to determine whether a 16-bit or 32-bit breakpoint
|
|
should be used. It returns the breakpoint's kind, and adjusts the program
|
|
counter (if necessary) to point to the actual memory location where the
|
|
breakpoint should be inserted. */
|
|
|
|
int
|
|
arm_breakpoint_kind_from_pc (CORE_ADDR *pcptr)
|
|
{
|
|
if (IS_THUMB_ADDR (*pcptr))
|
|
{
|
|
gdb_byte buf[2];
|
|
|
|
*pcptr = UNMAKE_THUMB_ADDR (*pcptr);
|
|
|
|
/* Check whether we are replacing a thumb2 32-bit instruction. */
|
|
if ((*the_target->read_memory) (*pcptr, buf, 2) == 0)
|
|
{
|
|
unsigned short inst1 = 0;
|
|
|
|
(*the_target->read_memory) (*pcptr, (gdb_byte *) &inst1, 2);
|
|
if (thumb_insn_size (inst1) == 4)
|
|
return ARM_BP_KIND_THUMB2;
|
|
}
|
|
return ARM_BP_KIND_THUMB;
|
|
}
|
|
else
|
|
return ARM_BP_KIND_ARM;
|
|
}
|
|
|
|
/* Implementation of the linux_target_ops method "sw_breakpoint_from_kind". */
|
|
|
|
const gdb_byte *
|
|
arm_sw_breakpoint_from_kind (int kind , int *size)
|
|
{
|
|
*size = arm_breakpoint_len;
|
|
/* Define an ARM-mode breakpoint; we only set breakpoints in the C
|
|
library, which is most likely to be ARM. If the kernel supports
|
|
clone events, we will never insert a breakpoint, so even a Thumb
|
|
C library will work; so will mixing EABI/non-EABI gdbserver and
|
|
application. */
|
|
switch (kind)
|
|
{
|
|
case ARM_BP_KIND_THUMB:
|
|
*size = thumb_breakpoint_len;
|
|
return (gdb_byte *) &thumb_breakpoint;
|
|
case ARM_BP_KIND_THUMB2:
|
|
*size = thumb2_breakpoint_len;
|
|
return (gdb_byte *) &thumb2_breakpoint;
|
|
case ARM_BP_KIND_ARM:
|
|
*size = arm_breakpoint_len;
|
|
return (const gdb_byte *) &arm_breakpoint;
|
|
default:
|
|
return NULL;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/* Implementation of the linux_target_ops method
|
|
"breakpoint_kind_from_current_state". */
|
|
|
|
int
|
|
arm_breakpoint_kind_from_current_state (CORE_ADDR *pcptr)
|
|
{
|
|
if (arm_is_thumb_mode ())
|
|
{
|
|
*pcptr = MAKE_THUMB_ADDR (*pcptr);
|
|
return arm_breakpoint_kind_from_pc (pcptr);
|
|
}
|
|
else
|
|
{
|
|
return arm_breakpoint_kind_from_pc (pcptr);
|
|
}
|
|
}
|
|
|
|
void
|
|
initialize_low_arch_aarch32 (void)
|
|
{
|
|
init_registers_arm_with_neon ();
|
|
|
|
initialize_regsets_info (&aarch32_regsets_info);
|
|
}
|