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

Bug 329682 - Rename method "evaluateSymbolAddress" to "evaluateAddressExpression"

Browse source
This commit is contained in:
Anton Leherbauer 2010-11-16 09:35:38 +00:00
parent b5c0570748
commit 009a2d0523
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java
View file

@ -8,6 +8,7 @@
* Contributors: * Contributors:
* Wind River Systems - initial API and implementation * Wind River Systems - initial API and implementation
* Freescale Semiconductor - refactoring * Freescale Semiconductor - refactoring
* Patrick Chuong (Texas Instruments) - Bug fix (329682)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.debug.internal.ui.disassembly.dsf; package org.eclipse.cdt.debug.internal.ui.disassembly.dsf;
@ -26,12 +27,14 @@ public abstract class AbstractDisassemblyBackend implements IDisassemblyBackend
} }
/** /**
* Evaluate the symbol address. * Evaluate the expression to an address. This might be the address of a symbol or
* the value of the numeric evaluation depending on the type of the expression.
* *
* @param symbol the symbol * @param expression the expression
* @param suppressError true to suppress error dialogs * @param suppressError <code>true</code> to suppress error dialogs
* @return the address, <code>null</code> if failed to evaluate symbol * @return the address or <code>null</code> if the expression could not be evaluated
* @since 7.0
*/ */
public abstract BigInteger evaluateSymbolAddress(String symbol, boolean suppressError); public abstract BigInteger evaluateAddressExpression(String expression, boolean suppressError);
} }

4
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdi.java
View file

@ -348,7 +348,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements
* @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.IDisassemblyBackend#gotoSymbol(java.lang.String) * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.IDisassemblyBackend#gotoSymbol(java.lang.String)
*/ */
public void gotoSymbol(String symbol) { public void gotoSymbol(String symbol) {
final BigInteger address = evaluateSymbolAddress(symbol, false); final BigInteger address = evaluateAddressExpression(symbol, false);
if (address != null) { if (address != null) {
fCallback.asyncExec(new Runnable() { fCallback.asyncExec(new Runnable() {
public void run() { public void run() {
@ -361,7 +361,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements
* (non-Javadoc) * (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#evaluateSymbolAddress(java.lang.String, boolean) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#evaluateSymbolAddress(java.lang.String, boolean)
*/ */
public BigInteger evaluateSymbolAddress(String symbol, final boolean suppressError) { public BigInteger evaluateAddressExpression(String symbol, final boolean suppressError) {
if (fTargetFrameContext != null) { if (fTargetFrameContext != null) {
try { try {
// This logic was lifted from CMemoryBlockRetrievalExtension.getExtendedMemoryBlock(String, Object) // This logic was lifted from CMemoryBlockRetrievalExtension.getExtendedMemoryBlock(String, Object)

1
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/IDisassemblyBackend.java
View file

@ -8,7 +8,6 @@
* Contributors: * Contributors:
* Wind River Systems - initial API and implementation * Wind River Systems - initial API and implementation
* Freescale Semiconductor - refactoring * Freescale Semiconductor - refactoring
* Patrick Chuong (Texas Instruments) - Bug fix (329682)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.debug.internal.ui.disassembly.dsf; package org.eclipse.cdt.debug.internal.ui.disassembly.dsf;

2
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java
View file

@ -881,7 +881,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
* @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#evaluateSymbolAddress(java.lang.String, boolean) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#evaluateSymbolAddress(java.lang.String, boolean)
*/ */
@Override @Override
public BigInteger evaluateSymbolAddress(final String symbol, final boolean suppressError) { public BigInteger evaluateAddressExpression(final String symbol, final boolean suppressError) {
Query<BigInteger> query = new Query<BigInteger>() { Query<BigInteger> query = new Query<BigInteger>() {
@Override @Override
protected void execute(DataRequestMonitor<BigInteger> rm) { protected void execute(DataRequestMonitor<BigInteger> rm) {

2
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
View file

@ -2968,7 +2968,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
if (fBackend != null) { if (fBackend != null) {
BigInteger address = null; BigInteger address = null;
if (fBackend instanceof AbstractDisassemblyBackend) { if (fBackend instanceof AbstractDisassemblyBackend) {
address = ((AbstractDisassemblyBackend) fBackend).evaluateSymbolAddress(expr, suppressError); address = ((AbstractDisassemblyBackend) fBackend).evaluateAddressExpression(expr, suppressError);
} else { } else {
String value = fBackend.evaluateExpression(expr); String value = fBackend.evaluateExpression(expr);
if (value != null) { if (value != null) {