gdb/energize-patches

   1 # Apply these patches to GDB to produce an Energize GDB.
   2 # To apply these patches, first cd to gdb-XX/gdb, run "patch -p0 <thisfile",
   3 # and then Sanitize.
   4
   5 ===================================================================
   6 RCS file: /local/cvsfiles/devo/gdb/.Sanitize,v
   7 retrieving revision 2.63
   8 diff -c -r2.63 .Sanitize
   9 *** 2.63        1992/07/14 07:51:45
  10 --- .Sanitize   1992/07/16 22:43:53
  11 ***************
  12 *** 77,82 ****
  13 --- 77,85 ----
  14   doc
  15   dwarfread.c
  16   elfread.c
  17 + energize
  18 + energize.c
  19 + energize.h
  20   environ.c
  21   environ.h
  22   eval.c
  23 ===================================================================
  24 RCS file: /local/cvsfiles/devo/gdb/Makefile.in,v
  25 retrieving revision 1.172
  26 diff -c -r1.172 Makefile.in
  27 *** 1.172       1992/07/17 23:53:54
  28 --- Makefile.in 1992/07/18 00:11:14
  29 ***************
  30 *** 123,128 ****
  31 --- 123,135 ----
  32   READLINE_DEP = $$(READLINE_DIR)
  33   RL_LIB = ./../readline${subdir}/libreadline.a
  34
  35 + # Energize libraries.  Works slightly differently than other libraries
  36 + # because it is a gdb subdir and we try to build the energize library
  37 + # if it doesn't exist, unlike readline, bfd, mmalloc, etc.  Note
  38 + # that SDIR and BDIR will be different if we configured with -srcdir.
  39 + ENERGIZE_DIR = energize
  40 + ENERGIZE_LIB = ${ENERGIZE_DIR}/libconn.a
  41 +
  42   # All the includes used for CFLAGS and for lint.
  43   # -I. for config files.
  44   # -I${srcdir} possibly for regex.h also.
  45 ***************
  46 *** 155,166 ****
  47   # {X,T}M_CLIBS, defined in *config files, have host- and target-dependent libs.
  48   # TERMCAP comes after readline, since readline depends on it.
  49   CLIBS = ${BFD_LIB}  ${RL_LIB} ${TERMCAP} ${MMALLOC_LIB} ${LIBIBERTY} \
  50 !       ${XM_CLIBS} ${TM_CLIBS}
  51   CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${MMALLOC_LIB} ${LIBIBERTY} \
  52         ${RL_LIB} ${MMALLOC_LIB}
  53
  54   ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES}
  55 ! ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES}
  56
  57   VERSION = 4.6.1
  58   DIST=gdb
  59 --- 162,174 ----
  60   # {X,T}M_CLIBS, defined in *config files, have host- and target-dependent libs.
  61   # TERMCAP comes after readline, since readline depends on it.
  62   CLIBS = ${BFD_LIB}  ${RL_LIB} ${TERMCAP} ${MMALLOC_LIB} ${LIBIBERTY} \
  63 !       ${ENERGIZE_LIB} ${XM_CLIBS} ${TM_CLIBS}
  64   CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${MMALLOC_LIB} ${LIBIBERTY} \
  65         ${RL_LIB} ${MMALLOC_LIB}
  66
  67   ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES}
  68 ! ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES} \
  69 !          ${ENERGIZE_LIB}
  70
  71   VERSION = 4.6.1
  72   DIST=gdb
  73 ***************
  74 *** 190,196 ****
  75          ${DEMANGLER}.c mem-break.c target.c inftarg.c \
  76          dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c \
  77          ieee-float.c language.c parse.c buildsym.c objfiles.c \
  78 !        minsyms.c mipsread.c maint.c
  79
  80   # Source files in subdirectories (which will be handled separately by
  81   #  'make gdb.tar.Z').
  82 --- 198,204 ----
  83          ${DEMANGLER}.c mem-break.c target.c inftarg.c \
  84          dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c \
  85          ieee-float.c language.c parse.c buildsym.c objfiles.c \
  86 !        minsyms.c mipsread.c maint.c energize.c
  87
  88   # Source files in subdirectories (which will be handled separately by
  89   #  'make gdb.tar.Z').
  90 ***************
  91 *** 276,282 ****
  92       command.o utils.o expprint.o environ.o version.o gdbtypes.o \
  93       copying.o $(DEPFILES) ${DEMANGLER}.o mem-break.o target.o \
  94       inftarg.o ieee-float.o putenv.o parse.o language.o $(YYOBJ) \
  95 !     buildsym.o objfiles.o minsyms.o maint.o demangle.o \
  96       dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o
  97
  98   RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
  99 --- 284,290 ----
 100       command.o utils.o expprint.o environ.o version.o gdbtypes.o \
 101       copying.o $(DEPFILES) ${DEMANGLER}.o mem-break.o target.o \
 102       inftarg.o ieee-float.o putenv.o parse.o language.o $(YYOBJ) \
 103 !     buildsym.o objfiles.o minsyms.o maint.o demangle.o energize.o \
 104       dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o
 105
 106   RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
 107 ***************
 108 *** 289,295 ****
 109
 110   NTSSTART = kdb-start.o
 111
 112 ! SUBDIRS = doc
 113
 114   # For now, shortcut the "configure GDB for fewer languages" stuff.
 115   YYFILES = c-exp.tab.c m2-exp.tab.c
 116 --- 297,303 ----
 117
 118   NTSSTART = kdb-start.o
 119
 120 ! SUBDIRS = doc ${ENERGIZE_DIR}
 121
 122   # For now, shortcut the "configure GDB for fewer languages" stuff.
 123   YYFILES = c-exp.tab.c m2-exp.tab.c
 124 ***************
 125 *** 343,348 ****
 126 --- 351,370 ----
 127         #load `echo " "$(DEPFILES) | sed -e 's/\.o/.c/g' -e 's, , ../,g'`
 128         echo "Load .c corresponding to:" $(DEPFILES)
 129
 130 + ${ENERGIZE_LIB} :
 131 +       @(cd ${ENERGIZE_DIR}; \
 132 +               $(MAKE) \
 133 +                       "against=$(against)" \
 134 +                       "AR=$(AR)" \
 135 +                       "AR_FLAGS=$(AR_FLAGS)" \
 136 +                       "CC=$(CC)" \
 137 +                       "CFLAGS=$(CFLAGS)" \
 138 +                       "RANLIB=$(RANLIB)" \
 139 +                       "MAKEINFO=$(MAKEINFO)" \
 140 +                       "INSTALL=$(INSTALL)" \
 141 +                       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
 142 +                       "INSTALL_DATA=$(INSTALL_DATA)" \
 143 +                       "BISON=$(BISON)")
 144
 145   # This is useful when debugging GDB, because some Unix's don't let you run GDB
 146   # on itself without copying the executable.  So "make gdb1" will make
 147 ***************
 148 *** 643,649 ****
 149              -e '/extern.*free/d' \
 150           < y.tab.c > m2-exp.tab.c
 151         -rm y.tab.c
 152 -
 153
 154   main.o:       ${srcdir}/main.c
 155         ${CC} -c ${INTERNAL_CFLAGS} -I${READLINE_DIR} $<
 156 --- 665,670 ----
 157 ===================================================================
 158 RCS file: /local/cvsfiles/devo/gdb/breakpoint.c,v
 159 retrieving revision 1.40
 160 diff -c -r1.40 breakpoint.c
 161 *** 1.40        1992/07/16 23:23:02
 162 --- breakpoint.c        1992/07/16 23:23:58
 163 ***************
 164 *** 273,278 ****
 165 --- 273,279 ----
 166             b->cond_string = NULL;
 167             if (from_tty)
 168               printf_filtered ("Breakpoint %d now unconditional.\n", bnum);
 169 +           energize_condition_breakpoint(b);
 170           }
 171         else
 172           {
 173 ***************
 174 *** 281,286 ****
 175 --- 282,288 ----
 176                typed in or the decompiled expression.  */
 177             b->cond_string = savestring (arg, strlen (arg));
 178             b->cond = parse_exp_1 (&arg, block_for_pc (b->address), 0);
 179 +           energize_condition_breakpoint(b);
 180             if (*arg)
 181               error ("Junk at end of expression");
 182           }
 183 ***************
 184 *** 316,327 ****
 185     ALL_BREAKPOINTS (b)
 186       if (b->number == bnum)
 187         {
 188 !       if (from_tty && input_from_terminal_p ())
 189           printf_filtered ("Type commands for when breakpoint %d is hit, one per line.\n\
 190   End with a line saying just \"end\".\n", bnum);
 191         l = read_command_lines ();
 192         free_command_lines (&b->commands);
 193         b->commands = l;
 194         return;
 195         }
 196     error ("No breakpoint number %d.", bnum);
 197 --- 318,330 ----
 198     ALL_BREAKPOINTS (b)
 199       if (b->number == bnum)
 200         {
 201 !       if ((from_tty && input_from_terminal_p ()) || energize)
 202           printf_filtered ("Type commands for when breakpoint %d is hit, one per line.\n\
 203   End with a line saying just \"end\".\n", bnum);
 204         l = read_command_lines ();
 205         free_command_lines (&b->commands);
 206         b->commands = l;
 207 +       energize_commands_breakpoint(b);
 208         return;
 209         }
 210     error ("No breakpoint number %d.", bnum);
 211 ***************
 212 *** 922,927 ****
 213 --- 925,931 ----
 214             {
 215               b->ignore_count--;
 216               this_bp_stop = 0;
 217 +             energize_ignore_breakpoint(b);
 218             }
 219           else
 220             {
 221 ***************
 222 *** 1366,1371 ****
 223 --- 1370,1377 ----
 224   mention (b)
 225        struct breakpoint *b;
 226   {
 227 +   energize_create_breakpoint(b);
 228 +
 229     switch (b->type)
 230       {
 231       case bp_watchpoint:
 232 ***************
 233 *** 2113,2118 ****
 234 --- 2119,2126 ----
 235     register struct breakpoint *b;
 236     register bpstat bs;
 237
 238 +   energize_delete_breakpoint(bpt);
 239 +
 240     if (bpt->inserted)
 241         target_remove_breakpoint(bpt->address, bpt->shadow_contents);
 242
 243 ***************
 244 *** 2284,2289 ****
 245 --- 2292,2298 ----
 246       if (b->number == bptnum)
 247         {
 248         b->ignore_count = count;
 249 +       energize_ignore_breakpoint(b);
 250         if (!from_tty)
 251           return;
 252         else if (count == 0)
 253 ***************
 254 *** 2308,2314 ****
 255     struct breakpoint *b;
 256
 257     ALL_BREAKPOINTS (b)
 258 !     b->ignore_count = 0;
 259   }
 260
 261   /* Command to set ignore-count of breakpoint N to COUNT.  */
 262 --- 2317,2326 ----
 263     struct breakpoint *b;
 264
 265     ALL_BREAKPOINTS (b)
 266 !     {
 267 !       b->ignore_count = 0;
 268 !       energize_ignore_breakpoint(b);
 269 !     }
 270   }
 271
 272   /* Command to set ignore-count of breakpoint N to COUNT.  */
 273 ***************
 274 *** 2375,2380 ****
 275 --- 2387,2394 ----
 276   {
 277     bpt->enable = enabled;
 278
 279 +   energize_enable_breakpoint(bpt);
 280 +
 281     if (xgdb_verbose && bpt->type == bp_breakpoint)
 282       printf ("breakpoint #%d enabled\n", bpt->number);
 283
 284 ***************
 285 *** 2422,2427 ****
 286 --- 2436,2443 ----
 287   disable_breakpoint (bpt)
 288        struct breakpoint *bpt;
 289   {
 290 +   energize_disable_breakpoint(bpt);
 291 +
 292     bpt->enable = disabled;
 293
 294     if (xgdb_verbose && bpt->type == bp_breakpoint)
 295 ===================================================================
 296 RCS file: /local/cvsfiles/devo/gdb/command.c,v
 297 retrieving revision 1.18
 298 diff -c -r1.18 command.c
 299 *** 1.18        1992/07/10 17:22:30
 300 --- command.c   1992/07/16 22:44:12
 301 ***************
 302 *** 1148,1154 ****
 303       }
 304
 305     if (pid != -1)
 306 !     while ((rc = wait (&status)) != pid && rc != -1)
 307         ;
 308     else
 309       error ("Fork failed");
 310 --- 1148,1154 ----
 311       }
 312
 313     if (pid != -1)
 314 !     while ((rc = energize_wait (&status)) != pid && rc != -1)
 315         ;
 316     else
 317       error ("Fork failed");
 318 ===================================================================
 319 RCS file: /local/cvsfiles/devo/gdb/configure.in,v
 320 retrieving revision 1.51
 321 diff -c -r1.51 configure.in
 322 *** 1.51        1992/07/07 07:22:33
 323 --- configure.in        1992/07/16 22:44:14
 324 ***************
 325 *** 1,4 ****
 326 ! configdirs="doc"
 327   srcname="GDB"
 328   srctrigger=main.c
 329   target_dependent=true
 330 --- 1,4 ----
 331 ! configdirs="energize doc"
 332   srcname="GDB"
 333   srctrigger=main.c
 334   target_dependent=true
 335 ===================================================================
 336 RCS file: /local/cvsfiles/devo/gdb/defs.h,v
 337 retrieving revision 1.43
 338 diff -c -r1.43 defs.h
 339 *** 1.43        1992/07/09 04:40:24
 340 --- defs.h      1992/07/16 22:48:44
 341 ***************
 342 *** 805,808 ****
 343 --- 805,810 ----
 344   #define MAINTENANCE_CMDS 1
 345   #endif
 346
 347 + #include "energize.h"
 348 +
 349   #endif /* !defined (DEFS_H) */
 350 ===================================================================
 351 RCS file: /local/cvsfiles/devo/gdb/inflow.c,v
 352 retrieving revision 1.27
 353 diff -c -r1.27 inflow.c
 354 *** 1.27        1992/07/04 03:21:21
 355 --- inflow.c    1992/07/05 12:58:31
 356 ***************
 357 *** 81,87 ****
 358   static short pgrp_inferior;
 359   static short pgrp_ours;
 360   # else /* not def SHORT_PGRP */
 361 ! static int pgrp_inferior;
 362   static int pgrp_ours;
 363   # endif /* not def SHORT_PGRP */
 364   #else /* not def TIOCGPGRP */
 365 --- 81,87 ----
 366   static short pgrp_inferior;
 367   static short pgrp_ours;
 368   # else /* not def SHORT_PGRP */
 369 ! int pgrp_inferior;
 370   static int pgrp_ours;
 371   # endif /* not def SHORT_PGRP */
 372   #else /* not def TIOCGPGRP */
 373 ===================================================================
 374 RCS file: /local/cvsfiles/devo/gdb/infrun.c,v
 375 retrieving revision 1.52
 376 diff -c -r1.52 infrun.c
 377 *** 1.52        1992/07/04 03:21:24
 378 --- infrun.c    1992/07/05 13:46:46
 379 ***************
 380 *** 617,622 ****
 381 --- 617,623 ----
 382      Here we must get it up to actual execution of the real program.  */
 383
 384     inferior_pid = pid;         /* Needed for wait_for_inferior stuff below */
 385 +   energize_new_process();
 386
 387     clear_proceed_status ();
 388
 389 ***************
 390 *** 755,760 ****
 391 --- 756,762 ----
 392
 393     attach (pid);
 394     inferior_pid = pid;
 395 +   energize_new_process();
 396     push_target (&child_ops);
 397
 398     mark_breakpoints_out ();
 399 ===================================================================
 400 RCS file: /local/cvsfiles/devo/gdb/inftarg.c,v
 401 retrieving revision 1.11
 402 diff -c -r1.11 inftarg.c
 403 *** 1.11        1992/03/29 23:21:27
 404 --- inftarg.c   1992/07/05 13:48:05
 405 ***************
 406 *** 58,64 ****
 407   #ifdef USE_PROC_FS
 408       pid = proc_wait (status);
 409   #else
 410 !     pid = wait (status);
 411   #endif
 412       if (pid == -1)            /* No more children to wait for */
 413         {
 414 --- 58,64 ----
 415   #ifdef USE_PROC_FS
 416       pid = proc_wait (status);
 417   #else
 418 !     pid = energize_wait (status);
 419   #endif
 420       if (pid == -1)            /* No more children to wait for */
 421         {
 422 ===================================================================
 423 RCS file: /local/cvsfiles/devo/gdb/main.c,v
 424 retrieving revision 1.51
 425 diff -c -r1.51 main.c
 426 *** 1.51        1992/07/10 17:22:33
 427 --- main.c      1992/07/17 23:22:19
 428 ***************
 429 *** 426,431 ****
 430 --- 426,432 ----
 431     char *corearg = NULL;
 432     char *cdarg = NULL;
 433     char *ttyarg = NULL;
 434 +   char *energize_id = NULL;
 435
 436     /* Pointers to all arguments of +command option.  */
 437     char **cmdarg;
 438 ***************
 439 *** 524,529 ****
 440 --- 525,531 ----
 441         {"tty", required_argument, 0, 't'},
 442         {"baud", required_argument, 0, 'b'},
 443         {"b", required_argument, 0, 'b'},
 444 +       {"context", required_argument, 0, 12},
 445   /* Allow machine descriptions to add more options... */
 446   #ifdef ADDITIONAL_OPTIONS
 447         ADDITIONAL_OPTIONS
 448 ***************
 449 *** 556,561 ****
 450 --- 558,566 ----
 451           case 11:
 452             cdarg = optarg;
 453             break;
 454 +         case 12:
 455 +           energize_id = optarg;
 456 +           break;
 457           case 's':
 458             symarg = optarg;
 459             break;
 460 ***************
 461 *** 736,741 ****
 462 --- 741,748 ----
 463     free ((PTR)dirarg);
 464     do_cleanups (ALL_CLEANUPS);
 465
 466 +   energize_initialize (energize_id, execarg);
 467 +
 468     if (execarg != NULL
 469         && symarg != NULL
 470         && strcmp (execarg, symarg) == 0)
 471 ***************
 472 *** 850,856 ****
 473         if (!setjmp (to_top_level))
 474         {
 475           do_cleanups (ALL_CLEANUPS);           /* Do complete cleanup */
 476 !         command_loop ();
 477             quit_command ((char *)0, instream == stdin);
 478         }
 479       }
 480 --- 857,866 ----
 481         if (!setjmp (to_top_level))
 482         {
 483           do_cleanups (ALL_CLEANUPS);           /* Do complete cleanup */
 484 !         if (energize)
 485 !           energize_main_loop();
 486 !         else
 487 !           command_loop ();
 488             quit_command ((char *)0, instream == stdin);
 489         }
 490       }
 491 ***************
 492 *** 912,918 ****
 493         else if (c->function.cfunc == NO_FUNCTION)
 494         error ("That is not a command, just a help topic.");
 495         else
 496 !       (*c->function.cfunc) (arg, from_tty & caution);
 497      }
 498
 499     /* Tell the user if the language has changed (except first time).  */
 500 --- 922,928 ----
 501         else if (c->function.cfunc == NO_FUNCTION)
 502         error ("That is not a command, just a help topic.");
 503         else
 504 !       energize_call_command (c, arg, from_tty & caution);
 505      }
 506
 507     /* Tell the user if the language has changed (except first time).  */
 508 ***************
 509 *** 1564,1570 ****
 510     while (1)
 511       {
 512         dont_repeat ();
 513 !       p = command_line_input ((char *) NULL, instream == stdin);
 514         if (p == NULL)
 515         /* Treat end of file like "end".  */
 516         break;
 517 --- 1574,1580 ----
 518     while (1)
 519       {
 520         dont_repeat ();
 521 !       p = energize_command_line_input ((char *) NULL, instream == stdin);
 522         if (p == NULL)
 523         /* Treat end of file like "end".  */
 524         break;
 525 ***************
 526 *** 1868,1874 ****
 527   void
 528   print_prompt ()
 529   {
 530 !   printf ("%s", prompt);
 531     fflush (stdout);
 532   }
 533   \f
 534 --- 1878,1884 ----
 535   void
 536   print_prompt ()
 537   {
 538 !   printf_filtered ("%s", prompt);
 539     fflush (stdout);
 540   }
 541   \f
 542 ===================================================================
 543 RCS file: /local/cvsfiles/devo/gdb/printcmd.c,v
 544 retrieving revision 1.30
 545 diff -c -r1.30 printcmd.c
 546 *** 1.30        1992/07/06 00:22:52
 547 --- printcmd.c  1992/07/16 22:44:42
 548 ***************
 549 *** 778,783 ****
 550 --- 778,792 ----
 551       {
 552         int histindex = record_latest_value (val);
 553
 554 +       if (energize)
 555 +       {
 556 +         char buf[20];
 557 +
 558 +         sprintf(buf, "$%d", histindex);
 559 +         energize_start_variable_annotation(buf, NULL, VALUE_TYPE(val),
 560 +                                            VALUE_ADDRESS(val), "");
 561 +       }
 562 +
 563         if (inspect)
 564         printf ("\031(gdb-makebuffer \"%s\"  %d '(\"", exp, histindex);
 565         else
 566 ***************
 567 *** 784,789 ****
 568 --- 793,799 ----
 569         if (histindex >= 0) printf_filtered ("$%d = ", histindex);
 570
 571         print_formatted (val, format, fmt.size);
 572 +       energize_end_variable_annotation();
 573         printf_filtered ("\n");
 574         if (inspect)
 575         printf("\") )\030");
 576 ***************
 577 *** 1653,1663 ****
 578 --- 1663,1681 ----
 579          standard indentation here is 4 spaces, and val_print indents
 580          2 for each recurse.  */
 581         val = read_var_value (sym, FRAME_INFO_ID (fi));
 582 +
 583 +       energize_start_variable_annotation(SYMBOL_NAME(sym), sym,
 584 +                                        VALUE_TYPE(val),
 585 +                                        VALUE_ADDRESS(val), "");
 586 +
 587         if (val)
 588           val_print (VALUE_TYPE (val), VALUE_CONTENTS (val), VALUE_ADDRESS (val),
 589                    stream, 0, 0, 2, Val_no_prettyprint);
 590         else
 591         fputs_filtered ("???", stream);
 592 +
 593 +       energize_end_variable_annotation();
 594 +
 595         first = 0;
 596       }
 597
 598 ===================================================================
 599 RCS file: /local/cvsfiles/devo/gdb/stack.c,v
 600 retrieving revision 1.33
 601 diff -c -r1.33 stack.c
 602 *** 1.33        1992/07/04 03:21:45
 603 --- stack.c     1992/07/05 14:13:23
 604 ***************
 605 *** 159,165 ****
 606         if (addressprint)
 607           printf_filtered ("%s in ", local_hex_string(fi->pc));
 608
 609 !       fputs_demangled (fname, stdout, 0);
 610         fputs_filtered (" (...)\n", stdout);
 611
 612         return;
 613 --- 159,168 ----
 614         if (addressprint)
 615           printf_filtered ("%s in ", local_hex_string(fi->pc));
 616
 617 !       if (energize)
 618 !       energize_annotate_function(fname, 0, level);
 619 !       else
 620 !       fputs_demangled (fname, stdout, 0);
 621         fputs_filtered (" (...)\n", stdout);
 622
 623         return;
 624 ***************
 625 *** 218,224 ****
 626         if (addressprint)
 627         if (fi->pc != sal.pc || !sal.symtab)
 628           printf_filtered ("%s in ", local_hex_string(fi->pc));
 629 !       fputs_demangled (funname ? funname : "??", stdout, 0);
 630         wrap_here ("   ");
 631         fputs_filtered (" (", stdout);
 632         if (args)
 633 --- 221,230 ----
 634         if (addressprint)
 635         if (fi->pc != sal.pc || !sal.symtab)
 636           printf_filtered ("%s in ", local_hex_string(fi->pc));
 637 !       if (energize)
 638 !       energize_annotate_function(funname ? funname : "??", 0, level);
 639 !       else
 640 !       fputs_demangled (funname ? funname : "??", stdout, 0);
 641         wrap_here ("   ");
 642         fputs_filtered (" (", stdout);
 643         if (args)
 644 ***************
 645 *** 255,261 ****
 646         {
 647           if (addressprint && mid_statement)
 648             printf_filtered ("%s\t", local_hex_string(fi->pc));
 649 !         print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
 650         }
 651         current_source_line = max (sal.line - lines_to_list/2, 1);
 652       }
 653 --- 261,268 ----
 654         {
 655           if (addressprint && mid_statement)
 656             printf_filtered ("%s\t", local_hex_string(fi->pc));
 657 !         if (!energize)
 658 !           print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
 659         }
 660         current_source_line = max (sal.line - lines_to_list/2, 1);
 661       }
 662 ***************
 663 *** 429,435 ****
 664     if (funname)
 665       {
 666         printf_filtered (" in ");
 667 !       fputs_demangled (funname, stdout, DMGL_ANSI | DMGL_PARAMS);
 668       }
 669     wrap_here ("   ");
 670     if (sal.symtab)
 671 --- 436,446 ----
 672     if (funname)
 673       {
 674         printf_filtered (" in ");
 675 !       if (energize)
 676 !       energize_annotate_function(funname, DMGL_ANSI | DMGL_PARAMS,
 677 !                                  selected_frame_level);
 678 !       else
 679 !       fputs_demangled (funname, stdout, DMGL_ANSI | DMGL_PARAMS);
 680       }
 681     wrap_here ("   ");
 682     if (sal.symtab)
 683 ===================================================================
 684 RCS file: /local/cvsfiles/devo/gdb/symfile.c,v
 685 retrieving revision 1.55
 686 diff -c -r1.55 symfile.c
 687 *** 1.55        1992/07/04 13:58:46
 688 --- symfile.c   1992/07/05 14:14:12
 689 ***************
 690 *** 611,616 ****
 691 --- 611,618 ----
 692         fflush (stdout);
 693       }
 694
 695 +   energize_symbol_file(objfile);
 696 +
 697     return (objfile);
 698   }
 699
 700 ===================================================================
 701 RCS file: /local/cvsfiles/devo/gdb/utils.c,v
 702 retrieving revision 1.54
 703 diff -c -r1.54 utils.c
 704 *** 1.54        1992/07/09 04:40:35
 705 --- utils.c     1992/07/16 22:44:50
 706 ***************
 707 *** 694,700 ****
 708     register int ans2;
 709
 710     /* Automatically answer "yes" if input is not from a terminal.  */
 711 !   if (!input_from_terminal_p ())
 712       return 1;
 713
 714     while (1)
 715 --- 694,700 ----
 716     register int ans2;
 717
 718     /* Automatically answer "yes" if input is not from a terminal.  */
 719 !   if (!input_from_terminal_p () && !energize)
 720       return 1;
 721
 722     while (1)
 723 ***************
 724 *** 701,721 ****
 725       {
 726         va_start (args);
 727         ctlstr = va_arg (args, char *);
 728         vfprintf_filtered (stdout, ctlstr, args);
 729 -       va_end (args);
 730         printf_filtered ("(y or n) ");
 731 !       fflush (stdout);
 732 !       answer = fgetc (stdin);
 733 !       clearerr (stdin);               /* in case of C-d */
 734 !       if (answer == EOF)      /* C-d */
 735 !         return 1;
 736 !       if (answer != '\n')     /* Eat rest of input line, to EOF or newline */
 737 !       do
 738 !         {
 739 !           ans2 = fgetc (stdin);
 740 !           clearerr (stdin);
 741 !         }
 742 !         while (ans2 != EOF && ans2 != '\n');
 743         if (answer >= 'a')
 744         answer -= 040;
 745         if (answer == 'Y')
 746 --- 701,732 ----
 747       {
 748         va_start (args);
 749         ctlstr = va_arg (args, char *);
 750 +       energize_query (ctlstr, args);
 751         vfprintf_filtered (stdout, ctlstr, args);
 752         printf_filtered ("(y or n) ");
 753 !       if (energize)
 754 !       {
 755 !         char *buf;
 756 !
 757 !         buf = energize_command_line_input(0, 0);
 758 !         answer = buf ? *buf : 'Y';
 759 !         energize_acknowledge_query(buf);
 760 !       }
 761 !       else
 762 !       {
 763 !         fflush (stdout);
 764 !         answer = fgetc (stdin);
 765 !         clearerr (stdin);             /* in case of C-d */
 766 !         if (answer == EOF)    /* C-d */
 767 !           return 1;
 768 !         if (answer != '\n')   /* Eat rest of input line, to EOF or newline */
 769 !           do
 770 !             {
 771 !               ans2 = fgetc (stdin);
 772 !               clearerr (stdin);
 773 !             }
 774 !         while (ans2 != EOF && ans2 != '\n');
 775 !       }
 776         if (answer >= 'a')
 777         answer -= 040;
 778         if (answer == 'Y')
 779 ***************
 780 *** 723,728 ****
 781 --- 734,740 ----
 782         if (answer == 'N')
 783         return 0;
 784         printf_filtered ("Please answer y or n.\n");
 785 +       va_end (args);
 786       }
 787   }
 788
 789 ***************
 790 *** 989,994 ****
 791 --- 1001,1012 ----
 792     if (linebuffer == 0)
 793       return;
 794
 795 +   if (energize)
 796 +     {
 797 +       energize_fputs(linebuffer);
 798 +       return;
 799 +     }
 800 +
 801     /* Don't do any filtering if it is disabled.  */
 802     if (stream != stdout
 803      || (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX))
 804 ===================================================================
 805 RCS file: /local/cvsfiles/devo/gdb/valprint.c,v
 806 retrieving revision 1.48
 807 diff -c -r1.48 valprint.c
 808 *** 1.48        1992/07/10 03:56:06
 809 --- valprint.c  1992/07/16 22:44:53
 810 ***************
 811 *** 485,490 ****
 812 --- 485,491 ----
 813        struct type **dont_print;
 814   {
 815     int i, len, n_baseclasses;
 816 +   char expr_tag[100];         /* Energize */
 817
 818     check_stub_type (type);
 819
 820 ***************
 821 *** 549,554 ****
 822 --- 550,562 ----
 823               fprint_symbol (stream, TYPE_FIELD_NAME (type, i));
 824               fputs_filtered (" = ", stream);
 825             }
 826 +
 827 +         sprintf(expr_tag, ".%s", TYPE_FIELD_NAME(type, i));
 828 +
 829 +         energize_start_variable_annotation(expr_tag, NULL,
 830 +                                            TYPE_FIELD_TYPE(type, i),
 831 +                                            (CORE_ADDR) (valaddr + TYPE_FIELD_BITPOS(type, i) / 8),
 832 +                                            "");
 833           if (TYPE_FIELD_PACKED (type, i))
 834             {
 835               value v;
 836 ***************
 837 *** 567,572 ****
 838 --- 575,581 ----
 839                          valaddr + TYPE_FIELD_BITPOS (type, i) / 8,
 840                          0, stream, format, 0, recurse + 1, pretty);
 841             }
 842 +         energize_end_variable_annotation();
 843         }
 844         if (pretty)
 845         {
 846 ***************
 847 *** 801,806 ****
 848 --- 810,816 ----
 849                   unsigned int rep1;
 850                   /* Number of repetitions we have detected so far.  */
 851                   unsigned int reps;
 852 +                 char expr_tag[100]; /* Energize */
 853
 854                   if (i != 0)
 855                     if (arrayprint)
 856 ***************
 857 *** 822,827 ****
 858 --- 832,842 ----
 859                       ++rep1;
 860                     }
 861
 862 +                 sprintf(expr_tag, "[%d]", i);
 863 +                 energize_start_variable_annotation(expr_tag, NULL,
 864 +                                                    elttype,
 865 +                                                    (CORE_ADDR) (valaddr + i * eltlen),
 866 +                                                    "");
 867                   if (reps > REPEAT_COUNT_THRESHOLD)
 868                     {
 869                       val_print (elttype, valaddr + i * eltlen,
 870 ***************
 871 *** 838,843 ****
 872 --- 853,859 ----
 873                                  recurse + 1, pretty);
 874                       things_printed++;
 875                     }
 876 +                 energize_end_variable_annotation();
 877                 }
 878               if (i < len)
 879                 fprintf_filtered (stream, "...");
 880 ===================================================================
 881 RCS file: /local/cvsfiles/devo/gdb/config/amix.mh,v
 882 retrieving revision 1.4
 883 diff -c -r1.4 amix.mh
 884 *** 1.4 1992/06/10 02:05:16
 885 --- config/amix.mh      1992/07/05 17:47:19
 886 ***************
 887 *** 22,24 ****
 888 --- 22,31 ----
 889
 890   # SVR4 puts the BSD compatible install in /usr/ucb.
 891   INSTALL = /usr/ucb/install -c
 892 +
 893 + # These are the libs that are needed for the Energize version of gdb on
 894 + # SVR4.  Note that we MUST include the standard C library before libucb.a,
 895 + # otherwise we get lots of broken stuff we don't want.
 896 + ENERGIZE_LIB = energize/libconn.a
 897 + ENERGIZE_LIBS = ${ENERGIZE_LIB} -L/usr/lib -lm -lnet -lresolv -lform \
 898 +       -lsocket -lc /usr/ucblib/libucb.a -lnsl
 899 ===================================================================
 900 RCS file: /local/cvsfiles/devo/gdb/config/ncr3000.mh,v
 901 retrieving revision 1.4
 902 diff -c -r1.4 ncr3000.mh
 903 *** 1.4 1992/06/15 19:25:13
 904 --- config/ncr3000.mh   1992/07/05 17:49:34
 905 ***************
 906 *** 38,40 ****
 907 --- 38,47 ----
 908   # The /usr/ucb/install program is incompatible (complains about unknown
 909   # group staff).  Use good old cp...
 910   INSTALL = cp
 911 +
 912 + # These are the libs that are needed for the Energize version of gdb on
 913 + # SVR4.  Note that we MUST include the standard C library before libucb.a,
 914 + # otherwise we get lots of broken stuff we don't want.
 915 + ENERGIZE_LIB = energize/libconn.a
 916 + ENERGIZE_LIBS = ${ENERGIZE_LIB} -L/usr/lib -lm -lnet -lresolv -lform \
 917 +       -lsocket -lc /usr/ucblib/libucb.a -lnsl