Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2012-10-21 16:13:43 +0000
committerEugene Tarassov2012-10-21 16:13:43 +0000
commit502da2e60d2cac4d3d711b068bcbcb5cab887608 (patch)
treeef879291ae14ec7c06af24dff666b2c7656befd3 /plugins
parent0e2007bdae8a1454566b9dd8dd684db1e6117dd0 (diff)
downloadorg.eclipse.tcf-502da2e60d2cac4d3d711b068bcbcb5cab887608.tar.gz
org.eclipse.tcf-502da2e60d2cac4d3d711b068bcbcb5cab887608.tar.xz
org.eclipse.tcf-502da2e60d2cac4d3d711b068bcbcb5cab887608.zip
TCF Debugger: fixed false detection of register representation group
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java8
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeRegister.java4
2 files changed, 8 insertions, 4 deletions
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java
index 0107e18f3..51993e538 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java
@@ -204,7 +204,7 @@ public class TCFModel implements ITCFModel, IElementContentProvider, IElementLab
private int display_source_generation;
private int suspend_trigger_generation;
private int auto_disconnect_generation;
-
+
private boolean reverse_debug_enabled;
// Debugger preferences:
@@ -315,7 +315,7 @@ public class TCFModel implements ITCFModel, IElementContentProvider, IElementLab
};
private final IModelSelectionPolicy selection_policy;
-
+
private IChannel channel;
private TCFNodeLaunch launch_node;
private boolean disposed;
@@ -2016,7 +2016,7 @@ public class TCFModel implements ITCFModel, IElementContentProvider, IElementLab
public boolean isInstructionSteppingEnabled() {
return instruction_stepping_enabled;
}
-
+
/**
* Set whether reverse debugging should be enabled or not.
* @param enabled
@@ -2030,5 +2030,5 @@ public class TCFModel implements ITCFModel, IElementContentProvider, IElementLab
*/
public boolean isReverseDebugEnabled() {
return reverse_debug_enabled;
- }
+ }
}
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeRegister.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeRegister.java
index 91824dad6..c0b417174 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeRegister.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeRegister.java
@@ -710,7 +710,11 @@ public class TCFNodeRegister extends TCFNode implements IElementEditor, IWatchIn
public boolean isRepresentationGroup(AtomicBoolean res, Runnable done) {
res.set(false);
HashSet<Integer> offsets = new HashSet<Integer>();
+ if (!context.validate(done)) return false;
if (!children.validate(done)) return false;
+ IRegisters.RegistersContext reg_ctx = context.getData();
+ if (reg_ctx == null) return true;
+ if (reg_ctx.getSize() == 0) return true;
for (TCFNode child_node : children.toArray()) {
TCFNodeRegister child_reg = (TCFNodeRegister)child_node;
if (!child_reg.context.validate(done)) return false;

Back to the top