From 7ca9f392fc1c33d83746ffab1f218b149a80d586 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 1 Feb 2003 20:51:06 +0000 Subject: [PATCH] 2003-02-01 Andrew Cagney * main.c (captured_main): Delete #ifdef ADDITIONAL_OPTIONS, ADDITIONAL_OPTION_CASES, and ADDITIONAL_OPTION_HANDLER code. (print_gdb_help): Delete #ifdef ADDITIONAL_OPTION_HELP code. * stabsread.c (DBX_PARM_SYMBOL_CLASS): Delete macro. (define_symbol): Update. * symfile.c (generic_load): Remove references to nindy. * symtab.c: Remove references to nindy. Index: doc/ChangeLog 2003-02-01 Andrew Cagney * gdbint.texinfo (Target Architecture Definition): Delete description of ADDITIONAL_OPTIONS, ADDITIONAL_OPTION_CASES, ADDITIONAL_OPTION_HANDLER, and ADDITIONAL_OPTION_HELP, and BEFORE_MAIN_LOOP_HOOK, and DBX_PARM_SYMBOL_CLASS along with references to nindy and i960. * gdb.texinfo (i960): Delete all references to i960 and nindy. --- gdb/ChangeLog | 10 ++++ gdb/doc/ChangeLog | 9 +++ gdb/doc/gdb.texinfo | 123 ----------------------------------------- gdb/doc/gdbint.texinfo | 33 +---------- gdb/main.c | 14 ----- gdb/stabsread.c | 8 +-- gdb/symfile.c | 10 ++-- gdb/symtab.c | 10 ++-- 8 files changed, 32 insertions(+), 185 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index beb80e51d03..390fa362110 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2003-02-01 Andrew Cagney + + * main.c (captured_main): Delete #ifdef ADDITIONAL_OPTIONS, + ADDITIONAL_OPTION_CASES, and ADDITIONAL_OPTION_HANDLER code. + (print_gdb_help): Delete #ifdef ADDITIONAL_OPTION_HELP code. + * stabsread.c (DBX_PARM_SYMBOL_CLASS): Delete macro. + (define_symbol): Update. + * symfile.c (generic_load): Remove references to nindy. + * symtab.c: Remove references to nindy. + 2003-02-01 Andrew Cagney * infcmd.c (print_float_info): Delete code conditional on diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 8d66b91b53f..832ac375c64 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,12 @@ +2003-02-01 Andrew Cagney + + * gdbint.texinfo (Target Architecture Definition): Delete + description of ADDITIONAL_OPTIONS, ADDITIONAL_OPTION_CASES, + ADDITIONAL_OPTION_HANDLER, and ADDITIONAL_OPTION_HELP, and + BEFORE_MAIN_LOOP_HOOK, and DBX_PARM_SYMBOL_CLASS along with + references to nindy and i960. + * gdb.texinfo (i960): Delete all references to i960 and nindy. + 2003-02-01 Andrew Cagney * gdbint.texinfo (Target Architecture Definition): Delete diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 58c254d6bb7..b3dd7a7f1dd 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -11414,7 +11414,6 @@ configurations. * ARM:: ARM * H8/300:: Hitachi H8/300 * H8/500:: Hitachi H8/500 -* i960:: Intel i960 * M32R/D:: Mitsubishi M32R/D * M68K:: Motorola M68K * MIPS Embedded:: MIPS Embedded @@ -11668,128 +11667,6 @@ memory}. The accepted values for @var{mod} are @code{small}, @end table -@node i960 -@subsection Intel i960 - -@table @code - -@kindex target mon960 -@item target mon960 @var{dev} -MON960 monitor for Intel i960. - -@kindex target nindy -@item target nindy @var{devicename} -An Intel 960 board controlled by a Nindy Monitor. @var{devicename} is -the name of the serial device to use for the connection, e.g. -@file{/dev/ttya}. - -@end table - -@cindex Nindy -@cindex i960 -@dfn{Nindy} is a ROM Monitor program for Intel 960 target systems. When -@value{GDBN} is configured to control a remote Intel 960 using Nindy, you can -tell @value{GDBN} how to connect to the 960 in several ways: - -@itemize @bullet -@item -Through command line options specifying serial port, version of the -Nindy protocol, and communications speed; - -@item -By responding to a prompt on startup; - -@item -By using the @code{target} command at any point during your @value{GDBN} -session. @xref{Target Commands, ,Commands for managing targets}. - -@end itemize - -@cindex download to Nindy-960 -With the Nindy interface to an Intel 960 board, @code{load} -downloads @var{filename} to the 960 as well as adding its symbols in -@value{GDBN}. - -@menu -* Nindy Startup:: Startup with Nindy -* Nindy Options:: Options for Nindy -* Nindy Reset:: Nindy reset command -@end menu - -@node Nindy Startup -@subsubsection Startup with Nindy - -If you simply start @code{@value{GDBP}} without using any command-line -options, you are prompted for what serial port to use, @emph{before} you -reach the ordinary @value{GDBN} prompt: - -@smallexample -Attach /dev/ttyNN -- specify NN, or "quit" to quit: -@end smallexample - -@noindent -Respond to the prompt with whatever suffix (after @samp{/dev/tty}) -identifies the serial port you want to use. You can, if you choose, -simply start up with no Nindy connection by responding to the prompt -with an empty line. If you do this and later wish to attach to Nindy, -use @code{target} (@pxref{Target Commands, ,Commands for managing targets}). - -@node Nindy Options -@subsubsection Options for Nindy - -These are the startup options for beginning your @value{GDBN} session with a -Nindy-960 board attached: - -@table @code -@item -r @var{port} -Specify the serial port name of a serial interface to be used to connect -to the target system. This option is only available when @value{GDBN} is -configured for the Intel 960 target architecture. You may specify -@var{port} as any of: a full pathname (e.g. @samp{-r /dev/ttya}), a -device name in @file{/dev} (e.g. @samp{-r ttya}), or simply the unique -suffix for a specific @code{tty} (e.g. @samp{-r a}). - -@item -O -(An uppercase letter ``O'', not a zero.) Specify that @value{GDBN} should use -the ``old'' Nindy monitor protocol to connect to the target system. -This option is only available when @value{GDBN} is configured for the Intel 960 -target architecture. - -@quotation -@emph{Warning:} if you specify @samp{-O}, but are actually trying to -connect to a target system that expects the newer protocol, the connection -fails, appearing to be a speed mismatch. @value{GDBN} repeatedly -attempts to reconnect at several different line speeds. You can abort -this process with an interrupt. -@end quotation - -@item -brk -Specify that @value{GDBN} should first send a @code{BREAK} signal to the target -system, in an attempt to reset it, before connecting to a Nindy target. - -@quotation -@emph{Warning:} Many target systems do not have the hardware that this -requires; it only works with a few boards. -@end quotation -@end table - -The standard @samp{-b} option controls the line speed used on the serial -port. - -@c @group -@node Nindy Reset -@subsubsection Nindy reset command - -@table @code -@item reset -@kindex reset -For a Nindy target, this command sends a ``break'' to the remote target -system; this is only useful if the target has been equipped with a -circuit to perform a hard reset (or some other interesting action) when -a break is detected. -@end table -@c @end group - @node M32R/D @subsection Mitsubishi M32R/D diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index a68763b250d..cf35a2817d8 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -2295,9 +2295,8 @@ always linked in.) @item USG Means that System V (prior to SVR4) include files are in use. (FIXME: -This symbol is abused in @file{infrun.c}, @file{regex.c}, -@file{remote-nindy.c}, and @file{utils.c} for other things, at the -moment.) +This symbol is abused in @file{infrun.c}, @file{regex.c}, and +@file{utils.c} for other things, at the moment.) @item lint Define this to help placate @code{lint} in some situations. @@ -2913,18 +2912,6 @@ machine. @table @code -@item ADDITIONAL_OPTIONS -@itemx ADDITIONAL_OPTION_CASES -@itemx ADDITIONAL_OPTION_HANDLER -@itemx ADDITIONAL_OPTION_HELP -@findex ADDITIONAL_OPTION_HELP -@findex ADDITIONAL_OPTION_HANDLER -@findex ADDITIONAL_OPTION_CASES -@findex ADDITIONAL_OPTIONS -These are a set of macros that allow the addition of additional command -line options to @value{GDBN}. They are currently used only for the unsupported -i960 Nindy target, and should not be used in any other configuration. - @item ADDR_BITS_REMOVE (addr) @findex ADDR_BITS_REMOVE If a raw machine instruction address includes any bits that are not @@ -2990,16 +2977,6 @@ This macro may safely assume that @var{type} is either a pointer or a C@t{++} reference type. @xref{Target Architecture Definition, , Pointers Are Not Always Addresses}. -@item BEFORE_MAIN_LOOP_HOOK -@findex BEFORE_MAIN_LOOP_HOOK -Define this to expand into any code that you want to execute before the -main loop starts. Although this is not, strictly speaking, a target -conditional, that is how it is currently being used. Note that if a -configuration were to define it one way for a host and a different way -for the target, @value{GDBN} will probably not compile, let alone run -correctly. This macro is currently used only for the unsupported i960 Nindy -target, and should not be used in any other configuration. - @item BELIEVE_PCC_PROMOTION @findex BELIEVE_PCC_PROMOTION Define if the compiler promotes a @code{short} or @code{char} @@ -3150,12 +3127,6 @@ Return non-zero if register @var{regnum} can represent data values in a non-standard form. @xref{Target Architecture Definition, , Using Different Register and Memory Data Representations}. -@item DBX_PARM_SYMBOL_CLASS -@findex DBX_PARM_SYMBOL_CLASS -Hook for the @code{SYMBOL_CLASS} of a parameter when decoding DBX symbol -information. In the i960, parameters can be stored as locals or as -args, depending on the type of the debug record. - @item DECR_PC_AFTER_BREAK @findex DECR_PC_AFTER_BREAK Define this to be the amount by which to decrement the PC after the diff --git a/gdb/main.c b/gdb/main.c index fb24be935a3..7da4ac4a325 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -300,10 +300,6 @@ captured_main (void *data) {"statistics", no_argument, 0, 13}, {"write", no_argument, &write_files, 1}, {"args", no_argument, &set_args, 1}, -/* Allow machine descriptions to add more options... */ -#ifdef ADDITIONAL_OPTIONS - ADDITIONAL_OPTIONS -#endif {0, no_argument, 0, 0} }; @@ -444,9 +440,6 @@ extern int gdbtk_test (char *); } break; -#ifdef ADDITIONAL_OPTION_CASES - ADDITIONAL_OPTION_CASES -#endif case '?': fprintf_unfiltered (gdb_stderr, _("Use `%s --help' for a complete list of options.\n"), @@ -643,10 +636,6 @@ extern int gdbtk_test (char *); if (ttyarg != NULL) catch_command_errors (tty_command, ttyarg, !batch, RETURN_MASK_ALL); -#ifdef ADDITIONAL_OPTION_HANDLER - ADDITIONAL_OPTION_HANDLER; -#endif - /* Error messages should no longer be distinguished with extra output. */ error_pre_print = NULL; quit_pre_print = NULL; @@ -835,9 +824,6 @@ Options:\n\n\ --write Set writing into executable and core files.\n\ --xdb XDB compatibility mode.\n\ "), stream); -#ifdef ADDITIONAL_OPTION_HELP - fputs_unfiltered (ADDITIONAL_OPTION_HELP, stream); -#endif fputs_unfiltered (_("\n\ For more information, type \"help\" from within GDB, or consult the\n\ GDB manual (available as on-line info or a printed manual).\n\ diff --git a/gdb/stabsread.c b/gdb/stabsread.c index cd338d5aec8..c05e32b5ea2 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -1646,13 +1646,7 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type, else SYMBOL_TYPE (sym) = read_type (&p, objfile); - /* Normally this is a parameter, a LOC_ARG. On the i960, it - can also be a LOC_LOCAL_ARG depending on symbol type. */ -#ifndef DBX_PARM_SYMBOL_CLASS -#define DBX_PARM_SYMBOL_CLASS(type) LOC_ARG -#endif - - SYMBOL_CLASS (sym) = DBX_PARM_SYMBOL_CLASS (type); + SYMBOL_CLASS (sym) = LOC_ARG; SYMBOL_VALUE (sym) = valu; SYMBOL_NAMESPACE (sym) = VAR_NAMESPACE; add_symbol_to_list (sym, &local_symbols); diff --git a/gdb/symfile.c b/gdb/symfile.c index 95da6f12416..c83c025bbfb 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1652,11 +1652,11 @@ generic_load (char *args, int from_tty) for other targets too. */ write_pc (entry); - /* FIXME: are we supposed to call symbol_file_add or not? According to - a comment from remote-mips.c (where a call to symbol_file_add was - commented out), making the call confuses GDB if more than one file is - loaded in. remote-nindy.c had no call to symbol_file_add, but remote-vx.c - does. */ + /* FIXME: are we supposed to call symbol_file_add or not? According + to a comment from remote-mips.c (where a call to symbol_file_add + was commented out), making the call confuses GDB if more than one + file is loaded in. Some targets do (e.g., remote-vx.c) but + others don't (or didn't - perhaphs they have all been deleted). */ print_transfer_performance (gdb_stdout, cbdata.data_count, cbdata.write_count, end_time - start_time); diff --git a/gdb/symtab.c b/gdb/symtab.c index 15f4c3f15b6..9d8bdc00969 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -716,11 +716,11 @@ fixup_psymbol_section (struct partial_symbol *psym, struct objfile *objfile) attractive to put in some QUIT's (though I'm not really sure whether it can run long enough to be really important). But there are a few calls for which it would appear to be bad news to quit - out of here: find_proc_desc in alpha-tdep.c and mips-tdep.c, and - nindy_frame_chain_valid in nindy-tdep.c. (Note that there is C++ - code below which can error(), but that probably doesn't affect - these calls since they are looking for a known variable and thus - can probably assume it will never hit the C++ code). */ + out of here: find_proc_desc in alpha-tdep.c and mips-tdep.c. (Note + that there is C++ code below which can error(), but that probably + doesn't affect these calls since they are looking for a known + variable and thus can probably assume it will never hit the C++ + code). */ struct symbol * lookup_symbol (const char *name, const struct block *block, -- 2.30.2