From: Yao Qi <yao.qi@linaro.org>
Date: Wed, 6 Jan 2016 15:03:41 +0000 (+0000)
Subject: Make {arm,thumb}_get_next_pcs_raw static
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f5aa306929127aacf9890a949f9a21b38a0e0e7e;p=deliverable%2Fbinutils-gdb.git

Make {arm,thumb}_get_next_pcs_raw static

This patch makes arm_get_next_pcs_raw and thumb_get_next_pcs_raw
static.

gdb:

2016-01-06  Yao Qi  <yao.qi@linaro.org>

	* arch/arm-get-next-pcs.c (arm_get_next_pcs): Move it to some
	lines below.
	(thumb_get_next_pcs_raw): Make it static.
	(arm_get_next_pcs_raw): Likewise.
	* arch/arm-get-next-pcs.h (thumb_get_next_pcs_raw): Remove the
	declaration.
	(arm_get_next_pcs_raw): Likewise.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ba83bc3e3b..e11ea1a6b5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2016-01-06  Yao Qi  <yao.qi@linaro.org>
+
+	* arch/arm-get-next-pcs.c (arm_get_next_pcs): Move it to some
+	lines below.
+	(thumb_get_next_pcs_raw): Make it static.
+	(arm_get_next_pcs_raw): Likewise.
+	* arch/arm-get-next-pcs.h (thumb_get_next_pcs_raw): Remove the
+	declaration.
+	(arm_get_next_pcs_raw): Likewise.
+
 2016-01-05  Mike Frysinger  <vapier@gentoo.org>
 
 	* version.in: Change cvs to git.
diff --git a/gdb/arch/arm-get-next-pcs.c b/gdb/arch/arm-get-next-pcs.c
index 4db74e750f..aba45e3f79 100644
--- a/gdb/arch/arm-get-next-pcs.c
+++ b/gdb/arch/arm-get-next-pcs.c
@@ -258,34 +258,10 @@ arm_deal_with_atomic_sequence_raw (struct arm_get_next_pcs *self,
   return next_pcs;
 }
 
-/* See arm-get-next-pcs.h.  */
-
-VEC (CORE_ADDR) *
-arm_get_next_pcs (struct arm_get_next_pcs *self, CORE_ADDR pc)
-{
-  VEC (CORE_ADDR) *next_pcs = NULL;
-
-  if (self->ops->is_thumb (self))
-    {
-      next_pcs = thumb_deal_with_atomic_sequence_raw (self, pc);
-      if (next_pcs == NULL)
-	next_pcs = thumb_get_next_pcs_raw (self, pc);
-    }
-  else
-    {
-      next_pcs = arm_deal_with_atomic_sequence_raw (self, pc);
-      if (next_pcs == NULL)
-	next_pcs = arm_get_next_pcs_raw (self, pc);
-    }
+/* Find the next possible PCs for thumb mode.  */
 
-  return next_pcs;
-}
-
-/* See arm-get-next-pcs.h.  */
-
-VEC (CORE_ADDR) *
-thumb_get_next_pcs_raw (struct arm_get_next_pcs *self,
-			CORE_ADDR pc)
+static VEC (CORE_ADDR) *
+thumb_get_next_pcs_raw (struct arm_get_next_pcs *self, CORE_ADDR pc)
 {
   int byte_order = self->byte_order;
   int byte_order_for_code = self->byte_order_for_code;
@@ -664,9 +640,8 @@ thumb_get_next_pcs_raw (struct arm_get_next_pcs *self,
    in Thumb-State, and gdbarch_addr_bits_remove () to get the plain memory
    address in GDB and arm_addr_bits_remove in GDBServer.  */
 
-VEC (CORE_ADDR) *
-arm_get_next_pcs_raw (struct arm_get_next_pcs *self,
-		      CORE_ADDR pc)
+static VEC (CORE_ADDR) *
+arm_get_next_pcs_raw (struct arm_get_next_pcs *self, CORE_ADDR pc)
 {
   int byte_order = self->byte_order;
   unsigned long pc_val;
@@ -924,3 +899,26 @@ arm_get_next_pcs_raw (struct arm_get_next_pcs *self,
   VEC_safe_push (CORE_ADDR, next_pcs, nextpc);
   return next_pcs;
 }
+
+/* See arm-get-next-pcs.h.  */
+
+VEC (CORE_ADDR) *
+arm_get_next_pcs (struct arm_get_next_pcs *self, CORE_ADDR pc)
+{
+  VEC (CORE_ADDR) *next_pcs = NULL;
+
+  if (self->ops->is_thumb (self))
+    {
+      next_pcs = thumb_deal_with_atomic_sequence_raw (self, pc);
+      if (next_pcs == NULL)
+	next_pcs = thumb_get_next_pcs_raw (self, pc);
+    }
+  else
+    {
+      next_pcs = arm_deal_with_atomic_sequence_raw (self, pc);
+      if (next_pcs == NULL)
+	next_pcs = arm_get_next_pcs_raw (self, pc);
+    }
+
+  return next_pcs;
+}
diff --git a/gdb/arch/arm-get-next-pcs.h b/gdb/arch/arm-get-next-pcs.h
index fdbc9bcf10..895e866644 100644
--- a/gdb/arch/arm-get-next-pcs.h
+++ b/gdb/arch/arm-get-next-pcs.h
@@ -59,12 +59,4 @@ void arm_get_next_pcs_ctor (struct arm_get_next_pcs *self,
 VEC (CORE_ADDR) *arm_get_next_pcs (struct arm_get_next_pcs *self,
 				   CORE_ADDR pc);
 
-/* Find the next possible PCs for thumb mode.  */
-VEC (CORE_ADDR) *thumb_get_next_pcs_raw (struct arm_get_next_pcs *self,
-					 CORE_ADDR pc);
-
-/* Find the next possible PCs for arm mode.  */
-VEC (CORE_ADDR) *arm_get_next_pcs_raw (struct arm_get_next_pcs *self,
-				       CORE_ADDR pc);
-
 #endif /* ARM_GET_NEXT_PCS_H */