/* 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
+ 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>
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;
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;
+ vp->tstart - ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT);
+ ANOFFSET (new_offsets, SECT_OFF_TEXT) = 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;
+ vp->dstart - ANOFFSET (objfile->section_offsets, SECT_OFF_DATA);
+ ANOFFSET (new_offsets, SECT_OFF_DATA) = 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;
+ vp->dstart - ANOFFSET (objfile->section_offsets, SECT_OFF_BSS);
+ ANOFFSET (new_offsets, SECT_OFF_BSS) = vp->dstart;
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. */
{
struct stat ii, vi;
register struct vmap *vp;
- register got_one, retried;
- CORE_ADDR ostart;
+ int got_one, retried;
+ int got_exec_file;
/* 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. */
- /* An error here is innocuous, most likely meaning that
- the file descriptor has become worthless. */
- if (fstat (fileno(io), &vi) < 0)
+ 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)
++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->tend += vp->tadj;
}
+ /* The objfile is only NULL for the exec file. */
+ if (vp->objfile == NULL)
+ got_exec_file = 1;
+
+#ifdef DONT_RELOCATE_SYMFILE_OBJFILE
+ if (vp->objfile == symfile_objfile
+ || vp->objfile == NULL)
+ {
+ ldi->ldinfo_dataorg = 0;
+ vp->dstart = (CORE_ADDR) 0;
+ vp->dend = ldi->ldinfo_datasize;
+ }
+#endif
+
/* 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
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;
+#ifdef DONT_RELOCATE_SYMFILE_OBJFILE
+ if (vp == vmap)
+ {
+ vp->dstart = (CORE_ADDR) 0;
+ vp->dend = ldip->ldinfo_datasize;
+ }
+#endif
+
if (vp->tadj != 0)
{
vp->tstart += vp->tadj;
int count;
struct section_table *stp;
- 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;
+ target->to_sections_end = target->to_sections + count;
+ stp = target->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
(CORE_ADDR)ldip->ldinfo_dataorg);
} while (ldip->ldinfo_next != 0);
vmap_exec ();
+ breakpoint_re_set ();
do_cleanups (old);
}
projects / binutils.git / blobdiff