Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Khodjaiants2013-09-16 18:56:25 -0400
committerMikhail Khodjaiants2013-09-16 18:56:44 -0400
commit82409f57c0cce9be3946b7d9d233d265d279d52f (patch)
tree9f08f2cf5c0da0f9225c3b4b4ecee3555cd77605
parent0e36772a55895b53deb6bad12a9b758e4b556870 (diff)
downloadorg.eclipse.cdt-82409f57c0cce9be3946b7d9d233d265d279d52f.tar.gz
org.eclipse.cdt-82409f57c0cce9be3946b7d9d233d265d279d52f.tar.xz
org.eclipse.cdt-82409f57c0cce9be3946b7d9d233d265d279d52f.zip
Bug 413483 - GDB Hardware Debugging - Memory viewing broken
The memory initialization is moved to "stepUpdateContainer" to avoid introducing a new API in 8.2.1.
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java46
1 files changed, 12 insertions, 34 deletions
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
index 39532704cb..14aeff30f3 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
@@ -44,7 +44,6 @@ import org.eclipse.cdt.dsf.concurrent.DsfExecutor;
import org.eclipse.cdt.dsf.concurrent.ImmediateDataRequestMonitor;
import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
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.debug.service.IBreakpoints.IBreakpointsTargetDMContext;
import org.eclipse.cdt.dsf.debug.service.IMemory.IMemoryDMContext;
@@ -470,39 +469,18 @@ public class GDBJtagDSFFinalLaunchSequence extends FinalLaunchSequence {
*/
@Execute
public void stepUpdateContainer(RequestMonitor rm) {
- // Temporary fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=413483
- // to avoid introducing a new API in 8.2.1 the memory initialization is added to
- // this step.
- // The proper fix is implemented in 8.2.
- getExecutor().execute(new Sequence(getExecutor(), rm) {
-
- @Override
- public Step[] getSteps() {
- return new Step[] {
- new Step() {
- @Override
- public void execute(RequestMonitor rm) {
- String groupId = getContainerContext().getGroupId();
- setContainerContext(fProcService.createContainerContextFromGroupId(fCommandControl.getContext(), groupId));
- rm.done();
- }
- },
- 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);
- };
- }
- };
- }
-
- });
+ String groupId = getContainerContext().getGroupId();
+ setContainerContext(fProcService.createContainerContextFromGroupId(fCommandControl.getContext(), groupId));
+
+ // Temporary fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=413483
+ // Initialize memory in this step to avoid adding new API.
+ 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);
}
/**

Back to the top