This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] Call get_remote_state after gdbarch_breakpoint_from_pc is called
- From: Jie Zhang <jie dot zhang at analog dot com>
- To: gdb-patches at sourceware dot org
- Date: Wed, 07 May 2008 18:12:46 +0800
- Subject: [PATCH] Call get_remote_state after gdbarch_breakpoint_from_pc is called
Hi,
I'm working on Blackfin port of GDB. Since Blackfin requires that 16-bit
breakpoint for 16-bit instruction and 32-bit breakpoint for 32-bit
instruction, Blackfin port GDB tries to read memory, decode instruction,
and find the instruction length in gdbarch_breakpoint_from_pc. Reading
memory calls putpkt and getpkt when debugging remotely, which might
change rs->buf. So we have to call get_remote_state after
gdbarch_breakpoint_from_pc in remote_insert_breakpoint. Same for
remote_insert_hw_breakpoint.
Is it OK?
Jie
* remote.c (remote_insert_breakpoint): Call get_remote_state
after gdbarch_breakpoint_from_pc is called.
(remote_insert_hw_breakpoint): Likewise.
Index: remote.c
===================================================================
RCS file: /cvs/src/src/gdb/remote.c,v
retrieving revision 1.286
diff -u -p -r1.286 remote.c
--- remote.c 21 Mar 2008 17:09:35 -0000 1.286
+++ remote.c 7 May 2008 09:24:01 -0000
@@ -5496,9 +5496,6 @@ extended_remote_async_create_inferior (c
static int
remote_insert_breakpoint (struct bp_target_info *bp_tgt)
{
- CORE_ADDR addr = bp_tgt->placed_address;
- struct remote_state *rs = get_remote_state ();
-
/* Try the "Z" s/w breakpoint packet if it is not already disabled.
If it succeeds, then set the support to PACKET_ENABLE. If it
fails, and the user has explicitly requested the Z support then
@@ -5506,13 +5503,19 @@ remote_insert_breakpoint (struct bp_targ
if (remote_protocol_packets[PACKET_Z0].support != PACKET_DISABLE)
{
- char *p = rs->buf;
+ CORE_ADDR addr;
+ struct remote_state *rs;
+ char *p;
+
+ gdbarch_breakpoint_from_pc
+ (current_gdbarch, &bp_tgt->placed_address, &bp_tgt->placed_size);
+
+ rs = get_remote_state ();
+ p = rs->buf;
*(p++) = 'Z';
*(p++) = '0';
*(p++) = ',';
- 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);
@@ -5698,8 +5701,8 @@ static int
remote_insert_hw_breakpoint (struct bp_target_info *bp_tgt)
{
CORE_ADDR addr;
- struct remote_state *rs = get_remote_state ();
- char *p = rs->buf;
+ struct remote_state *rs;
+ char *p;
/* The length field should be set to the size of a breakpoint
instruction, even though we aren't inserting one ourselves. */
@@ -5710,6 +5713,9 @@ remote_insert_hw_breakpoint (struct bp_t
if (remote_protocol_packets[PACKET_Z1].support == PACKET_DISABLE)
return -1;
+ rs = get_remote_state ();
+ p = rs->buf;
+
*(p++) = 'Z';
*(p++) = '1';
*(p++) = ',';