From 553cb5270f28725de86636340574644e45318fe1 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 16 Feb 2016 13:47:17 +0000 Subject: 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 * arch/arm-get-next-pcs.h (struct arm_get_next_pcs_ops) : 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 * linux-arm-low.c (get_next_pcs_syscall_next_pc): Remove argument PC. Get pc from regcache_read_pc. --- gdb/gdbserver/linux-arm-low.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gdb/gdbserver/linux-arm-low.c') diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c index 365f1c9..57826f1 100644 --- a/gdb/gdbserver/linux-arm-low.c +++ b/gdb/gdbserver/linux-arm-low.c @@ -147,8 +147,7 @@ static ULONGEST get_next_pcs_read_memory_unsigned_integer (CORE_ADDR memaddr, static CORE_ADDR get_next_pcs_addr_bits_remove (struct arm_get_next_pcs *self, CORE_ADDR val); -static CORE_ADDR get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self, - CORE_ADDR pc); +static CORE_ADDR get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self); static int get_next_pcs_is_thumb (struct arm_get_next_pcs *self); @@ -786,9 +785,10 @@ arm_sigreturn_next_pc (struct regcache *regcache, int svc_number, /* When PC is at a syscall instruction, return the PC of the next instruction to be executed. */ static CORE_ADDR -get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self, CORE_ADDR pc) +get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self) { CORE_ADDR next_pc = 0; + CORE_ADDR pc = regcache_read_pc (self->regcache); int is_thumb = arm_is_thumb_mode (); ULONGEST svc_number = 0; struct regcache *regcache = self->regcache; -- cgit v1.1