{
register struct vmap *vp, *nxt;
struct objfile *obj;
+ int need_symtab_cleanup = 0;
for (nxt = vmap; vp = nxt; )
{
free_objfile() will do proper cleanup of objfile *and* bfd. */
if (vp->objfile)
- free_objfile (vp->objfile);
+ {
+ free_objfile (vp->objfile);
+ need_symtab_cleanup = 1;
+ }
else
bfd_close(vp->bfd);
exec_ops.to_sections = NULL;
exec_ops.to_sections_end = NULL;
}
+
+ if (need_symtab_cleanup)
+ clear_symtab_users ();
}
/*
count = bfd_count_sections (some_bfd);
if (count == 0)
- abort(); /* return 1? */
+ fatal ("aborting"); /* return 1? */
if (*start)
free (*start);
*start = (struct section_table *) xmalloc (count * sizeof (**start));
*end = *start;
bfd_map_over_sections (some_bfd, add_to_section_table, (char *)end);
if (*end > *start + count)
- abort();
+ fatal ("aborting");
/* We could realloc the table, but it probably loses for most files. */
return 0;
}
\f
void
-sex_to_vmap(bfd *bf, sec_ptr sex, struct vmap_and_bfd *vmap_bfd)
+sex_to_vmap(bfd *bf, sec_ptr sex, PTR arg3)
{
+ struct vmap_and_bfd *vmap_bfd = (struct vmap_and_bfd *)arg3;
register struct vmap *vp, **vpp;
register struct symtab *syms;
bfd *arch = vmap_bfd->pbfd;
}
-/* true, if symbol table and minimal symbol table are relocated. */
-
-int symtab_relocated = 0;
-
-
/* vmap_symtab - handle symbol translation on vmapping */
-vmap_symtab(vp, old_start, vip)
-register struct vmap *vp;
-CORE_ADDR old_start;
-struct stat *vip;
+static void
+vmap_symtab (vp)
+ register struct vmap *vp;
{
- register struct symtab *s;
register struct objfile *objfile;
- register struct minimal_symbol *msymbol;
+ 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;
objfile = vp->objfile;
if (objfile == NULL)
objfile = symfile_objfile;
}
- s = objfile->symtabs;
-
- if (vp->tstart != old_start) {
-
- /* Once we find a relocation base address for one of the symtabs
- in this objfile, it will be the same for all symtabs in this
- objfile. Clean this algorithm. FIXME. */
-
- for (; s; s = s->next)
- if (!s->nonreloc || LINETABLE(s))
- vmap_symtab_1(s, vp, old_start);
-
-#if 1
- /* I believe trampoline entries now have a name like
- <trampoline>. In any event, if something needs to be changed,
- it should be changed in ALL_MSYMBOLS, so it works everywhere. */
- /*
- Himm.., recently we nullified trampoline entry names in order not
- to confuse them with real symbols. Appearently this turned into a
- problem, and msymbol vector did not get relocated properly. If
- msymbols have to have non-null names, then we should name
- trampoline entries with empty strings. */
+ new_offsets = alloca
+ (sizeof (struct section_offsets)
+ + sizeof (new_offsets->offsets) * objfile->num_sections);
- ALL_MSYMBOLS (objfile, msymbol)
-#else
- for (msymbol = objfile->msymbols;
- SYMBOL_NAME (msymbol) || SYMBOL_VALUE_ADDRESS (msymbol);
- (msymbol)++)
-#endif
- if (SYMBOL_VALUE_ADDRESS (msymbol) < TEXT_SEGMENT_BASE)
- SYMBOL_VALUE_ADDRESS (msymbol) += vp->tstart - old_start;
-
- }
-
- if (vp->tstart != old_start) {
- /* breakpoints need to be relocated as well. */
- fixup_breakpoints (0, TEXT_SEGMENT_BASE, vp->tstart - old_start);
+ 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;
+
+ objfile_relocate (objfile, new_offsets);
+
+ {
+ struct obj_section *s;
+ for (s = objfile->sections; s < objfile->sections_end; ++s)
+ {
+ if (s->sec_ptr->target_index == textsec->target_index)
+ {
+ s->addr += text_delta;
+ s->endaddr += text_delta;
+ }
+ else if (s->sec_ptr->target_index == datasec->target_index)
+ {
+ s->addr += data_delta;
+ s->endaddr += data_delta;
+ }
+ else if (s->sec_ptr->target_index == bsssec->target_index)
+ {
+ s->addr += bss_delta;
+ s->endaddr += bss_delta;
+ }
+ }
}
- symtab_relocated = 1;
-}
-
-
-vmap_symtab_1(s, vp, old_start)
-register struct symtab *s;
-register struct vmap *vp;
-CORE_ADDR old_start;
-{
- register int i, j;
- int len, blen;
- register struct linetable *l;
- struct blockvector *bv;
- register struct block *b;
- int depth;
- register ulong reloc, dreloc;
-
- if ((reloc = vp->tstart - old_start) == 0)
- return;
-
- dreloc = vp->dstart; /* data relocation */
-
- /*
- * The line table must be relocated. This is only present for
- * .text sections, so only vp->text type maps need be considered.
- */
- l = LINETABLE (s);
- if (l) {
- len = l->nitems;
- for (i = 0; i < len; i++)
- l->item[i].pc += reloc;
- }
-
- /* if this symbol table is not relocatable, only line table should
- be relocated and the rest ignored. */
- if (s->nonreloc)
- return;
-
- bv = BLOCKVECTOR(s);
- len = BLOCKVECTOR_NBLOCKS(bv);
-
- for (i = 0; i < len; i++) {
- b = BLOCKVECTOR_BLOCK(bv, i);
-
- BLOCK_START(b) += reloc;
- BLOCK_END(b) += reloc;
-
- blen = BLOCK_NSYMS(b);
- for (j = 0; j < blen; j++) {
- register struct symbol *sym;
-
- sym = BLOCK_SYM(b, j);
- switch (SYMBOL_NAMESPACE(sym)) {
- case STRUCT_NAMESPACE:
- case UNDEF_NAMESPACE:
- continue;
-
- case LABEL_NAMESPACE:
- case VAR_NAMESPACE:
- break;
- }
-
- switch (SYMBOL_CLASS(sym)) {
- case LOC_CONST:
- case LOC_CONST_BYTES:
- case LOC_LOCAL:
- case LOC_REGISTER:
- case LOC_ARG:
- case LOC_LOCAL_ARG:
- case LOC_REF_ARG:
- case LOC_REGPARM:
- case LOC_TYPEDEF:
- continue;
-
-#ifdef FIXME
- case LOC_EXTERNAL:
-#endif
- case LOC_LABEL:
- SYMBOL_VALUE_ADDRESS(sym) += reloc;
- break;
-
- case LOC_STATIC:
- SYMBOL_VALUE_ADDRESS(sym) += dreloc;
- break;
-
- case LOC_BLOCK:
- break;
-
- default:
- fatal("botched symbol class %x"
- , SYMBOL_CLASS(sym));
- break;
- }
- }
- }
+ if (text_delta != 0)
+ /* breakpoints need to be relocated as well. */
+ fixup_breakpoints (0, TEXT_SEGMENT_BASE, text_delta);
}
/* Add symbols for an objfile. */
#ifndef SOLIB_SYMBOLS_MANUAL
if (catch_errors (objfile_symbol_add, (char *)obj,
- "Error while reading shared library symbols:\n"))
+ "Error while reading shared library symbols:\n",
+ RETURN_MASK_ALL))
{
/* Note this is only done if symbol reading was successful. */
- vmap_symtab (vp, 0, 0);
+ vmap_symtab (vp);
vp->loaded = 1;
}
#endif
/* found a corresponding VMAP. remap! */
ostart = vp->tstart;
- vp->tstart = ldi->ldinfo_textorg;
+ /* We can assume pointer == CORE_ADDR, this code is native only. */
+ vp->tstart = (CORE_ADDR) ldi->ldinfo_textorg;
vp->tend = vp->tstart + ldi->ldinfo_textsize;
- vp->dstart = ldi->ldinfo_dataorg;
+ vp->dstart = (CORE_ADDR) ldi->ldinfo_dataorg;
vp->dend = vp->dstart + ldi->ldinfo_datasize;
if (vp->tadj) {
}
/* relocate symbol table(s). */
- vmap_symtab(vp, ostart, &vi);
+ vmap_symtab (vp);
/* there may be more, so we don't break out of the loop. */
}
boolean (*xfer_fn) PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
if (len <= 0)
- abort();
+ fatal ("aborting");
memend = memaddr + len;
xfer_fn = write? bfd_set_section_contents: bfd_get_section_contents;
int offset = 0;
struct ld_info *ldip;
struct vmap *vp;
-
+
/* Allocated size of buffer. */
int buffer_size = LDINFO_SIZE;
char *buffer = xmalloc (buffer_size);
struct cleanup *old = make_cleanup (free_current_contents, &buffer);
+ /* FIXME, this restriction should not exist. For now, though I'll
+ avoid coredumps with error() pending a real fix. */
+ if (vmap == NULL)
+ error
+ ("Can't debug a core file without an executable file (on the RS/6000)");
+
ldinfo_sec = bfd_get_section_by_name (core_bfd, ".ldinfo");
if (ldinfo_sec == NULL)
{
offset += ldip->ldinfo_next;
- vp->tstart = ldip->ldinfo_textorg;
+ /* We can assume pointer == CORE_ADDR, this code is native only. */
+ vp->tstart = (CORE_ADDR) ldip->ldinfo_textorg;
vp->tend = vp->tstart + ldip->ldinfo_textsize;
- vp->dstart = ldip->ldinfo_dataorg;
+ vp->dstart = (CORE_ADDR) ldip->ldinfo_dataorg;
vp->dend = vp->dstart + ldip->ldinfo_datasize;
if (vp->tadj != 0) {
stp->endaddr = bfd_section_vma (stp->bfd, stp->sec_ptr) + vp->dend;
}
- vmap_symtab (vp, 0, 0);
+ vmap_symtab (vp);
- add_text_to_loadinfo (ldip->ldinfo_textorg, ldip->ldinfo_dataorg);
+ add_text_to_loadinfo ((CORE_ADDR)ldip->ldinfo_textorg,
+ (CORE_ADDR)ldip->ldinfo_dataorg);
} while (ldip->ldinfo_next != 0);
vmap_exec ();
do_cleanups (old);
projects / deliverable / binutils-gdb.git / blobdiff