summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Hunt <hunt@redhat.com>2002-12-19 21:28:10 +0000
committerMartin Hunt <hunt@redhat.com>2002-12-19 21:28:10 +0000
commit777f1a4ceea35ce6c6856a717d8e9897630e85fb (patch)
tree5260f5845176ff539662202168b6b3976d6ad7b4
parente2880ee67a40933001f593578ac174bee93fd883 (diff)
downloadgdb-777f1a4ceea35ce6c6856a717d8e9897630e85fb.tar.gz
Updated Help.
-rw-r--r--gdb/gdbtk/library/help/debug.html58
-rw-r--r--gdb/gdbtk/library/help/help.html18
-rw-r--r--gdb/gdbtk/library/help/images/index.gifbin11645 -> 0 bytes
-rw-r--r--gdb/gdbtk/library/help/images/insightbwr.pngbin0 -> 1556 bytes
-rw-r--r--gdb/gdbtk/library/help/images/reg.pngbin0 -> 12541 bytes
-rw-r--r--gdb/gdbtk/library/help/images/reg_menu.pngbin0 -> 14377 bytes
-rw-r--r--gdb/gdbtk/library/help/images/watch.pngbin0 -> 14695 bytes
-rw-r--r--gdb/gdbtk/library/help/index.html81
-rw-r--r--gdb/gdbtk/library/help/locals.html95
-rw-r--r--gdb/gdbtk/library/help/reg_pref.html20
-rw-r--r--gdb/gdbtk/library/help/register.html36
-rw-r--r--gdb/gdbtk/library/help/target.html49
-rw-r--r--gdb/gdbtk/library/help/watch.html115
13 files changed, 181 insertions, 291 deletions
diff --git a/gdb/gdbtk/library/help/debug.html b/gdb/gdbtk/library/help/debug.html
index 11b9979deca..528a868ff5f 100644
--- a/gdb/gdbtk/library/help/debug.html
+++ b/gdb/gdbtk/library/help/debug.html
@@ -1,16 +1,18 @@
<HTML>
<HEAD>
-<TITLE>Debugging Help</TITLE>
+<TITLE>Internal Debugging Help</TITLE>
</HEAD>
<BODY>
-<H2>GDBTK Debugging Functions</H2>
-<H4>Overview</H4>
-<P> This describes the basic internal functions for debugging GDBTK.</P>
+<H2>Insight Internal Debugging Functions</H2>
+<H3>Overview</H3>
+<P> This describes the basic internal functions for debugging Insight.
+This information is for Insight developers trying to debug Insight,
+not for users trying to debug other programs.</P>
-<H4>Environment Variables</H4>
-<P><BOLD>GDBTK_DEBUG</BOLD> - Setting this variable controls the Debug
+<H3>Environment Variables</H3>
+<P><b>GDBTK_DEBUG</b> - Setting this variable controls the Debug
window.</P>
-<P><BOLD>GDBTK_DEBUG</BOLD> may have the following values:</P>
+<P><b>GDBTK_DEBUG</b> may have the following values:</P>
<DL>
<DT>0 or unset</DT>
<DD>The Debug window is not opened and not listed on the menu. (You
@@ -22,10 +24,10 @@ may still open it by typing Ctrl-U in the source window.)</DD>
</DL>
<HR>
-<P><BOLD>GDBTK_TRACE</BOLD> - This variable determines if tracing is enbabled.
-Tracing may only be enabled at GDBTK startup. Changing <BOLD>GDBTK_TRACE</BOLD>
+<P><b>GDBTK_TRACE</b> - This variable determines if tracing is enabled.
+Tracing may only be enabled at GDBTK startup. Changing <b>GDBTK_TRACE</b>
while GDBTK is running has no effect.</P>
-<P><BOLD>GDBTK_TRACE</BOLD> may have the following values:</P>
+<P><b>GDBTK_TRACE</b> may have the following values:</P>
<DL>
<DT>0 or unset</DT>
<DD>Tracing is not enabled.</DD>
@@ -34,42 +36,42 @@ while GDBTK is running has no effect.</P>
so in the Debug Window or from the console. (The command to do this is "tk
::debug::trace_start).</DD>
<DT>2</DT>
-<DD>Tracing is enabled and started immediately.</DT>
+<DD>Tracing is enabled and started immediately.</DD>
</DL>
-<P><BOLD>GDBTK_DEBUGFILE</BOLD> - This variable contains an optional filename
+<P><b>GDBTK_DEBUGFILE</b> - This variable contains an optional filename
where GDBTK will write all debugging information. This information will include
the output of all "debug" and "dbug" commands, as well as tracing, if it is
enabled. The value of
-<BOLD>GDBTK_DEBUGFILE</BOLD> will not change what is displayed in the Debug
+<b>GDBTK_DEBUGFILE</b> will not change what is displayed in the Debug
Window, with one exception; when the Debug Window is opened, it will read
-the contents of <BOLD>GDBTK_DEBUGFILE</BOLD> (if it is set and not "stdout").
-<P><BOLD>GDBTK_DEBUGFILE</BOLD> may have the following values:</P>
+the contents of <b>GDBTK_DEBUGFILE</b> (if it is set and not "stdout").
+<P><b>GDBTK_DEBUGFILE</b> may have the following values:</P>
<DL>
<DT>unset</DT>
<DD>No information will be logged.</DD>
-<DT><italic>filename</italic></DT>
-<DD>Debugging information will be logged to <italic>filename</italic>.
+<DT><i>filename</i></DT>
+<DD>Debugging information will be logged to <i>filename</i>.
<DT>"stdout"</DT>
<DD>Debugging information will be written to stdout</DD>
</DL>
<HR>
-<H4>Tcl Debugging Functions</H4>
+<H3>Tcl Debugging Functions</H3>
<P> All debugging functions have been moved into debug.tcl in the ::debug
namespace. "debug" and "dbug" are imported into the global namespace.</P>
<P> The following are the standard debug message functions.</P>
-<code>
+<pre>
# -----------------------------------------------------------------------------
# NAME: debug::debug
#
# SYNOPSIS: debug { {msg ""} }
#
-# DESC: Writes a message to the proper output. The priority of the
+# DESC: Writes a message to the proper output. The priority of the
# message is assumed to be "I" (informational). This function
# is provided for compatibility with the previous debug function.
# For higher priority messages, use dbug.
#
-# ARGS: msg - Message to be displayed.
+# ARGS: msg - Message to be displayed.
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
@@ -87,14 +89,14 @@ namespace. "debug" and "dbug" are imported into the global namespace.</P>
# "E" - Error
# "X" - Fatal Error
# ----------------------------------------------------------------------------
-</code>
+</pre>
<P> These next functions are used to trace variables, which should not be
confused with the functions tracing.<P>
-<code>
+<pre>
# ----------------------------------------------------------------------------
# NAME: debug::trace_var
# SYNOPSIS: debug::trace_var {varName mode}
-# DESC: Sets up variable trace. When the trace is activated,
+# DESC: Sets up variable trace. When the trace is activated,
# debugging messages will be displayed.
# ARGS: varName - the variable name
# mode - one of more of the following letters
@@ -112,10 +114,10 @@ confused with the functions tracing.<P>
# SYNOPSIS: debug::remove_all_traces
# DESC: Removes all traces set up with "trace_var".
# ----------------------------------------------------------------------------
-</code>
-<P> The following two functions may be used to start and stop tracing
+</pre>
+<P> The following two functions may be used to start and stop tracing
programmatically.</P>
-<code>
+<pre>
# -----------------------------------------------------------------------------
# NAME: ::debug::trace_start
# SYNOPSIS: ::debug::trace_start
@@ -126,6 +128,6 @@ programmatically.</P>
# SYNOPSIS: ::debug::trace_stop
# DESC: Stops logging of function trace information.
# -----------------------------------------------------------------------------
-</code>
+</pre>
</BODY>
</HTML>
diff --git a/gdb/gdbtk/library/help/help.html b/gdb/gdbtk/library/help/help.html
index 3a3640da1a1..7cf93c3cedd 100644
--- a/gdb/gdbtk/library/help/help.html
+++ b/gdb/gdbtk/library/help/help.html
@@ -11,14 +11,16 @@ this window.</P>
<P>Help Window topics:
<UL>
- <LI><UL><A HREF="#menus">Menus</A>
- <LI><A HREF="#menus_file">File Menu</A>
- <LI><A HREF="#menus_topics">Topics Menu</A>
- </UL>
- <LI><UL><A HREF="#display">Help Display</A>
- <LI><A HREF="#display_nav">Navigating the Help Window</A>
- <LI><A HREF="#display_link">Definition and Page Links</A>
- </UL>
+ <LI><A HREF="#menus">Menus</A>
+ <UL>
+ <LI><A HREF="#menus_file">File Menu</A></LI>
+ <LI><A HREF="#menus_topics">Topics Menu</A></LI>
+ </LI>
+ <LI><A HREF="#display">Help Display</A>
+ <UL>
+ <LI><A HREF="#display_nav">Navigating the Help Window</A></LI>
+ <LI><A HREF="#display_link">Definition and Page Links</A></LI>
+ </UL></LI>
</UL></P>
<H2><A NAME="menus">Menus</A></H2>
diff --git a/gdb/gdbtk/library/help/images/index.gif b/gdb/gdbtk/library/help/images/index.gif
deleted file mode 100644
index 34d116b6300..00000000000
--- a/gdb/gdbtk/library/help/images/index.gif
+++ /dev/null
Binary files differ
diff --git a/gdb/gdbtk/library/help/images/insightbwr.png b/gdb/gdbtk/library/help/images/insightbwr.png
new file mode 100644
index 00000000000..67618b56fef
--- /dev/null
+++ b/gdb/gdbtk/library/help/images/insightbwr.png
Binary files differ
diff --git a/gdb/gdbtk/library/help/images/reg.png b/gdb/gdbtk/library/help/images/reg.png
new file mode 100644
index 00000000000..251227da79e
--- /dev/null
+++ b/gdb/gdbtk/library/help/images/reg.png
Binary files differ
diff --git a/gdb/gdbtk/library/help/images/reg_menu.png b/gdb/gdbtk/library/help/images/reg_menu.png
new file mode 100644
index 00000000000..54e117b948e
--- /dev/null
+++ b/gdb/gdbtk/library/help/images/reg_menu.png
Binary files differ
diff --git a/gdb/gdbtk/library/help/images/watch.png b/gdb/gdbtk/library/help/images/watch.png
new file mode 100644
index 00000000000..3145de979ec
--- /dev/null
+++ b/gdb/gdbtk/library/help/images/watch.png
Binary files differ
diff --git a/gdb/gdbtk/library/help/index.html b/gdb/gdbtk/library/help/index.html
index b383156329c..9d7177cf259 100644
--- a/gdb/gdbtk/library/help/index.html
+++ b/gdb/gdbtk/library/help/index.html
@@ -1,52 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
- <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
- <META NAME="GENERATOR" CONTENT="Mozilla/4.07 [en] (X11; I; Linux 2.0.35 i686) [Netscape]">
- <TITLE>Help Index</TITLE>
-</HEAD>
-<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000EE" VLINK="#551A8B" ALINK="#FF0000">
-
-<CENTER><IMG SRC="images/index.gif" HEIGHT=123 WIDTH=335></CENTER>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+ <title>Insight Index</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="GENERATOR" content="Quanta Plus">
+</head>
+<body>
+<img src="images/insightbwr.png" width=300 height=120 border=0>
<UL>
-<LI>
-<A HREF="breakpoint.html">Breakpoint Window</A></LI>
-
-<LI>
-<A HREF="console.html">Console Window</A></LI>
-
-<LI>
-<A HREF="browser.html">Function Browser</A></LI>
-
-<LI>
-<A HREF="locals.html">Locals Window</A></LI>
-
-<LI>
-<A HREF="memory.html">Memory Window</A></LI>
-
-<LI>
-<A HREF="register.html">Register Window</A></LI>
-
-<LI>
-<A HREF="source.html">Source Window</A></LI>
-
-<LI>
-<A HREF="stack.html">Stack Window</A></LI>
-
-<LI>
-<A HREF="target.html">Target Window</A></LI>
-
-<LI>
-<A HREF="thread.html">Thread Window</A></LI>
-
-<LI>
-<A HREF="watch.html">Watch Window</A></LI>
-
-<LI>
-<A HREF="session.html">Sessions</A></LI>
-
+<LI><A HREF="breakpoint.html">Breakpoint Window</A></LI>
+<LI><A HREF="console.html">Console Window</A></LI>
+<LI><A HREF="browser.html">Function Browser</A></LI>
+<LI><A HREF="locals.html">Locals Window</A></LI>
+<LI><A HREF="memory.html">Memory Window</A></LI>
+<LI><A HREF="register.html">Register Window</A></LI>
+<LI><A HREF="session.html">Sessions</A></LI>
+<LI><A HREF="source.html">Source Window</A></LI>
+<LI><A HREF="stack.html">Stack Window</A></LI>
+<LI><A HREF="target.html">Target Window</A></LI>
+<LI><A HREF="thread.html">Thread Window</A></LI>
+<LI><A HREF="watch.html">Watch Window</A></LI>
</UL>
+<hr>
+<h2>For Developers Only</h2>
+<ul>
+<li><a href="debug.html">"Internal Debugging Functions</a></li>
+</ul>
+<hr>
+<br>
+<a href="http://sources.redhat.com/insight/" name="Insight Home Page">Insight Home Page</a>
+<br><br><hr><br>
<A HREF="license.html">GNU General Public License</A>
-</BODY>
-</HTML>
+</body>
+</html>
diff --git a/gdb/gdbtk/library/help/locals.html b/gdb/gdbtk/library/help/locals.html
index 058f94fd65f..5612b7de296 100644
--- a/gdb/gdbtk/library/help/locals.html
+++ b/gdb/gdbtk/library/help/locals.html
@@ -1,90 +1,47 @@
<HTML>
<HEAD>
-<TITLE>Locals Window Help</TITLE>
+<TITLE>Local Variables Help</TITLE>
</HEAD>
<BODY>
-<H1>The Locals Window</H1>
+<H1>The Local Variables Window</H1>
<H2>Overview</H2>
-<P>The Locals Window displays all local variables in scope. It may be used to
-visualize and edit local variables.</P>
+<p>The Local Variables Window displays all local variables in scope. It may be used to
+visualize and edit local variables. To open the Local Variables window, click on
+small house icon on the toolbar, or select "Local Variables" under the View
+pulldown menu.</p>
-<P>Locals Window topics:
-<UL>
- <LI><UL><A HREF="#menus">Variable Menu</A>
- <LI><A HREF="#menus_edit">Edit</A>
- <LI><A HREF="#menus_fmt">Format</A>
- </UL>
- <LI><UL><A HREF="#display">Locals Display</A>
- <LI><A HREF="#display_deref">Dereferencing Pointers</A>
- <LI><A HREF="#display_struct">Viewing a Structure or Class</A>
- <LI><A HREF="#display_edit">Editing a Variable</A>
- <LI><A HREF="#display_popup">Locals Pop-up Menu</A>
- </UL>
-</UL></P>
+<H3>Locals Display</H3>
-<H3><A NAME="menus">Variable Menu</A></H3>
-The Variable Menu gives on-screen access to the funtions of the Locals Window.
-To use any of these functions, first use the left mouse button to select a
-variable from the display. Then select:
-
-<DL>
- <DT><A NAME="menus_edit">Edit</A>
- <DD>Edit the value of the variable
- <DT><A NAME="menus_fmt">Format</A>
- <DD>Change the display format of the variable
-</DL>
-
-<H3><A NAME="display">Locals Display</A></H4>
-The Locals Window Display consists of a scrolled listbox which contains all
-local variables, one per line. To use any of the functions of the Locals Window,
-use the left mouse button to select any element from the Display.
-
-<P>Pointers, structures, and classes appear in the display with small exapansion
-box before their names. To <A NAME="display_deref">dereference pointers</A> or
-<A NAME="display_struct">view the members of classes or structures</A>, click
+<p>Pointers, structures, and classes appear in the display with small expansion
+box before their names. To dereference pointers or
+view the members of classes or structures, click
the closed expansion box (which appears as a small plus sign, "+") to "expand"
the listing. The expansion box changes to a minus sign, "-", indicating that the
display is now open. Pointers, structures and classes may be expanded recursively
-to allow multiple pointer dereferences and embedded structure viewing.
+to allow multiple pointer dereferences and embedded structure viewing.</p>
<P>The Locals Display updates after every execution of the program and highlights
-in blue those variables whose values have changed.</P>
+in green those variables whose values have changed.</P>
<P>The Locals Window will, by default, display all pointers in hexadecimal and all
other variables in decimal. To change the display format for a variable, select
-the Format option from either the Variable Menu or the <A HREF="#display_popup">
-Locals Pop-up Menu</A>.
-<BR>
+the Format option from the popup-menu.</P>
-<H4><A NAME="display_edit">Editing a Variable</A></H4>
-To edit a variable, either double-click the left mouse button on the variable in
-the Display or select the Edit option from either the Variable Menu or the Locals
-Pop-up Menu. To abort editing a variable's value, simply press the escape key on
-the keybaord. The variable's original value is restored.
-<BR>
+<H3>Editing a Variable</H3>
+<p>To edit a variable, either double-click the left mouse button on the value of the variable in
+the display or select the Edit option from the pop-up menu. To abort editing a variable's value,
+simply press the escape key on the keyboard. The variable's original value is restored.</p>
-<H4><A NAME="display_popup">Locals Pop-up Menu</A></H4>
-The Locals Pop-up Menu provides quick access to the functions of the Locals Window.
-To use the Locals Pop-up Menu, first select a variable from the Display (by clicking
-the left mouse button on it) and click the right mouse button, choosing from the
-pop-up:
+<H3>Local Variable Pop-up Menu</H3>
+<p>The pop-up menu provides quick access to the functions of the Local Variables Window.
+To use the pop-up menu, click the right mouse button while over a variable.</p>
<DL>
- <DT>Edit
- <DD>Edit the variable's value. See <A HREF="#display_edit"> Editing a Variable
- </A>
- <DT>Format
- <DD>Change the display format of the variable. The variable may be displayed
- as:
- <DL>
- <DT>Hex
- <DD>hexadecimal (base 16)
- <DT>Decimal
- <DD>decimal (base 10)
- <DT>Binary
- <DD>binary (base 2)
- <DT>Octal
- <DD>octal (base 8)
- </DL>
+ <dt>Format<dd>Change the display format of the variable.</dd></dt>
+ <dt>Edit<dd>Edit the variable's value.</dd></dt>
+ <dt>Delete<dd>Remove the variable from the display.</dd></dt>
+ <dt>Dump Memory<dd>Open a Memory Window with the variable's value as an aaddress.</dd></dt>
+ <dt>Help<dd>Open this help page.</dd></dt>
+ <dt>Close<dd>Close the Local Variables Window.</dd></dt>
</DL>
</BODY>
</HTML>
diff --git a/gdb/gdbtk/library/help/reg_pref.html b/gdb/gdbtk/library/help/reg_pref.html
deleted file mode 100644
index b21a5747df2..00000000000
--- a/gdb/gdbtk/library/help/reg_pref.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Register Window Preferences Help</TITLE>
-</HEAD>
-<BODY>
-<H1>Register Window Preferences</H1>
-<H3>Overview</H3>
-<P>Not yet done.</P>
-
-<P>Register Window Preferences topics:
-<UL>
- <LI><UL><A HREF="#">stuff</A>
- <LI><A HREF="#">stuff</A>
- <LI><A HREF="#">stuff</A>
- </UL>
-</UL></P>
-
-<H3><A NAME="">stuff</A></H3>
-</BODY>
-</HTML>
diff --git a/gdb/gdbtk/library/help/register.html b/gdb/gdbtk/library/help/register.html
index 694efe583d8..06513445eee 100644
--- a/gdb/gdbtk/library/help/register.html
+++ b/gdb/gdbtk/library/help/register.html
@@ -4,23 +4,36 @@
</HEAD>
<BODY>
<H1>The Register Window</H1>
-<P>The Register Window lists all the registers and their contents for
+<P>The Register Window lists registers and their contents for
the selected stack frame. It permits viewing the contents of registers
in different formats, editing register values, and some display
customizations.</P>
+<img src="images/reg.png" alt="register window" width=387 height=370 align="middle" border=0>
+
+<p>In the image above, you can see all the registers on the left and their values on the right.
+At the top is an option menu to allow you to choose what group of registers to display.
+The groups names are preset according to the architecture being debugged. The default is "all".
+Registers highlighted in green have recently changed.
+</p>
<P>The Register Window will update the register contents in the display
to match the stack frame currently being viewed in the <A HREF="source.html">
Source Window</A> and <A HREF="stack.html">Stack Window</A>.</P>
<p>Each time the program stops, the register window will automatically update.
-Registers that have changed since the last stop will be displayed in blue.</p>
-<H3>The Register Display</H3>
-<UL>
- <LI><A HREF="#display_edit">Editing a Register</A></LI>
- <LI><A HREF="#display_popup">Register Pop-up Menu</A></LI>
-</UL>
+Registers that have changed since the last stop will be displayed in green.</p>
+
+
+
+<H3>The Register Pop-up Menu</H3>
+<img src="images/reg_menu.png" alt="register popup menu" width=396 height=388 border=0>
+<P>
+To activate the pop-up menu, click the right mouse button over a register.
+This will allow you change the way the register is displayed, or to remove
+it from the display. Or you can add the register to the watch window.
+For integer registers, you can also open a memory window at the
+location pointed to by the register.</P>
-<H4><A NAME="display_edit">Editing a Register</A> </H4>
+<H3>Editing a Register</H3>
<P>
To edit a register, simply click on it with the left mouse button. Type
in the new value and hit enter. You can enter a decimal, hex, or float number and
@@ -31,12 +44,5 @@ The value of the register is set to the current value of the expression; it will
if the expression's value later changes.
</P>
<P>Press the escape key on the keyboard to cancel your edit.</P>
-<H4><A NAME="display_popup">The Register Pop-up Menu</A></H4>
-<P>
-To activate the pop-up menu, click the right mouse button over a register.
-This will allow you change the way the register is displayed, or to remove
-it from the display. Or you can add the register to the watch window.
-For integer registers, you can also open a memory window at the
-location pointed to by the register.</P>
</BODY>
</HTML>
diff --git a/gdb/gdbtk/library/help/target.html b/gdb/gdbtk/library/help/target.html
index 2f81fb6720e..c60ed47a251 100644
--- a/gdb/gdbtk/library/help/target.html
+++ b/gdb/gdbtk/library/help/target.html
@@ -4,33 +4,36 @@
</HEAD>
<BODY>
<H1>The Target Selection Dialog</H1>
-<H3>Overview</H3>
+<h2>Overview</h2>
<P>The Target Selection Dialog allows users to specify the debug target,
the interface used to connect to the target, and some useful run
options.</P>
-<P>Target Selection topics:
+<P>
+<h3><A HREF="#select">Selecting a Target</A></h3>
<UL>
- <LI><UL><A HREF="#select">Selecting a Target</A>
- <LI><A HREF="#select_tar">Specifying a Target</A>
- <LI><A HREF="#select_int">Choosing a Connection Interface</A>
- </UL>
- <LI><UL><A HREF="#options">Options</A>
- <LI><A HREF="#options_run_until_main">Run until 'main'</A>
- <LI><A HREF="#options_bp_at_exit">Set breakpoint at 'exit'</A>
- <LI><A HREF="#options_download_dialog">Display Download Dialog</A>
- </UL>
- <LI><UL><A HREF="#more_options">More Options</A>
- <LI><A HREF="#more_options_attach">Attach to Target</A>
- <LI><A HREF="#more_options_load">Download Program</A>
- <LI><A HREF="#more_options_run">Run Program</A>
- <LI><A HREF="#more_options_cont">Continue from Last Stop</A>
- </UL>
+<LI><A HREF="#select">Specifying a Target</A></LI>
+<LI><A HREF="#select_int">Choosing a Connection Interface</A></LI>
+</UL>
+
+<h3><A HREF="#options">Options</A></h3>
+<UL>
+<LI><A HREF="#options_run_until_main">Run until 'main'</A></LI>
+<LI><A HREF="#options_bp_at_exit">Set breakpoint at 'exit'</A></LI>
+<LI><A HREF="#options_download_dialog">Display Download Dialog</A></LI>
+</UL>
+
+<h3><A HREF="#more_options">More Options</A></h3>
+<UL>
+<LI><A HREF="#more_options_attach">Attach to Target</A></LI>
+<LI><A HREF="#more_options_load">Download Program</A></LI>
+<LI><A HREF="#more_options_run">Run Program</A></LI>
+<LI><A HREF="#more_options_cont">Continue from Last Stop</A></LI>
</UL></P>
<H3><A NAME="select">Selecting a Target</A></H3>
Selecting a target involves choosing a target for debugging and setting connection
-interface options for the target.
+interface options for the target.
<P>Common targets include: "Exec" for native debuggers, "Remote/Serial" for establishing
a connection to a target board via a serial line, "Remote/TCP" for TCP connections,
@@ -44,7 +47,7 @@ and port number of the machine to which to connect. Depending upon configuration
there may be numerous serial- and TCP-based connections. These always follow the
naming convention <I>target</I>/Serial and <I>target</I>/TCP.</P>
-<P>To <A NAME="select_tar"> select a target</A>, choose one of the available targets
+<P>To select a target, choose one of the available targets
from the dropdown menu in the Connection Frame. Then <A NAME="#select_int">specify
the interface options</A> for this target: selecting the baudrate and serial port
from the dropdown menus (serial targets only) or entering the hostname and port number
@@ -53,11 +56,11 @@ from the dropdown menus (serial targets only) or entering the hostname and port
<H3><A NAME="options">Options</A></H3>
Three run options which may be selected include:
<DL>
- <DT><A NAME="options_run_until_main">Run until 'main'
+ <DT><A NAME="options_run_until_main">Run until 'main'</A>
<DD>Sets a breakpoint at main()
- <DT><A NAME="options_bp_at_exit">Set breakpoint at 'exit'
+ <DT><A NAME="options_bp_at_exit">Set breakpoint at 'exit'</A>
<DD>Sets a breakpoint at exit()
- <DT><A NAME="options_download_dialog">Display Download Dialog
+ <DT><A NAME="options_download_dialog">Display Download Dialog</A>
<DD>Displays a dialog showing the progress of the download to
the target section by section
</DL>
@@ -67,7 +70,7 @@ Several additional run options may be set for each target from the Target Select
Dialog. These options govern the behavior of the debugger's
<A NAME="source.html#run_button">Run Button</A>. The debugger automatically selects
default values for these options whenever a target is selected with the dropdown menu
-in the Connection Frame. To modify this default bahavior, click the small triangle
+in the Connection Frame. To modify this default behavior, click the small triangle
next to "More Options" at the bottom of the dialog. The Run Options for the current
target are displayed, allowing modification of the actions for the target. When the
"OK" button is selected, these settings are saved and will be used as the default
diff --git a/gdb/gdbtk/library/help/watch.html b/gdb/gdbtk/library/help/watch.html
index 51734404534..01e253b1883 100644
--- a/gdb/gdbtk/library/help/watch.html
+++ b/gdb/gdbtk/library/help/watch.html
@@ -4,53 +4,25 @@
</HEAD>
<BODY>
<H1>The Watch Window</H1>
-<H3>Overview</H3>
+<img src="images/watch.png" alt="Watch Window Image" width=545 height=308 border=0>
+<H2>Overview</H2>
+
<P>The Watch Window may be used to inspect and edit any expression, including
global variables, static variables, local variables, function arguments,
-and registers.</P>
-
-<P>Watch Window topics:
-<UL>
- <LI><UL><A HREF="#menus">Watch Menu</A>
- <LI><A HREF="#menus_edit">Edit</A>
- <LI><A HREF="#menus_fmt">Format</A>
- <LI><A HREF="#menus_remove">Remove</A>
- </UL>
- <LI><UL><A HREF="#new">Adding Watch Expressions</A>
- <LI><A HREF="#new_ent">In the Watch Window</A>
- <LI><A HREF="#new_src">In the Source Window</A>
- <LI><A HREF="#new_cast">Casting Pointers</A>
- </UL>
- <LI><UL><A HREF="#display">Watch Display</A>
- <LI><A HREF="#display_deref">Dereferencing Pointers</A>
- <LI><A HREF="#display_struct">Viewing a Structure or Class</A>
- <LI><A HREF="#display_edit">Editing an Expression</A>
- <LI><A HREF="#display_popup">Watch Pop-up Menu</A>
- </UL>
-</UL></P>
-
-<H3><A NAME="menus">Watch Menu</A></H3>
-The Watch Menu gives on-screen access to the funtions of the Watch Window.
-To use any of these functions, first use the left mouse button to select an
-expression from the display. Then select:
+and registers. All expressions in scope are displayed with the expression in
+blue, the expression type in red, and the expression value in black. When an
+expression value changes, it is displayed in green. Expressions that are not
+in scope are all gray.</P>
-<DL>
- <DT><A NAME="menus_edit">Edit</A>
- <DD>Edit the value of the expression
- <DT><A NAME="menus_fmt">Format</A>
- <DD>Change the display format of the expression
- <DT><A NAME="menus_remove">Remove</A>
- <DD>Remove the expression from the Watch Window
-</DL>
-<H3><A NAME="new">Adding Watch Expressions</A></H3>
-<A NAME="new_ent">To add an expression to the Watch Window</A>, simply enter
+<H3>Adding Watch Expressions</H3>
+<p>To add an expression to the Watch Window, simply enter
the expression into the entry at the bottom of the window and press return
or click the "Add Watch" button. The expression is validated and added to the
-Watch Window Display.
+Watch Window Display.</p>
-<P><A NAME="new_src">To add an expression to the Watch Window from the
-<A HREF="source.html">Source Window</A></A>, use the
+<P>To add an expression to the Watch Window from the
+<A HREF="source.html">Source Window</A>, use the
"<A HREF="source.html#add_to_watch">Add to Watch</A>" option of the
<A HREF="source.html#display_popup">Source Window Pop-up Menu</A>.</P>
@@ -65,65 +37,50 @@ enter the name of the register preceded with a dollar sign ($) into the
Entry. For example, to watch the PC register, enter "<CODE>$pc</CODE>" into
the Watch Window Entry. The program counter is added to the Display.</P>
-<P><A NAME="new_cast">To cast pointers</A>, simply enter the cast into the
+<P>To cast pointers, simply enter the cast into the
Watch Window Entry at the bottom of the window. Use the same syntax for the
cast that the source file uses. If the source file uses C, the a simple
cast of "<CODE>ptr</CODE>" of type "<CODE>void *</CODE>" can be cast to type
"<CODE>my_struct</CODE>" by entering "<CODE>(my_struct *) ptr</CODE>" into
the Entry.</P>
-<H3><A NAME="display">Watch Display</A></H3>
-The Watch Window Display consists of a scrolled listbox which contains all
+<H3>Watch Display</H3>
+<p>The Watch Window Display consists of a scrolled listbox which contains all
watch expressions, one per line. To use any of the functions of the Watch
-Window, use the left mouse button to select any element from the Display.
+Window, use the left mouse button to select any element from the Display.</p>
<P>Pointers, structures, and classes appear in the display with a small
-exapansion box before their names. To <A NAME="display_deref">dereference
-pointers</A> or <A NAME="display_struct">view the members of classes or
-structures</A>, click the closed expansion box (which appears as a small
+exapansion box before their names. To dereference
+pointers or view the members of classes or
+structures, click the closed expansion box (which appears as a small
plus sign, "+") to "expand" the listing. The expansion box changes to a
minus sign, "-", indicating that the display is now open. Pointers,
structures and classes may be expanded recursively to allow multiple pointer
-derefernces and embedded structure viewing.
+derefernces and embedded structure viewing.</P>
<P>The Watch Display updates after every execution of the program and
-highlights in blue those expressions whose values have changed.</P>
+highlights in green those expressions whose values have changed.</P>
<P>The Watch Window will, by default, display all pointers and registers in
hexadecimal and all other expressions in decimal. To change the display
-format for an expression, select the Format option from either the Watch Menu
-or the <A HREF="#display_popup">Watch Pop-up Menu</A>.
-<BR>
+format for an expression, select the Format option from the pop-up menu.</P>
-<H4><A NAME="display_edit">Editing an Expression</A></H4>
-To edit an expression, either double-click the left mouse button on the expression
-in the Display or select the Edit option from either the Watch Menu or
-the Watch Pop-up Menu. To abort editing an expression's value, simply press
-the escape key on the keybaord. The expression's original value is restored.
-<BR>
+<H3>Editing an Expression</H3>
+<p>To edit an expression, either double-click the left mouse button on the expression
+in the Display or select the Edit option from the popup-menu. To abort editing
+an expression's value, simply press
+the escape key on the keyboard. The expression's original value is restored.</p>
-<H4><A NAME="display_popup">Watch Pop-up Menu</A></H4>
-The Watch Pop-up Menu provides quick access to the functions of the Watch Window.
-To use the Locals Pop-up Menu, first select an expression from the Display (by
-clicking the left mouse button on it) and click the right mouse button, choosing
-from the pop-up:
+<H3>Watch Pop-up Menu</H3>
+<p>The pop-up menu provides quick access to the functions of the Watch Window.
+To use the pop-up menu, click the right mouse button while over a variable.</p>
<DL>
- <DT>Edit
- <DD>Edit the expression's value. See <A HREF="#display_edit">
- Editing an Expression</A>
- <DT>Format
- <DD>Change the display format of the expression. The expression may be
- displayed as:
- <DL>
- <DT>Hex
- <DD>hexadecimal (base 16)
- <DT>Decimal
- <DD>decimal (base 10)
- <DT>Binary
- <DD>binary (base 2)
- <DT>Octal
- <DD>octal (base 8)
- </DL>
+ <dt>Format<dd>Change the display format of the variable.</dd></dt>
+ <dt>Edit<dd>Edit the variable's value.</dd></dt>
+ <dt>Delete<dd>Remove the variable from the display.</dd></dt>
+ <dt>Dump Memory<dd>Open a Memory Window with the variable's value as an aaddress.</dd></dt>
+ <dt>Help<dd>Open this help page.</dd></dt>
+ <dt>Close<dd>Close the Local Variables Window.</dd></dt>
</DL>
</BODY>
</HTML>