Re: [PATCH] Mostly trivial enum fixes

[Yao Qi <qiyaoltc@gmail.com>]

Simon Marchi <simon.marchi@ericsson.com> writes:

> -/* Get the ARM hardware breakpoint type from the RW value we're given when
> -   asked to set a watchpoint.  */
> +/* Get the ARM hardware breakpoint type from the type value we're
> +   given when asked to set a watchpoint.  */
>  static arm_hwbp_type 
> -arm_linux_get_hwbp_type (int rw)
> +arm_linux_get_hwbp_type (enum target_hw_bp_type type)
>  {
>    if (rw == hw_read)
>      return arm_hwbp_load;

Argument "rw" is updated to "type", but its uses inside function are not
updated.  This breaks GDB native build on arm-linux.  Patch below fixed
it.  Patch is pushed in.

-- 
Yao (齐尧)
From 8156fe7f47884390b7404af15903795bb607658b Mon Sep 17 00:00:00 2001
From: Yao Qi <yao.qi@linaro.org>
Date: Mon, 3 Aug 2015 10:37:23 +0100
Subject: [PATCH] Enum fix for arm-linux-nat.c

This patch fixes GDB build breakage on arm-linux.

gdb:

2015-08-03  Yao Qi  <yao.qi@linaro.org>

	* arm-linux-nat.c (arm_linux_get_hwbp_type): Capitalize "type"
	in comment.  Replace "rw" with "type".
	(arm_linux_remove_watchpoint): Change type of "rw" to
	"enum target_hw_bp_type".

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b8840fd..817610e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-03  Yao Qi  <yao.qi@linaro.org>
+
+	* arm-linux-nat.c (arm_linux_get_hwbp_type): Capitalize "type"
+	in comment.  Replace "rw" with "type".
+	(arm_linux_remove_watchpoint): Change type of "rw" to
+	"enum target_hw_bp_type".
+
 2015-08-02  Pierre-Marie de Rodat  <derodat@adacore.com>
 
 	* alpha-mdebug-tdep.c (find_proc_desc): Update call to
diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
index e2e43ac..825da4c 100644
--- a/gdb/arm-linux-nat.c
+++ b/gdb/arm-linux-nat.c
@@ -923,14 +923,14 @@ arm_linux_hw_breakpoint_initialize (struct gdbarch *gdbarch,
   p->control = arm_hwbp_control_initialize (mask, arm_hwbp_break, 1);
 }
 
-/* Get the ARM hardware breakpoint type from the type value we're
+/* Get the ARM hardware breakpoint type from the TYPE value we're
    given when asked to set a watchpoint.  */
 static arm_hwbp_type 
 arm_linux_get_hwbp_type (enum target_hw_bp_type type)
 {
-  if (rw == hw_read)
+  if (type == hw_read)
     return arm_hwbp_load;
-  else if (rw == hw_write)
+  else if (type == hw_write)
     return arm_hwbp_store;
   else
     return arm_hwbp_access;
@@ -1168,8 +1168,8 @@ arm_linux_insert_watchpoint (struct target_ops *self,
 
 /* Remove a hardware breakpoint.  */
 static int
-arm_linux_remove_watchpoint (struct target_ops *self,
-			     CORE_ADDR addr, int len, int rw,
+arm_linux_remove_watchpoint (struct target_ops *self, CORE_ADDR addr,
+			     int len, enum target_hw_bp_type rw,
 			     struct expression *cond)
 {
   struct lwp_info *lp;