This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[rfc] [5/8] Remove macros MEMORY_INSERT_BREAKPOINT and MEMORY_REMOVE_BREAKPOINT
- From: Markus Deuling <deuling at de dot ibm dot com>
- To: GDB Patches <gdb-patches at sourceware dot org>
- Cc: Ulrich Weigand <uweigand at de dot ibm dot com>
- Date: Fri, 08 Jun 2007 11:11:37 +0200
- Subject: [rfc] [5/8] Remove macros MEMORY_INSERT_BREAKPOINT and MEMORY_REMOVE_BREAKPOINT
Hello,
this patch removes MEMORY_INSERT_BREAKPOINT and MEMORY_REMOVE_BREAKPOINT macros from gdbarch.sh
ChangeLog:
* gdbarch.sh (MEMORY_INSERT_BREAKPOINT): Replace by
gdbarch_memory_insert_breakpoint.
* mem-break.c (memory_insert_breakpoint): Likewise.
* gdbarch.sh (MEMORY_REMOVE_BREAKPOINT): Replace by
gdbarch_memory_remove_breakpoint.
* mem-break.c (memory_remove_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerate.
Is this ok to commit?
--
Markus Deuling
GNU Toolchain for Linux on Cell BE
deuling@de.ibm.com
diff -urN src.orig/gdb/gdbarch.c dev/gdb/gdbarch.c
--- src.orig/gdb/gdbarch.c 2007-06-08 08:40:17.000000000 +0200
+++ dev/gdb/gdbarch.c 2007-06-08 08:41:11.000000000 +0200
@@ -1029,21 +1029,9 @@
fprintf_unfiltered (file,
"gdbarch_dump: long_long_bit = %s\n",
paddr_d (current_gdbarch->long_long_bit));
-#ifdef MEMORY_INSERT_BREAKPOINT
- fprintf_unfiltered (file,
- "gdbarch_dump: %s # %s\n",
- "MEMORY_INSERT_BREAKPOINT(bp_tgt)",
- XSTRING (MEMORY_INSERT_BREAKPOINT (bp_tgt)));
-#endif
fprintf_unfiltered (file,
"gdbarch_dump: memory_insert_breakpoint = <0x%lx>\n",
(long) current_gdbarch->memory_insert_breakpoint);
-#ifdef MEMORY_REMOVE_BREAKPOINT
- fprintf_unfiltered (file,
- "gdbarch_dump: %s # %s\n",
- "MEMORY_REMOVE_BREAKPOINT(bp_tgt)",
- XSTRING (MEMORY_REMOVE_BREAKPOINT (bp_tgt)));
-#endif
fprintf_unfiltered (file,
"gdbarch_dump: memory_remove_breakpoint = <0x%lx>\n",
(long) current_gdbarch->memory_remove_breakpoint);
diff -urN src.orig/gdb/gdbarch.h dev/gdb/gdbarch.h
--- src.orig/gdb/gdbarch.h 2007-06-08 08:40:17.000000000 +0200
+++ dev/gdb/gdbarch.h 2007-06-08 08:41:11.000000000 +0200
@@ -705,22 +705,10 @@
typedef int (gdbarch_memory_insert_breakpoint_ftype) (struct bp_target_info *bp_tgt);
extern int gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt);
extern void set_gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, gdbarch_memory_insert_breakpoint_ftype *memory_insert_breakpoint);
-#if !defined (GDB_TM_FILE) && defined (MEMORY_INSERT_BREAKPOINT)
-#error "Non multi-arch definition of MEMORY_INSERT_BREAKPOINT"
-#endif
-#if !defined (MEMORY_INSERT_BREAKPOINT)
-#define MEMORY_INSERT_BREAKPOINT(bp_tgt) (gdbarch_memory_insert_breakpoint (current_gdbarch, bp_tgt))
-#endif
typedef int (gdbarch_memory_remove_breakpoint_ftype) (struct bp_target_info *bp_tgt);
extern int gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt);
extern void set_gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, gdbarch_memory_remove_breakpoint_ftype *memory_remove_breakpoint);
-#if !defined (GDB_TM_FILE) && defined (MEMORY_REMOVE_BREAKPOINT)
-#error "Non multi-arch definition of MEMORY_REMOVE_BREAKPOINT"
-#endif
-#if !defined (MEMORY_REMOVE_BREAKPOINT)
-#define MEMORY_REMOVE_BREAKPOINT(bp_tgt) (gdbarch_memory_remove_breakpoint (current_gdbarch, bp_tgt))
-#endif
extern CORE_ADDR gdbarch_decr_pc_after_break (struct gdbarch *gdbarch);
extern void set_gdbarch_decr_pc_after_break (struct gdbarch *gdbarch, CORE_ADDR decr_pc_after_break);
diff -urN src.orig/gdb/gdbarch.sh dev/gdb/gdbarch.sh
--- src.orig/gdb/gdbarch.sh 2007-06-08 08:40:17.000000000 +0200
+++ dev/gdb/gdbarch.sh 2007-06-08 08:41:41.000000000 +0200
@@ -545,8 +545,8 @@
f::int:inner_than:CORE_ADDR lhs, CORE_ADDR rhs:lhs, rhs:0:0
f:=:const gdb_byte *:breakpoint_from_pc:CORE_ADDR *pcptr, int *lenptr:pcptr, lenptr::0:
M::CORE_ADDR:adjust_breakpoint_address:CORE_ADDR bpaddr:bpaddr
-f:=:int:memory_insert_breakpoint:struct bp_target_info *bp_tgt:bp_tgt:0:default_memory_insert_breakpoint::0
-f:=:int:memory_remove_breakpoint:struct bp_target_info *bp_tgt:bp_tgt:0:default_memory_remove_breakpoint::0
+f::int:memory_insert_breakpoint:struct bp_target_info *bp_tgt:bp_tgt:0:default_memory_insert_breakpoint::0
+f::int:memory_remove_breakpoint:struct bp_target_info *bp_tgt:bp_tgt:0:default_memory_remove_breakpoint::0
v::CORE_ADDR:decr_pc_after_break:::0:::0
# A function can be addressed by either it's "pointer" (possibly a
diff -urN src.orig/gdb/mem-break.c dev/gdb/mem-break.c
--- src.orig/gdb/mem-break.c 2007-01-09 18:58:52.000000000 +0100
+++ dev/gdb/mem-break.c 2007-06-08 08:41:11.000000000 +0200
@@ -79,11 +79,11 @@
int
memory_insert_breakpoint (struct bp_target_info *bp_tgt)
{
- return MEMORY_INSERT_BREAKPOINT (bp_tgt);
+ return gdbarch_memory_insert_breakpoint (current_gdbarch, bp_tgt);
}
int
memory_remove_breakpoint (struct bp_target_info *bp_tgt)
{
- return MEMORY_REMOVE_BREAKPOINT (bp_tgt);
+ return gdbarch_memory_remove_breakpoint (current_gdbarch, bp_tgt);
}