X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Frs6000-nat.c;h=31ef64a9059ac8ae718dadf1d854e792901d8a23;hb=a95babbf381faac591ef74244aba6b399448c653;hp=f8866aa0d22d37f0284a24cc08b753c6c801c74c;hpb=3e8c568d4fc67da218a87d51da180bba5ad585f1;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c
index f8866aa0d2..31ef64a905 100644
--- a/gdb/rs6000-nat.c
+++ b/gdb/rs6000-nat.c
@@ -1,14 +1,13 @@
/* IBM RS/6000 native-dependent code for GDB, the GNU debugger.
- Copyright (C) 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007
- Free Software Foundation, Inc.
+ Copyright (C) 1986-1987, 1989, 1991-2004, 2007-2012 Free Software
+ Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -17,9 +16,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#include "defs.h"
#include "inferior.h"
@@ -38,8 +35,8 @@
#include "ppc-tdep.h"
#include "rs6000-tdep.h"
#include "exec.h"
-#include "gdb_stdint.h"
#include "observer.h"
+#include "xcoffread.h"
#include
#include
@@ -63,24 +60,24 @@
/* On AIX4.3+, sys/ldr.h provides different versions of struct ld_info for
debugging 32-bit and 64-bit processes. Define a typedef and macros for
- accessing fields in the appropriate structures. */
+ accessing fields in the appropriate structures. */
/* In 32-bit compilation mode (which is the only mode from which ptrace()
- works on 4.3), __ld_info32 is #defined as equivalent to ld_info. */
+ works on 4.3), __ld_info32 is #defined as equivalent to ld_info. */
#ifdef __ld_info32
# define ARCH3264
#endif
-/* Return whether the current architecture is 64-bit. */
+/* Return whether the current architecture is 64-bit. */
#ifndef ARCH3264
# define ARCH64() 0
#else
-# define ARCH64() (register_size (current_gdbarch, 0) == 8)
+# define ARCH64() (register_size (target_gdbarch, 0) == 8)
#endif
-/* Union of 32-bit and 64-bit versions of ld_info. */
+/* Union of 32-bit and 64-bit versions of ld_info. */
typedef union {
#ifndef ARCH3264
@@ -94,7 +91,7 @@ typedef union {
/* If compiling with 32-bit and 64-bit debugging capability (e.g. AIX 4.x),
declare and initialize a variable named VAR suitable for use as the arch64
- parameter to the various LDI_*() macros. */
+ parameter to the various LDI_*() macros. */
#ifndef ARCH3264
# define ARCH64_DECL(var)
@@ -104,7 +101,7 @@ typedef union {
/* Return LDI's FIELD for a 64-bit process if ARCH64 and for a 32-bit process
otherwise. This technique only works for FIELDs with the same data type in
- 32-bit and 64-bit versions of ld_info. */
+ 32-bit and 64-bit versions of ld_info. */
#ifndef ARCH3264
# define LDI_FIELD(ldi, arch64, field) (ldi)->l32.ldinfo_##field
@@ -114,7 +111,7 @@ typedef union {
#endif
/* Return various LDI fields for a 64-bit process if ARCH64 and for a 32-bit
- process otherwise. */
+ process otherwise. */
#define LDI_NEXT(ldi, arch64) LDI_FIELD(ldi, arch64, next)
#define LDI_FD(ldi, arch64) LDI_FIELD(ldi, arch64, fd)
@@ -132,7 +129,7 @@ static int objfile_symbol_add (void *);
static void vmap_symtab (struct vmap *);
-static void exec_one_dummy_insn (void);
+static void exec_one_dummy_insn (struct regcache *);
extern void fixup_breakpoints (CORE_ADDR low, CORE_ADDR high, CORE_ADDR delta);
@@ -142,9 +139,9 @@ extern void fixup_breakpoints (CORE_ADDR low, CORE_ADDR high, CORE_ADDR delta);
ISFLOAT to indicate whether REGNO is a floating point register. */
static int
-regmap (int regno, int *isfloat)
+regmap (struct gdbarch *gdbarch, int regno, int *isfloat)
{
- struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
*isfloat = 0;
if (tdep->ppc_gp0_regnum <= regno
@@ -157,7 +154,7 @@ regmap (int regno, int *isfloat)
*isfloat = 1;
return regno - tdep->ppc_fp0_regnum + FPR0;
}
- else if (regno == gdbarch_pc_regnum (current_gdbarch))
+ else if (regno == gdbarch_pc_regnum (gdbarch))
return IAR;
else if (regno == tdep->ppc_ps_regnum)
return MSR;
@@ -178,7 +175,7 @@ regmap (int regno, int *isfloat)
return -1;
}
-/* Call ptrace(REQ, ID, ADDR, DATA, BUF). */
+/* Call ptrace(REQ, ID, ADDR, DATA, BUF). */
static int
rs6000_ptrace32 (int req, int id, int *addr, int data, int *buf)
@@ -191,7 +188,7 @@ rs6000_ptrace32 (int req, int id, int *addr, int data, int *buf)
return ret;
}
-/* Call ptracex(REQ, ID, ADDR, DATA, BUF). */
+/* Call ptracex(REQ, ID, ADDR, DATA, BUF). */
static int
rs6000_ptrace64 (int req, int id, long long addr, int data, void *buf)
@@ -202,51 +199,53 @@ rs6000_ptrace64 (int req, int id, long long addr, int data, void *buf)
int ret = 0;
#endif
#if 0
- printf ("rs6000_ptrace64 (%d, %d, 0x%llx, %08x, 0x%x) = 0x%x\n",
- req, id, addr, data, (unsigned int)buf, ret);
+ printf ("rs6000_ptrace64 (%d, %d, %s, %08x, 0x%x) = 0x%x\n",
+ req, id, hex_string (addr), data, (unsigned int)buf, ret);
#endif
return ret;
}
-/* Fetch register REGNO from the inferior. */
+/* Fetch register REGNO from the inferior. */
static void
fetch_register (struct regcache *regcache, int regno)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
int addr[MAX_REGISTER_SIZE];
int nr, isfloat;
- /* Retrieved values may be -1, so infer errors from errno. */
+ /* Retrieved values may be -1, so infer errors from errno. */
errno = 0;
- nr = regmap (regno, &isfloat);
+ nr = regmap (gdbarch, regno, &isfloat);
- /* Floating-point registers. */
+ /* Floating-point registers. */
if (isfloat)
rs6000_ptrace32 (PT_READ_FPR, PIDGET (inferior_ptid), addr, nr, 0);
- /* Bogus register number. */
+ /* Bogus register number. */
else if (nr < 0)
{
- if (regno >= gdbarch_num_regs (current_gdbarch))
+ if (regno >= gdbarch_num_regs (gdbarch))
fprintf_unfiltered (gdb_stderr,
"gdb error: register no %d not implemented.\n",
regno);
return;
}
- /* Fixed-point registers. */
+ /* Fixed-point registers. */
else
{
if (!ARCH64 ())
- *addr = rs6000_ptrace32 (PT_READ_GPR, PIDGET (inferior_ptid), (int *)nr, 0, 0);
+ *addr = rs6000_ptrace32 (PT_READ_GPR, PIDGET (inferior_ptid),
+ (int *) nr, 0, 0);
else
{
/* PT_READ_GPR requires the buffer parameter to point to long long,
- even if the register is really only 32 bits. */
+ even if the register is really only 32 bits. */
long long buf;
rs6000_ptrace64 (PT_READ_GPR, PIDGET (inferior_ptid), nr, 0, &buf);
- if (register_size (current_gdbarch, regno) == 8)
+ if (register_size (gdbarch, regno) == 8)
memcpy (addr, &buf, 8);
else
*addr = buf;
@@ -258,64 +257,66 @@ fetch_register (struct regcache *regcache, int regno)
else
{
#if 0
- /* FIXME: this happens 3 times at the start of each 64-bit program. */
- perror ("ptrace read");
+ /* FIXME: this happens 3 times at the start of each 64-bit program. */
+ perror (_("ptrace read"));
#endif
errno = 0;
}
}
-/* Store register REGNO back into the inferior. */
+/* Store register REGNO back into the inferior. */
static void
-store_register (const struct regcache *regcache, int regno)
+store_register (struct regcache *regcache, int regno)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
int addr[MAX_REGISTER_SIZE];
int nr, isfloat;
/* Fetch the register's value from the register cache. */
regcache_raw_collect (regcache, regno, addr);
- /* -1 can be a successful return value, so infer errors from errno. */
+ /* -1 can be a successful return value, so infer errors from errno. */
errno = 0;
- nr = regmap (regno, &isfloat);
+ nr = regmap (gdbarch, regno, &isfloat);
- /* Floating-point registers. */
+ /* Floating-point registers. */
if (isfloat)
rs6000_ptrace32 (PT_WRITE_FPR, PIDGET (inferior_ptid), addr, nr, 0);
- /* Bogus register number. */
+ /* Bogus register number. */
else if (nr < 0)
{
- if (regno >= gdbarch_num_regs (current_gdbarch))
+ if (regno >= gdbarch_num_regs (gdbarch))
fprintf_unfiltered (gdb_stderr,
"gdb error: register no %d not implemented.\n",
regno);
}
- /* Fixed-point registers. */
+ /* Fixed-point registers. */
else
{
- if (regno == gdbarch_sp_regnum (current_gdbarch))
+ if (regno == gdbarch_sp_regnum (gdbarch))
/* Execute one dummy instruction (which is a breakpoint) in inferior
process to give kernel a chance to do internal housekeeping.
Otherwise the following ptrace(2) calls will mess up user stack
since kernel will get confused about the bottom of the stack
- (%sp). */
- exec_one_dummy_insn ();
+ (%sp). */
+ exec_one_dummy_insn (regcache);
/* The PT_WRITE_GPR operation is rather odd. For 32-bit inferiors,
the register's value is passed by value, but for 64-bit inferiors,
the address of a buffer containing the value is passed. */
if (!ARCH64 ())
- rs6000_ptrace32 (PT_WRITE_GPR, PIDGET (inferior_ptid), (int *)nr, *addr, 0);
+ rs6000_ptrace32 (PT_WRITE_GPR, PIDGET (inferior_ptid),
+ (int *) nr, *addr, 0);
else
{
/* PT_WRITE_GPR requires the buffer parameter to point to an 8-byte
- area, even if the register is really only 32 bits. */
+ area, even if the register is really only 32 bits. */
long long buf;
- if (register_size (current_gdbarch, regno) == 8)
+ if (register_size (gdbarch, regno) == 8)
memcpy (&buf, addr, 8);
else
buf = *addr;
@@ -325,23 +326,25 @@ store_register (const struct regcache *regcache, int regno)
if (errno)
{
- perror ("ptrace write");
+ perror (_("ptrace write"));
errno = 0;
}
}
/* Read from the inferior all registers if REGNO == -1 and just register
- REGNO otherwise. */
+ REGNO otherwise. */
static void
-rs6000_fetch_inferior_registers (struct regcache *regcache, int regno)
+rs6000_fetch_inferior_registers (struct target_ops *ops,
+ struct regcache *regcache, int regno)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
if (regno != -1)
fetch_register (regcache, regno);
else
{
- struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
/* Read 32 general purpose registers. */
for (regno = tdep->ppc_gp0_regnum;
@@ -357,7 +360,7 @@ rs6000_fetch_inferior_registers (struct regcache *regcache, int regno)
fetch_register (regcache, tdep->ppc_fp0_regnum + regno);
/* Read special registers. */
- fetch_register (regcache, gdbarch_pc_regnum (current_gdbarch));
+ fetch_register (regcache, gdbarch_pc_regnum (gdbarch));
fetch_register (regcache, tdep->ppc_ps_regnum);
fetch_register (regcache, tdep->ppc_cr_regnum);
fetch_register (regcache, tdep->ppc_lr_regnum);
@@ -375,14 +378,16 @@ rs6000_fetch_inferior_registers (struct regcache *regcache, int regno)
Otherwise, REGNO specifies which register (so we can save time). */
static void
-rs6000_store_inferior_registers (struct regcache *regcache, int regno)
+rs6000_store_inferior_registers (struct target_ops *ops,
+ struct regcache *regcache, int regno)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
if (regno != -1)
store_register (regcache, regno);
else
{
- struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
/* Write general purpose registers first. */
for (regno = tdep->ppc_gp0_regnum;
@@ -398,7 +403,7 @@ rs6000_store_inferior_registers (struct regcache *regcache, int regno)
store_register (regcache, tdep->ppc_fp0_regnum + regno);
/* Write special registers. */
- store_register (regcache, gdbarch_pc_regnum (current_gdbarch));
+ store_register (regcache, gdbarch_pc_regnum (gdbarch));
store_register (regcache, tdep->ppc_ps_regnum);
store_register (regcache, tdep->ppc_cr_regnum);
store_register (regcache, tdep->ppc_lr_regnum);
@@ -465,7 +470,8 @@ rs6000_xfer_partial (struct target_ops *ops, enum target_object object,
rounded_offset, 0, NULL);
else
buffer.word = rs6000_ptrace32 (PT_READ_I, pid,
- (int *)(uintptr_t)rounded_offset,
+ (int *) (uintptr_t)
+ rounded_offset,
0, NULL);
}
@@ -480,7 +486,8 @@ rs6000_xfer_partial (struct target_ops *ops, enum target_object object,
rounded_offset, buffer.word, NULL);
else
rs6000_ptrace32 (PT_WRITE_D, pid,
- (int *)(uintptr_t)rounded_offset, buffer.word, NULL);
+ (int *) (uintptr_t) rounded_offset,
+ buffer.word, NULL);
if (errno)
return 0;
}
@@ -516,7 +523,8 @@ rs6000_xfer_partial (struct target_ops *ops, enum target_object object,
the status in *OURSTATUS. */
static ptid_t
-rs6000_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
+rs6000_wait (struct target_ops *ops,
+ ptid_t ptid, struct target_waitstatus *ourstatus, int options)
{
pid_t pid;
int status, save_errno;
@@ -524,7 +532,6 @@ rs6000_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
do
{
set_sigint_trap ();
- set_sigio_trap ();
do
{
@@ -533,7 +540,6 @@ rs6000_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
}
while (pid == -1 && errno == EINTR);
- clear_sigio_trap ();
clear_sigint_trap ();
if (pid == -1)
@@ -545,7 +551,7 @@ rs6000_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
/* Claim it exited with unknown signal. */
ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN;
- return minus_one_ptid;
+ return inferior_ptid;
}
/* Ignore terminated detached child processes. */
@@ -559,7 +565,7 @@ rs6000_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
/* stop after load" status. */
if (status == 0x57c)
ourstatus->kind = TARGET_WAITKIND_LOADED;
- /* signal 0. I have no idea why wait(2) returns with this status word. */
+ /* signal 0. I have no idea why wait(2) returns with this status word. */
else if (status == 0x7f)
ourstatus->kind = TARGET_WAITKIND_SPURIOUS;
/* A normal waitstatus. Let the usual macros deal with it. */
@@ -571,51 +577,53 @@ rs6000_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
/* Execute one dummy breakpoint instruction. This way we give the kernel
a chance to do some housekeeping and update inferior's internal data,
- including u_area. */
+ including u_area. */
static void
-exec_one_dummy_insn (void)
+exec_one_dummy_insn (struct regcache *regcache)
{
-#define DUMMY_INSN_ADDR gdbarch_tdep (current_gdbarch)->text_segment_base+0x200
+#define DUMMY_INSN_ADDR AIX_TEXT_SEGMENT_BASE+0x200
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
int ret, status, pid;
CORE_ADDR prev_pc;
void *bp;
- /* We plant one dummy breakpoint into DUMMY_INSN_ADDR address. We
+ /* We plant one dummy breakpoint into DUMMY_INSN_ADDR address. We
assume that this address will never be executed again by the real
- code. */
+ code. */
- bp = deprecated_insert_raw_breakpoint (DUMMY_INSN_ADDR);
+ bp = deprecated_insert_raw_breakpoint (gdbarch, NULL, DUMMY_INSN_ADDR);
/* You might think this could be done with a single ptrace call, and
you'd be correct for just about every platform I've ever worked
on. However, rs6000-ibm-aix4.1.3 seems to have screwed this up --
the inferior never hits the breakpoint (it's also worth noting
powerpc-ibm-aix4.1.3 works correctly). */
- prev_pc = read_pc ();
- write_pc (DUMMY_INSN_ADDR);
+ prev_pc = regcache_read_pc (regcache);
+ regcache_write_pc (regcache, DUMMY_INSN_ADDR);
if (ARCH64 ())
ret = rs6000_ptrace64 (PT_CONTINUE, PIDGET (inferior_ptid), 1, 0, NULL);
else
- ret = rs6000_ptrace32 (PT_CONTINUE, PIDGET (inferior_ptid), (int *)1, 0, NULL);
+ ret = rs6000_ptrace32 (PT_CONTINUE, PIDGET (inferior_ptid),
+ (int *) 1, 0, NULL);
if (ret != 0)
- perror ("pt_continue");
+ perror (_("pt_continue"));
do
{
- pid = wait (&status);
+ pid = waitpid (PIDGET (inferior_ptid), &status, 0);
}
while (pid != PIDGET (inferior_ptid));
- write_pc (prev_pc);
- deprecated_remove_raw_breakpoint (bp);
+ regcache_write_pc (regcache, prev_pc);
+ deprecated_remove_raw_breakpoint (gdbarch, bp);
}
/* Copy information about text and data sections from LDI to VP for a 64-bit
- process if ARCH64 and for a 32-bit process otherwise. */
+ process if ARCH64 and for a 32-bit process otherwise. */
static void
vmap_secs (struct vmap *vp, LdInfo *ldi, int arch64)
@@ -642,7 +650,7 @@ vmap_secs (struct vmap *vp, LdInfo *ldi, int arch64)
vp->tstart += vp->toffs;
}
-/* handle symbol translation on vmapping */
+/* Handle symbol translation on vmapping. */
static void
vmap_symtab (struct vmap *vp)
@@ -662,7 +670,7 @@ vmap_symtab (struct vmap *vp)
objfile = symfile_objfile;
}
else if (!vp->loaded)
- /* If symbols are not yet loaded, offsets are not yet valid. */
+ /* If symbols are not yet loaded, offsets are not yet valid. */
return;
new_offsets =
@@ -688,8 +696,8 @@ objfile_symbol_add (void *arg)
{
struct objfile *obj = (struct objfile *) arg;
- syms_from_objfile (obj, NULL, 0, 0, 0, 0);
- new_symfile_objfile (obj, 0, 0);
+ syms_from_objfile (obj, NULL, 0, 0, 0);
+ new_symfile_objfile (obj, 0);
return 1;
}
@@ -728,13 +736,13 @@ add_vmap (LdInfo *ldi)
ARCH64_DECL (arch64);
/* This ldi structure was allocated using alloca() in
- xcoff_relocate_symtab(). Now we need to have persistent object
- and member names, so we should save them. */
+ xcoff_relocate_symtab(). Now we need to have persistent object
+ and member names, so we should save them. */
filename = LDI_FILENAME (ldi, arch64);
mem = filename + strlen (filename) + 1;
- mem = savestring (mem, strlen (mem));
- objname = savestring (filename, strlen (filename));
+ mem = xstrdup (mem);
+ objname = xstrdup (filename);
fd = LDI_FD (ldi, arch64);
if (fd < 0)
@@ -750,7 +758,7 @@ add_vmap (LdInfo *ldi)
return NULL;
}
- /* make sure we have an object file */
+ /* Make sure we have an object file. */
if (bfd_check_format (abfd, bfd_object))
vp = map_vmap (abfd, 0);
@@ -758,9 +766,9 @@ add_vmap (LdInfo *ldi)
else if (bfd_check_format (abfd, bfd_archive))
{
last = 0;
- /* FIXME??? am I tossing BFDs? bfd? */
+ /* FIXME??? am I tossing BFDs? bfd? */
while ((last = bfd_openr_next_archived_file (abfd, last)))
- if (DEPRECATED_STREQ (mem, last->filename))
+ if (strcmp (mem, last->filename) == 0)
break;
if (!last)
@@ -825,7 +833,7 @@ vmap_ldinfo (LdInfo *ldi)
if (fstat (fd, &ii) < 0)
{
/* The kernel sets ld_info to -1, if the process is still using the
- object, and the object is removed. Keep the symbol info for the
+ object, and the object is removed. Keep the symbol info for the
removed object and issue a warning. */
warning (_("%s (fd=%d) has disappeared, keeping its symbols"),
name, fd);
@@ -837,15 +845,15 @@ vmap_ldinfo (LdInfo *ldi)
struct objfile *objfile;
/* First try to find a `vp', which is the same as in ldinfo.
- If not the same, just continue and grep the next `vp'. If same,
- relocate its tstart, tend, dstart, dend values. If no such `vp'
+ If not the same, just continue and grep the next `vp'. If same,
+ relocate its tstart, tend, dstart, dend values. If no such `vp'
found, get out of this for loop, add this ldi entry as a new vmap
- (add_vmap) and come back, find its `vp' and so on... */
+ (add_vmap) and come back, find its `vp' and so on... */
- /* The filenames are not always sufficient to match on. */
+ /* The filenames are not always sufficient to match on. */
- if ((name[0] == '/' && !DEPRECATED_STREQ (name, vp->name))
- || (memb[0] && !DEPRECATED_STREQ (memb, vp->member)))
+ if ((name[0] == '/' && strcmp (name, vp->name) != 0)
+ || (memb[0] && strcmp (memb, vp->member) != 0))
continue;
/* See if we are referring to the same file.
@@ -876,7 +884,7 @@ vmap_ldinfo (LdInfo *ldi)
if (vp->objfile == NULL)
got_exec_file = 1;
- /* relocate symbol table(s). */
+ /* relocate symbol table(s). */
vmap_symtab (vp);
/* Announce new object files. Doing this after symbol relocation
@@ -887,7 +895,8 @@ vmap_ldinfo (LdInfo *ldi)
/* There may be more, so we don't break out of the loop. */
}
- /* if there was no matching *vp, we must perforce create the sucker(s) */
+ /* If there was no matching *vp, we must perforce create the
+ sucker(s). */
if (!got_one && !retried)
{
add_vmap (ldi);
@@ -911,69 +920,70 @@ If in fact that file has symbols which the mapped files listed by\n\
symbols to the proper address)."),
symfile_objfile->name);
free_objfile (symfile_objfile);
- symfile_objfile = NULL;
+ gdb_assert (symfile_objfile == NULL);
}
breakpoint_re_set ();
}
-/* As well as symbol tables, exec_sections need relocation. After
+/* As well as symbol tables, exec_sections need relocation. After
the inferior process' termination, there will be a relocated symbol
- table exist with no corresponding inferior process. At that time, we
+ table exist with no corresponding inferior process. At that time, we
need to use `exec' bfd, rather than the inferior process's memory space
to look up symbols.
`exec_sections' need to be relocated only once, as long as the exec
- file remains unchanged.
- */
+ file remains unchanged. */
static void
vmap_exec (void)
{
static bfd *execbfd;
int i;
+ struct target_section_table *table = target_get_section_table (&exec_ops);
if (execbfd == exec_bfd)
return;
execbfd = exec_bfd;
- if (!vmap || !exec_ops.to_sections)
- error (_("vmap_exec: vmap or exec_ops.to_sections == 0."));
+ if (!vmap || !table->sections)
+ error (_("vmap_exec: vmap or table->sections == 0."));
- for (i = 0; &exec_ops.to_sections[i] < exec_ops.to_sections_end; i++)
+ for (i = 0; &table->sections[i] < table->sections_end; i++)
{
- if (DEPRECATED_STREQ (".text", exec_ops.to_sections[i].the_bfd_section->name))
+ if (strcmp (".text", table->sections[i].the_bfd_section->name) == 0)
{
- exec_ops.to_sections[i].addr += vmap->tstart - vmap->tvma;
- exec_ops.to_sections[i].endaddr += vmap->tstart - vmap->tvma;
+ table->sections[i].addr += vmap->tstart - vmap->tvma;
+ table->sections[i].endaddr += vmap->tstart - vmap->tvma;
}
- else if (DEPRECATED_STREQ (".data", exec_ops.to_sections[i].the_bfd_section->name))
+ else if (strcmp (".data", table->sections[i].the_bfd_section->name) == 0)
{
- exec_ops.to_sections[i].addr += vmap->dstart - vmap->dvma;
- exec_ops.to_sections[i].endaddr += vmap->dstart - vmap->dvma;
+ table->sections[i].addr += vmap->dstart - vmap->dvma;
+ table->sections[i].endaddr += vmap->dstart - vmap->dvma;
}
- else if (DEPRECATED_STREQ (".bss", exec_ops.to_sections[i].the_bfd_section->name))
+ else if (strcmp (".bss", table->sections[i].the_bfd_section->name) == 0)
{
- exec_ops.to_sections[i].addr += vmap->dstart - vmap->dvma;
- exec_ops.to_sections[i].endaddr += vmap->dstart - vmap->dvma;
+ table->sections[i].addr += vmap->dstart - vmap->dvma;
+ table->sections[i].endaddr += vmap->dstart - vmap->dvma;
}
}
}
/* Set the current architecture from the host running GDB. Called when
- starting a child process. */
+ starting a child process. */
-static void (*super_create_inferior) (char *exec_file, char *allargs,
- char **env, int from_tty);
+static void (*super_create_inferior) (struct target_ops *,char *exec_file,
+ char *allargs, char **env, int from_tty);
static void
-rs6000_create_inferior (char *exec_file, char *allargs, char **env, int from_tty)
+rs6000_create_inferior (struct target_ops * ops, char *exec_file,
+ char *allargs, char **env, int from_tty)
{
enum bfd_architecture arch;
unsigned long mach;
bfd abfd;
struct gdbarch_info info;
- super_create_inferior (exec_file, allargs, env, from_tty);
+ super_create_inferior (ops, exec_file, allargs, env, from_tty);
if (__power_rs ())
{
@@ -1011,7 +1021,8 @@ rs6000_create_inferior (char *exec_file, char *allargs, char **env, int from_tty
if (!gdbarch_update_p (info))
internal_error (__FILE__, __LINE__,
- _("rs6000_create_inferior: failed to select architecture"));
+ _("rs6000_create_inferior: failed "
+ "to select architecture"));
}
@@ -1030,7 +1041,8 @@ xcoff_relocate_symtab (unsigned int pid)
int ldisize = arch64 ? sizeof (ldi->l64) : sizeof (ldi->l32);
int size;
- if (ptid_equal (inferior_ptid, null_ptid))
+ /* Nothing to do if we are debugging a core file. */
+ if (!target_has_execution)
return;
do
@@ -1041,8 +1053,8 @@ xcoff_relocate_symtab (unsigned int pid)
#if 0
/* According to my humble theory, AIX has some timing problems and
when the user stack grows, kernel doesn't update stack info in time
- and ptrace calls step on user stack. That is why we sleep here a
- little, and give kernel to update its internals. */
+ and ptrace calls step on user stack. That is why we sleep here a
+ little, and give kernel to update its internals. */
usleep (36000);
#endif
@@ -1061,7 +1073,7 @@ xcoff_relocate_symtab (unsigned int pid)
else
{
vmap_ldinfo (ldi);
- vmap_exec (); /* relocate the exec and core sections as well. */
+ vmap_exec (); /* relocate the exec and core sections as well. */
}
} while (rc == -1);
if (ldi)
@@ -1082,7 +1094,7 @@ xcoff_relocate_core (struct target_ops *target)
struct vmap *vp;
int arch64 = ARCH64 ();
- /* Size of a struct ld_info except for the variable-length filename. */
+ /* Size of a struct ld_info except for the variable-length filename. */
int nonfilesz = (int)LDI_FILENAME ((LdInfo *)0, arch64);
/* Allocated size of buffer. */
@@ -1140,7 +1152,7 @@ xcoff_relocate_core (struct target_ops *target)
else
vp = add_vmap (ldi);
- /* Process next shared library upon error. */
+ /* Process next shared library upon error. */
offset += LDI_NEXT (ldi, arch64);
if (vp == NULL)
continue;
@@ -1151,10 +1163,9 @@ xcoff_relocate_core (struct target_ops *target)
add our sections to the section table for the core target. */
if (vp != vmap)
{
- struct section_table *stp;
+ struct target_section *stp;
- target_resize_to_sections (target, 2);
- stp = target->to_sections_end - 2;
+ stp = deprecated_core_resize_section_table (2);
stp->bfd = vp->bfd;
stp->the_bfd_section = bfd_get_section_by_name (stp->bfd, ".text");
@@ -1188,16 +1199,15 @@ static CORE_ADDR
find_toc_address (CORE_ADDR pc)
{
struct vmap *vp;
- extern CORE_ADDR get_toc_offset (struct objfile *); /* xcoffread.c */
for (vp = vmap; vp; vp = vp->nxt)
{
if (pc >= vp->tstart && pc < vp->tend)
{
/* vp->objfile is only NULL for the exec file. */
- return vp->dstart + get_toc_offset (vp->objfile == NULL
- ? symfile_objfile
- : vp->objfile);
+ return vp->dstart + xcoff_get_toc_offset (vp->objfile == NULL
+ ? symfile_objfile
+ : vp->objfile);
}
}
error (_("Unable to find TOC entry for pc %s."), hex_string (pc));