From 3bb04bddc31dde4fac4c974d77dcfca097ba071a Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 6 Sep 2000 23:39:15 +0000 Subject: [PATCH] Wed Sep 6 23:15:43 2000 Andrew Cagney * remote-rdi.c (voiddummy): Update function signature to match struct Dbg_HostosInterface's reset method. * remote-rdp.c (rdp_step): Fix handle parameter to remote_rdp_insert_breakpoint and remote_rdp_remove_breakpoint. * arm-tdep.c (SIGCONTEXT_REGISTER_ADDRESS_P): Provide default definition. (arm_init_extra_frame_info): Use. --- gdb/ChangeLog | 11 +++++++++++ gdb/arm-tdep.c | 11 ++++++++--- gdb/remote-rdi.c | 2 +- gdb/remote-rdp.c | 4 ++-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4c43340ba8c..a58602e8db6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +Wed Sep 6 23:15:43 2000 Andrew Cagney + + * remote-rdi.c (voiddummy): Update function signature to match + struct Dbg_HostosInterface's reset method. + * remote-rdp.c (rdp_step): Fix handle parameter to + remote_rdp_insert_breakpoint and remote_rdp_remove_breakpoint. + + * arm-tdep.c (SIGCONTEXT_REGISTER_ADDRESS_P): Provide default + definition. + (arm_init_extra_frame_info): Use. + 2000-09-06 Stephane Carrez * m68hc11-tdep.c (m68hc11_store_return_value): Store the value diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index d51c6a0d3e3..00d63cce495 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -51,8 +51,13 @@ done. It should not be necessary to modify the code below where this macro is used. */ -#ifndef SIGCONTEXT_REGISTER_ADDRESS -#define SIGCONTEXT_REGISTER_ADDRESS 0 +#ifdef SIGCONTEXT_REGISTER_ADDRESS +#ifndef SIGCONTEXT_REGISTER_ADDRESS_P +#define SIGCONTEXT_REGISTER_ADDRESS_P() 1 +#endif +#else +#define SIGCONTEXT_REGISTER_ADDRESS(SP,PC,REG) 0 +#define SIGCONTEXT_REGISTER_ADDRESS_P() 0 #endif extern void _initialize_arm_tdep (void); @@ -1040,7 +1045,7 @@ arm_init_extra_frame_info (int fromleaf, struct frame_info *fi) to first fetch the name of the function and then pass this name to IN_SIGTRAMP. */ - if (SIGCONTEXT_REGISTER_ADDRESS + if (SIGCONTEXT_REGISTER_ADDRESS_P () && (fi->signal_handler_caller || IN_SIGTRAMP (fi->pc, 0))) { CORE_ADDR sp; diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c index 200f84242b0..ca95498b628 100644 --- a/gdb/remote-rdi.c +++ b/gdb/remote-rdi.c @@ -141,7 +141,7 @@ arm_rdi_start_remote (char *dummy) these to forward output from the target system and so forth. */ void -voiddummy (void) +voiddummy (void *dummy) { fprintf_unfiltered (gdb_stdout, "void dummy\n"); } diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c index 2acd57bcde6..d64e94ac539 100644 --- a/gdb/remote-rdp.c +++ b/gdb/remote-rdp.c @@ -1096,9 +1096,9 @@ rdp_step (void) char handle[4]; CORE_ADDR pc = read_register (PC_REGNUM); pc = arm_get_next_pc (pc); - remote_rdp_insert_breakpoint (pc, &handle); + remote_rdp_insert_breakpoint (pc, handle); rdp_execute (); - remote_rdp_remove_breakpoint (pc, &handle); + remote_rdp_remove_breakpoint (pc, handle); } }