* energize-patches: Change names of all cadillac procedure calls

to be energize procedure calls.  Simplify many hooks by moving
tests energize.c.  Configure energize, and build it automatically now.

1 files changed, 284 insertions, 362 deletions

diff --git a/gdb/energize-patches b/gdb/energize-patches
index 74fff63..b0eca38 100755
--- a/gdb/energize-patches
+++ b/gdb/energize-patches
@@ -2,52 +2,46 @@
 # To apply these patches, first cd to gdb-XX/gdb, run "patch -p0 <thisfile",
 # and then Sanitize.
 
+cvs diff: Diffing .
 ===================================================================
-
-diff -rc .Sanitize .Sanitize
-*** .Sanitize	Mon Jun 22 23:26:00 1992
---- .Sanitize	Sat Jun 27 12:29:59 1992
-***************
-*** 53,58 ****
---- 53,59 ----
-  buildsym.c
-  buildsym.h
-  c-exp.y
-+ cadillac.c
-  call-cmds.h
-  coffread.c
-  command.c
-***************
-*** 70,75 ****
---- 71,77 ----
-  cplus-dem.c
-  createtags
-  dbxread.c
-+ deblib
-  defs.h
-  demangle.h
-  depend
-diff -rc Makefile.in Makefile.in
-*** Makefile.in	Sat Jun 27 12:16:43 1992
---- Makefile.in	Sat Jun 27 12:31:29 1992
+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 17:15:52
+***************
+*** 76,81 ****
+--- 76,83 ----
+  doc
+  dwarfread.c
+  elfread.c
++ energize
++ energize.c
+  environ.c
+  environ.h
+  eval.c
+===================================================================
+RCS file: /local/cvsfiles/devo/gdb/Makefile.in,v
+retrieving revision 1.161
+diff -c -r1.161 Makefile.in
+*** 1.161	1992/07/04 13:58:24
+--- Makefile.in	1992/07/05 17:43:37
 ***************
 *** 123,128 ****
---- 123,135 ----
+--- 123,133 ----
   READLINE_DEP = $$(READLINE_DIR)
   RL_LIB = ./../readline${subdir}/libreadline.a
   
-+ # Cadillac libraries
-+ CONNECTION_DIR = deblib/connection
-+ CONNECTION_LIB = ${CONNECTION_DIR}/libconn.a
-+ CADILLAC_DIR = ${srcdir}/deblib
-+ CADILLAC_INCLUDES = -I${CADILLAC_DIR}/connection -I${CADILLAC_DIR}/debugger
-+ CADILLAC_LIBS = ${CONNECTION_LIB}
++ # Energize libraries
++ ENERGIZE_DIR = ${srcdir}/energize
++ ENERGIZE_INCLUDES = -I${ENERGIZE_DIR}
++ ENERGIZE_LIBS = ${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 ****
+*** 155,161 ****
   # {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} \
@@ -55,25 +49,14 @@ diff -rc Makefile.in Makefile.in
   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.5.6
-  DIST=gdb
---- 162,174 ----
+--- 160,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} ${CADILLAC_LIBS}
+! 	${XM_CLIBS} ${TM_CLIBS} ${ENERGIZE_LIBS}
   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} \
-! 	${CONNECTION_LIB}
-  
-  VERSION = 4.5.6
-  DIST=gdb
 ***************
 *** 176,182 ****
   # demangling.  For other demangling styles, such as the Annotated C++
@@ -83,7 +66,7 @@ diff -rc Makefile.in Makefile.in
   
   # Host and target-dependent makefile fragments come in here.
   ####
---- 184,195 ----
+--- 181,192 ----
   # demangling.  For other demangling styles, such as the Annotated C++
   # Reference Manual (section 7.2.1c) style, set this define in the target-
   # dependent makefile fragment.
@@ -105,16 +88,16 @@ diff -rc Makefile.in Makefile.in
   
   # Source files in subdirectories (which will be handled separately by
   #  'make gdb.tar.Z').
---- 207,213 ----
+--- 204,210 ----
   	 ${DEMANGLER}.c mem-break.c target.c inftarg.c \
   	 dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c \
   	 ieee-float.c language.c parse.c buildsym.c objfiles.c \
-! 	 minsyms.c mipsread.c cadillac.c
+! 	 minsyms.c mipsread.c energize.c
   
   # Source files in subdirectories (which will be handled separately by
   #  'make gdb.tar.Z').
 ***************
-*** 279,285 ****
+*** 280,286 ****
       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) \
@@ -122,16 +105,16 @@ diff -rc Makefile.in Makefile.in
       dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o
   
   RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
---- 292,298 ----
+--- 290,296 ----
       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 cadillac.o \
+!     buildsym.o objfiles.o minsyms.o energize.o \
       dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o
   
   RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
 ***************
-*** 292,298 ****
+*** 293,299 ****
   
   NTSSTART = kdb-start.o
   
@@ -139,22 +122,22 @@ diff -rc Makefile.in Makefile.in
   
   # For now, shortcut the "configure GDB for fewer languages" stuff.
   YYFILES = c-exp.tab.c m2-exp.tab.c
---- 305,311 ----
+--- 303,309 ----
   
   NTSSTART = kdb-start.o
   
-! SUBDIRS = doc ${CONNECTION_DIR}
+! SUBDIRS = doc ${ENERGIZE_DIR}
   
   # For now, shortcut the "configure GDB for fewer languages" stuff.
   YYFILES = c-exp.tab.c m2-exp.tab.c
 ***************
-*** 346,351 ****
---- 359,378 ----
+*** 347,352 ****
+--- 357,376 ----
   	#load `echo " "$(DEPFILES) | sed -e 's/\.o/.c/g' -e 's, , ../,g'`
   	echo "Load .c corresponding to:" $(DEPFILES)
   
-+ ${CONNECTION_LIB} :
-+ 	@(cd ${CONNECTION_DIR}; \
++ ${ENERGIZE_LIB} :
++ 	@(cd ${ENERGIZE_DIR}; \
 + 		$(MAKE) \
 + 			"against=$(against)" \
 + 			"AR=$(AR)" \
@@ -171,39 +154,40 @@ diff -rc Makefile.in Makefile.in
   # 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
 ***************
-*** 694,699 ****
---- 721,729 ----
+*** 695,700 ****
+--- 719,727 ----
   
   ttyflush.o: ${srcdir}/nindy-share/ttyflush.c
   	${CC} -c ${INTERNAL_CFLAGS} ${srcdir}/nindy-share/ttyflush.c
 + 
-+ cadillac.o: ${srcdir}/cadillac.c
-+ 	${CC} -c ${INTERNAL_CFLAGS} ${CADILLAC_INCLUDES} ${srcdir}/cadillac.c
++ energize.o: ${srcdir}/energize.c
++ 	${CC} -c ${INTERNAL_CFLAGS} ${ENERGIZE_INCLUDES} ${srcdir}/energize.c
   
   lint: $(LINTFILES)
   	$(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
-diff -rc breakpoint.c breakpoint.c
-*** breakpoint.c	Wed Jun 17 14:53:28 1992
---- breakpoint.c	Sat Jun 27 12:30:01 1992
+===================================================================
+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
 ***************
 *** 273,278 ****
---- 273,280 ----
+--- 273,279 ----
   	    b->cond_string = NULL;
   	    if (from_tty)
   	      printf_filtered ("Breakpoint %d now unconditional.\n", bnum);
-+ 	    if (cadillac)
-+ 	      cadillac_condition_breakpoint(b);
++ 	    energize_condition_breakpoint(b);
   	  }
   	else
   	  {
 ***************
 *** 281,286 ****
---- 283,290 ----
+--- 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);
-+ 	    if (cadillac)
-+ 	      cadillac_condition_breakpoint(b);
++ 	    energize_condition_breakpoint(b);
   	    if (*arg)
   	      error ("Junk at end of expression");
   	  }
@@ -224,69 +208,64 @@ diff -rc breakpoint.c breakpoint.c
   	return;
         }
     error ("No breakpoint number %d.", bnum);
---- 320,333 ----
+--- 318,330 ----
     ALL_BREAKPOINTS (b)
       if (b->number == bnum)
         {
-! 	if ((from_tty && input_from_terminal_p ()) || cadillac)
+! 	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;
-+ 	if (cadillac)
-+ 	  cadillac_commands_breakpoint(b);
++ 	energize_commands_breakpoint(b);
   	return;
         }
     error ("No breakpoint number %d.", bnum);
 ***************
 *** 925,930 ****
---- 928,935 ----
+--- 925,931 ----
   	    {
   	      b->ignore_count--;
   	      this_bp_stop = 0;
-+ 	      if (cadillac)
-+ 		cadillac_ignore_breakpoint(b);
++ 	      energize_ignore_breakpoint(b);
   	    }
   	  else
   	    {
 ***************
 *** 1365,1370 ****
---- 1370,1378 ----
+--- 1366,1373 ----
   mention (b)
        struct breakpoint *b;
   {
-+   if (cadillac)
-+     cadillac_create_breakpoint(b);
++   energize_create_breakpoint(b);
 + 
     switch (b->type)
       {
       case bp_watchpoint:
 ***************
-*** 2106,2111 ****
---- 2114,2122 ----
+*** 2112,2117 ****
+--- 2115,2122 ----
     register struct breakpoint *b;
     register bpstat bs;
   
-+   if (cadillac)
-+     cadillac_delete_breakpoint(bpt);
++   energize_delete_breakpoint(bpt);
 + 
     if (bpt->inserted)
         target_remove_breakpoint(bpt->address, bpt->shadow_contents);
   
 ***************
-*** 2277,2282 ****
---- 2288,2295 ----
+*** 2283,2288 ****
+--- 2288,2294 ----
       if (b->number == bptnum)
         {
   	b->ignore_count = count;
-+ 	if (cadillac)
-+ 	  cadillac_ignore_breakpoint(b);
++ 	energize_ignore_breakpoint(b);
   	if (!from_tty)
   	  return;
   	else if (count == 0)
 ***************
-*** 2301,2307 ****
+*** 2307,2313 ****
     struct breakpoint *b;
   
     ALL_BREAKPOINTS (b)
@@ -294,45 +273,45 @@ diff -rc breakpoint.c breakpoint.c
   }
   
   /* Command to set ignore-count of breakpoint N to COUNT.  */
---- 2314,2324 ----
+--- 2313,2322 ----
     struct breakpoint *b;
   
     ALL_BREAKPOINTS (b)
 !     {
 !       b->ignore_count = 0;
-!       if (cadillac)
-! 	cadillac_ignore_breakpoint(b);
+!       energize_ignore_breakpoint(b);
 !     }
   }
   
   /* Command to set ignore-count of breakpoint N to COUNT.  */
 ***************
-*** 2368,2373 ****
---- 2385,2393 ----
+*** 2374,2379 ****
+--- 2383,2390 ----
   {
     bpt->enable = enabled;
   
-+   if (cadillac)
-+     cadillac_enable_breakpoint(bpt);
++   energize_enable_breakpoint(bpt);
 + 
     if (xgdb_verbose && bpt->type == bp_breakpoint)
       printf ("breakpoint #%d enabled\n", bpt->number);
   
 ***************
-*** 2415,2420 ****
---- 2435,2443 ----
+*** 2421,2426 ****
+--- 2432,2439 ----
   disable_breakpoint (bpt)
        struct breakpoint *bpt;
   {
-+   if (cadillac)
-+     cadillac_disable_breakpoint(bpt);
++   energize_disable_breakpoint(bpt);
 + 
     bpt->enable = disabled;
   
     if (xgdb_verbose && bpt->type == bp_breakpoint)
-diff -rc command.c command.c
-*** command.c	Mon Jun 22 20:33:41 1992
---- command.c	Sat Jun 27 12:30:01 1992
+===================================================================
+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
 ***************
 *** 1149,1155 ****
       }
@@ -346,45 +325,16 @@ diff -rc command.c command.c
       }
   
     if (pid != -1)
-!     while ((rc = cadillac ? cadillac_wait(&status) : wait (&status)) != pid && rc != -1)
+!     while ((rc = energize_wait (&status)) != pid && rc != -1)
         ;
     else
       error ("Fork failed");
-diff -rc config/amix.mh config/amix.mh
-*** config/amix.mh	Tue Jun  9 19:05:16 1992
---- config/amix.mh	Sat Jun 27 12:31:29 1992
-***************
-*** 22,24 ****
---- 22,31 ----
-  
-  # SVR4 puts the BSD compatible install in /usr/ucb.
-  INSTALL = /usr/ucb/install -c
-+ 
-+ # These are the libs that are needed for the Cadillac 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.
-+ CONNECTION_LIB = deblib/connection/libconn.a
-+ CADILLAC_LIBS = ${CONNECTION_LIB} -L/usr/lib -lm -lnet -lresolv -lform \
-+ 	-lsocket -lc /usr/ucblib/libucb.a -lnsl
-diff -rc config/ncr3000.mh config/ncr3000.mh
-*** config/ncr3000.mh	Mon Jun 15 12:25:13 1992
---- config/ncr3000.mh	Sat Jun 27 12:31:30 1992
-***************
-*** 38,40 ****
---- 38,47 ----
-  # 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 Cadillac 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.
-+ CONNECTION_LIB = deblib/connection/libconn.a
-+ CADILLAC_LIBS = ${CONNECTION_LIB} -L/usr/lib -lm -lnet -lresolv -lform \
-+ 	-lsocket -lc /usr/ucblib/libucb.a -lnsl
-diff -rc configure.in configure.in
-*** configure.in	Mon Jun 22 17:25:00 1992
---- configure.in	Sat Jun 27 12:31:29 1992
+===================================================================
+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
 ***************
 *** 1,4 ****
 ! configdirs="doc"
@@ -392,92 +342,31 @@ diff -rc configure.in configure.in
   srctrigger=main.c
   target_dependent=true
 --- 1,4 ----
-! configdirs="deblib doc"
+! configdirs="energize doc"
   srcname="GDB"
   srctrigger=main.c
   target_dependent=true
-diff -rc defs.h defs.h
-*** defs.h	Thu Jun 25 04:50:31 1992
---- defs.h	Sat Jun 27 12:30:02 1992
-***************
-*** 770,773 ****
---- 770,842 ----
+===================================================================
+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
+***************
+*** 787,790 ****
+--- 787,792 ----
   extern CORE_ADDR
   push_word ();
   
-+ /* Energize/Cadillac stuff */
-+ 
-+ /* Non-zero means that we're doing the cadillac interface. */
-+ extern int cadillac;
-+ 
-+ /* Get a pty for use with cadillac */
-+ extern char *cadillac_getpty PARAMS ((void));
-+ 
-+ /* Notify cadillac of new process creation */
-+ extern void cadillac_new_process PARAMS ((void));
-+ 
-+ /* Low level wait routine for wait_for_inferior */
-+ extern int cadillac_wait PARAMS ((int *));
-+ 
-+ /* Initialize */
-+ extern void cadillac_initialize PARAMS ((char *, char *));
-+ 
-+ /* Main loop for cadillac protocol driver */
-+ extern void cadillac_main_loop PARAMS ((void));
-+ 
-+ struct cmd_list_element;
-+ 
-+ /* Command hook for cadillac */
-+ extern void cadillac_call_command PARAMS ((struct cmd_list_element *,
-+ 					   char *, int));
-+ 
-+ /* Read commands for the command command, and others */
-+ extern char *cadillac_command_line_input PARAMS ((void));
-+ 
-+ struct symbol;
-+ struct type;
-+ 
-+ extern void cadillac_start_variable_annotation PARAMS ((char *,
-+ 							struct symbol *,
-+ 							struct type *,
-+ 							CORE_ADDR,
-+ 							char *));
-+ 
-+ extern void cadillac_end_variable_annotation PARAMS ((void));
-+ 
-+ extern void cadillac_annotate_function PARAMS ((char *, int, int));
-+ 
-+ struct objfile;
-+ extern void cadillac_symbol_file PARAMS ((struct objfile *));
-+ 
-+ /*extern void cadillac_query PARAMS ((char *, ...));*/
-+ extern void cadillac_query ();	/* Prototypes for varargs don't work */
-+ 
-+ extern char *cadillac_command_line_input PARAMS ((void));
-+ 
-+ extern void cadillac_acknowledge_query PARAMS ((char *));
-+ 
-+ extern void cadillac_fputs PARAMS ((const char *));
-+ 
-+ struct breakpoint;
-+ extern void cadillac_condition_breakpoint PARAMS ((struct breakpoint *));
-+ 
-+ extern void cadillac_commands_breakpoint PARAMS ((struct breakpoint *));
-+ 
-+ extern void cadillac_ignore_breakpoint PARAMS ((struct breakpoint *));
-+ 
-+ extern void cadillac_create_breakpoint PARAMS ((struct breakpoint *));
-+ 
-+ extern void cadillac_delete_breakpoint PARAMS ((struct breakpoint *));
-+ 
-+ extern void cadillac_enable_breakpoint PARAMS ((struct breakpoint *));
-+ 
-+ extern void cadillac_disable_breakpoint PARAMS ((struct breakpoint *));
++ #include "energize.h"
 + 
   #endif /* !defined (DEFS_H) */
-diff -rc inflow.c inflow.c
-*** inflow.c	Tue Jun 23 21:49:19 1992
---- inflow.c	Sat Jun 27 12:30:03 1992
+===================================================================
+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
 ***************
 *** 81,87 ****
   static short pgrp_inferior;
@@ -495,34 +384,38 @@ diff -rc inflow.c inflow.c
   static int pgrp_ours;
   # endif /* not def SHORT_PGRP */
   #else /* not def TIOCGPGRP */
-diff -rc infrun.c infrun.c
-*** infrun.c	Tue Jun 23 21:49:22 1992
---- infrun.c	Sat Jun 27 12:30:04 1992
+===================================================================
+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,624 ----
+--- 617,623 ----
      Here we must get it up to actual execution of the real program.  */
   
     inferior_pid = pid;		/* Needed for wait_for_inferior stuff below */
-+   if (cadillac)
-+     cadillac_new_process();
++   energize_new_process();
   
     clear_proceed_status ();
   
 ***************
 *** 755,760 ****
---- 757,764 ----
+--- 756,762 ----
   
     attach (pid);
     inferior_pid = pid;
-+   if (cadillac) 
-+     cadillac_new_process();
++   energize_new_process();
     push_target (&child_ops);
   
     mark_breakpoints_out ();
-diff -rc inftarg.c inftarg.c
-*** inftarg.c	Sun Mar 29 15:21:27 1992
---- inftarg.c	Sat Jun 27 12:30:04 1992
+===================================================================
+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
 ***************
 *** 58,64 ****
   #ifdef USE_PROC_FS
@@ -532,33 +425,33 @@ diff -rc inftarg.c inftarg.c
   #endif
       if (pid == -1)		/* No more children to wait for */
         {
---- 58,67 ----
+--- 58,64 ----
   #ifdef USE_PROC_FS
       pid = proc_wait (status);
   #else
-!     if (cadillac)
-!       pid = cadillac_wait (status);
-!     else
-!       pid = wait (status);
+!     pid = energize_wait (status);
   #endif
       if (pid == -1)		/* No more children to wait for */
         {
-diff -rc main.c main.c
-*** main.c	Mon Jun  8 23:09:23 1992
---- main.c	Sat Jun 27 12:30:05 1992
+===================================================================
+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 ----
     char *corearg = NULL;
     char *cdarg = NULL;
     char *ttyarg = NULL;
-+   char *cadillac_id = NULL;
++   char *energize_id = NULL;
   
     /* Pointers to all arguments of +command option.  */
     char **cmdarg;
 ***************
-*** 492,497 ****
---- 493,499 ----
+*** 495,500 ****
+--- 496,502 ----
   	{"tty", required_argument, 0, 't'},
   	{"baud", required_argument, 0, 'b'},
   	{"b", required_argument, 0, 'b'},
@@ -567,41 +460,30 @@ diff -rc main.c main.c
   #ifdef ADDITIONAL_OPTIONS
   	ADDITIONAL_OPTIONS
 ***************
-*** 524,529 ****
---- 526,534 ----
+*** 527,532 ****
+--- 529,537 ----
   	  case 11:
   	    cdarg = optarg;
   	    break;
 + 	  case 12:
-+ 	    cadillac_id = optarg;
++ 	    energize_id = optarg;
 + 	    break;
   	  case 's':
   	    symarg = optarg;
   	    break;
 ***************
-*** 670,675 ****
---- 675,683 ----
+*** 707,712 ****
+--- 712,719 ----
     free ((PTR)dirarg);
     do_cleanups (ALL_CLEANUPS);
   
-+   if (cadillac_id)
-+     cadillac_initialize (cadillac_id, execarg);
++   energize_initialize (energize_id, execarg);
 + 
     if (execarg != NULL
         && symarg != NULL
         && strcmp (execarg, symarg) == 0)
 ***************
-*** 691,696 ****
---- 699,705 ----
-  	if (!setjmp (to_top_level))
-  	  symbol_file_command (symarg, 0);
-      }
-+ 
-    do_cleanups (ALL_CLEANUPS);
-  
-    /* After the symbol file has been read, print a newline to get us
-***************
-*** 818,824 ****
+*** 821,827 ****
         if (!setjmp (to_top_level))
   	{
   	  do_cleanups (ALL_CLEANUPS);		/* Do complete cleanup */
@@ -609,19 +491,19 @@ diff -rc main.c main.c
             quit_command ((char *)0, instream == stdin);
   	}
       }
---- 827,836 ----
+--- 828,837 ----
         if (!setjmp (to_top_level))
   	{
   	  do_cleanups (ALL_CLEANUPS);		/* Do complete cleanup */
-! 	  if (cadillac_id)
-! 	    cadillac_main_loop();
+! 	  if (energize)
+! 	    energize_main_loop();
 ! 	  else
 ! 	    command_loop ();
             quit_command ((char *)0, instream == stdin);
   	}
       }
 ***************
-*** 880,886 ****
+*** 883,889 ****
         else if (c->function.cfunc == NO_FUNCTION)
   	error ("That is not a command, just a help topic.");
         else
@@ -629,19 +511,16 @@ diff -rc main.c main.c
      }
   
     /* Tell the user if the language has changed (except first time).  */
---- 892,901 ----
+--- 893,899 ----
         else if (c->function.cfunc == NO_FUNCTION)
   	error ("That is not a command, just a help topic.");
         else
-! 	if (cadillac)
-! 	  cadillac_call_command (c, arg, from_tty & caution);
-! 	else
-! 	  (*c->function.cfunc) (arg, from_tty & caution);
+! 	energize_call_command (c, arg, from_tty & caution);
      }
   
     /* Tell the user if the language has changed (except first time).  */
 ***************
-*** 1516,1522 ****
+*** 1519,1525 ****
     while (1)
       {
         dont_repeat ();
@@ -649,19 +528,16 @@ diff -rc main.c main.c
         if (p == NULL)
   	/* Treat end of file like "end".  */
   	break;
---- 1531,1540 ----
+--- 1529,1535 ----
     while (1)
       {
         dont_repeat ();
-!       if (cadillac)
-! 	p = cadillac_command_line_input();
-!       else
-! 	p = command_line_input ((char *) NULL, instream == stdin);
+!       p = energize_command_line_input ((char *) NULL, instream == stdin);
         if (p == NULL)
   	/* Treat end of file like "end".  */
   	break;
 ***************
-*** 1820,1826 ****
+*** 1823,1829 ****
   void
   print_prompt ()
   {
@@ -669,7 +545,7 @@ diff -rc main.c main.c
     fflush (stdout);
   }
   
---- 1838,1844 ----
+--- 1833,1839 ----
   void
   print_prompt ()
   {
@@ -677,21 +553,24 @@ diff -rc main.c main.c
     fflush (stdout);
   }
   
-diff -rc printcmd.c printcmd.c
-*** printcmd.c	Thu Jun 25 03:58:47 1992
---- printcmd.c	Sat Jun 27 12:30:05 1992
+===================================================================
+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
 ***************
 *** 778,783 ****
 --- 778,792 ----
       {
         int histindex = record_latest_value (val);
   
-+       if (cadillac)
++       if (energize)
 + 	{
 + 	  char buf[20];
 + 
 + 	  sprintf(buf, "$%d", histindex);
-+ 	  cadillac_start_variable_annotation(buf, NULL, VALUE_TYPE(val),
++ 	  energize_start_variable_annotation(buf, NULL, VALUE_TYPE(val),
 + 					     VALUE_ADDRESS(val), "");
 + 	}
 + 
@@ -700,26 +579,24 @@ diff -rc printcmd.c printcmd.c
         else
 ***************
 *** 784,789 ****
---- 793,800 ----
+--- 793,799 ----
   	if (histindex >= 0) printf_filtered ("$%d = ", histindex);
   
         print_formatted (val, format, fmt.size);
-+       if (cadillac)
-+ 	cadillac_end_variable_annotation();
++       energize_end_variable_annotation();
         printf_filtered ("\n");
         if (inspect)
   	printf("\") )\030");
 ***************
 *** 1610,1620 ****
---- 1621,1641 ----
+--- 1620,1638 ----
   	 standard indentation here is 4 spaces, and val_print indents
   	 2 for each recurse.  */
         val = read_var_value (sym, FRAME_INFO_ID (fi));
 + 
-+       if (cadillac)
-+ 	cadillac_start_variable_annotation(SYMBOL_NAME(sym), sym,
-+ 					   VALUE_TYPE(val),
-+ 					   VALUE_ADDRESS(val), "");
++       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),
@@ -727,15 +604,17 @@ diff -rc printcmd.c printcmd.c
         else
   	fputs_filtered ("???", stream);
 + 
-+       if (cadillac)
-+ 	cadillac_end_variable_annotation();
++       energize_end_variable_annotation();
 + 
         first = 0;
       }
   
-diff -rc stack.c stack.c
-*** stack.c	Sat Jun 20 16:30:33 1992
---- stack.c	Sat Jun 27 12:30:06 1992
+===================================================================
+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
 ***************
 *** 159,165 ****
         if (addressprint)
@@ -749,8 +628,8 @@ diff -rc stack.c stack.c
         if (addressprint)
           printf_filtered ("%s in ", local_hex_string(fi->pc));
   
-!       if (cadillac)
-! 	cadillac_annotate_function(fname, 0, level);
+!       if (energize)
+! 	energize_annotate_function(fname, 0, level);
 !       else
 ! 	fputs_demangled (fname, stdout, 0);
         fputs_filtered (" (...)\n", stdout);
@@ -769,8 +648,8 @@ diff -rc stack.c stack.c
         if (addressprint)
   	if (fi->pc != sal.pc || !sal.symtab)
   	  printf_filtered ("%s in ", local_hex_string(fi->pc));
-!       if (cadillac)
-! 	cadillac_annotate_function(funname ? funname : "??", 0, level);
+!       if (energize)
+! 	energize_annotate_function(funname ? funname : "??", 0, level);
 !       else
 ! 	fputs_demangled (funname ? funname : "??", stdout, 0);
         wrap_here ("   ");
@@ -789,7 +668,7 @@ diff -rc stack.c stack.c
   	{
   	  if (addressprint && mid_statement)
   	    printf_filtered ("%s\t", local_hex_string(fi->pc));
-! 	  if (!cadillac)
+! 	  if (!energize)
 ! 	    print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
   	}
         current_source_line = max (sal.line - lines_to_list/2, 1);
@@ -807,42 +686,37 @@ diff -rc stack.c stack.c
     if (funname)
       {
         printf_filtered (" in ");
-!       if (cadillac)
-! 	cadillac_annotate_function(funname, DMGL_ANSI | DMGL_PARAMS,
-! 				 selected_frame_level);
+!       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)
-diff -rc symfile.c symfile.c
-*** symfile.c	Sat Jun 13 09:20:12 1992
---- symfile.c	Sat Jun 27 12:30:06 1992
-***************
-*** 555,560 ****
---- 555,563 ----
+===================================================================
+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
+***************
+*** 611,616 ****
+--- 611,618 ----
         fflush (stdout);
       }
   
-+   if (cadillac)
-+     cadillac_symbol_file(objfile);
++   energize_symbol_file(objfile);
 + 
     return (objfile);
   }
   
-diff -rc utils.c utils.c
-*** utils.c	Mon Jun 15 07:27:07 1992
---- utils.c	Sat Jun 27 12:30:07 1992
-***************
-*** 96,101 ****
---- 96,102 ----
-  
-  char *error_pre_print;
-  char *warning_pre_print = "\nwarning: ";
-+ 
-  
-  /* Add a new cleanup to the cleanup_chain,
-     and return the previous chain pointer
+===================================================================
+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
 ***************
 *** 694,700 ****
     register int ans2;
@@ -852,11 +726,11 @@ diff -rc utils.c utils.c
       return 1;
   
     while (1)
---- 695,701 ----
+--- 694,700 ----
     register int ans2;
   
     /* Automatically answer "yes" if input is not from a terminal.  */
-!   if (!input_from_terminal_p () && !cadillac)
+!   if (!input_from_terminal_p () && !energize)
       return 1;
   
     while (1)
@@ -883,21 +757,20 @@ diff -rc utils.c utils.c
         if (answer >= 'a')
   	answer -= 040;
         if (answer == 'Y')
---- 702,734 ----
+--- 701,732 ----
       {
         va_start (args);
         ctlstr = va_arg (args, char *);
-+       if (cadillac)
-+ 	cadillac_query (ctlstr, args);
++       energize_query (ctlstr, args);
         vfprintf_filtered (stdout, ctlstr, args);
         printf_filtered ("(y or n) ");
-!       if (cadillac)
+!       if (energize)
 ! 	{
 ! 	  char *buf;
 ! 
-! 	  buf = cadillac_command_line_input();
+! 	  buf = energize_command_line_input(0, 0);
 ! 	  answer = buf ? *buf : 'Y';
-! 	  cadillac_acknowledge_query(buf);
+! 	  energize_acknowledge_query(buf);
 ! 	}
 !       else
 ! 	{
@@ -919,7 +792,7 @@ diff -rc utils.c utils.c
         if (answer == 'Y')
 ***************
 *** 723,728 ****
---- 736,742 ----
+--- 734,740 ----
         if (answer == 'N')
   	return 0;
         printf_filtered ("Please answer y or n.\n");
@@ -929,93 +802,142 @@ diff -rc utils.c utils.c
   
 ***************
 *** 989,994 ****
---- 1003,1014 ----
+--- 1001,1012 ----
     if (linebuffer == 0)
       return;
     
-+   if (cadillac)
++   if (energize)
 +     {
-+       cadillac_fputs(linebuffer);
++       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))
-diff -rc valprint.c valprint.c
-*** valprint.c	Tue Jun 23 23:24:51 1992
---- valprint.c	Sat Jun 27 12:30:07 1992
+===================================================================
+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 ----
        struct type **dont_print;
   {
     int i, len, n_baseclasses;
-+   char expr_tag[100];		/* Cadillac */
++   char expr_tag[100];		/* Energize */
   
     check_stub_type (type);
   
 ***************
 *** 549,554 ****
---- 550,563 ----
+--- 550,562 ----
   	      fprint_symbol (stream, TYPE_FIELD_NAME (type, i));
   	      fputs_filtered (" = ", stream);
   	    }
 + 
 + 	  sprintf(expr_tag, ".%s", TYPE_FIELD_NAME(type, i));
 + 
-+ 	  if (cadillac)
-+ 	    cadillac_start_variable_annotation(expr_tag, NULL,
-+ 					       TYPE_FIELD_TYPE(type, i),
-+ 					       (CORE_ADDR) (valaddr + TYPE_FIELD_BITPOS(type, i) / 8),
-+ 					       "");
++ 	  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;
 ***************
 *** 567,572 ****
---- 576,583 ----
+--- 575,581 ----
   			 valaddr + TYPE_FIELD_BITPOS (type, i) / 8,
   			 0, stream, format, 0, recurse + 1, pretty);
   	    }
-+ 	  if (cadillac)
-+ 	    cadillac_end_variable_annotation();
++ 	  energize_end_variable_annotation();
   	}
         if (pretty)
   	{
 ***************
 *** 801,806 ****
---- 812,818 ----
+--- 810,816 ----
   		  unsigned int rep1;
   		  /* Number of repetitions we have detected so far.  */
   		  unsigned int reps;
-+ 		  char expr_tag[100]; /* Cadillac */
++ 		  char expr_tag[100]; /* Energize */
   		  
   		  if (i != 0)
   		    if (arrayprint)
 ***************
 *** 822,827 ****
---- 834,845 ----
+--- 832,842 ----
   		      ++rep1;
   		    }
   
 + 		  sprintf(expr_tag, "[%d]", i);
-+ 		  if (cadillac)
-+ 		    cadillac_start_variable_annotation(expr_tag, NULL,
-+ 						       elttype,
-+ 						       (CORE_ADDR) (valaddr + i * eltlen),
-+ 						       "");
++ 		  energize_start_variable_annotation(expr_tag, NULL,
++ 						     elttype,
++ 						     (CORE_ADDR) (valaddr + i * eltlen),
++ 						     "");
   		  if (reps > REPEAT_COUNT_THRESHOLD)
   		    {
   		      val_print (elttype, valaddr + i * eltlen,
 ***************
 *** 838,843 ****
---- 856,863 ----
+--- 853,859 ----
   				 recurse + 1, pretty);
   		      things_printed++;
   		    }
-+ 		  if (cadillac)
-+ 		    cadillac_end_variable_annotation();
++ 		  energize_end_variable_annotation();
   		}
   	      if (i < len)
   		fprintf_filtered (stream, "...");
+cvs diff: Diffing 29k-share
+cvs diff: Diffing 29k-share/dfe
+cvs diff: Diffing 29k-share/include
+cvs diff: Diffing 29k-share/udi
+cvs diff: Diffing config
+===================================================================
+RCS file: /local/cvsfiles/devo/gdb/config/amix.mh,v
+retrieving revision 1.4
+diff -c -r1.4 amix.mh
+*** 1.4	1992/06/10 02:05:16
+--- amix.mh	1992/07/05 17:47:19
+***************
+*** 22,24 ****
+--- 22,31 ----
+  
+  # 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.
++ ENERGIZE_LIB = energize/libconn.a
++ ENERGIZE_LIBS = ${ENERGIZE_LIB} -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
+--- ncr3000.mh	1992/07/05 17:49:34
+***************
+*** 38,40 ****
+--- 38,47 ----
+  # 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.
++ ENERGIZE_LIB = energize/libconn.a
++ ENERGIZE_LIBS = ${ENERGIZE_LIB} -L/usr/lib -lm -lnet -lresolv -lform \
++ 	-lsocket -lc /usr/ucblib/libucb.a -lnsl
+cvs diff: Diffing doc
+cvs diff: Diffing doc/config
+cvs diff: Diffing energize
+cvs diff: Diffing energize/config
+cvs diff: Diffing nindy-share
+cvs diff: Diffing tests
+cvs diff: Diffing vx-share