diff options
| -rw-r--r-- | gdb/ChangeLog | 15 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 2 | ||||
| -rw-r--r-- | gdb/breakpoint.h | 4 | ||||
| -rw-r--r-- | gdb/gdbarch.c | 6 | ||||
| -rw-r--r-- | gdb/gdbarch.h | 6 | ||||
| -rwxr-xr-x | gdb/gdbarch.sh | 2 | ||||
| -rw-r--r-- | gdb/mem-break.c | 3 | ||||
| -rw-r--r-- | gdb/mips-tdep.c | 12 | ||||
| -rw-r--r-- | gdb/ppc-linux-tdep.c | 2 | ||||
| -rw-r--r-- | gdb/remote.c | 6 | ||||
| -rw-r--r-- | gdb/s390-tdep.c | 2 |
11 files changed, 33 insertions, 27 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index da8af0a..2b3881d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,20 @@ 2007-06-13 Markus Deuling <deuling@de.ibm.com> + * gdbarch.sh (BREAKPOINT_FROM_PC): Replace by + gdbarch_breakpoint_from_pc. + * s390-tdep.c (s390_gdbarch_init): Likewise (comment). + * remote.c (remote_insert_breakpoint) + (remote_insert_hw_breakpoint): Likewise. + * ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise. + * mips-tdep.c (mips_breakpoint_from_pc): Likewise (comment). + * breakpoint.h (bp_target_info): Likewise (comment). + * breakpoint.c (read_memory_nobpt): Likewise. + * mem-break.c (default_memory_insert_breakpoint): Likewise. + (symtab.h, breakpoint.h): Remove include. Remove unnecessary comment. + * gdbarch.c, gdbarch.h: Regenerate. + +2007-06-13 Markus Deuling <deuling@de.ibm.com> + * gdbarch.sh (TARGET_PTR_BIT): Replace with gdbarch_ptr_bit. * solib-svr4.c (svr4_truncate_ptr): Likewise. * solib-pa64.c (read_dynamic_info): Likewise. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 730922c..c8e1b4a 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -706,7 +706,7 @@ read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr, unsigned len) CORE_ADDR bp_addr = 0; int bp_size = 0; - if (BREAKPOINT_FROM_PC (&bp_addr, &bp_size) == NULL) + if (gdbarch_breakpoint_from_pc (current_gdbarch, &bp_addr, &bp_size) == NULL) /* No breakpoints on this machine. */ return target_read_memory (memaddr, myaddr, len); diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 6a28b79..1573ac8 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -188,7 +188,7 @@ struct bp_target_info { /* Address at which the breakpoint was placed. This is normally the same as ADDRESS from the bp_location, except when adjustment - happens in BREAKPOINT_FROM_PC. The most common form of + happens in gdbarch_breakpoint_from_pc. The most common form of adjustment is stripping an alternate ISA marker from the PC which is used to determine the type of breakpoint to insert. */ CORE_ADDR placed_address; @@ -203,7 +203,7 @@ struct bp_target_info int shadow_len; /* The size of the placed breakpoint, according to - BREAKPOINT_FROM_PC, when the breakpoint was inserted. This is + gdbarch_breakpoint_from_pc, when the breakpoint was inserted. This is generally the same as SHADOW_LEN, unless we did not need to read from the target to implement the memory breakpoint (e.g. if a remote stub handled the details). We may still diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 66498c5..e14b8e4 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -712,12 +712,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: bfd_vma_bit = %s\n", paddr_d (current_gdbarch->bfd_vma_bit)); -#ifdef BREAKPOINT_FROM_PC - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "BREAKPOINT_FROM_PC(pcptr, lenptr)", - XSTRING (BREAKPOINT_FROM_PC (pcptr, lenptr))); -#endif fprintf_unfiltered (file, "gdbarch_dump: breakpoint_from_pc = <0x%lx>\n", (long) current_gdbarch->breakpoint_from_pc); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 6767bf7..c99b15b 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -551,12 +551,6 @@ extern void set_gdbarch_inner_than (struct gdbarch *gdbarch, gdbarch_inner_than_ typedef const gdb_byte * (gdbarch_breakpoint_from_pc_ftype) (CORE_ADDR *pcptr, int *lenptr); extern const gdb_byte * gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr); extern void set_gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, gdbarch_breakpoint_from_pc_ftype *breakpoint_from_pc); -#if !defined (GDB_TM_FILE) && defined (BREAKPOINT_FROM_PC) -#error "Non multi-arch definition of BREAKPOINT_FROM_PC" -#endif -#if !defined (BREAKPOINT_FROM_PC) -#define BREAKPOINT_FROM_PC(pcptr, lenptr) (gdbarch_breakpoint_from_pc (current_gdbarch, pcptr, lenptr)) -#endif extern int gdbarch_adjust_breakpoint_address_p (struct gdbarch *gdbarch); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index d401b4d..4ccaf79 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -543,7 +543,7 @@ F:=:CORE_ADDR:deprecated_extract_struct_value_address:struct regcache *regcache: # f::CORE_ADDR:skip_prologue:CORE_ADDR ip:ip:0:0 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: +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 diff --git a/gdb/mem-break.c b/gdb/mem-break.c index 2122308..e538bbc 100644 --- a/gdb/mem-break.c +++ b/gdb/mem-break.c @@ -50,7 +50,8 @@ default_memory_insert_breakpoint (struct bp_target_info *bp_tgt) 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 + (current_gdbarch, &bp_tgt->placed_address, &bp_tgt->placed_size); if (bp == NULL) error (_("Software breakpoints not implemented for this target.")); diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 63e4eea..c1c7e72 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -4397,12 +4397,12 @@ gdb_print_insn_mips (bfd_vma memaddr, struct disassemble_info *info) return print_insn_little_mips (memaddr, info); } -/* This function implements the BREAKPOINT_FROM_PC macro. It uses the program - counter value to determine whether a 16- or 32-bit breakpoint should be - used. It returns a pointer to a string of bytes that encode a breakpoint - instruction, stores the length of the string to *lenptr, and adjusts pc - (if necessary) to point to the actual memory location where the - breakpoint should be inserted. */ +/* This function implements gdbarch_breakpoint_from_pc. It uses the program + counter value to determine whether a 16- or 32-bit breakpoint should be used. + It returns a pointer to a string of bytes that encode a breakpoint + instruction, stores the length of the string to *lenptr, and adjusts pc (if + necessary) to point to the actual memory location where the breakpoint + should be inserted. */ static const gdb_byte * mips_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr) diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c index 9f2aceea..9eff5b0 100644 --- a/gdb/ppc-linux-tdep.c +++ b/gdb/ppc-linux-tdep.c @@ -329,7 +329,7 @@ ppc_linux_memory_remove_breakpoint (struct bp_target_info *bp_tgt) gdb_byte old_contents[BREAKPOINT_MAX]; /* Determine appropriate breakpoint contents and size for this address. */ - bp = BREAKPOINT_FROM_PC (&addr, &bplen); + bp = gdbarch_breakpoint_from_pc (current_gdbarch, &addr, &bplen); if (bp == NULL) error (_("Software breakpoints not implemented for this target.")); diff --git a/gdb/remote.c b/gdb/remote.c index 10707f4..e7a7d35 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -5128,7 +5128,8 @@ remote_insert_breakpoint (struct bp_target_info *bp_tgt) *(p++) = 'Z'; *(p++) = '0'; *(p++) = ','; - BREAKPOINT_FROM_PC (&bp_tgt->placed_address, &bp_tgt->placed_size); + gdbarch_breakpoint_from_pc + (current_gdbarch, &bp_tgt->placed_address, &bp_tgt->placed_size); addr = (ULONGEST) remote_address_masked (bp_tgt->placed_address); p += hexnumstr (p, addr); sprintf (p, ",%d", bp_tgt->placed_size); @@ -5323,7 +5324,8 @@ remote_insert_hw_breakpoint (struct bp_target_info *bp_tgt) /* The length field should be set to the size of a breakpoint instruction, even though we aren't inserting one ourselves. */ - BREAKPOINT_FROM_PC (&bp_tgt->placed_address, &bp_tgt->placed_size); + gdbarch_breakpoint_from_pc + (current_gdbarch, &bp_tgt->placed_address, &bp_tgt->placed_size); if (remote_protocol_packets[PACKET_Z1].support == PACKET_DISABLE) return -1; diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 395c57e..aa23735 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -2374,7 +2374,7 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_char_signed (gdbarch, 0); /* Amount PC must be decremented by after a breakpoint. This is - often the number of bytes returned by BREAKPOINT_FROM_PC but not + often the number of bytes returned by gdbarch_breakpoint_from_pc but not always. */ set_gdbarch_decr_pc_after_break (gdbarch, 2); /* Stack grows downward. */ |