You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
839 lines
22 KiB
839 lines
22 KiB
# Apply these patches to GDB to produce an Energize GDB.
|
|
# To apply these patches, first cd to gdb-XX/gdb, run "patch -p0 <thisfile",
|
|
# and then Sanitize.
|
|
|
|
===================================================================
|
|
*** 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,135 ----
|
|
READLINE_DEP = $$(READLINE_DIR)
|
|
RL_LIB = ./../readline${subdir}/libreadline.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.
|
|
# -I${srcdir} possibly for regex.h also.
|
|
***************
|
|
*** 155,166 ****
|
|
# {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} \
|
|
! ${XM_CLIBS} ${TM_CLIBS}
|
|
CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${MMALLOC_LIB} ${LIBIBERTY} \
|
|
${RL_LIB} ${MMALLOC_LIB}
|
|
|
|
ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES}
|
|
! ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES}
|
|
|
|
VERSION = 4.6.3
|
|
DIST=gdb
|
|
--- 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}
|
|
CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${MMALLOC_LIB} ${LIBIBERTY} \
|
|
${RL_LIB} ${MMALLOC_LIB}
|
|
|
|
ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES}
|
|
! ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES} \
|
|
! ${ENERGIZE_LIB}
|
|
|
|
VERSION = 4.6.3
|
|
DIST=gdb
|
|
***************
|
|
*** 203,209 ****
|
|
${DEMANGLER}.c mem-break.c target.c inftarg.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').
|
|
--- 211,217 ----
|
|
${DEMANGLER}.c mem-break.c target.c inftarg.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').
|
|
***************
|
|
*** 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 \
|
|
stabsread.o
|
|
|
|
--- 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 \
|
|
stabsread.o
|
|
|
|
***************
|
|
*** 303,309 ****
|
|
|
|
NTSSTART = kdb-start.o
|
|
|
|
! SUBDIRS = doc
|
|
|
|
# For now, shortcut the "configure GDB for fewer languages" stuff.
|
|
YYFILES = c-exp.tab.c m2-exp.tab.c
|
|
--- 311,317 ----
|
|
|
|
NTSSTART = kdb-start.o
|
|
|
|
! SUBDIRS = doc ${ENERGIZE_DIR}
|
|
|
|
# For now, shortcut the "configure GDB for fewer languages" stuff.
|
|
YYFILES = c-exp.tab.c m2-exp.tab.c
|
|
***************
|
|
*** 363,368 ****
|
|
--- 371,390 ----
|
|
#load `echo " "$(DEPFILES) | sed -e 's/\.o/.c/g' -e 's, , ../,g'`
|
|
echo "Load .c corresponding to:" $(DEPFILES)
|
|
|
|
+ ${ENERGIZE_LIB} :
|
|
+ @(cd ${ENERGIZE_DIR}; \
|
|
+ $(MAKE) \
|
|
+ "against=$(against)" \
|
|
+ "AR=$(AR)" \
|
|
+ "AR_FLAGS=$(AR_FLAGS)" \
|
|
+ "CC=$(CC)" \
|
|
+ "CFLAGS=$(CFLAGS)" \
|
|
+ "RANLIB=$(RANLIB)" \
|
|
+ "MAKEINFO=$(MAKEINFO)" \
|
|
+ "INSTALL=$(INSTALL)" \
|
|
+ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
|
+ "INSTALL_DATA=$(INSTALL_DATA)" \
|
|
+ "BISON=$(BISON)")
|
|
|
|
# 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
|
|
***************
|
|
*** 652,658 ****
|
|
-e '/extern.*free/d' \
|
|
< y.tab.c > m2-exp.tab.c
|
|
-rm y.tab.c
|
|
-
|
|
|
|
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 ----
|
|
b->cond_string = NULL;
|
|
if (from_tty)
|
|
printf_filtered ("Breakpoint %d now unconditional.\n", bnum);
|
|
+ energize_condition_breakpoint(b);
|
|
}
|
|
else
|
|
{
|
|
***************
|
|
*** 281,286 ****
|
|
--- 282,288 ----
|
|
typed in or the decompiled expression. */
|
|
b->cond_string = savestring (arg, strlen (arg));
|
|
b->cond = parse_exp_1 (&arg, block_for_pc (b->address), 0);
|
|
+ energize_condition_breakpoint(b);
|
|
if (*arg)
|
|
error ("Junk at end of expression");
|
|
}
|
|
***************
|
|
*** 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\
|
|
End with a line saying just \"end\".\n", bnum);
|
|
l = read_command_lines ();
|
|
free_command_lines (&b->commands);
|
|
b->commands = l;
|
|
return;
|
|
}
|
|
error ("No breakpoint number %d.", bnum);
|
|
--- 318,330 ----
|
|
ALL_BREAKPOINTS (b)
|
|
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\
|
|
End with a line saying just \"end\".\n", bnum);
|
|
l = read_command_lines ();
|
|
free_command_lines (&b->commands);
|
|
b->commands = l;
|
|
+ energize_commands_breakpoint(b);
|
|
return;
|
|
}
|
|
error ("No breakpoint number %d.", bnum);
|
|
***************
|
|
*** 922,927 ****
|
|
--- 925,931 ----
|
|
{
|
|
b->ignore_count--;
|
|
this_bp_stop = 0;
|
|
+ energize_ignore_breakpoint(b);
|
|
}
|
|
else
|
|
{
|
|
***************
|
|
*** 1373,1378 ****
|
|
--- 1377,1384 ----
|
|
mention (b)
|
|
struct breakpoint *b;
|
|
{
|
|
+ energize_create_breakpoint(b);
|
|
+
|
|
switch (b->type)
|
|
{
|
|
case bp_watchpoint:
|
|
***************
|
|
*** 2120,2125 ****
|
|
--- 2126,2133 ----
|
|
register struct breakpoint *b;
|
|
register bpstat bs;
|
|
|
|
+ energize_delete_breakpoint(bpt);
|
|
+
|
|
if (bpt->inserted)
|
|
target_remove_breakpoint(bpt->address, bpt->shadow_contents);
|
|
|
|
***************
|
|
*** 2296,2301 ****
|
|
--- 2304,2310 ----
|
|
if (b->number == bptnum)
|
|
{
|
|
b->ignore_count = count;
|
|
+ energize_ignore_breakpoint(b);
|
|
if (!from_tty)
|
|
return;
|
|
else if (count == 0)
|
|
***************
|
|
*** 2320,2326 ****
|
|
struct breakpoint *b;
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
! b->ignore_count = 0;
|
|
}
|
|
|
|
/* Command to set ignore-count of breakpoint N to COUNT. */
|
|
--- 2329,2338 ----
|
|
struct breakpoint *b;
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
! {
|
|
! b->ignore_count = 0;
|
|
! energize_ignore_breakpoint(b);
|
|
! }
|
|
}
|
|
|
|
/* Command to set ignore-count of breakpoint N to COUNT. */
|
|
***************
|
|
*** 2387,2392 ****
|
|
--- 2399,2406 ----
|
|
{
|
|
bpt->enable = enabled;
|
|
|
|
+ energize_enable_breakpoint(bpt);
|
|
+
|
|
if (xgdb_verbose && bpt->type == bp_breakpoint)
|
|
printf ("breakpoint #%d enabled\n", bpt->number);
|
|
|
|
***************
|
|
*** 2434,2439 ****
|
|
--- 2448,2455 ----
|
|
disable_breakpoint (bpt)
|
|
struct breakpoint *bpt;
|
|
{
|
|
+ energize_disable_breakpoint(bpt);
|
|
+
|
|
bpt->enable = disabled;
|
|
|
|
if (xgdb_verbose && bpt->type == bp_breakpoint)
|
|
*** command.c.orig Fri Jul 10 10:22:30 1992
|
|
--- command.c Mon Aug 24 19:22:26 1992
|
|
***************
|
|
*** 1148,1154 ****
|
|
}
|
|
|
|
if (pid != -1)
|
|
! while ((rc = wait (&status)) != pid && rc != -1)
|
|
;
|
|
else
|
|
error ("Fork failed");
|
|
--- 1148,1154 ----
|
|
}
|
|
|
|
if (pid != -1)
|
|
! while ((rc = energize_wait (&status)) != pid && rc != -1)
|
|
;
|
|
else
|
|
error ("Fork failed");
|
|
*** 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
|
|
--- 1,4 ----
|
|
! configdirs="energize doc"
|
|
srcname="GDB"
|
|
srctrigger=main.c
|
|
target_dependent=true
|
|
*** defs.h.orig Mon Jul 20 21:14:28 1992
|
|
--- defs.h Mon Aug 24 19:22:27 1992
|
|
***************
|
|
*** 808,811 ****
|
|
--- 808,813 ----
|
|
#define MAINTENANCE_CMDS 1
|
|
#endif
|
|
|
|
+ #include "energize.h"
|
|
+
|
|
#endif /* !defined (DEFS_H) */
|
|
*** inflow.c.orig Wed Jul 22 21:41:45 1992
|
|
--- inflow.c Mon Aug 24 19:22:27 1992
|
|
***************
|
|
*** 89,95 ****
|
|
static short pgrp_inferior;
|
|
static short pgrp_ours;
|
|
# else /* not def SHORT_PGRP */
|
|
! static int pgrp_inferior;
|
|
static int pgrp_ours;
|
|
# endif /* not def SHORT_PGRP */
|
|
#else /* not def TIOCGPGRP */
|
|
--- 89,95 ----
|
|
static short pgrp_inferior;
|
|
static short pgrp_ours;
|
|
# else /* not def SHORT_PGRP */
|
|
! int pgrp_inferior;
|
|
static int pgrp_ours;
|
|
# endif /* not def SHORT_PGRP */
|
|
#else /* not def TIOCGPGRP */
|
|
*** 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 */
|
|
+ energize_new_process();
|
|
|
|
clear_proceed_status ();
|
|
|
|
***************
|
|
*** 771,776 ****
|
|
--- 772,778 ----
|
|
|
|
attach (pid);
|
|
inferior_pid = pid;
|
|
+ energize_new_process();
|
|
push_target (&child_ops);
|
|
|
|
mark_breakpoints_out ();
|
|
*** 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
|
|
pid = proc_wait (status);
|
|
#else
|
|
! pid = wait (status);
|
|
#endif
|
|
if (pid == -1) /* No more children to wait for */
|
|
{
|
|
--- 58,64 ----
|
|
#ifdef USE_PROC_FS
|
|
pid = proc_wait (status);
|
|
#else
|
|
! pid = energize_wait (status);
|
|
#endif
|
|
if (pid == -1) /* No more children to wait for */
|
|
{
|
|
*** 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;
|
|
+ char *energize_id = NULL;
|
|
|
|
/* Pointers to all arguments of +command option. */
|
|
char **cmdarg;
|
|
***************
|
|
*** 524,529 ****
|
|
--- 525,531 ----
|
|
{"tty", required_argument, 0, 't'},
|
|
{"baud", required_argument, 0, 'b'},
|
|
{"b", required_argument, 0, 'b'},
|
|
+ {"context", required_argument, 0, 12},
|
|
/* Allow machine descriptions to add more options... */
|
|
#ifdef ADDITIONAL_OPTIONS
|
|
ADDITIONAL_OPTIONS
|
|
***************
|
|
*** 556,561 ****
|
|
--- 558,566 ----
|
|
case 11:
|
|
cdarg = optarg;
|
|
break;
|
|
+ case 12:
|
|
+ energize_id = optarg;
|
|
+ break;
|
|
case 's':
|
|
symarg = optarg;
|
|
break;
|
|
***************
|
|
*** 736,741 ****
|
|
--- 741,748 ----
|
|
free ((PTR)dirarg);
|
|
do_cleanups (ALL_CLEANUPS);
|
|
|
|
+ energize_initialize (energize_id, execarg);
|
|
+
|
|
if (execarg != NULL
|
|
&& symarg != NULL
|
|
&& strcmp (execarg, symarg) == 0)
|
|
***************
|
|
*** 850,856 ****
|
|
if (!setjmp (to_top_level))
|
|
{
|
|
do_cleanups (ALL_CLEANUPS); /* Do complete cleanup */
|
|
! command_loop ();
|
|
quit_command ((char *)0, instream == stdin);
|
|
}
|
|
}
|
|
--- 857,866 ----
|
|
if (!setjmp (to_top_level))
|
|
{
|
|
do_cleanups (ALL_CLEANUPS); /* Do complete cleanup */
|
|
! if (energize)
|
|
! energize_main_loop();
|
|
! else
|
|
! command_loop ();
|
|
quit_command ((char *)0, instream == stdin);
|
|
}
|
|
}
|
|
***************
|
|
*** 912,918 ****
|
|
else if (c->function.cfunc == NO_FUNCTION)
|
|
error ("That is not a command, just a help topic.");
|
|
else
|
|
! (*c->function.cfunc) (arg, from_tty & caution);
|
|
}
|
|
|
|
/* Tell the user if the language has changed (except first time). */
|
|
--- 922,928 ----
|
|
else if (c->function.cfunc == NO_FUNCTION)
|
|
error ("That is not a command, just a help topic.");
|
|
else
|
|
! energize_call_command (c, arg, from_tty & caution);
|
|
}
|
|
|
|
/* Tell the user if the language has changed (except first time). */
|
|
***************
|
|
*** 1564,1570 ****
|
|
while (1)
|
|
{
|
|
dont_repeat ();
|
|
! p = command_line_input ((char *) NULL, instream == stdin);
|
|
if (p == NULL)
|
|
/* Treat end of file like "end". */
|
|
break;
|
|
--- 1574,1580 ----
|
|
while (1)
|
|
{
|
|
dont_repeat ();
|
|
! p = energize_command_line_input ((char *) NULL, instream == stdin);
|
|
if (p == NULL)
|
|
/* Treat end of file like "end". */
|
|
break;
|
|
***************
|
|
*** 1868,1874 ****
|
|
void
|
|
print_prompt ()
|
|
{
|
|
! printf ("%s", prompt);
|
|
fflush (stdout);
|
|
}
|
|
|
|
--- 1878,1884 ----
|
|
void
|
|
print_prompt ()
|
|
{
|
|
! printf_filtered ("%s", prompt);
|
|
fflush (stdout);
|
|
}
|
|
|
|
*** printcmd.c.orig Sun Jul 5 17:22:52 1992
|
|
--- printcmd.c Mon Aug 24 19:22:29 1992
|
|
***************
|
|
*** 778,783 ****
|
|
--- 778,792 ----
|
|
{
|
|
int histindex = record_latest_value (val);
|
|
|
|
+ if (energize)
|
|
+ {
|
|
+ char buf[20];
|
|
+
|
|
+ sprintf(buf, "$%d", histindex);
|
|
+ energize_start_variable_annotation(buf, NULL, VALUE_TYPE(val),
|
|
+ VALUE_ADDRESS(val), "");
|
|
+ }
|
|
+
|
|
if (inspect)
|
|
printf ("\031(gdb-makebuffer \"%s\" %d '(\"", exp, histindex);
|
|
else
|
|
***************
|
|
*** 784,789 ****
|
|
--- 793,799 ----
|
|
if (histindex >= 0) printf_filtered ("$%d = ", histindex);
|
|
|
|
print_formatted (val, format, fmt.size);
|
|
+ energize_end_variable_annotation();
|
|
printf_filtered ("\n");
|
|
if (inspect)
|
|
printf("\") )\030");
|
|
***************
|
|
*** 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));
|
|
+
|
|
+ energize_start_variable_annotation(SYMBOL_NAME(sym), sym,
|
|
+ VALUE_TYPE(val),
|
|
+ VALUE_ADDRESS(val), "");
|
|
+
|
|
if (val)
|
|
val_print (VALUE_TYPE (val), VALUE_CONTENTS (val), VALUE_ADDRESS (val),
|
|
stream, 0, 0, 2, Val_no_prettyprint);
|
|
else
|
|
fputs_filtered ("???", stream);
|
|
+
|
|
+ energize_end_variable_annotation();
|
|
+
|
|
first = 0;
|
|
}
|
|
|
|
*** stack.c.orig Fri Jul 3 20:21:45 1992
|
|
--- stack.c Mon Aug 24 19:22:30 1992
|
|
***************
|
|
*** 159,165 ****
|
|
if (addressprint)
|
|
printf_filtered ("%s in ", local_hex_string(fi->pc));
|
|
|
|
! fputs_demangled (fname, stdout, 0);
|
|
fputs_filtered (" (...)\n", stdout);
|
|
|
|
return;
|
|
--- 159,168 ----
|
|
if (addressprint)
|
|
printf_filtered ("%s in ", local_hex_string(fi->pc));
|
|
|
|
! if (energize)
|
|
! energize_annotate_function(fname, 0, level);
|
|
! else
|
|
! fputs_demangled (fname, stdout, 0);
|
|
fputs_filtered (" (...)\n", stdout);
|
|
|
|
return;
|
|
***************
|
|
*** 218,224 ****
|
|
if (addressprint)
|
|
if (fi->pc != sal.pc || !sal.symtab)
|
|
printf_filtered ("%s in ", local_hex_string(fi->pc));
|
|
! fputs_demangled (funname ? funname : "??", stdout, 0);
|
|
wrap_here (" ");
|
|
fputs_filtered (" (", stdout);
|
|
if (args)
|
|
--- 221,230 ----
|
|
if (addressprint)
|
|
if (fi->pc != sal.pc || !sal.symtab)
|
|
printf_filtered ("%s in ", local_hex_string(fi->pc));
|
|
! if (energize)
|
|
! energize_annotate_function(funname ? funname : "??", 0, level);
|
|
! else
|
|
! fputs_demangled (funname ? funname : "??", stdout, 0);
|
|
wrap_here (" ");
|
|
fputs_filtered (" (", stdout);
|
|
if (args)
|
|
***************
|
|
*** 255,261 ****
|
|
{
|
|
if (addressprint && mid_statement)
|
|
printf_filtered ("%s\t", local_hex_string(fi->pc));
|
|
! print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
|
|
}
|
|
current_source_line = max (sal.line - lines_to_list/2, 1);
|
|
}
|
|
--- 261,268 ----
|
|
{
|
|
if (addressprint && mid_statement)
|
|
printf_filtered ("%s\t", local_hex_string(fi->pc));
|
|
! if (!energize)
|
|
! print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
|
|
}
|
|
current_source_line = max (sal.line - lines_to_list/2, 1);
|
|
}
|
|
***************
|
|
*** 429,435 ****
|
|
if (funname)
|
|
{
|
|
printf_filtered (" in ");
|
|
! fputs_demangled (funname, stdout, DMGL_ANSI | DMGL_PARAMS);
|
|
}
|
|
wrap_here (" ");
|
|
if (sal.symtab)
|
|
--- 436,446 ----
|
|
if (funname)
|
|
{
|
|
printf_filtered (" in ");
|
|
! if (energize)
|
|
! energize_annotate_function(funname, DMGL_ANSI | DMGL_PARAMS,
|
|
! selected_frame_level);
|
|
! else
|
|
! fputs_demangled (funname, stdout, DMGL_ANSI | DMGL_PARAMS);
|
|
}
|
|
wrap_here (" ");
|
|
if (sal.symtab)
|
|
*** symfile.c.orig Sun Aug 23 11:09:17 1992
|
|
--- symfile.c Mon Aug 24 19:22:30 1992
|
|
***************
|
|
*** 611,616 ****
|
|
--- 611,618 ----
|
|
fflush (stdout);
|
|
}
|
|
|
|
+ energize_symbol_file(objfile);
|
|
+
|
|
return (objfile);
|
|
}
|
|
|
|
*** utils.c.orig Sun Aug 23 11:09:21 1992
|
|
--- utils.c Mon Aug 24 19:22:31 1992
|
|
***************
|
|
*** 694,700 ****
|
|
register int ans2;
|
|
|
|
/* Automatically answer "yes" if input is not from a terminal. */
|
|
! if (!input_from_terminal_p ())
|
|
return 1;
|
|
|
|
while (1)
|
|
--- 694,700 ----
|
|
register int ans2;
|
|
|
|
/* Automatically answer "yes" if input is not from a terminal. */
|
|
! if (!input_from_terminal_p () && !energize)
|
|
return 1;
|
|
|
|
while (1)
|
|
***************
|
|
*** 703,723 ****
|
|
fflush (stdout);
|
|
va_start (args);
|
|
ctlstr = va_arg (args, char *);
|
|
vfprintf_filtered (stdout, ctlstr, args);
|
|
- va_end (args);
|
|
printf_filtered ("(y or n) ");
|
|
! fflush (stdout);
|
|
! answer = fgetc (stdin);
|
|
! clearerr (stdin); /* in case of C-d */
|
|
! if (answer == EOF) /* C-d */
|
|
! return 1;
|
|
! if (answer != '\n') /* Eat rest of input line, to EOF or newline */
|
|
! do
|
|
! {
|
|
! ans2 = fgetc (stdin);
|
|
! clearerr (stdin);
|
|
! }
|
|
! while (ans2 != EOF && ans2 != '\n');
|
|
if (answer >= 'a')
|
|
answer -= 040;
|
|
if (answer == 'Y')
|
|
--- 703,734 ----
|
|
fflush (stdout);
|
|
va_start (args);
|
|
ctlstr = va_arg (args, char *);
|
|
+ energize_query (ctlstr, args);
|
|
vfprintf_filtered (stdout, ctlstr, args);
|
|
printf_filtered ("(y or n) ");
|
|
! if (energize)
|
|
! {
|
|
! char *buf;
|
|
!
|
|
! buf = energize_command_line_input(0, 0);
|
|
! answer = buf ? *buf : 'Y';
|
|
! energize_acknowledge_query(buf);
|
|
! }
|
|
! else
|
|
! {
|
|
! fflush (stdout);
|
|
! answer = fgetc (stdin);
|
|
! clearerr (stdin); /* in case of C-d */
|
|
! if (answer == EOF) /* C-d */
|
|
! return 1;
|
|
! if (answer != '\n') /* Eat rest of input line, to EOF or newline */
|
|
! do
|
|
! {
|
|
! ans2 = fgetc (stdin);
|
|
! clearerr (stdin);
|
|
! }
|
|
! while (ans2 != EOF && ans2 != '\n');
|
|
! }
|
|
if (answer >= 'a')
|
|
answer -= 040;
|
|
if (answer == 'Y')
|
|
***************
|
|
*** 725,730 ****
|
|
--- 736,742 ----
|
|
if (answer == 'N')
|
|
return 0;
|
|
printf_filtered ("Please answer y or n.\n");
|
|
+ va_end (args);
|
|
}
|
|
}
|
|
|
|
***************
|
|
*** 991,996 ****
|
|
--- 1003,1014 ----
|
|
if (linebuffer == 0)
|
|
return;
|
|
|
|
+ if (energize)
|
|
+ {
|
|
+ energize_fputs(linebuffer);
|
|
+ return;
|
|
+ }
|
|
+
|
|
/* Don't do any filtering if it is disabled. */
|
|
if (stream != stdout
|
|
|| (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX))
|
|
*** 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;
|
|
+ char expr_tag[100]; /* Energize */
|
|
|
|
check_stub_type (type);
|
|
|
|
***************
|
|
*** 552,557 ****
|
|
--- 553,565 ----
|
|
fprint_symbol (stream, TYPE_FIELD_NAME (type, i));
|
|
fputs_filtered (" = ", stream);
|
|
}
|
|
+
|
|
+ sprintf(expr_tag, ".%s", TYPE_FIELD_NAME(type, i));
|
|
+
|
|
+ energize_start_variable_annotation(expr_tag, NULL,
|
|
+ TYPE_FIELD_TYPE(type, i),
|
|
+ (CORE_ADDR) (valaddr + TYPE_FIELD_BITPOS(type, i) / 8),
|
|
+ "");
|
|
if (TYPE_FIELD_PACKED (type, i))
|
|
{
|
|
value v;
|
|
***************
|
|
*** 570,575 ****
|
|
--- 578,584 ----
|
|
valaddr + TYPE_FIELD_BITPOS (type, i) / 8,
|
|
0, stream, format, 0, recurse + 1, pretty);
|
|
}
|
|
+ energize_end_variable_annotation();
|
|
}
|
|
if (pretty)
|
|
{
|
|
***************
|
|
*** 804,809 ****
|
|
--- 813,819 ----
|
|
unsigned int rep1;
|
|
/* Number of repetitions we have detected so far. */
|
|
unsigned int reps;
|
|
+ char expr_tag[100]; /* Energize */
|
|
|
|
if (i != 0)
|
|
if (arrayprint)
|
|
***************
|
|
*** 825,830 ****
|
|
--- 835,845 ----
|
|
++rep1;
|
|
}
|
|
|
|
+ sprintf(expr_tag, "[%d]", i);
|
|
+ energize_start_variable_annotation(expr_tag, NULL,
|
|
+ elttype,
|
|
+ (CORE_ADDR) (valaddr + i * eltlen),
|
|
+ "");
|
|
if (reps > REPEAT_COUNT_THRESHOLD)
|
|
{
|
|
val_print (elttype, valaddr + i * eltlen,
|
|
***************
|
|
*** 841,846 ****
|
|
--- 856,862 ----
|
|
recurse + 1, pretty);
|
|
things_printed++;
|
|
}
|
|
+ energize_end_variable_annotation();
|
|
}
|
|
if (i < len)
|
|
fprintf_filtered (stream, "...");
|
|
*** 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. */
|
|
|
|
#ifndef DEFAULT_DEMANGLING_STYLE
|
|
! # define DEFAULT_DEMANGLING_STYLE AUTO_DEMANGLING_STYLE_STRING
|
|
#endif
|
|
|
|
/* The current demangling style in affect. Global so that the demangler
|
|
--- 37,43 ----
|
|
the appropriate target configuration file. */
|
|
|
|
#ifndef DEFAULT_DEMANGLING_STYLE
|
|
! # define DEFAULT_DEMANGLING_STYLE LUCID_DEMANGLING_STYLE_STRING
|
|
#endif
|
|
|
|
/* The current demangling style in affect. Global so that the demangler
|
|
|