X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fxcoffsolib.c;h=bb286eba031ed9dedefd054a86ed09936b002635;hb=feb129926a8d12656f1ca4b7a8bb10268d3af4fb;hp=13d8065ea1d3c213933c56eca4959fc8db992477;hpb=eb17f9d504a3c73831b4b2eaa1658ced25bea3fe;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/xcoffsolib.c b/gdb/xcoffsolib.c index 13d8065ea1..bb286eba03 100644 --- a/gdb/xcoffsolib.c +++ b/gdb/xcoffsolib.c @@ -2,21 +2,22 @@ Copyright 1991, 1992 Free Software Foundation. Contributed by IBM Corporation. -This file is part of GDB. + 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 -(at your option) any later version. + 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 + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #if 0 #include @@ -38,7 +39,7 @@ void (*xcoff_relocate_symtab_hook) PARAMS ((unsigned int)) = NULL; #ifdef SOLIB_SYMBOLS_MANUAL extern struct symtab *current_source_symtab; -extern int current_source_line; +extern int current_source_line; /* The real work of adding a shared library file to the symtab and the section list. */ @@ -48,85 +49,91 @@ solib_add (arg_string, from_tty, target) char *arg_string; int from_tty; struct target_ops *target; -{ +{ char *val; struct vmap *vp = vmap; struct objfile *obj; struct symtab *saved_symtab; int saved_line; - int loaded = 0; /* true if any shared obj loaded */ - int matched = 0; /* true if any shared obj matched */ + int loaded = 0; /* true if any shared obj loaded */ + int matched = 0; /* true if any shared obj matched */ if (arg_string == 0) - re_comp ("."); - else if (val = (char *) re_comp (arg_string)) { + re_comp ("."); + else if (val = (char *) re_comp (arg_string)) + { error ("Invalid regexp: %s", val); - } + } if (!vp || !vp->nxt) return; /* save current symbol table and line number, in case they get changed in symbol loading process. */ - + saved_symtab = current_source_symtab; saved_line = current_source_line; /* skip over the first vmap, it is the main program, always loaded. */ vp = vp->nxt; - for (; vp; vp = vp->nxt) { - - if (re_exec (vp->name) || (*vp->member && re_exec (vp->member))) { - - matched = 1; - - /* if already loaded, continue with the next one. */ - if (vp->loaded) { - - printf_unfiltered ("%s%s%s%s: already loaded.\n", - *vp->member ? "(" : "", - vp->member, - *vp->member ? ") " : "", - vp->name); - continue; - } + for (; vp; vp = vp->nxt) + { - printf_unfiltered ("Loading %s%s%s%s...", - *vp->member ? "(" : "", - vp->member, - *vp->member ? ") " : "", - vp->name); - gdb_flush (gdb_stdout); - - /* This is gross and doesn't work. If this code is re-enabled, - just stick a objfile member into the struct vmap; that's the - way solib.c (for SunOS/SVR4) does it. */ - obj = lookup_objfile_bfd (vp->bfd); - if (!obj) { - warning ("\nObj structure for the shared object not found. Loading failed."); - continue; + if (re_exec (vp->name) || (*vp->member && re_exec (vp->member))) + { + + matched = 1; + + /* if already loaded, continue with the next one. */ + if (vp->loaded) + { + + printf_unfiltered ("%s%s%s%s: already loaded.\n", + *vp->member ? "(" : "", + vp->member, + *vp->member ? ") " : "", + vp->name); + continue; + } + + printf_unfiltered ("Loading %s%s%s%s...", + *vp->member ? "(" : "", + vp->member, + *vp->member ? ") " : "", + vp->name); + gdb_flush (gdb_stdout); + + /* This is gross and doesn't work. If this code is re-enabled, + just stick a objfile member into the struct vmap; that's the + way solib.c (for SunOS/SVR4) does it. */ + obj = lookup_objfile_bfd (vp->bfd); + if (!obj) + { + warning ("\nObj structure for the shared object not found. Loading failed."); + continue; + } + + syms_from_objfile (obj, 0, 0, 0); + new_symfile_objfile (obj, 0, 0); + vmap_symtab (vp, 0, 0); + printf_unfiltered ("Done.\n"); + loaded = vp->loaded = 1; } - - syms_from_objfile (obj, 0, 0, 0); - new_symfile_objfile (obj, 0, 0); - vmap_symtab (vp, 0, 0); - printf_unfiltered ("Done.\n"); - loaded = vp->loaded = 1; } - } /* if any shared object is loaded, then misc_func_vector needs sorting. */ - if (loaded) { + if (loaded) + { #if 0 - sort_misc_function_vector (); + sort_misc_function_vector (); #endif - current_source_symtab = saved_symtab; - current_source_line = saved_line; + current_source_symtab = saved_symtab; + current_source_line = saved_line; - /* Getting new symbols might change our opinion about what is frameless. - Is this correct?? FIXME. */ + /* Getting new symbols might change our opinion about what is frameless. + Is this correct?? FIXME. */ /* reinit_frame_cache(); */ - } + } else if (!matched) printf_unfiltered ("No matching shared object found.\n"); } @@ -137,23 +144,25 @@ solib_add (arg_string, from_tty, target) char * pc_load_segment_name (addr) -CORE_ADDR addr; + CORE_ADDR addr; { - static char buffer [BUFSIZ]; - struct vmap *vp = vmap; - - buffer [0] = buffer [1] = '\0'; - for (; vp; vp = vp->nxt) - if (vp->tstart <= addr && addr < vp->tend) { - if (*vp->member) { - buffer [0] = '('; - strcat (&buffer[1], vp->member); - strcat (buffer, ")"); - } + static char buffer[BUFSIZ]; + struct vmap *vp = vmap; + + buffer[0] = buffer[1] = '\0'; + for (; vp; vp = vp->nxt) + if (vp->tstart <= addr && addr < vp->tend) + { + if (*vp->member) + { + buffer[0] = '('; + strcat (&buffer[1], vp->member); + strcat (buffer, ")"); + } strcat (buffer, vp->name); return buffer; - } - return "(unknown load module)"; + } + return "(unknown load module)"; } static void solib_info PARAMS ((char *, int)); @@ -171,7 +180,7 @@ solib_info (args, from_tty) if (vp == NULL || vp->nxt == NULL) { - printf_unfiltered ("No shared libraries loaded at this time.\n"); + printf_unfiltered ("No shared libraries loaded at this time.\n"); return; } @@ -206,15 +215,15 @@ sharedlibrary_command (args, from_tty) (*xcoff_relocate_symtab_hook) (inferior_pid); #ifdef SOLIB_SYMBOLS_MANUAL - solib_add (args, from_tty, (struct target_ops *)0); + solib_add (args, from_tty, (struct target_ops *) 0); #endif /* SOLIB_SYMBOLS_MANUAL */ } void -_initialize_solib() +_initialize_solib () { add_com ("sharedlibrary", class_files, sharedlibrary_command, "Load shared object library symbols for files matching REGEXP."); - add_info ("sharedlibrary", solib_info, + add_info ("sharedlibrary", solib_info, "Status of loaded shared object libraries"); }