From 943b3971168b833d62b5740bcf4d01d7beb7ba5e Mon Sep 17 00:00:00 2001 From: Nicholas Duffek Date: Mon, 16 Jul 2001 23:32:14 +0000 Subject: [PATCH] * remote.c (init_remote_ops, init_remote_cisco_ops, init_remote_async_ops): Set to_pid_to_str and to_extra_thread_info correctly and in the same order as declared in target.h. --- gdb/ChangeLog | 7 +++++++ gdb/remote.c | 28 +++++++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a4277c53d1a..4dbdd329669 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2001-07-16 Nick Duffek + + * remote.c (init_remote_ops, init_remote_cisco_ops, + init_remote_async_ops): Set to_pid_to_str and + to_extra_thread_info correctly and in the same order as declared + in target.h. + 2001-07-16 Nick Duffek * findvar.c (read_var_value): Apply value_as_pointer() to diff --git a/gdb/remote.c b/gdb/remote.c index e6c3c919ed8..9ddce8f6741 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -4513,13 +4513,17 @@ remote_insert_breakpoint (CORE_ADDR addr, char *contents_cache) { char *buf = alloca (PBUFSIZ); char *p = buf; + CORE_ADDR addr2; - addr = remote_address_masked (addr); + addr2 = remote_address_masked (addr); + if (ADJUST_REMOTE_Z_BREAKPOINT_P ()) + ADJUST_REMOTE_Z_BREAKPOINT (&addr2); + *(p++) = 'Z'; *(p++) = '0'; *(p++) = ','; - p += hexnumstr (p, (ULONGEST) addr); - BREAKPOINT_FROM_PC (&addr, &bp_size); + p += hexnumstr (p, (ULONGEST) addr2); + BREAKPOINT_FROM_PC (&addr2, &bp_size); sprintf (p, ",%d", bp_size); putpkt (buf); @@ -4564,14 +4568,18 @@ remote_remove_breakpoint (CORE_ADDR addr, char *contents_cache) { char *buf = alloca (PBUFSIZ); char *p = buf; + CORE_ADDR addr2; *(p++) = 'z'; *(p++) = '0'; *(p++) = ','; - addr = remote_address_masked (addr); - p += hexnumstr (p, (ULONGEST) addr); - BREAKPOINT_FROM_PC (&addr, &bp_size); + addr2 = remote_address_masked (addr); + if (ADJUST_REMOTE_Z_BREAKPOINT_P ()) + ADJUST_REMOTE_Z_BREAKPOINT (&addr2); + + p += hexnumstr (p, (ULONGEST) addr2); + BREAKPOINT_FROM_PC (&addr2, &bp_size); sprintf (p, ",%d", bp_size); putpkt (buf); @@ -5227,8 +5235,8 @@ Specify the serial device it is connected to\n\ remote_ops.to_mourn_inferior = remote_mourn; remote_ops.to_thread_alive = remote_thread_alive; remote_ops.to_find_new_threads = remote_threads_info; - remote_ops.to_extra_thread_info = remote_threads_extra_info; remote_ops.to_pid_to_str = remote_pid_to_str; + remote_ops.to_extra_thread_info = remote_threads_extra_info; remote_ops.to_stop = remote_stop; remote_ops.to_query = remote_query; remote_ops.to_rcmd = remote_rcmd; @@ -5636,7 +5644,8 @@ Specify the serial device it is connected to (e.g. host:2020)."; remote_cisco_ops.to_mourn_inferior = remote_cisco_mourn; remote_cisco_ops.to_thread_alive = remote_thread_alive; remote_cisco_ops.to_find_new_threads = remote_threads_info; - remote_ops.to_extra_thread_info = remote_threads_extra_info; + remote_cisco_ops.to_pid_to_str = remote_pid_to_str; + remote_cisco_ops.to_extra_thread_info = remote_threads_extra_info; remote_cisco_ops.to_stratum = process_stratum; remote_cisco_ops.to_has_all_memory = 1; remote_cisco_ops.to_has_memory = 1; @@ -5726,7 +5735,8 @@ Specify the serial device it is connected to (e.g. /dev/ttya)."; remote_async_ops.to_mourn_inferior = remote_async_mourn; remote_async_ops.to_thread_alive = remote_thread_alive; remote_async_ops.to_find_new_threads = remote_threads_info; - remote_ops.to_extra_thread_info = remote_threads_extra_info; + remote_async_ops.to_pid_to_str = remote_pid_to_str; + remote_async_ops.to_extra_thread_info = remote_threads_extra_info; remote_async_ops.to_stop = remote_stop; remote_async_ops.to_query = remote_query; remote_async_ops.to_rcmd = remote_rcmd; -- 2.30.2