From 0d0266c631018f5eecc0486d1d83fdeffe08faac Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 26 Oct 2004 14:13:24 +0000 Subject: [PATCH] 2004-10-26 Andrew Cagney * mips-tdep.h (mips_software_single_step): Move to here ... * config/mips/tm-mips.h: ... from here. * config/mips/tm-linux.h (SOFTWARE_SINGLE_STEP_P) (SOFTWARE_SINGLE_STEP): Delete. * mips-linux-tdep.c (mips_linux_init_abi): Set software_single_step. --- gdb/ChangeLog | 8 ++++++++ gdb/config/mips/tm-linux.h | 5 ----- gdb/config/mips/tm-mips.h | 3 --- gdb/mips-linux-tdep.c | 2 ++ gdb/mips-tdep.h | 2 ++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 176fd45b85..6fab098fe2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2004-10-26 Andrew Cagney + + * mips-tdep.h (mips_software_single_step): Move to here ... + * config/mips/tm-mips.h: ... from here. + * config/mips/tm-linux.h (SOFTWARE_SINGLE_STEP_P) + (SOFTWARE_SINGLE_STEP): Delete. + * mips-linux-tdep.c (mips_linux_init_abi): Set software_single_step. + 2004-10-25 Andrew Cagney * NEWS: Add Changes since GDB 6.3 section. diff --git a/gdb/config/mips/tm-linux.h b/gdb/config/mips/tm-linux.h index 7b10e4e6d5..2012fec824 100644 --- a/gdb/config/mips/tm-linux.h +++ b/gdb/config/mips/tm-linux.h @@ -39,11 +39,6 @@ #include "config/tm-linux.h" -/* We do single stepping in software. */ - -#define SOFTWARE_SINGLE_STEP_P() 1 -#define SOFTWARE_SINGLE_STEP(sig,bp_p) mips_software_single_step (sig, bp_p) - #undef IN_SOLIB_DYNSYM_RESOLVE_CODE #define IN_SOLIB_DYNSYM_RESOLVE_CODE(PC) mips_linux_in_dynsym_resolve_code (PC) int mips_linux_in_dynsym_resolve_code (CORE_ADDR pc); diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h index 040ab15705..8efb229dd4 100644 --- a/gdb/config/mips/tm-mips.h +++ b/gdb/config/mips/tm-mips.h @@ -107,6 +107,3 @@ extern int mips_ignore_helper (CORE_ADDR pc); typedef unsigned long t_inst; /* Integer big enough to hold an instruction */ #endif /* TM_MIPS_H */ - -/* Single step based on where the current instruction will take us. */ -extern void mips_software_single_step (enum target_signal, int); diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c index dce507f410..81d3e1e645 100644 --- a/gdb/mips-linux-tdep.c +++ b/gdb/mips-linux-tdep.c @@ -1167,6 +1167,8 @@ mips_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_skip_solib_resolver (gdbarch, mips_linux_skip_resolver); + set_gdbarch_software_single_step (gdbarch, mips_software_single_step); + /* This overrides the MIPS16 stub support from mips-tdep. But no one uses MIPS16 on GNU/Linux yet, so this isn't much of a loss. */ set_gdbarch_in_solib_call_trampoline (gdbarch, mips_linux_in_dynsym_stub); diff --git a/gdb/mips-tdep.h b/gdb/mips-tdep.h index a28f7297eb..67d8cd855c 100644 --- a/gdb/mips-tdep.h +++ b/gdb/mips-tdep.h @@ -74,5 +74,7 @@ enum { /* Defined in mips-tdep.c and used in remote-mips.c */ extern void deprecated_mips_set_processor_regs_hack (void); +/* Single step based on where the current instruction will take us. */ +extern void mips_software_single_step (enum target_signal, int); #endif /* MIPS_TDEP_H */