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

Bug 535163: Use 'reset and halt' command (DAP)

Browse source 
Change-Id: Id5ec90a062a203933a2756d0a2f71ce36d00daf8
Signed-off-by: John Dallaway <john@dallaway.org.uk>
This commit is contained in:
John Dallaway 2019-08-23 19:45:13 +01:00
parent 49c7ae5f3b
commit 4ebb82d8b2
1 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
jtag/org.eclipse.cdt.debug.dap.gdbjtag/src/org/eclipse/cdt/debug/dap/gdbjtag/DapGdbJtagLaunchDelegate.java
View file

@ -1,3 +1,16 @@
/*******************************************************************************
* Copyright (c) 2019 Kichwa Coders and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* John Dallaway - Use 'reset and halt' command (Bug 535163)
*******************************************************************************/
package org.eclipse.cdt.debug.dap.gdbjtag; package org.eclipse.cdt.debug.dap.gdbjtag;
import java.net.URI; import java.net.URI;
@ -222,26 +235,38 @@ public class DapGdbJtagLaunchDelegate extends DapLaunchDelegate {
private void addInitCommands(Map<String, Object> params, IGDBJtagDevice jtagDevice, Map<String, Object> attributes) private void addInitCommands(Map<String, Object> params, IGDBJtagDevice jtagDevice, Map<String, Object> attributes)
throws CoreException { throws CoreException {
boolean doReset = CDebugUtils.getAttribute(attributes, IGDBJtagConstants.ATTR_DO_RESET,
IGDBJtagConstants.DEFAULT_DO_RESET);
boolean doHalt = CDebugUtils.getAttribute(attributes, IGDBJtagConstants.ATTR_DO_HALT,
IGDBJtagConstants.DEFAULT_DO_HALT);
int defaultDelay = jtagDevice.getDefaultDelay();
int delay = CDebugUtils.getAttribute(attributes, IGDBJtagConstants.ATTR_DELAY, defaultDelay);
List<String> resetAndHaltCommands = new ArrayList<>();
jtagDevice.doResetAndHalt(resetAndHaltCommands);
boolean useResetAndHalt = doReset && doHalt && (0 == delay) && !resetAndHaltCommands.isEmpty();
List<String> commands = new ArrayList<>(); List<String> commands = new ArrayList<>();
if (CDebugUtils.getAttribute(attributes, IGDBJtagConstants.ATTR_DO_RESET, IGDBJtagConstants.DEFAULT_DO_RESET)) { if (doReset) {
int size = commands.size(); int size = commands.size();
jtagDevice.doReset(commands); if (useResetAndHalt) {
commands.addAll(resetAndHaltCommands);
} else {
jtagDevice.doReset(commands);
}
if (size == commands.size()) { if (size == commands.size()) {
throw newCoreException( throw newCoreException(
String.format("Reset command not defined for device '%s'", getGDBJtagDeviceName(attributes))); String.format("Reset command not defined for device '%s'", getGDBJtagDeviceName(attributes)));
} }
} }
if (CDebugUtils.getAttribute(attributes, IGDBJtagConstants.ATTR_DO_RESET, IGDBJtagConstants.DEFAULT_DO_RESET)) { if (doReset && (0 != delay)) {
int defaultDelay = jtagDevice.getDefaultDelay();
int delay = CDebugUtils.getAttribute(attributes, IGDBJtagConstants.ATTR_DELAY, defaultDelay);
int size = commands.size(); int size = commands.size();
jtagDevice.doDelay(delay, commands); jtagDevice.doDelay(delay, commands);
if (size == commands.size() && (delay != 0)) { if (size == commands.size()) {
throw newCoreException( throw newCoreException(
String.format("Delay command not defined for device '%s'", getGDBJtagDeviceName(attributes))); String.format("Delay command not defined for device '%s'", getGDBJtagDeviceName(attributes)));
} }
} }
if (CDebugUtils.getAttribute(attributes, IGDBJtagConstants.ATTR_DO_HALT, IGDBJtagConstants.DEFAULT_DO_HALT)) { if (doHalt && !useResetAndHalt) {
int size = commands.size(); int size = commands.size();
jtagDevice.doHalt(commands); jtagDevice.doHalt(commands);
if (size == commands.size()) { if (size == commands.size()) {