X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmem-break.c;h=6b7de4ebca8b8d080a897e926d2ca7ebd0a047b8;hb=4c38e0a4fcb69f8586d8db0b9cdb8dbab5980811;hp=2d9851bc2a21a0b822f2e24087283a3f9801659d;hpb=8181d85fdcb9f4d31030a70bd0a1d3f4e1f5b7e3;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/mem-break.c b/gdb/mem-break.c
index 2d9851bc2a..6b7de4ebca 100644
--- a/gdb/mem-break.c
+++ b/gdb/mem-break.c
@@ -1,7 +1,7 @@
 /* Simulate breakpoints by patching locations in the target system, for GDB.
 
-   Copyright (C) 1990, 1991, 1992, 1993, 1995, 1997, 1998, 1999, 2000,
-   2002 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1991, 1992, 1993, 1995, 1997, 1998, 1999, 2000, 2002,
+   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    Contributed by Cygnus Support.  Written by John Gilmore.
 
@@ -9,7 +9,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -18,9 +18,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 
@@ -43,14 +41,16 @@
    BREAKPOINT_MAX).  */
 
 int
-default_memory_insert_breakpoint (struct bp_target_info *bp_tgt)
+default_memory_insert_breakpoint (struct gdbarch *gdbarch,
+				  struct bp_target_info *bp_tgt)
 {
   int val;
   const unsigned char *bp;
   int bplen;
 
   /* Determine appropriate breakpoint contents and size for this address.  */
-  bp = BREAKPOINT_FROM_PC (&bp_tgt->placed_address, &bp_tgt->placed_size);
+  bp = gdbarch_breakpoint_from_pc
+       (gdbarch, &bp_tgt->placed_address, &bp_tgt->placed_size);
   if (bp == NULL)
     error (_("Software breakpoints not implemented for this target."));
 
@@ -69,7 +69,8 @@ default_memory_insert_breakpoint (struct bp_target_info *bp_tgt)
 
 
 int
-default_memory_remove_breakpoint (struct bp_target_info *bp_tgt)
+default_memory_remove_breakpoint (struct gdbarch *gdbarch,
+				  struct bp_target_info *bp_tgt)
 {
   return target_write_memory (bp_tgt->placed_address, bp_tgt->shadow_contents,
 			      bp_tgt->placed_size);
@@ -77,13 +78,15 @@ default_memory_remove_breakpoint (struct bp_target_info *bp_tgt)
 
 
 int
-memory_insert_breakpoint (struct bp_target_info *bp_tgt)
+memory_insert_breakpoint (struct gdbarch *gdbarch,
+			  struct bp_target_info *bp_tgt)
 {
-  return MEMORY_INSERT_BREAKPOINT (bp_tgt);
+  return gdbarch_memory_insert_breakpoint (gdbarch, bp_tgt);
 }
 
 int
-memory_remove_breakpoint (struct bp_target_info *bp_tgt)
+memory_remove_breakpoint (struct gdbarch *gdbarch,
+			  struct bp_target_info *bp_tgt)
 {
-  return MEMORY_REMOVE_BREAKPOINT (bp_tgt);
+  return gdbarch_memory_remove_breakpoint (gdbarch, bp_tgt);
 }