X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fmem-break.c;h=96750c8b8f6876e4ca8315f184e14bed5f2c7db1;hb=c185a355e6bf82e4f371f9f6f912b00e2c711422;hp=7e55233e168263e0e2c2c0db508e8e50e07dda6e;hpb=e98fe4f7b54cbdf29aef9287bbb1bea8801dd05a;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/mem-break.c b/gdb/mem-break.c
index 7e55233e16..96750c8b8f 100644
--- a/gdb/mem-break.c
+++ b/gdb/mem-break.c
@@ -1,102 +1,92 @@
 /* Simulate breakpoints by patching locations in the target system, for GDB.
-   Copyright 1990, 1991 Free Software Foundation, Inc.
+
+   Copyright 1990, 1991, 1992, 1993, 1995, 1997, 1998, 1999, 2000,
+   2002 Free Software Foundation, Inc.
+
    Contributed by Cygnus Support.  Written by John Gilmore.
 
-This file is part of GDB.
+   This file is part of GDB.
 
-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
-(at your option) any later version.
+   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
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 
-#ifdef BREAKPOINT
-/* This file is only useful if BREAKPOINT is set.  If not, we punt.  */
+/* This file is only useful if BREAKPOINT_FROM_PC is set.  If not, we
+   punt.  */
 
-#include <stdio.h>
+#include "symtab.h"
 #include "breakpoint.h"
 #include "inferior.h"
 #include "target.h"
 
-/* This is the sequence of bytes we insert for a breakpoint.  On some
-   machines, breakpoints are handled by the target environment and we
-   don't have to worry about them here.  */
-
-static char break_insn[] = BREAKPOINT;
 
-/* This is only to check that BREAKPOINT fits in BREAKPOINT_MAX bytes.  */
-
-static char check_break_insn_size[BREAKPOINT_MAX] = BREAKPOINT;
-
-/* Insert a breakpoint on machines that don't have any better breakpoint
+/* Insert a breakpoint on targets that don't have any better breakpoint
    support.  We read the contents of the target location and stash it,
    then overwrite it with a breakpoint instruction.  ADDR is the target
    location in the target machine.  CONTENTS_CACHE is a pointer to 
    memory allocated for saving the target contents.  It is guaranteed
-   by the caller to be long enough to save sizeof BREAKPOINT bytes.
-   FIXME: This size is target_arch dependent and should be available in
-   the target_arch transfer vector, if we ever have one...  */
+   by the caller to be long enough to save BREAKPOINT_LEN bytes (this
+   is accomplished via BREAKPOINT_MAX).  */
 
 int
-memory_insert_breakpoint (addr, contents_cache)
-     CORE_ADDR addr;
-     char *contents_cache;
+default_memory_insert_breakpoint (CORE_ADDR addr, char *contents_cache)
 {
   int val;
+  const unsigned char *bp;
+  int bplen;
+
+  /* Determine appropriate breakpoint contents and size for this address.  */
+  bp = BREAKPOINT_FROM_PC (&addr, &bplen);
+  if (bp == NULL)
+    error ("Software breakpoints not implemented for this target.");
 
-  val = target_read_memory (addr, contents_cache, sizeof break_insn);
+  /* Save the memory contents.  */
+  val = target_read_memory (addr, contents_cache, bplen);
 
+  /* Write the breakpoint.  */
   if (val == 0)
-    val = target_write_memory (addr, break_insn, sizeof break_insn);
+    val = target_write_memory (addr, (char *) bp, bplen);
 
   return val;
 }
 
 
 int
-memory_remove_breakpoint (addr, contents_cache)
-     CORE_ADDR addr;
-     char *contents_cache;
+default_memory_remove_breakpoint (CORE_ADDR addr, char *contents_cache)
 {
-  return target_write_memory (addr, contents_cache, sizeof break_insn);
-}
-
-
-int memory_breakpoint_size = sizeof (break_insn);
+  const unsigned char *bp;
+  int bplen;
 
+  /* Determine appropriate breakpoint contents and size for this address.  */
+  bp = BREAKPOINT_FROM_PC (&addr, &bplen);
+  if (bp == NULL)
+    error ("Software breakpoints not implemented for this target.");
 
-#else  /* BREAKPOINT */
+  return target_write_memory (addr, contents_cache, bplen);
+}
 
-char nogo[] = "Breakpoints not implemented for this target.";
 
 int
-memory_insert_breakpoint (addr, contents_cache)
-     CORE_ADDR addr;
-     char *contents_cache;
+memory_insert_breakpoint (CORE_ADDR addr, char *contents_cache)
 {
-  error (nogo);
-  return 0;	/* lint */
+  return MEMORY_INSERT_BREAKPOINT(addr, contents_cache);
 }
 
 int
-memory_remove_breakpoint (addr, contents_cache)
-     CORE_ADDR addr;
-     char *contents_cache;
+memory_remove_breakpoint (CORE_ADDR addr, char *contents_cache)
 {
-  error (nogo);
-  return 0;	/* lint */
+  return MEMORY_REMOVE_BREAKPOINT(addr, contents_cache);
 }
-
-int memory_breakpoint_size = -1;
-
-#endif /* BREAKPOINT */