mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-13 03:05:39 +02:00
Code Issues Wiki Activity

Bug 100447: NPE generated when Run To Line in Disassembly view.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2005-06-16 19:23:34 +00:00
parent e6211fb710
commit 652898366b
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
debug/org.eclipse.cdt.debug.ui/ChangeLog
View file

@ -1,3 +1,8 @@
2005-06-12 Mikhail Khodjaiants
Bug 100447: NPE generated when Run To Line in Disassembly view.
* ResumeAtLineAdapter.java
* RunToLineAdapter.java
2005-06-12 Mikhail Khodjaiants 2005-06-12 Mikhail Khodjaiants
Temporary fix for bug 79872: Make instruction stepping default in disassembly view. Temporary fix for bug 79872: Make instruction stepping default in disassembly view.
* DisassemblyView.java * DisassemblyView.java

2
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java
View file

@ -93,7 +93,7 @@ public class ResumeAtLineAdapter implements IResumeAtLineTarget {
ITextSelection textSelection = (ITextSelection)selection; ITextSelection textSelection = (ITextSelection)selection;
int lineNumber = textSelection.getStartLine() + 1; int lineNumber = textSelection.getStartLine() + 1;
final IAddress address = ((DisassemblyEditorInput)input).getAddress( lineNumber ); final IAddress address = ((DisassemblyEditorInput)input).getAddress( lineNumber );
if ( target instanceof IAdaptable ) { if ( address != null && target instanceof IAdaptable ) {
final IJumpToAddress jumpToAddress = (IJumpToAddress)((IAdaptable)target).getAdapter( IJumpToAddress.class ); final IJumpToAddress jumpToAddress = (IJumpToAddress)((IAdaptable)target).getAdapter( IJumpToAddress.class );
if ( jumpToAddress != null && jumpToAddress.canJumpToAddress( address ) ) { if ( jumpToAddress != null && jumpToAddress.canJumpToAddress( address ) ) {
Runnable r = new Runnable() { Runnable r = new Runnable() {

2
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java
View file

@ -96,7 +96,7 @@ public class RunToLineAdapter implements IRunToLineTarget {
ITextSelection textSelection = (ITextSelection)selection; ITextSelection textSelection = (ITextSelection)selection;
int lineNumber = textSelection.getStartLine() + 1; int lineNumber = textSelection.getStartLine() + 1;
final IAddress address = ((DisassemblyEditorInput)input).getAddress( lineNumber ); final IAddress address = ((DisassemblyEditorInput)input).getAddress( lineNumber );
if ( target instanceof IAdaptable ) { if ( address != null && target instanceof IAdaptable ) {
final IRunToAddress runToAddress = (IRunToAddress)((IAdaptable)target).getAdapter( IRunToAddress.class ); final IRunToAddress runToAddress = (IRunToAddress)((IAdaptable)target).getAdapter( IRunToAddress.class );
if ( runToAddress != null && runToAddress.canRunToAddress( address ) ) { if ( runToAddress != null && runToAddress.canRunToAddress( address ) ) {
Runnable r = new Runnable() { Runnable r = new Runnable() {