i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed spurious IP and breakpoint markers in disassembled code.

Browse Source 
* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31686 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-07-22 01:59:52 +00:00
parent 25598171b1
commit 0e8b72b130
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/debugger/gui/team_window/SourceView.cpp
+19 -10
View File
@@ -4,6 +4,7 @@
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#include "SourceView.h" #include "SourceView.h"
#include <algorithm> #include <algorithm>
@@ -681,12 +682,16 @@ SourceView::MarkerView::_UpdateIPMarkers()
} }
Reference<Statement> statementReference(statement, true); Reference<Statement> statementReference(statement, true);
uint32 line = statement->StartSourceLocation().Line(); int32 line = statement->StartSourceLocation().Line();
if ((functionInstance->GetSourceCode() != fSourceCode if (line < 0 || line >= LineCount())
&& functionInstance->GetFunction()->SourceFile()
!= sourceFile)
|| line < 0 || line >= (uint32)LineCount()) {
continue; continue;
if (sourceFile != NULL) {
if (functionInstance->GetFunction()->SourceFile() != sourceFile)
continue;
} else {
if (functionInstance->GetSourceCode() != fSourceCode)
continue;
} }
bool isTopFrame = i == 0 bool isTopFrame = i == 0
@@ -740,12 +745,16 @@ SourceView::MarkerView::_UpdateBreakpointMarkers()
} }
Reference<Statement> statementReference(statement, true); Reference<Statement> statementReference(statement, true);
uint32 line = statement->StartSourceLocation().Line(); int32 line = statement->StartSourceLocation().Line();
if ((functionInstance->GetSourceCode() != fSourceCode if (line < 0 || line >= LineCount())
&& functionInstance->GetFunction()->SourceFile()
!= sourceFile)
|| line < 0 || line >= (uint32)LineCount()) {
continue; continue;
if (sourceFile != NULL) {
if (functionInstance->GetFunction()->SourceFile() != sourceFile)
continue;
} else {
if (functionInstance->GetSourceCode() != fSourceCode)
continue;
} }
BreakpointMarker* marker = new(std::nothrow) BreakpointMarker( BreakpointMarker* marker = new(std::nothrow) BreakpointMarker(