diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java
index ac1f9f15fca..a1c266bf5c9 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *     Freescale Semiconductor - refactoring
+ *     Patrick Chuong (Texas Instruments) - Bug fix (329682)
  *******************************************************************************/
 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 suppressError true to suppress error dialogs
-	 * @return the address, <code>null</code> if failed to evaluate symbol
+	 * @param expression the expression
+	 * @param suppressError <code>true</code> to suppress error dialogs
+	 * @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);
 
 }
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdi.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdi.java
index 116eb876698..b453ddb3e17 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdi.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdi.java
@@ -348,7 +348,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements
 	 * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.IDisassemblyBackend#gotoSymbol(java.lang.String)
 	 */
 	public void gotoSymbol(String symbol) {
-		final BigInteger address = evaluateSymbolAddress(symbol, false);
+		final BigInteger address = evaluateAddressExpression(symbol, false);
 		if (address != null) {
 			fCallback.asyncExec(new Runnable() {
 				public void run() {
@@ -361,7 +361,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements
 	 * (non-Javadoc)
 	 * @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) {
 			try {
 				// This logic was lifted from CMemoryBlockRetrievalExtension.getExtendedMemoryBlock(String, Object)
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/IDisassemblyBackend.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/IDisassemblyBackend.java
index dfba77dcf00..ec8b802467b 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/IDisassemblyBackend.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/IDisassemblyBackend.java
@@ -8,7 +8,6 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *     Freescale Semiconductor - refactoring
- *     Patrick Chuong (Texas Instruments) - Bug fix (329682)
  *******************************************************************************/
 package org.eclipse.cdt.debug.internal.ui.disassembly.dsf;
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java
index aa413e15536..61deaf0fc3e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java
@@ -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)
 	 */
 	@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>() {
 			@Override
 			protected void execute(DataRequestMonitor<BigInteger> rm) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
index 2c8a8063e74..a29b19723c0 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
@@ -2968,7 +2968,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 		if (fBackend != null) {
 			BigInteger address = null;
 			if (fBackend instanceof AbstractDisassemblyBackend) {
-				address = ((AbstractDisassemblyBackend) fBackend).evaluateSymbolAddress(expr, suppressError);
+				address = ((AbstractDisassemblyBackend) fBackend).evaluateAddressExpression(expr, suppressError);
 			} else {
 				String value = fBackend.evaluateExpression(expr);
 				if (value != null) {