[AArch64] Use int64_t for address offset
Commit Message
In AArch64 displaced stepping and fast tracepoint, GDB/GDBserver needs
to check whether the offset can fit in the range. We are using int32_t
for offset, it is sufficient to get an offset from an instruction, but
it is not enough to get an offset from two addresses. For example,
we have a BL in shared lib which is at 0x0000002000040774, and the
scratch pad for displaced stepping is at 0x400698. The offset can't
fit in 28 bit imm. However, since we are using int32_t for offset, GDB
thinks the offset can fit it, and generate the B instruction with wrong
offset.
It fixes the following fail,
-FAIL: gdb.base/dso2dso.exp: next over call to sub2
gdb:
2016-06-13 Yao Qi <yao.qi@linaro.org>
* aarch64-tdep.c (aarch64_displaced_step_b): Use int64_t for
variable new_offset.
gdb/gdbserver:
2016-06-13 Yao Qi <yao.qi@linaro.org>
* linux-aarch64-low.c (aarch64_ftrace_insn_reloc_b): Use int64_t
for variable new_offset.
(aarch64_ftrace_insn_reloc_b_cond): Likewise.
(aarch64_ftrace_insn_reloc_cb): Likewise.
(aarch64_ftrace_insn_reloc_tb): Likewise.
(aarch64_install_fast_tracepoint_jump_pad): Likewise. Use
PRIx64 instead of PRIx32.
---
gdb/aarch64-tdep.c | 2 +-
gdb/gdbserver/linux-aarch64-low.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
Comments
On Wed, Jun 15, 2016 at 9:38 AM, Yao Qi <qiyaoltc@gmail.com> wrote:
> In AArch64 displaced stepping and fast tracepoint, GDB/GDBserver needs
> to check whether the offset can fit in the range. We are using int32_t
> for offset, it is sufficient to get an offset from an instruction, but
> it is not enough to get an offset from two addresses. For example,
> we have a BL in shared lib which is at 0x0000002000040774, and the
> scratch pad for displaced stepping is at 0x400698. The offset can't
> fit in 28 bit imm. However, since we are using int32_t for offset, GDB
> thinks the offset can fit it, and generate the B instruction with wrong
> offset.
>
> It fixes the following fail,
>
> -FAIL: gdb.base/dso2dso.exp: next over call to sub2
I pushed it in.
@@ -2322,7 +2322,7 @@ aarch64_displaced_step_b (const int is_bl, const int32_t offset,
{
struct aarch64_displaced_step_data *dsd
= (struct aarch64_displaced_step_data *) data;
- int32_t new_offset = data->insn_addr - dsd->new_addr + offset;
+ int64_t new_offset = data->insn_addr - dsd->new_addr + offset;
if (can_encode_int32 (new_offset, 28))
{
@@ -1557,7 +1557,7 @@ aarch64_ftrace_insn_reloc_b (const int is_bl, const int32_t offset,
{
struct aarch64_insn_relocation_data *insn_reloc
= (struct aarch64_insn_relocation_data *) data;
- int32_t new_offset
+ int64_t new_offset
= insn_reloc->base.insn_addr - insn_reloc->new_addr + offset;
if (can_encode_int32 (new_offset, 28))
@@ -1572,7 +1572,7 @@ aarch64_ftrace_insn_reloc_b_cond (const unsigned cond, const int32_t offset,
{
struct aarch64_insn_relocation_data *insn_reloc
= (struct aarch64_insn_relocation_data *) data;
- int32_t new_offset
+ int64_t new_offset
= insn_reloc->base.insn_addr - insn_reloc->new_addr + offset;
if (can_encode_int32 (new_offset, 21))
@@ -1609,7 +1609,7 @@ aarch64_ftrace_insn_reloc_cb (const int32_t offset, const int is_cbnz,
{
struct aarch64_insn_relocation_data *insn_reloc
= (struct aarch64_insn_relocation_data *) data;
- int32_t new_offset
+ int64_t new_offset
= insn_reloc->base.insn_addr - insn_reloc->new_addr + offset;
if (can_encode_int32 (new_offset, 21))
@@ -1646,7 +1646,7 @@ aarch64_ftrace_insn_reloc_tb (const int32_t offset, int is_tbnz,
{
struct aarch64_insn_relocation_data *insn_reloc
= (struct aarch64_insn_relocation_data *) data;
- int32_t new_offset
+ int64_t new_offset
= insn_reloc->base.insn_addr - insn_reloc->new_addr + offset;
if (can_encode_int32 (new_offset, 16))
@@ -1782,7 +1782,7 @@ aarch64_install_fast_tracepoint_jump_pad (CORE_ADDR tpoint,
{
uint32_t buf[256];
uint32_t *p = buf;
- int32_t offset;
+ int64_t offset;
int i;
uint32_t insn;
CORE_ADDR buildaddr = *jump_entry;
@@ -2119,7 +2119,7 @@ aarch64_install_fast_tracepoint_jump_pad (CORE_ADDR tpoint,
{
sprintf (err,
"E.Jump back from jump pad too far from tracepoint "
- "(offset 0x%" PRIx32 " cannot be encoded in 28 bits).",
+ "(offset 0x%" PRIx64 " cannot be encoded in 28 bits).",
offset);
return 1;
}
@@ -2133,7 +2133,7 @@ aarch64_install_fast_tracepoint_jump_pad (CORE_ADDR tpoint,
{
sprintf (err,
"E.Jump pad too far from tracepoint "
- "(offset 0x%" PRIx32 " cannot be encoded in 28 bits).",
+ "(offset 0x%" PRIx64 " cannot be encoded in 28 bits).",
offset);
return 1;
}