OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ulrich Weigand 2007-06-13 17:38:43 +00:00
parent 819844ad98
commit 3b3b875c48
11 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gdb/ChangeLog
View File

@ -1,3 +1,18 @@
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> 2007-06-13 Markus Deuling <deuling@de.ibm.com>
* gdbarch.sh (TARGET_PTR_BIT): Replace with gdbarch_ptr_bit. * gdbarch.sh (TARGET_PTR_BIT): Replace with gdbarch_ptr_bit.

2
gdb/breakpoint.c
View File

@ -706,7 +706,7 @@ read_memory_nobpt (CORE_ADDR memaddr, gdb_byte *myaddr, unsigned len)
CORE_ADDR bp_addr = 0; CORE_ADDR bp_addr = 0;
int bp_size = 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. */ /* No breakpoints on this machine. */
return target_read_memory (memaddr, myaddr, len); return target_read_memory (memaddr, myaddr, len);

4
gdb/breakpoint.h
View File

@ -188,7 +188,7 @@ struct bp_target_info
{ {
/* Address at which the breakpoint was placed. This is normally the /* Address at which the breakpoint was placed. This is normally the
same as ADDRESS from the bp_location, except when adjustment 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 adjustment is stripping an alternate ISA marker from the PC which
is used to determine the type of breakpoint to insert. */ is used to determine the type of breakpoint to insert. */
CORE_ADDR placed_address; CORE_ADDR placed_address;
@ -203,7 +203,7 @@ struct bp_target_info
int shadow_len; int shadow_len;
/* The size of the placed breakpoint, according to /* 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 generally the same as SHADOW_LEN, unless we did not need
to read from the target to implement the memory breakpoint to read from the target to implement the memory breakpoint
(e.g. if a remote stub handled the details). We may still (e.g. if a remote stub handled the details). We may still

6
gdb/gdbarch.c
View File

@ -712,12 +712,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
fprintf_unfiltered (file, fprintf_unfiltered (file,
"gdbarch_dump: bfd_vma_bit = %s\n", "gdbarch_dump: bfd_vma_bit = %s\n",
paddr_d (current_gdbarch->bfd_vma_bit)); 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, fprintf_unfiltered (file,
"gdbarch_dump: breakpoint_from_pc = <0x%lx>\n", "gdbarch_dump: breakpoint_from_pc = <0x%lx>\n",
(long) current_gdbarch->breakpoint_from_pc); (long) current_gdbarch->breakpoint_from_pc);

6
gdb/gdbarch.h
View File

@ -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); 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 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); 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); extern int gdbarch_adjust_breakpoint_address_p (struct gdbarch *gdbarch);

2
gdb/gdbarch.sh
View File

@ -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::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::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 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_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_remove_breakpoint:struct bp_target_info *bp_tgt:bp_tgt:0:default_memory_remove_breakpoint::0

3
gdb/mem-break.c
View File

@ -50,7 +50,8 @@ default_memory_insert_breakpoint (struct bp_target_info *bp_tgt)
int bplen; int bplen;
/* Determine appropriate breakpoint contents and size for this address. */ /* 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) if (bp == NULL)
error (_("Software breakpoints not implemented for this target.")); error (_("Software breakpoints not implemented for this target."));

12
gdb/mips-tdep.c
View File

@ -4397,12 +4397,12 @@ gdb_print_insn_mips (bfd_vma memaddr, struct disassemble_info *info)
return print_insn_little_mips (memaddr, info); return print_insn_little_mips (memaddr, info);
} }
/* This function implements the BREAKPOINT_FROM_PC macro. It uses the program /* This function implements gdbarch_breakpoint_from_pc. It uses the program
counter value to determine whether a 16- or 32-bit breakpoint should be counter value to determine whether a 16- or 32-bit breakpoint should be used.
used. It returns a pointer to a string of bytes that encode a breakpoint 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 instruction, stores the length of the string to *lenptr, and adjusts pc (if
(if necessary) to point to the actual memory location where the necessary) to point to the actual memory location where the breakpoint
breakpoint should be inserted. */ should be inserted. */
static const gdb_byte * static const gdb_byte *
mips_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr) mips_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)

2
gdb/ppc-linux-tdep.c
View File

@ -329,7 +329,7 @@ ppc_linux_memory_remove_breakpoint (struct bp_target_info *bp_tgt)
gdb_byte old_contents[BREAKPOINT_MAX]; gdb_byte old_contents[BREAKPOINT_MAX];
/* Determine appropriate breakpoint contents and size for this address. */ /* 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) if (bp == NULL)
error (_("Software breakpoints not implemented for this target.")); error (_("Software breakpoints not implemented for this target."));

6
gdb/remote.c
View File

@ -5128,7 +5128,8 @@ remote_insert_breakpoint (struct bp_target_info *bp_tgt)
*(p++) = 'Z'; *(p++) = 'Z';
*(p++) = '0'; *(p++) = '0';
*(p++) = ','; *(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); addr = (ULONGEST) remote_address_masked (bp_tgt->placed_address);
p += hexnumstr (p, addr); p += hexnumstr (p, addr);
sprintf (p, ",%d", bp_tgt->placed_size); 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 /* The length field should be set to the size of a breakpoint
instruction, even though we aren't inserting one ourselves. */ 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) if (remote_protocol_packets[PACKET_Z1].support == PACKET_DISABLE)
return -1; return -1;

2
gdb/s390-tdep.c
View File

@ -2374,7 +2374,7 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
set_gdbarch_char_signed (gdbarch, 0); set_gdbarch_char_signed (gdbarch, 0);
/* Amount PC must be decremented by after a breakpoint. This is /* 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. */ always. */
set_gdbarch_decr_pc_after_break (gdbarch, 2); set_gdbarch_decr_pc_after_break (gdbarch, 2);
/* Stack grows downward. */ /* Stack grows downward. */