mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-07 01:36:01 +02:00
Fixed the problems with the Disassembly view and address breakpoints caused by switch to IAddress.
This commit is contained in:
parent
d4a7887d9b
commit
5cf6e98981
3 changed files with 11 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2004-09-21 Mikhail Khodjaiants
|
||||||
|
Fixed the problems with the Disassembly view and address breakpoints caused by switch to IAddress.
|
||||||
|
* CBreakpointPropertyPage.java
|
||||||
|
* DisassemblyEditorInput.java
|
||||||
|
|
||||||
2004-09-20 Mikhail Khodjaiants
|
2004-09-20 Mikhail Khodjaiants
|
||||||
Fix for bug 73920: Stopping CDT debug at a break point and using a non-text editor throws an error.
|
Fix for bug 73920: Stopping CDT debug at a break point and using a non-text editor throws an error.
|
||||||
* ResumeAtLineActionDelegate.java
|
* ResumeAtLineActionDelegate.java
|
||||||
|
|
|
@ -13,7 +13,6 @@ package org.eclipse.cdt.debug.internal.ui.propertypages;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
|
import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
|
||||||
import org.eclipse.cdt.debug.core.model.ICBreakpoint;
|
import org.eclipse.cdt.debug.core.model.ICBreakpoint;
|
||||||
import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint;
|
import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint;
|
||||||
|
@ -293,6 +292,11 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement
|
||||||
ICAddressBreakpoint abrkpt = (ICAddressBreakpoint)breakpoint;
|
ICAddressBreakpoint abrkpt = (ICAddressBreakpoint)breakpoint;
|
||||||
addField( createLabelEditor( getFieldEditorParent(), PropertyPageMessages.getString( "CBreakpointPropertyPage.18" ), PropertyPageMessages.getString( "CBreakpointPropertyPage.6" ) ) ); //$NON-NLS-1$//$NON-NLS-2$
|
addField( createLabelEditor( getFieldEditorParent(), PropertyPageMessages.getString( "CBreakpointPropertyPage.18" ), PropertyPageMessages.getString( "CBreakpointPropertyPage.6" ) ) ); //$NON-NLS-1$//$NON-NLS-2$
|
||||||
String address = PropertyPageMessages.getString( "CBreakpointPropertyPage.4" ); //$NON-NLS-1$
|
String address = PropertyPageMessages.getString( "CBreakpointPropertyPage.4" ); //$NON-NLS-1$
|
||||||
|
try {
|
||||||
|
address = abrkpt.getAddress();
|
||||||
|
}
|
||||||
|
catch( CoreException e ) {
|
||||||
|
}
|
||||||
if ( address != null ) {
|
if ( address != null ) {
|
||||||
addField( createLabelEditor( getFieldEditorParent(), PropertyPageMessages.getString( "CBreakpointPropertyPage.5" ), address ) ); //$NON-NLS-1$
|
addField( createLabelEditor( getFieldEditorParent(), PropertyPageMessages.getString( "CBreakpointPropertyPage.5" ), address ) ); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
|
|
|
@ -135,7 +135,7 @@ public class DisassemblyEditorInput implements IEditorInput {
|
||||||
++result;
|
++result;
|
||||||
for ( int j = 0; j < instructions.length; ++j ) {
|
for ( int j = 0; j < instructions.length; ++j ) {
|
||||||
++result;
|
++result;
|
||||||
if ( address.compareTo(instructions[j].getAdress()) == 0) {
|
if ( address.equals( instructions[j].getAdress() ) ) {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue