diff options
| author | Yao Qi <yao.qi@linaro.org> | 2016-02-16 13:47:17 +0000 |
|---|---|---|
| committer | Yao Qi <yao.qi@linaro.org> | 2016-02-16 13:47:17 +0000 |
| commit | 553cb5270f28725de86636340574644e45318fe1 (patch) | |
| tree | b94ccd30b826b8a2d3aaf0d52fcc6862df2bd136 /gdb/arch | |
| parent | 9406ee731d01bb34ee25280eec18167244ac6e2d (diff) | |
Remove PC from syscall_next_pc
Method syscall_next_pc of struct arm_get_next_pcs_ops has an argument
PC, which is not necessary, because PC can be got from regcache in
'struct arm_get_next_pcs'. This patch removes the PC argument of
syscall_next_pc.
gdb:
2016-02-16 Yao Qi <yao.qi@linaro.org>
* arch/arm-get-next-pcs.h (struct arm_get_next_pcs_ops)
<syscall_next_pc>: Remove argument PC. Callers updated.
* arm-linux-tdep.c (arm_linux_get_next_pcs_syscall_next_pc):
Remove argument PC. Get pc from regcache_read_pc.
* arm-tdep.c (arm_get_next_pcs_syscall_next_pc): Remove
argument PC.
gdb/gdbserver:
2016-02-16 Yao Qi <yao.qi@linaro.org>
* linux-arm-low.c (get_next_pcs_syscall_next_pc): Remove argument
PC. Get pc from regcache_read_pc.
Diffstat (limited to 'gdb/arch')
| -rw-r--r-- | gdb/arch/arm-get-next-pcs.c | 4 | ||||
| -rw-r--r-- | gdb/arch/arm-get-next-pcs.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gdb/arch/arm-get-next-pcs.c b/gdb/arch/arm-get-next-pcs.c index 8404869798..f3e9fd9750 100644 --- a/gdb/arch/arm-get-next-pcs.c +++ b/gdb/arch/arm-get-next-pcs.c @@ -417,7 +417,7 @@ thumb_get_next_pcs_raw (struct arm_get_next_pcs *self) unsigned long cond = bits (inst1, 8, 11); if (cond == 0x0f) /* 0x0f = SWI */ { - nextpc = self->ops->syscall_next_pc (self, pc); + nextpc = self->ops->syscall_next_pc (self); } else if (cond != 0x0f && condition_true (cond, status)) nextpc = pc_val + (sbits (inst1, 0, 7) << 1); @@ -889,7 +889,7 @@ arm_get_next_pcs_raw (struct arm_get_next_pcs *self) break; case 0xf: /* SWI */ { - nextpc = self->ops->syscall_next_pc (self, pc); + nextpc = self->ops->syscall_next_pc (self); } break; diff --git a/gdb/arch/arm-get-next-pcs.h b/gdb/arch/arm-get-next-pcs.h index e038982c51..5525ee219f 100644 --- a/gdb/arch/arm-get-next-pcs.h +++ b/gdb/arch/arm-get-next-pcs.h @@ -28,7 +28,7 @@ struct arm_get_next_pcs; struct arm_get_next_pcs_ops { ULONGEST (*read_mem_uint) (CORE_ADDR memaddr, int len, int byte_order); - CORE_ADDR (*syscall_next_pc) (struct arm_get_next_pcs *self, CORE_ADDR pc); + CORE_ADDR (*syscall_next_pc) (struct arm_get_next_pcs *self); CORE_ADDR (*addr_bits_remove) (struct arm_get_next_pcs *self, CORE_ADDR val); int (*is_thumb) (struct arm_get_next_pcs *self); |