From 82a24fcde9628a329bdc98827af099a9c8a2e5f6 Mon Sep 17 00:00:00 2001 From: John Dallaway Date: Tue, 28 Dec 2021 12:35:52 +0000 Subject: [PATCH] Bug 575934: Initialize memory data before connecting to target We must ensure that memory data is initialized before the restoration of persisted memory monitors is triggered. Change-Id: Id87809bb4de80785dbcfe444fd782efe41d6d086 Signed-off-by: John Dallaway --- jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF | 2 +- .../cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF index da87260db35..2d1bb42fec6 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.debug.gdbjtag.core;singleton:=true -Bundle-Version: 10.5.100.qualifier +Bundle-Version: 10.5.200.qualifier Bundle-Activator: org.eclipse.cdt.debug.gdbjtag.core.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, 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 b04390e6e3d..28961ed5eb7 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 @@ -25,6 +25,7 @@ * John Dallaway - Use 'reset and halt' command (Bug 535163) * John Dallaway - Eliminate deprecated API (Bug 566462) * John Dallaway - Set executable file (Bug 457697) + * John Dallaway - Initialize memory data before connecting to target (Bug 575934) *******************************************************************************/ package org.eclipse.cdt.debug.gdbjtag.core; @@ -225,6 +226,8 @@ public class GDBJtagDSFFinalLaunchSequence extends FinalLaunchSequence { "stepRetrieveJTAGDevice", //$NON-NLS-1$ "stepSetExecutableFile", //$NON-NLS-1$ "stepLoadSymbols", //$NON-NLS-1$ + "stepInitializeMemory", //$NON-NLS-1$ + "stepConnectToTarget", //$NON-NLS-1$ "stepResetBoard", //$NON-NLS-1$ "stepDelayStartup", //$NON-NLS-1$ @@ -234,7 +237,6 @@ public class GDBJtagDSFFinalLaunchSequence extends FinalLaunchSequence { "stepUpdateContainer", //$NON-NLS-1$ - "stepInitializeMemory", //$NON-NLS-1$ "stepSetArguments", //$NON-NLS-1$ "stepSetEnvironmentVariables", //$NON-NLS-1$ "stepStartTrackingBreakpoints", //$NON-NLS-1$