OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* tuiSource.c (tuiSetSourceContent): Remove old breakpoint code. 

(_hasBreak): Remove.
	(tuiShowSource): Fix comment indentation.
	(tuiSourceIsDisplayed): Likewise.
	(tuiVerticalSourceScroll): Likewise.
This commit is contained in:
Stephane Carrez 2002-08-30 20:23:34 +00:00
parent 00b2bad465
commit 98427f3550
2 changed files with 29 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/tui/ChangeLog
View File

@ -1,3 +1,11 @@
2002-08-31 Stephane Carrez <stcarrez@nerim.fr>
* tuiSource.c (tuiSetSourceContent): Remove old breakpoint code.
(_hasBreak): Remove.
(tuiShowSource): Fix comment indentation.
(tuiSourceIsDisplayed): Likewise.
(tuiVerticalSourceScroll): Likewise.
2002-08-30 Stephane Carrez <stcarrez@nerim.fr>
* tuiSourceWin.h (tui_update_all_breakpoint_info): Declare.

112
gdb/tui/tuiSource.c
View File

@ -54,17 +54,7 @@
#include "tuiSource.h"
/*****************************************
** STATIC LOCAL FUNCTIONS FORWARD DECLS **
******************************************/
static struct breakpoint *_hasBreak (char *, int);
/*
** tuiSetSourceContent().
** Function to display source in the source window.
*/
/* Function to display source in the source window. */
TuiStatus
tuiSetSourceContent (struct symtab *s, int lineNo, int noerror)
{
@ -79,10 +69,8 @@ tuiSetSourceContent (struct symtab *s, int lineNo, int noerror)
if ((ret = tuiAllocSourceBuffer (srcWin)) == TUI_SUCCESS)
{
lineWidth = srcWin->generic.width - 1;
/*
** Take hilite (window border) into account, when calculating
** the number of lines
*/
/* Take hilite (window border) into account, when calculating
the number of lines */
nlines = (lineNo + (srcWin->generic.height - 2)) - lineNo;
desc = open_source_file (s);
if (desc < 0)
@ -141,7 +129,6 @@ tuiSetSourceContent (struct symtab *s, int lineNo, int noerror)
{
TuiWinElementPtr element = (TuiWinElementPtr)
srcWin->generic.content[curLine];
struct breakpoint *bp;
/* get the first character in the line */
c = fgetc (stream);
@ -163,10 +150,8 @@ tuiSetSourceContent (struct symtab *s, int lineNo, int noerror)
}
srcLine[curLen] = (char) 0;
/*
** Set whether element is the execution point and
** whether there is a break point on it.
*/
/* Set whether element is the execution point and
whether there is a break point on it. */
element->whichElement.source.lineOrAddr.lineNo =
curLineNo;
element->whichElement.source.isExecPoint =
@ -175,11 +160,6 @@ tuiSetSourceContent (struct symtab *s, int lineNo, int noerror)
s->filename) == 0
&& curLineNo == ((TuiWinElementPtr)
locator->content[0])->whichElement.locator.lineNo);
bp = _hasBreak (s->filename, curLineNo);
element->whichElement.source.hasBreak =
(bp != (struct breakpoint *) NULL &&
(!element->whichElement.source.isExecPoint ||
(bp->disposition != disp_del || bp->hit_count <= 0)));
if (c != EOF)
{
i = strlen (srcLine) - 1;
@ -199,13 +179,11 @@ tuiSetSourceContent (struct symtab *s, int lineNo, int noerror)
srcLine[i] = '?';
}
else
{ /*
** Store the charcter in the line
** buffer. If it is a tab, then
** translate to the correct number of
** chars so we don't overwrite our
** buffer.
*/
{ /* Store the charcter in the line
buffer. If it is a tab, then
translate to the correct number of
chars so we don't overwrite our
buffer. */
if (c == '\t')
{
int j, maxTabLen = tuiDefaultTabLen ();
@ -224,10 +202,8 @@ tuiSetSourceContent (struct symtab *s, int lineNo, int noerror)
srcLine[i + 1] = 0;
}
else
{ /*
** if we have not reached EOL, then eat
** chars until we do
*/
{ /* If we have not reached EOL, then eat
chars until we do */
while (c != EOF && c != '\n' && c != '\r')
c = fgetc (stream);
}
@ -257,7 +233,7 @@ tuiSetSourceContent (struct symtab *s, int lineNo, int noerror)
}
}
return ret;
} /* tuiSetSourceContent */
}
/* elz: this function sets the contents of the source window to empty
@ -328,44 +304,30 @@ tuiSetSourceContentNil (TuiWinInfoPtr winInfo, char *warning_string)
curr_line++;
} /* end while */
} /*tuiSetSourceContentNil */
}
/*
** tuiShowSource().
** Function to display source in the source window. This function
** initializes the horizontal scroll to 0.
*/
/* Function to display source in the source window. This function
initializes the horizontal scroll to 0. */
void
tuiShowSource (struct symtab *s, TuiLineOrAddress line, int noerror)
{
srcWin->detail.sourceInfo.horizontalOffset = 0;
tuiUpdateSourceWindowAsIs(srcWin, s, line, noerror);
return;
} /* tuiShowSource */
}
/*
** tuiSourceIsDisplayed().
** Answer whether the source is currently displayed in the source window.
*/
/* Answer whether the source is currently displayed in the source window. */
int
tuiSourceIsDisplayed (char *fname)
{
return (srcWin->generic.contentInUse &&
(strcmp (((TuiWinElementPtr) (locatorWinInfoPtr ())->
content[0])->whichElement.locator.fileName, fname) == 0));
} /* tuiSourceIsDisplayed */
}
/*
** tuiVerticalSourceScroll().
** Scroll the source forward or backward vertically
*/
/* Scroll the source forward or backward vertically. */
void
tuiVerticalSourceScroll (TuiScrollDirection scrollDirection,
int numToScroll)
@ -400,36 +362,4 @@ tuiVerticalSourceScroll (TuiScrollDirection scrollDirection,
if (identify_source_line (s, l.lineNo, 0, -1) == 1)
tuiUpdateSourceWindowAsIs (srcWin, s, l, FALSE);
}
return;
} /* tuiVerticalSourceScroll */
/*****************************************
** STATIC LOCAL FUNCTIONS **
******************************************/
/*
** _hasBreak().
** Answer whether there is a break point at the input line in
** the source file indicated
*/
static struct breakpoint *
_hasBreak (char *sourceFileName, int lineNo)
{
struct breakpoint *bpWithBreak = (struct breakpoint *) NULL;
struct breakpoint *bp;
extern struct breakpoint *breakpoint_chain;
for (bp = breakpoint_chain;
(bp != (struct breakpoint *) NULL &&
bpWithBreak == (struct breakpoint *) NULL);
bp = bp->next)
if (bp->source_file
&& (strcmp (sourceFileName, bp->source_file) == 0)
&& (lineNo == bp->line_number))
bpWithBreak = bp;
return bpWithBreak;
} /* _hasBreak */
}