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