[binutils-gdb] gdbarch_breakpoint_from_pc doesn't return NULL

[Yao Qi <qiyao at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=8b55a7e4e5b30877e924e4b0ed0437d16ccdcedf

commit 8b55a7e4e5b30877e924e4b0ed0437d16ccdcedf
Author: Yao Qi <yao.qi@linaro.org>
Date:   Thu Nov 3 14:35:13 2016 +0000

    gdbarch_breakpoint_from_pc doesn't return NULL
    
    gdbarch_breakpoint_from_pc doesn't return NULL except for
    ia64_breakpoint_from_pc, and we checked its return value in three
    places. In microblaze_linux_memory_remove_breakpoint and
    ppc_linux_memory_remove_breakpoint, gdbarch_breakpoint_from_pc never
    returns NULL, so we can remove the NULL checking.  In
    default_memory_insert_breakpoint, gdbarch_breakpoint_from_pc can't
    returns NULL too because ia64 defines its own memory_insert_breakpoint.
    
    gdb:
    
    2016-11-03  Yao Qi  <yao.qi@linaro.org>
    
    	* mem-break.c (default_memory_insert_breakpoint): Don't check
    	'bp' against NULL.
    	* microblaze-linux-tdep.c (microblaze_linux_memory_remove_breakpoint):
    	Likewise.
    	* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.

Diff:
---
 gdb/ChangeLog               | 8 ++++++++
 gdb/mem-break.c             | 2 --
 gdb/microblaze-linux-tdep.c | 2 --
 gdb/ppc-linux-tdep.c        | 2 --
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8ce6132..92fdd69 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2016-11-03  Yao Qi  <yao.qi@linaro.org>
+
+	* mem-break.c (default_memory_insert_breakpoint): Don't check
+	'bp' against NULL.
+	* microblaze-linux-tdep.c (microblaze_linux_memory_remove_breakpoint):
+	Likewise.
+	* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
+
 2016-11-02  Tom Tromey  <tom@tromey.com>
 
 	* dwarf2loc.c (dwarf_evaluate_loc_desc::get_base_type): Rename
diff --git a/gdb/mem-break.c b/gdb/mem-break.c
index 803f62b..cc8145c 100644
--- a/gdb/mem-break.c
+++ b/gdb/mem-break.c
@@ -45,8 +45,6 @@ default_memory_insert_breakpoint (struct gdbarch *gdbarch,
 
   /* Determine appropriate breakpoint contents and size for this address.  */
   bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
-  if (bp == NULL)
-    error (_("Software breakpoints not implemented for this target."));
 
   bp_tgt->placed_address = addr;
   bp_tgt->placed_size = bplen;
diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
index 18ddfea..22e5959 100644
--- a/gdb/microblaze-linux-tdep.c
+++ b/gdb/microblaze-linux-tdep.c
@@ -49,8 +49,6 @@ microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
 
   /* Determine appropriate breakpoint contents and size for this address.  */
   bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
-  if (bp == NULL)
-    error (_("Software breakpoints not implemented for this target."));
 
   val = target_read_memory (addr, old_contents, bplen);
 
diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
index ee158e3..9c0b8fc 100644
--- a/gdb/ppc-linux-tdep.c
+++ b/gdb/ppc-linux-tdep.c
@@ -222,8 +222,6 @@ ppc_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
 
   /* Determine appropriate breakpoint contents and size for this address.  */
   bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
-  if (bp == NULL)
-    error (_("Software breakpoints not implemented for this target."));
 
   /* Make sure we see the memory breakpoints.  */
   cleanup = make_show_memory_breakpoints_cleanup (1);