empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a problem reported by Christopher Pow: cc65_lineinfo_byname doesn't handle

Browse source 
multiple line infos for one line correctly. It did only return one randomly
chosen line info instead of all.


git-svn-id: svn://svn.cc65.org/cc65/trunk@5110 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2011-08-03 18:39:08 +00:00
parent ca0877adb6
commit 3cf41ed2e7
1 changed files with 51 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
src/dbginfo/dbginfo.c
View file

@ -3109,40 +3109,43 @@ static LineInfoListEntry* FindLineInfoByAddr (const LineInfoList* L, cc65_addr A
static LineInfo* FindLineInfoByLine (FileInfo* F, cc65_line Line) static int FindLineInfoByLine (Collection* LineInfos, cc65_line Line,
/* Find the LineInfo for a given line number */ unsigned* Index)
/* Find the LineInfo for a given line number. The function returns true if the
* line was found. In this case, Index contains the index of the first item
* that matches. If the item wasn't found, the function returns false and
* Index contains the insert position for the line.
*/
{ {
int Hi;
int Lo;
/* Get a pointer to the line info collection for this file */
Collection* LineInfoByLine = &F->LineInfoByLine;
/* Do a binary search */ /* Do a binary search */
Lo = 0; int Lo = 0;
Hi = (int) CollCount (LineInfoByLine) - 1; int Hi = (int) CollCount (LineInfos) - 1;
int Found = 0;
while (Lo <= Hi) { while (Lo <= Hi) {
/* Mid of range */ /* Mid of range */
int Cur = (Lo + Hi) / 2; int Cur = (Lo + Hi) / 2;
/* Get item */ /* Get item */
LineInfo* CurItem = CollAt (LineInfoByLine, Cur); const LineInfo* CurItem = CollAt (LineInfos, Cur);
/* Found? */ /* Found? */
if (Line < CurItem->Line) { if (Line > CurItem->Line) {
Hi = Cur - 1;
} else if (Line > CurItem->Line) {
Lo = Cur + 1; Lo = Cur + 1;
} else { } else {
/* Found! */ Hi = Cur - 1;
return CurItem; /* Since we may have duplicates, repeat the search until we've
* the first item that has a match.
*/
if (Line == CurItem->Line) {
Found = 1;
}
} }
} }
/* Not found */ /* Pass back the index. This is also the insert position */
return 0; *Index = Lo;
return Found;
} }
@ -3588,7 +3591,8 @@ cc65_lineinfo* cc65_lineinfo_byname (cc65_dbginfo Handle, const char* FileName,
FileInfo* F; FileInfo* F;
cc65_lineinfo* D; cc65_lineinfo* D;
int Found; int Found;
unsigned Index; unsigned FileIndex;
unsigned I;
Collection LineInfoList = COLLECTION_INITIALIZER; Collection LineInfoList = COLLECTION_INITIALIZER;
/* Check the parameter */ /* Check the parameter */
@ -3598,30 +3602,47 @@ cc65_lineinfo* cc65_lineinfo_byname (cc65_dbginfo Handle, const char* FileName,
Info = (DbgInfo*) Handle; Info = (DbgInfo*) Handle;
/* Search for the first file with this name */ /* Search for the first file with this name */
Found = FindFileInfoByName (&Info->FileInfoByName, FileName, &Index); Found = FindFileInfoByName (&Info->FileInfoByName, FileName, &FileIndex);
if (!Found) { if (!Found) {
return 0; return 0;
} }
/* Loop over all files with this name */ /* Loop over all files with this name */
F = CollAt (&Info->FileInfoByName, Index); F = CollAt (&Info->FileInfoByName, FileIndex);
while (Found) { while (Found) {
unsigned LineIndex;
LineInfo* L = 0;
/* Search in the file for the given line */ /* Search in the file for the given line */
LineInfo* L = FindLineInfoByLine (F, Line); Found = FindLineInfoByLine (&F->LineInfoByLine, Line, &LineIndex);
if (L) { if (Found) {
/* Remember the line info */ L = CollAt (&F->LineInfoByLine, LineIndex);
}
/* Add all line infos for this line */
while (Found) {
/* Add next */
CollAppend (&LineInfoList, L); CollAppend (&LineInfoList, L);
/* Check if the next one is also a match */
if (LineIndex >= CollCount (&F->LineInfoByLine)) {
break;
}
L = CollAt (&F->LineInfoByLine, ++LineIndex);
if (L->Line != Line) {
Found = 0;
}
} }
/* Next entry */ /* Next entry */
++Index; ++FileIndex;
/* If the index is valid, check if the next entry is a file with the /* If the index is valid, check if the next entry is a file with the
* same name. * same name.
*/ */
if (Index < CollCount (&Info->FileInfoByName)) { if (FileIndex < CollCount (&Info->FileInfoByName)) {
F = CollAt (&Info->FileInfoByName, Index); F = CollAt (&Info->FileInfoByName, FileIndex);
Found = (strcmp (F->FileName, FileName) == 0); Found = (strcmp (F->FileName, FileName) == 0);
} else { } else {
Found = 0; Found = 0;
@ -3638,8 +3659,8 @@ cc65_lineinfo* cc65_lineinfo_byname (cc65_dbginfo Handle, const char* FileName,
D = new_cc65_lineinfo (CollCount (&LineInfoList)); D = new_cc65_lineinfo (CollCount (&LineInfoList));
/* Copy the data */ /* Copy the data */
for (Index = 0; Index < CollCount (&LineInfoList); ++Index) { for (I = 0; I < CollCount (&LineInfoList); ++I) {
CopyLineInfo (D->data + Index, CollAt (&LineInfoList, Index)); CopyLineInfo (D->data + I, CollAt (&LineInfoList, I));
} }
/* Delete the temporary data collection */ /* Delete the temporary data collection */