/* IBM RS/6000 native-dependent code for GDB, the GNU debugger.
- Copyright 1986, 1987, 1989, 1991, 1992, 1994 Free Software Foundation, Inc.
+ Copyright 1986, 1987, 1989, 1991, 1992, 1994, 1995, 1996, 1997
+ Free Software Foundation, Inc.
This file is part of GDB.
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., 675 Mass Ave, Cambridge, MA 02139, USA. */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "defs.h"
#include "inferior.h"
#include "xcoffsolib.h"
#include "symfile.h"
#include "objfiles.h"
-#include "libbfd.h" /* BFD internals (sigh!) FIXME */
+#include "libbfd.h" /* For bfd_cache_lookup (FIXME) */
#include "bfd.h"
+#include "gdb-stabs.h"
#include <sys/ptrace.h>
#include <sys/reg.h>
#include <a.out.h>
#include <sys/file.h>
-#include <sys/stat.h>
+#include "gdb_stat.h"
#include <sys/core.h>
#include <sys/ldr.h>
extern struct target_ops exec_ops;
static void
-exec_one_dummy_insn PARAMS ((void));
+vmap_exec PARAMS ((void));
-extern void
-add_text_to_loadinfo PARAMS ((CORE_ADDR textaddr, CORE_ADDR dataaddr));
+static void
+vmap_ldinfo PARAMS ((struct ld_info *));
+
+static struct vmap *
+add_vmap PARAMS ((struct ld_info *));
+
+static int
+objfile_symbol_add PARAMS ((char *));
+
+static void
+vmap_symtab PARAMS ((struct vmap *));
+
+static void
+fetch_core_registers PARAMS ((char *, unsigned int, int, CORE_ADDR));
+
+static void
+exec_one_dummy_insn PARAMS ((void));
extern void
fixup_breakpoints PARAMS ((CORE_ADDR low, CORE_ADDR high, CORE_ADDR delta));
#define DUMMY_INSN_ADDR (TEXT_SEGMENT_BASE)+0x200
char shadow_contents[BREAKPOINT_MAX]; /* Stash old bkpt addr contents */
- unsigned int status, pid;
+ int status, pid;
+ CORE_ADDR prev_pc;
/* We plant one dummy breakpoint into DUMMY_INSN_ADDR address. We assume that
this address will never be executed again by the real code. */
target_insert_breakpoint (DUMMY_INSN_ADDR, shadow_contents);
errno = 0;
- ptrace (PT_CONTINUE, inferior_pid, (PTRACE_ARG3_TYPE) DUMMY_INSN_ADDR, 0, 0);
+
+ /* 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);
+ ptrace (PT_CONTINUE, inferior_pid, (PTRACE_ARG3_TYPE)1, 0, 0);
+
if (errno)
perror ("pt_continue");
pid = wait (&status);
} while (pid != inferior_pid);
+ write_pc (prev_pc);
target_remove_breakpoint (DUMMY_INSN_ADDR, shadow_contents);
}
-void
+static void
fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
char *core_reg_sect;
unsigned core_reg_size;
int which;
- unsigned int reg_addr; /* Unused in this version */
+ CORE_ADDR reg_addr; /* Unused in this version */
{
/* fetch GPRs and special registers from the first register section
in core bfd. */
register struct vmap *vp;
{
register struct objfile *objfile;
- asection *textsec;
- asection *datasec;
- asection *bsssec;
- CORE_ADDR text_delta;
- CORE_ADDR data_delta;
- CORE_ADDR bss_delta;
struct section_offsets *new_offsets;
int i;
for (i = 0; i < objfile->num_sections; ++i)
ANOFFSET (new_offsets, i) = ANOFFSET (objfile->section_offsets, i);
- textsec = bfd_get_section_by_name (vp->bfd, ".text");
- text_delta =
- vp->tstart - ANOFFSET (objfile->section_offsets, textsec->target_index);
- ANOFFSET (new_offsets, textsec->target_index) = vp->tstart;
-
- datasec = bfd_get_section_by_name (vp->bfd, ".data");
- data_delta =
- vp->dstart - ANOFFSET (objfile->section_offsets, datasec->target_index);
- ANOFFSET (new_offsets, datasec->target_index) = vp->dstart;
-
- bsssec = bfd_get_section_by_name (vp->bfd, ".bss");
- bss_delta =
- vp->dstart - ANOFFSET (objfile->section_offsets, bsssec->target_index);
- ANOFFSET (new_offsets, bsssec->target_index) = vp->dstart;
+ /* The symbols in the object file are linked to the VMA of the section,
+ relocate them VMA relative. */
+ ANOFFSET (new_offsets, SECT_OFF_TEXT) = vp->tstart - vp->tvma;
+ ANOFFSET (new_offsets, SECT_OFF_DATA) = vp->dstart - vp->dvma;
+ ANOFFSET (new_offsets, SECT_OFF_BSS) = vp->dstart - vp->dvma;
objfile_relocate (objfile, new_offsets);
-
- {
- struct obj_section *s;
- for (s = objfile->sections; s < objfile->sections_end; ++s)
- {
- if (s->the_bfd_section->target_index == textsec->target_index)
- {
- s->addr += text_delta;
- s->endaddr += text_delta;
- }
- else if (s->the_bfd_section->target_index == datasec->target_index)
- {
- s->addr += data_delta;
- s->endaddr += data_delta;
- }
- else if (s->the_bfd_section->target_index == bsssec->target_index)
- {
- s->addr += bss_delta;
- s->endaddr += bss_delta;
- }
- }
- }
-
- if (text_delta != 0)
- /* breakpoints need to be relocated as well. */
- fixup_breakpoints (0, TEXT_SEGMENT_BASE, text_delta);
}
\f
/* Add symbols for an objfile. */
bfd_close (abfd);
/* FIXME -- should be error */
warning ("\"%s\": member \"%s\" missing.", abfd->filename, mem);
- return;
+ return 0;
}
if (!bfd_check_format(last, bfd_object))
{
struct stat ii, vi;
register struct vmap *vp;
- register got_one, retried;
- CORE_ADDR ostart;
+ int got_one, retried;
+ int got_exec_file = 0;
/* For each *ldi, see if we have a corresponding *vp.
If so, update the mapping, and symbol table.
retry:
for (got_one = 0, vp = vmap; vp; vp = vp->nxt)
{
- FILE *io;
-
/* 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'
|| (memb[0] && !STREQ(memb, vp->member)))
continue;
- io = bfd_cache_lookup (vp->bfd); /* totally opaque! */
- if (!io)
- fatal ("cannot find BFD's iostream for %s", vp->name);
-
/* See if we are referring to the same file. */
- if (fstat (fileno(io), &vi) < 0)
- fatal ("cannot fstat(fd=%d) the BFD for %s (errno=%d)",
- fileno(io), vp->name, errno);
+ if (bfd_stat (vp->bfd, &vi) < 0)
+ /* An error here is innocuous, most likely meaning that
+ the file descriptor has become worthless.
+ FIXME: What does it mean for a file descriptor to become
+ "worthless"? What makes it happen? What error does it
+ produce (ENOENT? others?)? Should we at least provide
+ a warning? */
+ continue;
if (ii.st_dev != vi.st_dev || ii.st_ino != vi.st_ino)
continue;
++got_one;
- /* found a corresponding VMAP. remap! */
- ostart = vp->tstart;
+ /* Found a corresponding VMAP. Remap! */
/* We can assume pointer == CORE_ADDR, this code is native only. */
vp->tstart = (CORE_ADDR) ldi->ldinfo_textorg;
vp->dstart = (CORE_ADDR) ldi->ldinfo_dataorg;
vp->dend = vp->dstart + ldi->ldinfo_datasize;
- if (vp->tadj)
- {
- vp->tstart += vp->tadj;
- vp->tend += vp->tadj;
- }
+ /* The run time loader maps the file header in addition to the text
+ section and returns a pointer to the header in ldinfo_textorg.
+ Adjust the text start address to point to the real start address
+ of the text section. */
+ vp->tstart += vp->toffs;
+
+ /* The objfile is only NULL for the exec file. */
+ if (vp->objfile == NULL)
+ got_exec_file = 1;
/* relocate symbol table(s). */
vmap_symtab (vp);
- /* there may be more, so we don't break out of the loop. */
+ /* 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) */
} while (ldi->ldinfo_next
&& (ldi = (void *) (ldi->ldinfo_next + (char *) ldi)));
+ /* If we don't find the symfile_objfile anywhere in the ldinfo, it
+ is unlikely that the symbol file is relocated to the proper
+ address. And we might have attached to a process which is
+ running a different copy of the same executable. */
+ if (symfile_objfile != NULL && !got_exec_file)
+ {
+ warning_begin ();
+ fputs_unfiltered ("Symbol file ", gdb_stderr);
+ fputs_unfiltered (symfile_objfile->name, gdb_stderr);
+ fputs_unfiltered ("\nis not mapped; discarding it.\n\
+If in fact that file has symbols which the mapped files listed by\n\
+\"info files\" lack, you can load symbols with the \"symbol-file\" or\n\
+\"add-symbol-file\" commands (note that you must take care of relocating\n\
+symbols to the proper address).\n", gdb_stderr);
+ free_objfile (symfile_objfile);
+ symfile_objfile = NULL;
+ }
+ breakpoint_re_set ();
}
\f
/* As well as symbol tables, exec_sections need relocation. After
{
if (STREQ(".text", exec_ops.to_sections[i].the_bfd_section->name))
{
- exec_ops.to_sections[i].addr += vmap->tstart;
- exec_ops.to_sections[i].endaddr += vmap->tstart;
+ exec_ops.to_sections[i].addr += vmap->tstart - vmap->tvma;
+ exec_ops.to_sections[i].endaddr += vmap->tstart - vmap->tvma;
}
else if (STREQ(".data", exec_ops.to_sections[i].the_bfd_section->name))
{
- exec_ops.to_sections[i].addr += vmap->dstart;
- exec_ops.to_sections[i].endaddr += vmap->dstart;
+ exec_ops.to_sections[i].addr += vmap->dstart - vmap->dvma;
+ exec_ops.to_sections[i].endaddr += vmap->dstart - vmap->dvma;
+ }
+ else if (STREQ(".bss", exec_ops.to_sections[i].the_bfd_section->name))
+ {
+ exec_ops.to_sections[i].addr += vmap->dstart - vmap->dvma;
+ exec_ops.to_sections[i].endaddr += vmap->dstart - vmap->dvma;
}
}
}
errno = 0;
ptrace (PT_LDINFO, pid, (PTRACE_ARG3_TYPE) ldi,
- MAX_LOAD_SEGS * sizeof(*ldi), ldi);
+ MAX_LOAD_SEGS * sizeof(*ldi), (int *) ldi);
if (errno)
perror_with_name ("ptrace ldinfo");
vmap_ldinfo (ldi);
- do {
- /* We are allowed to assume CORE_ADDR == pointer. This code is
- native only. */
- add_text_to_loadinfo ((CORE_ADDR) ldi->ldinfo_textorg,
- (CORE_ADDR) ldi->ldinfo_dataorg);
- } while (ldi->ldinfo_next
- && (ldi = (void *) (ldi->ldinfo_next + (char *) ldi)));
-
-#if 0
- /* Now that we've jumbled things around, re-sort them. */
- sort_minimal_symbols ();
-#endif
-
/* relocate the exec and core sections as well. */
vmap_exec ();
}
from the core file. */
void
-xcoff_relocate_core ()
+xcoff_relocate_core (target)
+ struct target_ops *target;
{
/* Offset of member MEMBER in a struct of type TYPE. */
#ifndef offsetof
vp->dstart = (CORE_ADDR) ldip->ldinfo_dataorg;
vp->dend = vp->dstart + ldip->ldinfo_datasize;
- if (vp->tadj != 0) {
- vp->tstart += vp->tadj;
- vp->tend += vp->tadj;
- }
+ /* The run time loader maps the file header in addition to the text
+ section and returns a pointer to the header in ldinfo_textorg.
+ Adjust the text start address to point to the real start address
+ of the text section. */
+ vp->tstart += vp->toffs;
/* Unless this is the exec file,
add our sections to the section table for the core target. */
{
int count;
struct section_table *stp;
+ int update_coreops;
+
+ /* We must update the to_sections field in the core_ops structure
+ now to avoid dangling pointer dereferences. */
+ update_coreops = core_ops.to_sections == target->to_sections;
- count = core_ops.to_sections_end - core_ops.to_sections;
+ count = target->to_sections_end - target->to_sections;
count += 2;
- core_ops.to_sections = (struct section_table *)
- xrealloc (core_ops.to_sections,
+ target->to_sections = (struct section_table *)
+ xrealloc (target->to_sections,
sizeof (struct section_table) * count);
- core_ops.to_sections_end = core_ops.to_sections + count;
- stp = core_ops.to_sections_end - 2;
-
- /* "Why do we add bfd_section_vma?", I hear you cry.
- Well, the start of the section in the file is actually
- that far into the section as the struct vmap understands it.
- So for text sections, bfd_section_vma tends to be 0x200,
- and if vp->tstart is 0xd0002000, then the first byte of
- the text section on disk corresponds to address 0xd0002200. */
+ target->to_sections_end = target->to_sections + count;
+
+ /* Update the to_sections field in the core_ops structure
+ if needed. */
+ if (update_coreops)
+ {
+ core_ops.to_sections = target->to_sections;
+ core_ops.to_sections_end = target->to_sections_end;
+ }
+ stp = target->to_sections_end - 2;
+
stp->bfd = vp->bfd;
stp->the_bfd_section = bfd_get_section_by_name (stp->bfd, ".text");
- stp->addr = bfd_section_vma (stp->bfd, stp->the_bfd_section) + vp->tstart;
- stp->endaddr = bfd_section_vma (stp->bfd, stp->the_bfd_section) + vp->tend;
+ stp->addr = vp->tstart;
+ stp->endaddr = vp->tend;
stp++;
stp->bfd = vp->bfd;
stp->the_bfd_section = bfd_get_section_by_name (stp->bfd, ".data");
- stp->addr = bfd_section_vma (stp->bfd, stp->the_bfd_section) + vp->dstart;
- stp->endaddr = bfd_section_vma (stp->bfd, stp->the_bfd_section) + vp->dend;
+ stp->addr = vp->dstart;
+ stp->endaddr = vp->dend;
}
vmap_symtab (vp);
-
- add_text_to_loadinfo ((CORE_ADDR)ldip->ldinfo_textorg,
- (CORE_ADDR)ldip->ldinfo_dataorg);
} while (ldip->ldinfo_next != 0);
vmap_exec ();
+ breakpoint_re_set ();
do_cleanups (old);
}
+
+int
+kernel_u_size ()
+{
+ return (sizeof (struct user));
+}
+\f
+/* Under AIX, we have to pass the correct TOC pointer to a function
+ when calling functions in the inferior.
+ We try to find the relative toc offset of the objfile containing PC
+ and add the current load address of the data segment from the vmap. */
+
+static CORE_ADDR
+find_toc_address (pc)
+ CORE_ADDR pc;
+{
+ struct vmap *vp;
+
+ 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);
+ }
+ }
+ error ("Unable to find TOC entry for pc 0x%x\n", pc);
+}
+\f
+/* Register that we are able to handle rs6000 core file formats. */
+
+static struct core_fns rs6000_core_fns =
+{
+ bfd_target_coff_flavour,
+ fetch_core_registers,
+ NULL
+};
+
+void
+_initialize_core_rs6000 ()
+{
+ /* Initialize hook in rs6000-tdep.c for determining the TOC address when
+ calling functions in the inferior. */
+ find_toc_address_hook = &find_toc_address;
+
+ /* For native configurations, where this module is included, inform
+ the xcoffsolib module where it can find the function for symbol table
+ relocation at runtime. */
+ xcoff_relocate_symtab_hook = &xcoff_relocate_symtab;
+ add_core_fns (&rs6000_core_fns);
+}
projects / deliverable / binutils-gdb.git / blobdiff