mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 22:22:11 +02:00
Code Issues Wiki Activity

Bug 329682 - Restore backwards compatibility

Browse source
This commit is contained in:
Anton Leherbauer 2010-11-12 17:48:01 +00:00
parent d0907f8bec
commit 1e2b8c24bb
5 changed files with 65 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,37 @@
/*******************************************************************************
* Copyright (c) 2010 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Wind River Systems - initial API and implementation
* Freescale Semiconductor - refactoring
*******************************************************************************/
package org.eclipse.cdt.debug.internal.ui.disassembly.dsf;
import java.math.BigInteger;
public abstract class AbstractDisassemblyBackend implements IDisassemblyBackend {
protected IDisassemblyPartCallback fCallback;
protected AbstractDisassemblyBackend() {
}
public void init(IDisassemblyPartCallback callback) {
assert callback != null;
fCallback = callback;
}
/**
* Evaluate the symbol address.
*
* @param symbol the symbol
* @param suppressError true to suppress error dialogs
* @return the address, <code>null</code> if failed to evaluate symbol
*/
public abstract BigInteger evaluateSymbolAddress(String symbol, boolean suppressError);
}

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

@ -57,9 +57,8 @@ import com.ibm.icu.text.MessageFormat;
* The CDI backend to the DSF disassembly view.
*
*/
public class DisassemblyBackendCdi implements IDisassemblyBackend, IDebugEventSetListener {
public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements IDebugEventSetListener {
private IDisassemblyPartCallback fCallback;
private ICThread fTargetContext;
private String fCdiSessionId;
private ICStackFrame fTargetFrameContext;
@ -74,8 +73,7 @@ public class DisassemblyBackendCdi implements IDisassemblyBackend, IDebugEventSe
* @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#init(org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyPartCallback)
*/
public void init(IDisassemblyPartCallback callback) {
assert callback != null;
fCallback = callback;
super.init(callback);
DebugPlugin.getDefault().addDebugEventListener(this);
}

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

@ -22,6 +22,9 @@ import org.eclipse.jface.text.Position;
* DSF backends. This interface is obtained through IAdaptable. A new instance
* is provided every time the adapter is requested. The caller must invoke
* {@link #dispose()} when it has no further use for the instance.
*
* @noimplement This interface is not intended to be implemented by clients.
* Clients should extend {@link AbstractDisassemblyBackend}.
*/
public interface IDisassemblyBackend {
@ -142,15 +145,6 @@ public interface IDisassemblyBackend {
Object insertSource(Position pos, BigInteger address, final String file, int lineNumber);
void gotoSymbol(String symbol);
/**
* Evaluate the symbol address.
*
* @param symbol the symbol
* @param suppressError true to suppress error dialogs
* @return the address, <code>null</code> if failed to evaluate symbol
*/
BigInteger evaluateSymbolAddress(String symbol, boolean suppressError);
/**
* Retrieves disassembly of the code generated by a source file, starting at

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

@ -22,10 +22,10 @@ import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.AbstractDisassemblyBackend;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.AddressRangePosition;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.DisassemblyUtils;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.ErrorPosition;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyPartCallback;
import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
import org.eclipse.cdt.dsf.concurrent.DsfExecutor;
@ -68,7 +68,7 @@ import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.Position;
public class DisassemblyBackendDsf implements IDisassemblyBackend, SessionEndedListener {
public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements SessionEndedListener {
private volatile IExecutionDMContext fTargetContext;
private DsfServicesTracker fServicesTracker;
@ -77,8 +77,6 @@ public class DisassemblyBackendDsf implements IDisassemblyBackend, SessionEndedL
private String fDsfSessionId;
private IDisassemblyPartCallback fCallback;
/**
* Constructor
*/
@ -88,9 +86,9 @@ public class DisassemblyBackendDsf implements IDisassemblyBackend, SessionEndedL
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#init(org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyPartCallback)
*/
@Override
public void init(IDisassemblyPartCallback callback) {
assert callback != null;
fCallback = callback;
super.init(callback);
DsfSession.addSessionEndedListener(this);
}
@ -882,6 +880,7 @@ public class DisassemblyBackendDsf implements IDisassemblyBackend, SessionEndedL
* (non-Javadoc)
* @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) {
Query<BigInteger> query = new Query<BigInteger>() {
@Override

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

@ -27,8 +27,10 @@ import java.util.Map;
import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.AbstractDisassemblyBackend;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.AddressRangePosition;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.DisassemblyPosition;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.DisassemblyUtils;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.ErrorPosition;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyDocument;
@ -2964,11 +2966,25 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
public BigInteger eval(String expr, boolean suppressError) {
if (fBackend != null) {
BigInteger address = fBackend.evaluateSymbolAddress(expr, suppressError);
BigInteger address = null;
if (fBackend instanceof AbstractDisassemblyBackend) {
address = ((AbstractDisassemblyBackend) fBackend).evaluateSymbolAddress(expr, suppressError);
} else {
String value = fBackend.evaluateExpression(expr);
if (value != null) {
try {
address = DisassemblyUtils.decodeAddress(value);
} catch (NumberFormatException e) {
if (!suppressError) {
generateErrorDialog(DisassemblyMessages.Disassembly_log_error_expression_eval);
}
}
}
}
if (address != null)
return address;
}
return PC_UNKNOWN;
return PC_UNKNOWN;
}
protected boolean isTrackExpression() {