aboutsummaryrefslogtreecommitdiff
path: root/gdb/config/i960
diff options
context:
space:
mode:
authorJason Molenda <jmolenda@apple.com>1999-11-09 01:23:30 +0000
committerJason Molenda <jmolenda@apple.com>1999-11-09 01:23:30 +0000
commit11cf87416416e13eff634a70b4954fe6a3912720 (patch)
treea6dc7a21bb3d45b89c3f95e4b5862ec9d2fab83b /gdb/config/i960
parent98007ce7b0dea06f0c04d833d39b5a9c9773a07a (diff)
downloadgdb-11cf87416416e13eff634a70b4954fe6a3912720.zip
gdb-11cf87416416e13eff634a70b4954fe6a3912720.tar.gz
gdb-11cf87416416e13eff634a70b4954fe6a3912720.tar.bz2
import gdb-1999-11-08 snapshot
Diffstat (limited to 'gdb/config/i960')
-rw-r--r--gdb/config/i960/tm-nindy960.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/gdb/config/i960/tm-nindy960.h b/gdb/config/i960/tm-nindy960.h
index 7a20af3..d57a697 100644
--- a/gdb/config/i960/tm-nindy960.h
+++ b/gdb/config/i960/tm-nindy960.h
@@ -60,13 +60,18 @@ extern char *nindy_ttyname; /* Name of serial port to talk to nindy */
/* If specified on the command line, open tty for talking to nindy,
and download the executable file if one was specified. */
-#define ADDITIONAL_OPTION_HANDLER \
- if (!SET_TOP_LEVEL () && nindy_ttyname) { \
- nindy_open (nindy_ttyname, !batch); \
- if (!SET_TOP_LEVEL () && execarg) { \
- target_load (execarg, !batch); \
- } \
- }
+extern void nindy_open (char *name, int from_tty);
+#define ADDITIONAL_OPTION_HANDLER \
+ if (nindy_ttyname != NULL) \
+ { \
+ if (catch_command_errors (nindy_open, nindy_ttyname, \
+ !batch, RETURN_MASK_ALL)) \
+ { \
+ if (execarg != NULL) \
+ catch_command_errors (target_load, execarg, !batch, \
+ RETURN_MASK_ALL); \
+ } \
+ }
/* If configured for i960 target, we take control before main loop
and demand that we configure for a nindy target. */