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

Removed an extraneous back-end call to resolve the memory address.

Browse source
This commit is contained in:
Francois Chouinard 2007-12-18 19:15:09 +00:00
parent 0f9a2839a8
commit 210443c47a
1 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/model/DsfMemoryBlockRetrieval.java
View file

@ -30,7 +30,6 @@ import org.eclipse.dd.dsf.debug.service.IExpressions;
import org.eclipse.dd.dsf.debug.service.IFormattedValues;
import org.eclipse.dd.dsf.debug.service.IMemory;
import org.eclipse.dd.dsf.debug.service.IExpressions.IExpressionDMContext;
import org.eclipse.dd.dsf.debug.service.IExpressions.IExpressionDMData;
import org.eclipse.dd.dsf.debug.service.IFormattedValues.FormattedValueDMContext;
import org.eclipse.dd.dsf.debug.service.IFormattedValues.FormattedValueDMData;
import org.eclipse.dd.dsf.debug.service.IMemory.IMemoryDMContext;
@ -293,7 +292,7 @@ public class DsfMemoryBlockRetrieval extends PlatformObject implements IMemoryBl
private BigInteger resolveMemoryAddress(final IDMContext idmContext, final String expression) throws DebugException {
// Use a Query to "synchronise" the downstream calls
// Use a Query to "synchronize" the downstream calls
Query<BigInteger> query = new Query<BigInteger>() {
@Override
protected void execute(final DataRequestMonitor<BigInteger> drm) {
@ -302,32 +301,26 @@ public class DsfMemoryBlockRetrieval extends PlatformObject implements IMemoryBl
if (expressionService != null) {
// Create the expression
final IExpressionDMContext expressionDMC = expressionService.createExpression(idmContext, expression);
expressionService.getExpressionData(expressionDMC, new DataRequestMonitor<IExpressionDMData>(getExecutor(), drm) {
@Override
protected void handleOK() {
// Evaluate the expression - request HEX since it works in every case
String formatId = IFormattedValues.HEX_FORMAT;
FormattedValueDMContext valueDmc = expressionService.getFormattedValueContext(expressionDMC, formatId);
expressionService.getFormattedExpressionValue(
valueDmc,
new DataRequestMonitor<FormattedValueDMData>(getExecutor(), drm) {
@Override
protected void handleOK() {
// Store the result
FormattedValueDMData data = getData();
String value = data.getFormattedValue().substring(2); // Strip the "0x"
drm.setData(new BigInteger(value, 16));
drm.done();
}
}
);
}
});
String formatId = IFormattedValues.HEX_FORMAT;
FormattedValueDMContext valueDmc = expressionService.getFormattedValueContext(expressionDMC, formatId);
expressionService.getFormattedExpressionValue(
valueDmc,
new DataRequestMonitor<FormattedValueDMData>(getExecutor(), drm) {
@Override
protected void handleOK() {
// Store the result
FormattedValueDMData data = getData();
String value = data.getFormattedValue().substring(2); // Strip the "0x"
drm.setData(new BigInteger(value, 16));
drm.done();
}
}
);
}
}
};
fExecutor.execute(query);
try {
// The happy case
return query.get();