diff options
| author | Jim Kingdon <jkingdon@engr.sgi.com> | 1995-04-04 20:07:21 +0000 |
|---|---|---|
| committer | Jim Kingdon <jkingdon@engr.sgi.com> | 1995-04-04 20:07:21 +0000 |
| commit | dee803840d2ba679a5444ed6715be25194a8e8d7 (patch) | |
| tree | d212125a99632bc7f52d5ce684a0ac119d51c716 | |
| parent | 01c32fc42ce3ad8e03b04c81db50fd6b0e171c26 (diff) | |
| download | gdb-dee803840d2ba679a5444ed6715be25194a8e8d7.zip gdb-dee803840d2ba679a5444ed6715be25194a8e8d7.tar.gz gdb-dee803840d2ba679a5444ed6715be25194a8e8d7.tar.bz2 | |
* top.c, utils.c, main.c: Replace error_pre_print with two
variables: error_pre_print (for RETURN_ERROR) and quit_pre_print
(for RETURN_QUIT). Fixes a bug whereby typing ^C (e.g. in "maint
print sym") could output extraneous stuff.
* objfiles.c: Don't declare error_pre_print; defs.h does it.
| -rw-r--r-- | gdb/ChangeLog | 17 | ||||
| -rw-r--r-- | gdb/objfiles.c | 4 | ||||
| -rw-r--r-- | gdb/top.c | 24 |
3 files changed, 35 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 77c8703..7e66fcc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,20 @@ +Mon Apr 3 19:28:14 1995 Jim Kingdon (kingdon@lioth.cygnus.com) + + * top.c, utils.c, main.c: Replace error_pre_print with two + variables: error_pre_print (for RETURN_ERROR) and quit_pre_print + (for RETURN_QUIT). Fixes a bug whereby typing ^C (e.g. in "maint + print sym") could output extraneous stuff. + * objfiles.c: Don't declare error_pre_print; defs.h does it. + +Mon Apr 3 13:48:28 1995 Stu Grossman (grossman@andros.cygnus.com) + + * monitor.h: Add MO_GETMEM_NEEDS_RANGE flag. + * monitor.c (monitor_read_memory): Use previously mentioned flag + to send proper format memory examine commands to the w89k monitor. + Also, try to handle bizarre format of memory dump... + + * op50-rom.c w89k-rom.c: Update to new monitor.[ch] conventions. + Sat Apr 1 03:22:20 1995 Peter Schauer (pes@regent.e-technik.tu-muenchen.de) * dbxread.c (process_one_symbol) [SOFUN_ADDRESS_MAYBE_MISSING]: diff --git a/gdb/objfiles.c b/gdb/objfiles.c index cce17f8..c73716c 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -49,10 +49,6 @@ map_to_address PARAMS ((void)); #endif /* !defined(NO_MMALLOC) && defined(HAVE_MMAP) */ -/* Message to be printed before the error message, when an error occurs. */ - -extern char *error_pre_print; - /* Externally visible variables that are owned by this module. See declarations in objfile.h for more info. */ @@ -493,15 +493,22 @@ catch_errors (func, args, errstring, mask) int val; struct cleanup *saved_cleanup_chain; char *saved_error_pre_print; + char *saved_quit_pre_print; saved_cleanup_chain = save_cleanups (); saved_error_pre_print = error_pre_print; + saved_quit_pre_print = quit_pre_print; if (mask & RETURN_MASK_ERROR) - memcpy ((char *)saved_error, (char *)error_return, sizeof (jmp_buf)); + { + memcpy ((char *)saved_error, (char *)error_return, sizeof (jmp_buf)); + error_pre_print = errstring; + } if (mask & RETURN_MASK_QUIT) - memcpy (saved_quit, quit_return, sizeof (jmp_buf)); - error_pre_print = errstring; + { + memcpy (saved_quit, quit_return, sizeof (jmp_buf)); + quit_pre_print = errstring; + } if (setjmp (tmp_jmp) == 0) { @@ -516,11 +523,16 @@ catch_errors (func, args, errstring, mask) restore_cleanups (saved_cleanup_chain); - error_pre_print = saved_error_pre_print; if (mask & RETURN_MASK_ERROR) - memcpy (error_return, saved_error, sizeof (jmp_buf)); + { + memcpy (error_return, saved_error, sizeof (jmp_buf)); + error_pre_print = saved_error_pre_print; + } if (mask & RETURN_MASK_QUIT) - memcpy (quit_return, saved_quit, sizeof (jmp_buf)); + { + memcpy (quit_return, saved_quit, sizeof (jmp_buf)); + quit_pre_print = saved_quit_pre_print; + } return val; } |