diff options
4 files changed, 20 insertions, 2 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java index d700b8aa933..c2f3e8ec5eb 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java @@ -394,6 +394,7 @@ public class MIStack extends AbstractDsfService public String getFile() { return getMIFrame().getFile(); } public int getLine() { return getMIFrame().getLine(); } public String getFunction() { return getMIFrame().getFunction(); } + public String getModule() { return ""; }//$NON-NLS-1$ @Override public String toString() { return getMIFrame().toString(); } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java index 55dcd154fe3..06647cd74c8 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java @@ -353,8 +353,10 @@ public class StackFramesVMNode extends AbstractDMVMNode label.append("()"); //$NON-NLS-1$ } + boolean hasFileName = dmData.getFile() != null && dmData.getFile().length() != 0; + // Add full file name - if (dmData.getFile() != null && dmData.getFile().length() != 0) { + if (hasFileName) { label.append(" at "); //$NON-NLS-1$ label.append(dmData.getFile()); } @@ -365,7 +367,14 @@ public class StackFramesVMNode extends AbstractDMVMNode label.append(dmData.getLine()); label.append(" "); //$NON-NLS-1$ } - + + // Add module + if (!hasFileName && (dmData.getModule() != null && dmData.getModule().length() != 0)) { + label.append(" "); //$NON-NLS-1$ + label.append(dmData.getModule()); + label.append(" "); //$NON-NLS-1$ + } + // Add the address if (dmData.getAddress() != null) { label.append("- 0x" + dmData.getAddress().toString(16)); //$NON-NLS-1$ diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IStack.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IStack.java index d6003483f94..70df43d90a8 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IStack.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IStack.java @@ -40,6 +40,10 @@ public interface IStack extends IDMService { String getFunction(); int getLine(); int getColumn(); + /** + * @since 2.0 + */ + String getModule(); } /** diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java index 8e2058bf162..ddcddd08819 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java @@ -117,6 +117,10 @@ public class PDAStack extends AbstractDsfService implements IStack2, ICachingSer public IAddress getAddress() { return null; } + + public String getModule() { + return "";//$NON-NLS-1$ + } } /** |