Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2017-03-02 19:20:06 +0000
committerEugene Tarassov2017-03-02 19:20:06 +0000
commit7ea19eb2f558283f19f278897d56f545aa596e88 (patch)
treea9d9d019c4956c29480964aee037ca7b4de6050c /plugins
parentfef6b834390bf79419e5ea93c926a1fad6d57cba (diff)
downloadorg.eclipse.tcf-7ea19eb2f558283f19f278897d56f545aa596e88.tar.gz
org.eclipse.tcf-7ea19eb2f558283f19f278897d56f545aa596e88.tar.xz
org.eclipse.tcf-7ea19eb2f558283f19f278897d56f545aa596e88.zip
TCF Debugger: new breakpoint attribute: "Service"
Automatic breakpoints, which are used to implement run control functions like "Run To Line", now have "Service":"RunControl" attribute
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/TCFSuspendResumeAdapter.java4
-rw-r--r--plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/commands/TCFStepIntoSelectionHandler.java3
-rw-r--r--plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java6
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/ActionStepOut.java3
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/ActionStepOver.java3
5 files changed, 13 insertions, 6 deletions
diff --git a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/TCFSuspendResumeAdapter.java b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/TCFSuspendResumeAdapter.java
index d58c583b5..19e91e729 100644
--- a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/TCFSuspendResumeAdapter.java
+++ b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/TCFSuspendResumeAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2015 Wind River Systems, Inc. and others.
+ * Copyright (c) 2010, 2017 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -292,7 +292,7 @@ public class TCFSuspendResumeAdapter implements ISuspendResume, IRunToLine,
}
// properties.put(IBreakpoints.PROP_CONTEXTIDS, new String[] { contextId });
properties.put(IBreakpoints.PROP_ENABLED, Boolean.TRUE);
-// properties.put(IBreakpoints.PROP_TEMPORARY, Boolean.TRUE);
+ properties.put(IBreakpoints.PROP_SERVICE, IRunControl.NAME);
final String breakpointId = TCFAction.STEP_BREAKPOINT_PREFIX + contextId;
properties.put(IBreakpoints.PROP_ID, breakpointId);
breakpoints.add(properties, new IBreakpoints.DoneCommand() {
diff --git a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/commands/TCFStepIntoSelectionHandler.java b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/commands/TCFStepIntoSelectionHandler.java
index ba39ed595..7854f21b0 100644
--- a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/commands/TCFStepIntoSelectionHandler.java
+++ b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/commands/TCFStepIntoSelectionHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015 Xilinx, Inc. and others.
+ * Copyright (c) 2015, 2017 Xilinx, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -108,6 +108,7 @@ public class TCFStepIntoSelectionHandler implements IDebugCommandHandler {
}
properties.put(IBreakpoints.PROP_CONTEXT_IDS, new String[] { l.node.getID() });
properties.put(IBreakpoints.PROP_ENABLED, Boolean.TRUE);
+ properties.put(IBreakpoints.PROP_SERVICE, IRunControl.NAME);
bp_id = TCFAction.STEP_BREAKPOINT_PREFIX + l.node.getID();
properties.put(IBreakpoints.PROP_ID, bp_id);
breakpoints.add(properties, new IBreakpoints.DoneCommand() {
diff --git a/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java b/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java
index f85231930..23f5c24a7 100644
--- a/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java
+++ b/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/services/IBreakpoints.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2016 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2017 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -75,6 +75,10 @@ public interface IBreakpoints extends IService {
static final String
PROP_LINE_OFFSET = "LineOffset"; // Number - max number of lines breakpoint is allowed
// to be moved in case of inexact line info match
+ /** @since 1.5 */
+ static final String
+ PROP_SERVICE = "Service"; // String - name of a service that owns the breakpoint.
+ // User breakpoints don't have this attribute.
/**
* Breakpoints service can control cross trigger matrix - if the target hardware has one.
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/ActionStepOut.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/ActionStepOut.java
index 83c19406b..e379889dc 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/ActionStepOut.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/ActionStepOut.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2015 Wind River Systems, Inc. and others.
+ * Copyright (c) 2010, 2017 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -148,6 +148,7 @@ public class ActionStepOut extends TCFAction implements IRunControl.RunControlLi
bp.put(IBreakpoints.PROP_LOCATION, addr.toString());
bp.put(IBreakpoints.PROP_CONDITION, "$thread==\"" + ctx_data.getID() + "\"");
bp.put(IBreakpoints.PROP_ENABLED, Boolean.TRUE);
+ bp.put(IBreakpoints.PROP_SERVICE, IRunControl.NAME);
bps.add(bp, new IBreakpoints.DoneCommand() {
public void doneCommand(IToken token, Exception error) {
if (error != null) exit(error);
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/ActionStepOver.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/ActionStepOver.java
index e2a326cf6..a6095d5b1 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/ActionStepOver.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/ActionStepOver.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2015 Wind River Systems, Inc. and others.
+ * Copyright (c) 2010, 2017 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -225,6 +225,7 @@ public class ActionStepOver extends TCFAction implements IRunControl.RunControlL
bp.put(IBreakpoints.PROP_LOCATION, addr.toString());
bp.put(IBreakpoints.PROP_CONDITION, "$thread==\"" + ctx_data.getID() + "\"");
bp.put(IBreakpoints.PROP_ENABLED, Boolean.TRUE);
+ bp.put(IBreakpoints.PROP_SERVICE, IRunControl.NAME);
bps.add(bp, new IBreakpoints.DoneCommand() {
public void doneCommand(IToken token, Exception error) {
if (error != null) exit(error);

Back to the top