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