# and then Sanitize.
===================================================================
-RCS file: /local/cvsfiles/devo/gdb/.Sanitize,v
-retrieving revision 2.56
-diff -c -r2.56 .Sanitize
-*** 2.56 1992/06/23 06:26:00
---- .Sanitize 1992/07/05 18:39:47
-***************
-*** 76,81 ****
---- 76,84 ----
- doc
- dwarfread.c
- elfread.c
-+ energize
-+ energize.c
-+ energize.h
- environ.c
- environ.h
- eval.c
-===================================================================
-*** Makefile.in Wed Jul 15 12:22:03 1992
---- Makefile.in Wed Jul 15 12:15:34 1992
+*** config/ncr3000.mh.orig Mon Jun 15 12:25:13 1992
+--- config/ncr3000.mh Mon Aug 24 19:22:31 1992
+***************
+*** 38,40 ****
+--- 38,46 ----
+ # The /usr/ucb/install program is incompatible (complains about unknown
+ # group staff). Use good old cp...
+ INSTALL = cp
++
++ # These are the libs that are needed for the Energize version of gdb on
++ # SVR4. Note that we MUST include the standard C library before libucb.a,
++ # otherwise we get lots of broken stuff we don't want.
++ XM_CLIBS = -L/usr/lib -lm -lnet -lresolv -lform -lsocket -lc \
++ /usr/ucblib/libucb.a -lnsl
+*** Makefile.in.orig Tue Aug 18 14:59:22 1992
+--- Makefile.in Mon Aug 24 19:24:01 1992
***************
*** 123,128 ****
---- 123,132 ----
+--- 123,135 ----
READLINE_DEP = $$(READLINE_DIR)
RL_LIB = ./../readline${subdir}/libreadline.a
-+ # Energize libraries
-+ ENERGIZE_DIR = ${srcdir}/../gdb/energize
-+ ENERGIZE_LIB = ./../gdb/energize${subdir}/libconn.a
++ # Energize libraries. Works slightly differently than other libraries
++ # because it is a gdb subdir and we try to build the energize library
++ # if it doesn't exist, unlike readline, bfd, mmalloc, etc. Note
++ # that SDIR and BDIR will be different if we configured with -srcdir.
++ ENERGIZE_DIR = energize
++ ENERGIZE_LIB = ${ENERGIZE_DIR}/libconn.a
+
# All the includes used for CFLAGS and for lint.
# -I. for config files.
ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES}
! ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES}
- VERSION = 4.6.1
+ VERSION = 4.6.3
DIST=gdb
---- 159,171 ----
+--- 162,174 ----
# {X,T}M_CLIBS, defined in *config files, have host- and target-dependent libs.
# TERMCAP comes after readline, since readline depends on it.
CLIBS = ${BFD_LIB} ${RL_LIB} ${TERMCAP} ${MMALLOC_LIB} ${LIBIBERTY} \
-! ${ENERGIZE_LIB} ${XM_CLIBS} ${TM_CLIBS}
+! ${ENERGIZE_LIB} ${XM_CLIBS} ${TM_CLIBS}
CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${MMALLOC_LIB} ${LIBIBERTY} \
${RL_LIB} ${MMALLOC_LIB}
! ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES} \
! ${ENERGIZE_LIB}
- VERSION = 4.6.1
+ VERSION = 4.6.3
DIST=gdb
***************
-*** 190,196 ****
+*** 203,209 ****
${DEMANGLER}.c mem-break.c target.c inftarg.c \
- dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c \
+ dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c stabsread.c \
ieee-float.c language.c parse.c buildsym.c objfiles.c \
! minsyms.c mipsread.c maint.c
# Source files in subdirectories (which will be handled separately by
# 'make gdb.tar.Z').
---- 195,201 ----
+--- 211,217 ----
${DEMANGLER}.c mem-break.c target.c inftarg.c \
- dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c \
+ dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c stabsread.c \
ieee-float.c language.c parse.c buildsym.c objfiles.c \
! minsyms.c mipsread.c maint.c energize.c
# Source files in subdirectories (which will be handled separately by
# 'make gdb.tar.Z').
***************
-*** 276,282 ****
+*** 289,295 ****
command.o utils.o expprint.o environ.o version.o gdbtypes.o \
copying.o $(DEPFILES) ${DEMANGLER}.o mem-break.o target.o \
inftarg.o ieee-float.o putenv.o parse.o language.o $(YYOBJ) \
! buildsym.o objfiles.o minsyms.o maint.o demangle.o \
- dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o
+ dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o \
+ stabsread.o
- RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
---- 281,287 ----
+--- 297,303 ----
command.o utils.o expprint.o environ.o version.o gdbtypes.o \
copying.o $(DEPFILES) ${DEMANGLER}.o mem-break.o target.o \
inftarg.o ieee-float.o putenv.o parse.o language.o $(YYOBJ) \
! buildsym.o objfiles.o minsyms.o maint.o demangle.o energize.o \
- dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o
+ dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o \
+ stabsread.o
- RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
***************
-*** 289,295 ****
+*** 303,309 ****
NTSSTART = kdb-start.o
# For now, shortcut the "configure GDB for fewer languages" stuff.
YYFILES = c-exp.tab.c m2-exp.tab.c
---- 294,300 ----
+--- 311,317 ----
NTSSTART = kdb-start.o
# For now, shortcut the "configure GDB for fewer languages" stuff.
YYFILES = c-exp.tab.c m2-exp.tab.c
***************
-*** 343,348 ****
---- 348,367 ----
+*** 363,368 ****
+--- 371,390 ----
#load `echo " "$(DEPFILES) | sed -e 's/\.o/.c/g' -e 's, , ../,g'`
echo "Load .c corresponding to:" $(DEPFILES)
# This is useful when debugging GDB, because some Unix's don't let you run GDB
# on itself without copying the executable. So "make gdb1" will make
***************
-*** 665,670 ****
---- 684,694 ----
-
- xcoffexec.o: ${srcdir}/xcoffexec.c
- ${CC} -c ${INTERNAL_CFLAGS} -I$(BFD_DIR) ${srcdir}/xcoffexec.c
-+
-+ # Energize support has dependencies on ENERGIZE header files.
-+
-+ energize.o: ${srcdir}/energize.c
-+ ${CC} -c ${INTERNAL_CFLAGS} -I$(ENERGIZE_DIR) ${srcdir}/energize.c
+*** 652,658 ****
+ -e '/extern.*free/d' \
+ < y.tab.c > m2-exp.tab.c
+ -rm y.tab.c
+-
- # Drag in the files that are in another directory.
-
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/breakpoint.c,v
-retrieving revision 1.38
-diff -c -r1.38 breakpoint.c
-*** 1.38 1992/07/04 03:20:43
---- breakpoint.c 1992/07/05 13:37:46
+ main.o: ${srcdir}/main.c
+ ${CC} -c ${INTERNAL_CFLAGS} -I${READLINE_DIR} $<
+--- 674,679 ----
+*** breakpoint.c.orig Sun Aug 23 11:09:10 1992
+--- breakpoint.c Mon Aug 24 19:22:26 1992
***************
*** 273,278 ****
--- 273,279 ----
error ("Junk at end of expression");
}
***************
-*** 316,330 ****
+*** 316,327 ****
ALL_BREAKPOINTS (b)
if (b->number == bnum)
{
! if (from_tty && input_from_terminal_p ())
-! {
-! printf_filtered ("Type commands for when breakpoint %d is hit, one per line.\n\
+ printf_filtered ("Type commands for when breakpoint %d is hit, one per line.\n\
End with a line saying just \"end\".\n", bnum);
-- fflush (stdout);
-- }
l = read_command_lines ();
free_command_lines (&b->commands);
b->commands = l;
if (b->number == bnum)
{
! if ((from_tty && input_from_terminal_p ()) || energize)
-! printf_filtered ("Type commands for when breakpoint %d is hit, one per line.\n\
+ printf_filtered ("Type commands for when breakpoint %d is hit, one per line.\n\
End with a line saying just \"end\".\n", bnum);
l = read_command_lines ();
free_command_lines (&b->commands);
}
error ("No breakpoint number %d.", bnum);
***************
-*** 925,930 ****
+*** 922,927 ****
--- 925,931 ----
{
b->ignore_count--;
else
{
***************
-*** 1365,1370 ****
---- 1366,1373 ----
+*** 1373,1378 ****
+--- 1377,1384 ----
mention (b)
struct breakpoint *b;
{
{
case bp_watchpoint:
***************
-*** 2112,2117 ****
---- 2115,2122 ----
+*** 2120,2125 ****
+--- 2126,2133 ----
register struct breakpoint *b;
register bpstat bs;
target_remove_breakpoint(bpt->address, bpt->shadow_contents);
***************
-*** 2283,2288 ****
---- 2288,2294 ----
+*** 2296,2301 ****
+--- 2304,2310 ----
if (b->number == bptnum)
{
b->ignore_count = count;
return;
else if (count == 0)
***************
-*** 2307,2313 ****
+*** 2320,2326 ****
struct breakpoint *b;
ALL_BREAKPOINTS (b)
}
/* Command to set ignore-count of breakpoint N to COUNT. */
---- 2313,2322 ----
+--- 2329,2338 ----
struct breakpoint *b;
ALL_BREAKPOINTS (b)
/* Command to set ignore-count of breakpoint N to COUNT. */
***************
-*** 2374,2379 ****
---- 2383,2390 ----
+*** 2387,2392 ****
+--- 2399,2406 ----
{
bpt->enable = enabled;
printf ("breakpoint #%d enabled\n", bpt->number);
***************
-*** 2421,2426 ****
---- 2432,2439 ----
+*** 2434,2439 ****
+--- 2448,2455 ----
disable_breakpoint (bpt)
struct breakpoint *bpt;
{
bpt->enable = disabled;
if (xgdb_verbose && bpt->type == bp_breakpoint)
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/command.c,v
-retrieving revision 1.17
-diff -c -r1.17 command.c
-*** 1.17 1992/07/04 03:20:54
---- command.c 1992/07/05 13:41:51
+*** command.c.orig Fri Jul 10 10:22:30 1992
+--- command.c Mon Aug 24 19:22:26 1992
***************
-*** 1149,1155 ****
+*** 1148,1154 ****
}
if (pid != -1)
;
else
error ("Fork failed");
---- 1149,1155 ----
+--- 1148,1154 ----
}
if (pid != -1)
;
else
error ("Fork failed");
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/configure.in,v
-retrieving revision 1.50
-diff -c -r1.50 configure.in
-*** 1.50 1992/06/23 00:25:00
---- configure.in 1992/07/05 17:50:08
+*** configure.in.orig Tue Aug 18 11:35:50 1992
+--- configure.in Mon Aug 24 19:22:26 1992
***************
*** 1,4 ****
! configdirs="doc"
srcname="GDB"
srctrigger=main.c
target_dependent=true
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/defs.h,v
-retrieving revision 1.41
-diff -c -r1.41 defs.h
-*** 1.41 1992/06/30 08:53:18
---- defs.h 1992/07/05 13:24:31
+*** defs.h.orig Mon Jul 20 21:14:28 1992
+--- defs.h Mon Aug 24 19:22:27 1992
***************
-*** 787,790 ****
---- 787,792 ----
- extern CORE_ADDR
- push_word ();
+*** 808,811 ****
+--- 808,813 ----
+ #define MAINTENANCE_CMDS 1
+ #endif
+ #include "energize.h"
+
#endif /* !defined (DEFS_H) */
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/inflow.c,v
-retrieving revision 1.27
-diff -c -r1.27 inflow.c
-*** 1.27 1992/07/04 03:21:21
---- inflow.c 1992/07/05 12:58:31
+*** inflow.c.orig Wed Jul 22 21:41:45 1992
+--- inflow.c Mon Aug 24 19:22:27 1992
***************
-*** 81,87 ****
+*** 89,95 ****
static short pgrp_inferior;
static short pgrp_ours;
# else /* not def SHORT_PGRP */
static int pgrp_ours;
# endif /* not def SHORT_PGRP */
#else /* not def TIOCGPGRP */
---- 81,87 ----
+--- 89,95 ----
static short pgrp_inferior;
static short pgrp_ours;
# else /* not def SHORT_PGRP */
static int pgrp_ours;
# endif /* not def SHORT_PGRP */
#else /* not def TIOCGPGRP */
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/infrun.c,v
-retrieving revision 1.52
-diff -c -r1.52 infrun.c
-*** 1.52 1992/07/04 03:21:24
---- infrun.c 1992/07/05 13:46:46
-***************
-*** 617,622 ****
---- 617,623 ----
+*** infrun.c.orig Mon Aug 24 12:00:30 1992
+--- infrun.c Mon Aug 24 19:22:28 1992
+***************
+*** 633,638 ****
+--- 633,639 ----
Here we must get it up to actual execution of the real program. */
inferior_pid = pid; /* Needed for wait_for_inferior stuff below */
clear_proceed_status ();
***************
-*** 755,760 ****
---- 756,762 ----
+*** 771,776 ****
+--- 772,778 ----
attach (pid);
inferior_pid = pid;
push_target (&child_ops);
mark_breakpoints_out ();
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/inftarg.c,v
-retrieving revision 1.11
-diff -c -r1.11 inftarg.c
-*** 1.11 1992/03/29 23:21:27
---- inftarg.c 1992/07/05 13:48:05
+*** inftarg.c.orig Sun Mar 29 15:21:27 1992
+--- inftarg.c Mon Aug 24 19:22:28 1992
***************
*** 58,64 ****
#ifdef USE_PROC_FS
#endif
if (pid == -1) /* No more children to wait for */
{
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/main.c,v
-retrieving revision 1.49
-diff -c -r1.49 main.c
-*** 1.49 1992/07/04 12:20:57
---- main.c 1992/07/05 14:08:32
-***************
-*** 397,402 ****
---- 397,403 ----
+*** main.c.orig Fri Jul 10 10:22:33 1992
+--- main.c Mon Aug 24 19:22:29 1992
+***************
+*** 426,431 ****
+--- 426,432 ----
char *corearg = NULL;
char *cdarg = NULL;
char *ttyarg = NULL;
/* Pointers to all arguments of +command option. */
char **cmdarg;
***************
-*** 495,500 ****
---- 496,502 ----
+*** 524,529 ****
+--- 525,531 ----
{"tty", required_argument, 0, 't'},
{"baud", required_argument, 0, 'b'},
{"b", required_argument, 0, 'b'},
#ifdef ADDITIONAL_OPTIONS
ADDITIONAL_OPTIONS
***************
-*** 527,532 ****
---- 529,537 ----
+*** 556,561 ****
+--- 558,566 ----
case 11:
cdarg = optarg;
break;
symarg = optarg;
break;
***************
-*** 707,712 ****
---- 712,719 ----
+*** 736,741 ****
+--- 741,748 ----
free ((PTR)dirarg);
do_cleanups (ALL_CLEANUPS);
&& symarg != NULL
&& strcmp (execarg, symarg) == 0)
***************
-*** 821,827 ****
+*** 850,856 ****
if (!setjmp (to_top_level))
{
do_cleanups (ALL_CLEANUPS); /* Do complete cleanup */
quit_command ((char *)0, instream == stdin);
}
}
---- 828,837 ----
+--- 857,866 ----
if (!setjmp (to_top_level))
{
do_cleanups (ALL_CLEANUPS); /* Do complete cleanup */
}
}
***************
-*** 883,889 ****
+*** 912,918 ****
else if (c->function.cfunc == NO_FUNCTION)
error ("That is not a command, just a help topic.");
else
}
/* Tell the user if the language has changed (except first time). */
---- 893,899 ----
+--- 922,928 ----
else if (c->function.cfunc == NO_FUNCTION)
error ("That is not a command, just a help topic.");
else
/* Tell the user if the language has changed (except first time). */
***************
-*** 1519,1525 ****
+*** 1564,1570 ****
while (1)
{
dont_repeat ();
if (p == NULL)
/* Treat end of file like "end". */
break;
---- 1529,1535 ----
+--- 1574,1580 ----
while (1)
{
dont_repeat ();
/* Treat end of file like "end". */
break;
***************
-*** 1823,1829 ****
+*** 1868,1874 ****
void
print_prompt ()
{
fflush (stdout);
}
\f
---- 1833,1839 ----
+--- 1878,1884 ----
void
print_prompt ()
{
fflush (stdout);
}
\f
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/printcmd.c,v
-retrieving revision 1.29
-diff -c -r1.29 printcmd.c
-*** 1.29 1992/06/25 10:58:47
---- printcmd.c 1992/07/05 14:09:25
+*** printcmd.c.orig Sun Jul 5 17:22:52 1992
+--- printcmd.c Mon Aug 24 19:22:29 1992
***************
*** 778,783 ****
--- 778,792 ----
if (inspect)
printf("\") )\030");
***************
-*** 1610,1620 ****
---- 1620,1638 ----
+*** 1653,1663 ****
+--- 1663,1681 ----
standard indentation here is 4 spaces, and val_print indents
2 for each recurse. */
val = read_var_value (sym, FRAME_INFO_ID (fi));
first = 0;
}
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/stack.c,v
-retrieving revision 1.33
-diff -c -r1.33 stack.c
-*** 1.33 1992/07/04 03:21:45
---- stack.c 1992/07/05 14:13:23
+*** stack.c.orig Fri Jul 3 20:21:45 1992
+--- stack.c Mon Aug 24 19:22:30 1992
***************
*** 159,165 ****
if (addressprint)
}
wrap_here (" ");
if (sal.symtab)
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/symfile.c,v
-retrieving revision 1.55
-diff -c -r1.55 symfile.c
-*** 1.55 1992/07/04 13:58:46
---- symfile.c 1992/07/05 14:14:12
+*** symfile.c.orig Sun Aug 23 11:09:17 1992
+--- symfile.c Mon Aug 24 19:22:30 1992
***************
*** 611,616 ****
--- 611,618 ----
return (objfile);
}
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/utils.c,v
-retrieving revision 1.53
-diff -c -r1.53 utils.c
-*** 1.53 1992/07/04 03:21:59
---- utils.c 1992/07/05 17:32:13
+*** utils.c.orig Sun Aug 23 11:09:21 1992
+--- utils.c Mon Aug 24 19:22:31 1992
***************
*** 694,700 ****
register int ans2;
while (1)
***************
-*** 701,721 ****
- {
+*** 703,723 ****
+ fflush (stdout);
va_start (args);
ctlstr = va_arg (args, char *);
vfprintf_filtered (stdout, ctlstr, args);
if (answer >= 'a')
answer -= 040;
if (answer == 'Y')
---- 701,732 ----
- {
+--- 703,734 ----
+ fflush (stdout);
va_start (args);
ctlstr = va_arg (args, char *);
+ energize_query (ctlstr, args);
answer -= 040;
if (answer == 'Y')
***************
-*** 723,728 ****
---- 734,740 ----
+*** 725,730 ****
+--- 736,742 ----
if (answer == 'N')
return 0;
printf_filtered ("Please answer y or n.\n");
}
***************
-*** 989,994 ****
---- 1001,1012 ----
+*** 991,996 ****
+--- 1003,1014 ----
if (linebuffer == 0)
return;
/* Don't do any filtering if it is disabled. */
if (stream != stdout
|| (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX))
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/valprint.c,v
-retrieving revision 1.45
-diff -c -r1.45 valprint.c
-*** 1.45 1992/07/04 03:22:04
---- valprint.c 1992/07/05 14:19:51
-***************
-*** 485,490 ****
---- 485,491 ----
+*** valprint.c.orig Sat Aug 8 23:14:57 1992
+--- valprint.c Mon Aug 24 19:22:31 1992
+***************
+*** 488,493 ****
+--- 488,494 ----
struct type **dont_print;
{
int i, len, n_baseclasses;
check_stub_type (type);
***************
-*** 549,554 ****
---- 550,562 ----
+*** 552,557 ****
+--- 553,565 ----
fprint_symbol (stream, TYPE_FIELD_NAME (type, i));
fputs_filtered (" = ", stream);
}
{
value v;
***************
-*** 567,572 ****
---- 575,581 ----
+*** 570,575 ****
+--- 578,584 ----
valaddr + TYPE_FIELD_BITPOS (type, i) / 8,
0, stream, format, 0, recurse + 1, pretty);
}
if (pretty)
{
***************
-*** 801,806 ****
---- 810,816 ----
+*** 804,809 ****
+--- 813,819 ----
unsigned int rep1;
/* Number of repetitions we have detected so far. */
unsigned int reps;
if (i != 0)
if (arrayprint)
***************
-*** 822,827 ****
---- 832,842 ----
+*** 825,830 ****
+--- 835,845 ----
++rep1;
}
{
val_print (elttype, valaddr + i * eltlen,
***************
-*** 838,843 ****
---- 853,859 ----
+*** 841,846 ****
+--- 856,862 ----
recurse + 1, pretty);
things_printed++;
}
}
if (i < len)
fprintf_filtered (stream, "...");
-===================================================================
-*** config/amix.mh Tue Jun 9 19:05:16 1992
---- config/amix.mh Wed Jul 15 12:37:29 1992
-***************
-*** 22,24 ****
---- 22,30 ----
-
- # SVR4 puts the BSD compatible install in /usr/ucb.
- INSTALL = /usr/ucb/install -c
-+
-+ # These are the libs that are needed for the Energize version of gdb on
-+ # SVR4. Note that we MUST include the standard C library before libucb.a,
-+ # otherwise we get lots of broken stuff we don't want.
-+ XM_CLIBS = -L/usr/lib -lm -lnet -lresolv -lform -lsocket -lc \
-+ /usr/ucblib/libucb.a -lnsl
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/config/ncr3000.mh,v
-retrieving revision 1.4
-diff -c -r1.4 ncr3000.mh
-*** 1.4 1992/06/15 19:25:13
---- config/ncr3000.mh 1992/07/05 17:49:34
-***************
-*** 38,40 ****
---- 38,46 ----
- # The /usr/ucb/install program is incompatible (complains about unknown
- # group staff). Use good old cp...
- INSTALL = cp
-+
-+ # These are the libs that are needed for the Energize version of gdb on
-+ # SVR4. Note that we MUST include the standard C library before libucb.a,
-+ # otherwise we get lots of broken stuff we don't want.
-+ XM_CLIBS = -L/usr/lib -lm -lnet -lresolv -lform -lsocket -lc \
-+ /usr/ucblib/libucb.a -lnsl
-===================================================================
-*** demangle.c Wed Jul 15 11:42:27 1992
---- demangle.c Wed Jul 15 11:25:14 1992
+*** demangle.c.orig Wed Jul 15 12:33:17 1992
+--- demangle.c Mon Aug 24 19:22:32 1992
***************
*** 37,43 ****
the appropriate target configuration file. */