aarch64 multi-arch part 6: HW breakpoint on unaligned address
Commit Message
Pedro Alves <palves@redhat.com> writes:
>>>> aarch64_point_is_aligned (int is_watchpoint, CORE_ADDR addr, int len)
>>>> {
>>>> - unsigned int alignment = is_watchpoint ? AARCH64_HWP_ALIGNMENT
>>>> - : AARCH64_HBP_ALIGNMENT;
>>>> + unsigned int alignment = 0;
>>>> +
>>>> + if (is_watchpoint)
>>>> + alignment = AARCH64_HWP_ALIGNMENT;
>>>> + else
>>>> + {
>>>> + /* Set alignment to 2 only if the current process is 32-bit,
>>>> + since thumb instruction can be 2-byte aligned. Otherwise, set
>>>> + alignment to AARCH64_HBP_ALIGNMENT. */
>>>> + alignment = 2;
>>>
>>> Is some other code doing what the comment says? I'm not seeing
>>> any obvious 32-bit check.
>>
>> No, I don't do the 32-bit check here. Ideally, we should set alignment
>> to 2 only when the process is 32-bit, and still use 4 as alignment
>> otherwise. However, I don't find an easy way to do the 32-bit check
>> here, because this code is used by both GDB and GDBserver. We can do
>> the 32-bit check in GDB and GDBserver respectively, and pass the result
>> to nat/aarch64-linux-hw-point.c, but I don't like putting information down
>> multiple levels like this.
>
> At least the comment should be updated. It's quite misleading as is.
In order to do 32-bit check in nat/aarch64-linux-hw-point.c, I add a new
regcache interface regcache_register_size which is defined in both GDB
and GDBserver. It has two arguments, regcache and number, which looks
more reasonable than register_size, IMO. With regcache_register_size in
place, we can check 32-bit like this,
struct regcache *regcache
= get_thread_regcache_for_ptid (current_lwp_ptid ());
/* Set alignment to 2 only if the current process is 32-bit,
since thumb instruction can be 2-byte aligned. Otherwise, set
alignment to AARCH64_HBP_ALIGNMENT. */
if (regcache_register_size (regcache, 0) == 8)
alignment = AARCH64_HBP_ALIGNMENT;
else
alignment = 2;
on the other hand, a lot of register_size calls in GDB and GDBserver can
be replaced by regcache_register_size. This can be done separately.
Here is the patch V2, regression tested on aarch64-linux.
Comments
On 10/15/2015 09:14 AM, Yao Qi wrote:
> Pedro Alves <palves@redhat.com> writes:
>> At least the comment should be updated. It's quite misleading as is.
>
> In order to do 32-bit check in nat/aarch64-linux-hw-point.c, I add a new
> regcache interface regcache_register_size which is defined in both GDB
> and GDBserver. It has two arguments, regcache and number, which looks
> more reasonable than register_size, IMO. With regcache_register_size in
> place, we can check 32-bit like this,
>
> struct regcache *regcache
> = get_thread_regcache_for_ptid (current_lwp_ptid ());
>
> /* Set alignment to 2 only if the current process is 32-bit,
> since thumb instruction can be 2-byte aligned. Otherwise, set
> alignment to AARCH64_HBP_ALIGNMENT. */
> if (regcache_register_size (regcache, 0) == 8)
> alignment = AARCH64_HBP_ALIGNMENT;
> else
> alignment = 2;
>
> on the other hand, a lot of register_size calls in GDB and GDBserver can
> be replaced by regcache_register_size. This can be done separately.
>
> Here is the patch V2, regression tested on aarch64-linux.
LGTM.
Thanks,
Pedro Alves
On 15/10/15 14:02, Pedro Alves wrote:
>> Here is the patch V2, regression tested on aarch64-linux.
> LGTM.
Thanks, patch is pushed in.
@@ -608,11 +608,13 @@ aarch64_linux_insert_hw_breakpoint (struct target_ops *self,
{
int ret;
CORE_ADDR addr = bp_tgt->placed_address = bp_tgt->reqstd_address;
- const int len = 4;
+ int len;
const enum target_hw_bp_type type = hw_execute;
struct aarch64_debug_reg_state *state
= aarch64_get_debug_reg_state (ptid_get_pid (inferior_ptid));
+ gdbarch_breakpoint_from_pc (gdbarch, &addr, &len);
+
if (show_debug_regs)
fprintf_unfiltered
(gdb_stdlog,
@@ -640,11 +642,13 @@ aarch64_linux_remove_hw_breakpoint (struct target_ops *self,
{
int ret;
CORE_ADDR addr = bp_tgt->placed_address;
- const int len = 4;
+ int len = 4;
const enum target_hw_bp_type type = hw_execute;
struct aarch64_debug_reg_state *state
= aarch64_get_debug_reg_state (ptid_get_pid (inferior_ptid));
+ gdbarch_breakpoint_from_pc (gdbarch, &addr, &len);
+
if (show_debug_regs)
fprintf_unfiltered
(gdb_stdlog, "remove_hw_breakpoint on entry (addr=0x%08lx, len=%d))\n",
@@ -28,6 +28,11 @@
extern struct regcache *get_thread_regcache_for_ptid (ptid_t ptid);
+/* Return the size of register numbered N in REGCACHE. This function
+ must be provided by the client. */
+
+extern int regcache_register_size (const struct regcache *regcache, int n);
+
/* Read the PC register. This function must be provided by the
client. */
@@ -315,9 +315,17 @@ aarch64_insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
ret = -1;
}
else
- ret =
- aarch64_handle_breakpoint (targ_type, addr, len, 1 /* is_insert */,
- state);
+ {
+ if (len == 3)
+ {
+ /* LEN is 3 means the breakpoint is set on a 32-bit thumb
+ instruction. Set it to 2 to correctly encode length bit
+ mask in hardware/watchpoint control register. */
+ len = 2;
+ }
+ ret = aarch64_handle_breakpoint (targ_type, addr, len,
+ 1 /* is_insert */, state);
+ }
if (show_debug_regs)
aarch64_show_debug_reg_state (state, "insert_point", addr, len,
@@ -353,9 +361,17 @@ aarch64_remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
aarch64_handle_watchpoint (targ_type, addr, len, 0 /* is_insert */,
state);
else
- ret =
- aarch64_handle_breakpoint (targ_type, addr, len, 0 /* is_insert */,
- state);
+ {
+ if (len == 3)
+ {
+ /* LEN is 3 means the breakpoint is set on a 32-bit thumb
+ instruction. Set it to 2 to correctly encode length bit
+ mask in hardware/watchpoint control register. */
+ len = 2;
+ }
+ ret = aarch64_handle_breakpoint (targ_type, addr, len,
+ 0 /* is_insert */, state);
+ }
if (show_debug_regs)
aarch64_show_debug_reg_state (state, "remove_point", addr, len,
@@ -316,6 +316,14 @@ register_size (const struct target_desc *tdesc, int n)
return tdesc->reg_defs[n].size / 8;
}
+/* See common/common-regcache.h. */
+
+int
+regcache_register_size (const struct regcache *regcache, int n)
+{
+ return register_size (regcache->tdesc, n);
+}
+
static unsigned char *
register_data (struct regcache *regcache, int n, int fetch)
{
@@ -18,6 +18,7 @@
#include "common-defs.h"
#include "break-common.h"
+#include "common-regcache.h"
#include "nat/linux-nat.h"
#include "aarch64-linux-hw-point.h"
@@ -112,8 +113,23 @@ aarch64_point_encode_ctrl_reg (enum target_hw_bp_type type, int len)
static int
aarch64_point_is_aligned (int is_watchpoint, CORE_ADDR addr, int len)
{
- unsigned int alignment = is_watchpoint ? AARCH64_HWP_ALIGNMENT
- : AARCH64_HBP_ALIGNMENT;
+ unsigned int alignment = 0;
+
+ if (is_watchpoint)
+ alignment = AARCH64_HWP_ALIGNMENT;
+ else
+ {
+ struct regcache *regcache
+ = get_thread_regcache_for_ptid (current_lwp_ptid ());
+
+ /* Set alignment to 2 only if the current process is 32-bit,
+ since thumb instruction can be 2-byte aligned. Otherwise, set
+ alignment to AARCH64_HBP_ALIGNMENT. */
+ if (regcache_register_size (regcache, 0) == 8)
+ alignment = AARCH64_HBP_ALIGNMENT;
+ else
+ alignment = 2;
+ }
if (addr & (alignment - 1))
return 0;
@@ -445,7 +461,7 @@ aarch64_handle_breakpoint (enum target_hw_bp_type type, CORE_ADDR addr,
struct aarch64_debug_reg_state *state)
{
/* The hardware breakpoint on AArch64 should always be 4-byte
- aligned. */
+ aligned, but on AArch32, it can be 2-byte aligned. */
if (!aarch64_point_is_aligned (0 /* is_watchpoint */ , addr, len))
return -1;
@@ -179,6 +179,14 @@ register_size (struct gdbarch *gdbarch, int regnum)
return size;
}
+/* See common/common-regcache.h. */
+
+int
+regcache_register_size (const struct regcache *regcache, int n)
+{
+ return register_size (get_regcache_arch (regcache), n);
+}
+
/* The register cache for storing raw register values. */
struct regcache