mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-24 08:44:01 +02:00
Code Issues Wiki Activity

Bug 413483 - GDB Hardware Debugging - Memory viewing broken

Browse source 
The memory initialization is moved to "stepUpdateContainer" to avoid
introducing a new API in 8.2.1.
This commit is contained in:
Mikhail Khodjaiants 2013-09-16 18:56:25 -04:00
parent 0e36772a55
commit 82409f57c0
1 changed files with 11 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
View file

@ -44,7 +44,6 @@ import org.eclipse.cdt.dsf.concurrent.DsfExecutor;
import org.eclipse.cdt.dsf.concurrent.ImmediateDataRequestMonitor; import org.eclipse.cdt.dsf.concurrent.ImmediateDataRequestMonitor;
import org.eclipse.cdt.dsf.concurrent.RequestMonitor; import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
import org.eclipse.cdt.dsf.concurrent.RequestMonitorWithProgress; import org.eclipse.cdt.dsf.concurrent.RequestMonitorWithProgress;
import org.eclipse.cdt.dsf.concurrent.Sequence;
import org.eclipse.cdt.dsf.datamodel.DMContexts; import org.eclipse.cdt.dsf.datamodel.DMContexts;
import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext; import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext;
import org.eclipse.cdt.dsf.debug.service.IMemory.IMemoryDMContext; import org.eclipse.cdt.dsf.debug.service.IMemory.IMemoryDMContext;
@ -470,39 +469,18 @@ public class GDBJtagDSFFinalLaunchSequence extends FinalLaunchSequence {
*/ */
@Execute @Execute
public void stepUpdateContainer(RequestMonitor rm) { public void stepUpdateContainer(RequestMonitor rm) {
// Temporary fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=413483 String groupId = getContainerContext().getGroupId();
// to avoid introducing a new API in 8.2.1 the memory initialization is added to setContainerContext(fProcService.createContainerContextFromGroupId(fCommandControl.getContext(), groupId));
// this step.
// The proper fix is implemented in 8.2.
getExecutor().execute(new Sequence(getExecutor(), rm) {
@Override // Temporary fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=413483
public Step[] getSteps() { // Initialize memory in this step to avoid adding new API.
return new Step[] { IGDBMemory memory = fTracker.getService(IGDBMemory.class);
new Step() { IMemoryDMContext memContext = DMContexts.getAncestorOfType(getContainerContext(), IMemoryDMContext.class);
@Override if (memory == null || memContext == null) {
public void execute(RequestMonitor rm) { rm.done();
String groupId = getContainerContext().getGroupId(); return;
setContainerContext(fProcService.createContainerContextFromGroupId(fCommandControl.getContext(), groupId)); }
rm.done(); memory.initializeMemoryData(memContext, rm);
}
},
new Step() {
@Override
public void execute(RequestMonitor rm) {
IGDBMemory memory = fTracker.getService(IGDBMemory.class);
IMemoryDMContext memContext = DMContexts.getAncestorOfType(getContainerContext(), IMemoryDMContext.class);
if (memory == null || memContext == null) {
rm.done();
return;
}
memory.initializeMemoryData(memContext, rm);
};
}
};
}
});
} }
/** /**