2000-04-17 Elena Zannoni <ezannoni@kwikemart.cygnus.com>

symfile.c: (symbol_file_command): Remove support for rombug, to
 	simplify code.
This commit is contained in:
Elena Zannoni 2000-04-17 15:59:56 +00:00
parent db162d44d7
commit 4da95fc42d
2 changed files with 21 additions and 45 deletions

View File

@ -1,3 +1,8 @@
2000-04-17 Elena Zannoni <ezannoni@kwikemart.cygnus.com>
symfile.c: (symbol_file_command): Remove support for rombug, to
simplify code.
2000-04-17 Elena Zannoni <ezannoni@kwikemart.cygnus.com> 2000-04-17 Elena Zannoni <ezannoni@kwikemart.cygnus.com>
* symfile.c (add_symbol_file_command): Rewrite the arguments * symfile.c (add_symbol_file_command): Rewrite the arguments

View File

@ -993,6 +993,10 @@ symbol_file_add (name, from_tty, addrs, mainline, flags)
used in GDB (perhaps "set mapped on", "set readnow on" would be used in GDB (perhaps "set mapped on", "set readnow on" would be
better), (3) the order of options matters, which is contrary to GNU better), (3) the order of options matters, which is contrary to GNU
conventions (because it is confusing and inconvenient). */ conventions (because it is confusing and inconvenient). */
/* Note: ezannoni 2000-04-17. This function used to have support for
rombug (see remote-os9k.c). It consisted of a call to target_link()
(target.c) to get the address of the text segment from the target,
and pass that to symbol_file_add(). This is no longer supported. */
void void
symbol_file_command (args, from_tty) symbol_file_command (args, from_tty)
@ -1001,7 +1005,6 @@ symbol_file_command (args, from_tty)
{ {
char **argv; char **argv;
char *name = NULL; char *name = NULL;
CORE_ADDR text_relocation = 0; /* text_relocation */
struct cleanup *cleanups; struct cleanup *cleanups;
int flags = OBJF_USERLOADED; int flags = OBJF_USERLOADED;
@ -1026,9 +1029,7 @@ symbol_file_command (args, from_tty)
symfile_objfile = NULL; symfile_objfile = NULL;
if (from_tty) if (from_tty)
{
printf_unfiltered ("No symbol file now.\n"); printf_unfiltered ("No symbol file now.\n");
}
#ifdef HPUXHPPA #ifdef HPUXHPPA
RESET_HP_UX_GLOBALS (); RESET_HP_UX_GLOBALS ();
#endif #endif
@ -1043,56 +1044,26 @@ symbol_file_command (args, from_tty)
while (*argv != NULL) while (*argv != NULL)
{ {
if (STREQ (*argv, "-mapped")) if (STREQ (*argv, "-mapped"))
{ flags |= OBJF_MAPPED;
flags |= OBJF_MAPPED; else
} if (STREQ (*argv, "-readnow"))
else if (STREQ (*argv, "-readnow"))
{
flags |= OBJF_READNOW; flags |= OBJF_READNOW;
} else
else if (**argv == '-') if (**argv == '-')
{ error ("unknown option `%s'", *argv);
error ("unknown option `%s'", *argv);
}
else
{
char *p;
name = *argv;
/* this is for rombug remote only, to get the text relocation by
using link command */
p = strrchr (name, '/');
if (p != NULL)
p++;
else else
p = name;
target_link (p, &text_relocation);
if (text_relocation == (CORE_ADDR) 0)
return;
else if (text_relocation == (CORE_ADDR) -1)
{ {
name = *argv;
symbol_file_add (name, from_tty, NULL, 1, flags); symbol_file_add (name, from_tty, NULL, 1, flags);
#ifdef HPUXHPPA #ifdef HPUXHPPA
RESET_HP_UX_GLOBALS (); RESET_HP_UX_GLOBALS ();
#endif #endif
} /* Getting new symbols may change our opinion about
else what is frameless. */
{ reinit_frame_cache ();
struct section_addr_info section_addrs;
memset (&section_addrs, 0, sizeof (section_addrs));
section_addrs.text_addr = (CORE_ADDR) text_relocation;
symbol_file_add (name, from_tty, &section_addrs, 0, flags);
}
/* Getting new symbols may change our opinion about what is set_initial_language ();
frameless. */ }
reinit_frame_cache ();
set_initial_language ();
}
argv++; argv++;
} }