Re: [patch] [ia64] Fixup breakpoints errors handling

[Jan Kratochvil <jan.kratochvil@redhat.com>]

On Mon, 07 Sep 2009 20:32:59 +0200, Joel Brobecker wrote:
> > gdb/
> > 2009-09-05  Jan Kratochvil  <jan.kratochvil@redhat.com>
> > 
> > 	* ia64-tdep.c (ia64_memory_insert_breakpoint)
> > 	(ia64_memory_remove_breakpoint): Return immediately if any of memory
> > 	reads fail.  Do not combine the VAL values.
> 
> The patch is OK.

Checked-in.


Thanks,
Jan

http://sourceware.org/ml/gdb-cvs/2009-09/msg00033.html

--- src/gdb/ChangeLog	2009/09/08 17:39:19	1.10849
+++ src/gdb/ChangeLog	2009/09/08 17:52:26	1.10850
@@ -1,5 +1,11 @@
 2009-09-08  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
+	* ia64-tdep.c (ia64_memory_insert_breakpoint)
+	(ia64_memory_remove_breakpoint): Return immediately if any of memory
+	reads fail.  Do not combine the VAL values.
+
+2009-09-08  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
 	Fix ia64 shadowing of breakpoints in multiple slots of a single bundle.
 	* ia64-tdep.c (ia64_memory_insert_breakpoint): New call
 	of make_show_memory_breakpoints_cleanup with parameter 0.  Move the
--- src/gdb/ia64-tdep.c	2009/09/08 17:39:21	1.197
+++ src/gdb/ia64-tdep.c	2009/09/08 17:52:27	1.198
@@ -629,6 +629,11 @@
      breakpoint instruction bits region.  */
   cleanup = make_show_memory_breakpoints_cleanup (0);
   val = target_read_memory (addr, bundle, BUNDLE_LEN);
+  if (val != 0)
+    {
+      do_cleanups (cleanup);
+      return val;
+    }
 
   /* Slot number 2 may skip at most 2 bytes at the beginning.  */
   bp_tgt->shadow_len = BUNDLE_LEN - 2;
@@ -645,7 +650,12 @@
      adjacent placed breakpoints.  It is due to our SHADOW_CONTENTS overlapping
      the real breakpoint instruction bits region.  */
   make_show_memory_breakpoints_cleanup (1);
-  val |= target_read_memory (addr, bundle, BUNDLE_LEN);
+  val = target_read_memory (addr, bundle, BUNDLE_LEN);
+  if (val != 0)
+    {
+      do_cleanups (cleanup);
+      return val;
+    }
 
   /* Check for L type instruction in slot 1, if present then bump up the slot
      number to the slot 2.  */
@@ -666,9 +676,8 @@
 
   bp_tgt->placed_size = bp_tgt->shadow_len;
 
-  if (val == 0)
-    val = target_write_memory (addr + slotnum, bundle + slotnum,
-			       bp_tgt->shadow_len);
+  val = target_write_memory (addr + slotnum, bundle + slotnum,
+			     bp_tgt->shadow_len);
 
   do_cleanups (cleanup);
   return val;
@@ -695,6 +704,11 @@
      breakpoint instruction bits region.  */
   cleanup = make_show_memory_breakpoints_cleanup (1);
   val = target_read_memory (addr, bundle_mem, BUNDLE_LEN);
+  if (val != 0)
+    {
+      do_cleanups (cleanup);
+      return val;
+    }
 
   /* Check for L type instruction in slot 1, if present then bump up the slot
      number to the slot 2.  */
@@ -723,8 +737,7 @@
   /* In BUNDLE_MEM be careful to modify only the bits belonging to SLOTNUM and
      never any other possibly also stored in SHADOW_CONTENTS.  */
   replace_slotN_contents (bundle_mem, instr_saved, slotnum);
-  if (val == 0)
-    val = target_write_memory (addr, bundle_mem, BUNDLE_LEN);
+  val = target_write_memory (addr, bundle_mem, BUNDLE_LEN);
 
   do_cleanups (cleanup);
   return val;