* symfile.c (add_symbol_file_command): Properly reformat "else if"
code. * coffread.c (coff_symtab_read): Ditto.
This commit is contained in:
parent
80b756a06c
commit
34e924c066
3 changed files with 59 additions and 58 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2000-06-12 Elena Zannoni <ezannoni@kwikemart.cygnus.com>
|
||||||
|
|
||||||
|
* symfile.c (add_symbol_file_command): Properly reformat "else if"
|
||||||
|
code.
|
||||||
|
* coffread.c (coff_symtab_read): Ditto.
|
||||||
|
|
||||||
Mon Jun 12 15:24:04 2000 Andrew Cagney <cagney@b1.cygnus.com>
|
Mon Jun 12 15:24:04 2000 Andrew Cagney <cagney@b1.cygnus.com>
|
||||||
|
|
||||||
* Makefile.in (SER_HARDWIRE): Set using autoconf.
|
* Makefile.in (SER_HARDWIRE): Set using autoconf.
|
||||||
|
|
|
@ -982,22 +982,20 @@ coff_symtab_read (symtab_offset, nsyms, objfile)
|
||||||
SMASH_TEXT_ADDRESS (tmpaddr);
|
SMASH_TEXT_ADDRESS (tmpaddr);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
else if (sec == SECT_OFF_DATA (objfile))
|
||||||
|
{
|
||||||
|
ms_type =
|
||||||
|
cs->c_sclass == C_EXT || cs->c_sclass == C_THUMBEXT ?
|
||||||
|
mst_data : mst_file_data;
|
||||||
|
}
|
||||||
|
else if (sec == SECT_OFF_BSS (objfile))
|
||||||
|
{
|
||||||
|
ms_type =
|
||||||
|
cs->c_sclass == C_EXT || cs->c_sclass == C_THUMBEXT ?
|
||||||
|
mst_data : mst_file_data;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
if (sec == SECT_OFF_DATA (objfile))
|
ms_type = mst_unknown;
|
||||||
{
|
|
||||||
ms_type =
|
|
||||||
cs->c_sclass == C_EXT || cs->c_sclass == C_THUMBEXT ?
|
|
||||||
mst_data : mst_file_data;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
if (sec == SECT_OFF_BSS (objfile))
|
|
||||||
{
|
|
||||||
ms_type =
|
|
||||||
cs->c_sclass == C_EXT || cs->c_sclass == C_THUMBEXT ?
|
|
||||||
mst_data : mst_file_data;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
ms_type = mst_unknown;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cs->c_name[0] != '@' /* Skip tdesc symbols */ )
|
if (cs->c_name[0] != '@' /* Skip tdesc symbols */ )
|
||||||
|
|
|
@ -1492,54 +1492,51 @@ add_symbol_file_command (args, from_tty)
|
||||||
filename = tilde_expand (arg);
|
filename = tilde_expand (arg);
|
||||||
my_cleanups = make_cleanup (free, filename);
|
my_cleanups = make_cleanup (free, filename);
|
||||||
}
|
}
|
||||||
|
else if (argcnt == 1)
|
||||||
|
{
|
||||||
|
/* The second argument is always the text address at which
|
||||||
|
to load the program. */
|
||||||
|
sect_opts[section_index].name = ".text";
|
||||||
|
sect_opts[section_index].value = arg;
|
||||||
|
section_index++;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
if (argcnt == 1)
|
{
|
||||||
{
|
/* It's an option (starting with '-') or it's an argument
|
||||||
/* The second argument is always the text address at which
|
to an option */
|
||||||
to load the program. */
|
|
||||||
sect_opts[section_index].name = ".text";
|
|
||||||
sect_opts[section_index].value = arg;
|
|
||||||
section_index++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* It's an option (starting with '-') or it's an argument
|
|
||||||
to an option */
|
|
||||||
|
|
||||||
if (*arg == '-')
|
if (*arg == '-')
|
||||||
{
|
{
|
||||||
if (strcmp (arg, "-mapped") == 0)
|
if (strcmp (arg, "-mapped") == 0)
|
||||||
flags |= OBJF_MAPPED;
|
flags |= OBJF_MAPPED;
|
||||||
else
|
else if (strcmp (arg, "-readnow") == 0)
|
||||||
if (strcmp (arg, "-readnow") == 0)
|
flags |= OBJF_READNOW;
|
||||||
flags |= OBJF_READNOW;
|
else if (strcmp (arg, "-s") == 0)
|
||||||
else
|
{
|
||||||
if (strcmp (arg, "-s") == 0)
|
if (section_index >= SECT_OFF_MAX)
|
||||||
{
|
error ("Too many sections specified.");
|
||||||
if (section_index >= SECT_OFF_MAX)
|
expecting_sec_name = 1;
|
||||||
error ("Too many sections specified.");
|
expecting_sec_addr = 1;
|
||||||
expecting_sec_name = 1;
|
}
|
||||||
expecting_sec_addr = 1;
|
}
|
||||||
}
|
else
|
||||||
}
|
{
|
||||||
else
|
if (expecting_sec_name)
|
||||||
{
|
{
|
||||||
if (expecting_sec_name)
|
sect_opts[section_index].name = arg;
|
||||||
|
expecting_sec_name = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
if (expecting_sec_addr)
|
||||||
{
|
{
|
||||||
sect_opts[section_index].name = arg;
|
sect_opts[section_index].value = arg;
|
||||||
expecting_sec_name = 0;
|
expecting_sec_addr = 0;
|
||||||
|
section_index++;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
if (expecting_sec_addr)
|
error ("USAGE: add-symbol-file <filename> <textaddress> [-mapped] [-readnow] [-s <secname> <addr>]*");
|
||||||
{
|
}
|
||||||
sect_opts[section_index].value = arg;
|
}
|
||||||
expecting_sec_addr = 0;
|
|
||||||
section_index++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
error ("USAGE: add-symbol-file <filename> <textaddress> [-mapped] [-readnow] [-s <secname> <addr>]*");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
argcnt++;
|
argcnt++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue