From 6f7f3f0da4e5202ebe8722ea0464ca35f937b206 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Tue, 27 Feb 2007 23:04:28 +0000 Subject: * config/powerpc/linux.mt (DEPRECATED_TM_FILE): Set to tm-ppc-eabi.h. * config/powerpc/tm-linux.h: Delete file. * config/powerpc/tm-ppc-eabi.h: Do not include "rs6000/tm-rs6000.h". (PROCESS_LINENUMBER_HOOK): Do not undefine. (TEXT_SEGMENT_BASE): Do not redefine. * config/rs6000/nm-rs6000.h (CHILD_SPECIAL_WAITSTATUS): Move here from config/rs6000/tm-rs6000.h. (TARGET_CREATE_INFERIOR_HOOK, rs6000_create_inferior): Likewise. * config/rs6000/tm-rs6000.h (struct frame_info): Remove declaration. (TEXT_SEGMENT_BASE): Remove. (IN_SOLIB_RETURN_TRAMPOLINE): Remove. (rs6000_in_solib_return_trampoline): Remove. (SKIP_TRAMPOLINE_CODE): Remove. (rs6000_skip_trampoline_code): Remove. (CHILD_SPECIAL_WAITSTATUS): Move to config/rs6000/nm-rs6000.h. (TARGET_CREATE_INFERIOR_HOOK, rs6000_create_inferior): Likewise. (FP0_REGNUM): Remove. (rs6000_find_toc_address_hook): Move to rs6000-tdep.h. (rs6000_set_host_arch_hook): Remove. * Makefile.in (rs6000-nat.o): Add dependency on $(rs6000_tdep_h). (rs6000-aix-tdep.o): Add dependency on $(ppc_tdep_h). * ppc-tdep.h (struct gdbarch_tdep): Add field text_segment_base. * rs6000-aix-tdep.c: Include "ppc-tdep.h". (rs6000_aix_init_osabi): Set text_segment_base tdep field. * rs6000-nat.c: Include "rs6000-tdep.h". (exec_one_dummy_insn): Replace TEXT_SEGMENT_BASE by tdep field. (set_host_arch): Rename to ... (rs6000_create_inferior): ... this. Make public. (_initialize_core_rs6000): Do not set rs6000_set_host_arch_hook. * rs6000-tdep.c (rs6000_set_host_arch_hook): Remove. (rs6000_create_inferior): Remove. (branch_dest): Replace TEXT_SEGMENT_BASE by tdep field. (rs6000_gdbarch_init): Call set_gdbarch_fp0_regnum, set_gdbarch_in_solib_return_trampoline, and set_gdbarch_skip_trampoline_code. * rs6000-tdep.h (rs6000_find_toc_address_hook): Move here from config/rs6000/tm-rs6000.h. --- gdb/rs6000-nat.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'gdb/rs6000-nat.c') diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c index 07147a1..97a53aa 100644 --- a/gdb/rs6000-nat.c +++ b/gdb/rs6000-nat.c @@ -35,6 +35,7 @@ #include "regcache.h" #include "arch-utils.h" #include "ppc-tdep.h" +#include "rs6000-tdep.h" #include "exec.h" #include @@ -525,7 +526,7 @@ child_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, static void exec_one_dummy_insn (void) { -#define DUMMY_INSN_ADDR (TEXT_SEGMENT_BASE)+0x200 +#define DUMMY_INSN_ADDR gdbarch_tdep (current_gdbarch)->text_segment_base+0x200 int ret, status, pid; CORE_ADDR prev_pc; @@ -993,8 +994,8 @@ vmap_exec (void) /* Set the current architecture from the host running GDB. Called when starting a child process. */ -static void -set_host_arch (int pid) +void +rs6000_create_inferior (int pid) { enum bfd_architecture arch; unsigned long mach; @@ -1037,7 +1038,7 @@ set_host_arch (int pid) if (!gdbarch_update_p (info)) internal_error (__FILE__, __LINE__, - _("set_host_arch: failed to select architecture")); + _("rs6000_create_inferior: failed to select architecture")); } @@ -1248,9 +1249,5 @@ _initialize_core_rs6000 (void) when calling functions in the inferior. */ rs6000_find_toc_address_hook = find_toc_address; - /* Initialize hook in rs6000-tdep.c to set the current architecture - when starting a child process. */ - rs6000_set_host_arch_hook = set_host_arch; - deprecated_add_core_fns (&rs6000_core_fns); } -- cgit v1.1