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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7cb4b0a63142cfb55d5072465083514b5f7d15fd..c32722efd07a508abfac76aa839d9e6f3b061656 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2016-02-15  Yao Qi  <yao.qi@linaro.org>
 
        * aarch64-tdep.c (aarch64_analyze_prologue): Remove "0x".

diff --git a/gdb/arch/arm-get-next-pcs.c b/gdb/arch/arm-get-next-pcs.c
index 840486979874daac10300a55b0edd038fd0e76c8..f3e9fd97504f3e0438d855270da397fa287a13a4 100644 (file)
--- 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 e038982c5148135f8b7f8e27fef5a836305c7706..5525ee219fc3ee12210d21f35506d1929651052e 100644 (file)
--- 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);
 

diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
index e416e28fefa3a3e9361ce66d6feaa14a14986d94..46d54bc4ee2dd1bd1f1a6607c13fa3ed33bacf67 100644 (file)
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -266,8 +266,7 @@ static const gdb_byte arm_linux_thumb2_le_breakpoint[] = { 0xf0, 0xf7, 0x00, 0xa
 #define ARM_RT_SIGRETURN 173
 
 static CORE_ADDR
-  arm_linux_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self,
-                                         CORE_ADDR pc);
+  arm_linux_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self);
 
 /* Operation function pointers for get_next_pcs.  */
 static struct arm_get_next_pcs_ops arm_linux_get_next_pcs_ops = {
@@ -872,10 +871,10 @@ arm_linux_get_syscall_number (struct gdbarch *gdbarch,
 }
 
 static CORE_ADDR
-arm_linux_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self,
-                                       CORE_ADDR pc)
+arm_linux_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 (self->regcache);
   ULONGEST svc_number = 0;
   struct gdbarch *gdbarch = get_regcache_arch (self->regcache);

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 048406aca8d4c42f0381e75cdd7803332a013648..9bd48a24832edf12d569a5cffc0e9903ed9b62cf 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -238,8 +238,7 @@ static void arm_neon_quad_write (struct gdbarch *gdbarch,
                                 int regnum, const gdb_byte *buf);
 
 static CORE_ADDR
-  arm_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self,
-                                   CORE_ADDR pc);
+  arm_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self);
 
 
 /* get_next_pcs operations.  */
@@ -6139,8 +6138,7 @@ arm_get_next_pcs_addr_bits_remove (struct arm_get_next_pcs *self,
 /* Wrapper over syscall_next_pc for use in get_next_pcs.  */
 
 static CORE_ADDR
-arm_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self,
-                                 CORE_ADDR pc)
+arm_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self)
 {
   return 0;
 }

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 7676f7145c5bdc10a1b0c45c37fbc72ce1a9ae78..7bb2e18e42ddcc218377523d513764900f98d62f 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2016-02-12  Yao Qi  <yao.qi@linaro.org>
 
        * linux-aarch64-low.c (aarch64_get_pc): Call linux_get_pc_64bit

diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
index 365f1c932227713d77c12dc1fd4eae29ee4972fc..57826f17d7639d5b616b08bcec783c3821bdeb94 100644 (file)
--- 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;