mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2024-10-28 12:09:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 356346 - You cannot enter an expression in the memory Browser expression area if a continuous breakpoint is runing

Browse source
This commit is contained in:
John Cortell 2011-11-10 15:38:12 -06:00
parent be238e7014
commit 551220367b
2 changed files with 63 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java
View file

@ -268,16 +268,36 @@ public class GoToAddressBarWidget {
public void loadSavedExpressions(Object context, String memorySpace)
{
try {
// Rebuild the combobox entries, but make sure we don't clear the
// (expression) field. It's an input field; don't trample anything
// the user may have previously entered or is in the process of
// entering (see bugzilla 356346). removeAll() clears all the
// entries and the field. remove(beg, end) leaves the field in-tact
// as long as it's not asked to remove the entry the user selected
// to set the current field value. So, if the current expression
// corresponds to an entry, we purge all the entries but that one.
String[] expressions = getSavedExpressions(context, memorySpace);
String currentExpression = fExpression.getText();
fExpression.removeAll();
if (currentExpression.length() > 0)
{
int index = fExpression.indexOf(currentExpression);
if(index > 0) {
fExpression.remove(0, index-1);
}
index = fExpression.indexOf(currentExpression);
if (fExpression.getItemCount() - index - 1 > 1) {
fExpression.remove(index+1, fExpression.getItemCount()-1);
}
}
else {
// No expression to trample. Use removeAll()
fExpression.removeAll();
}
for (String expression : expressions) {
fExpression.add(expression);
if (fExpression.indexOf(expression) < 0) {
fExpression.add(expression);
}
}
if (currentExpression != null) {
fExpression.setText(currentExpression);
}
System.out.println("GoToAddressBarWidget: set context field to " + context);
} catch (CoreException e) {
// Unexpected snag dealing with launch configuration
MemoryBrowserPlugin.log(e);

49
memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
View file

@ -195,10 +195,15 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM
/**
* Property we attach to a CTabItem to track the expression we used to
* create memory blocks on the tab's behalf. Value is an
* {@link String}
* create memory blocks on the tab's behalf. Value is a String.
*/
private final static String KEY_EXPRESSION = "EXPRESSION"; //$NON-NLS-1$
private final static String KEY_EXPRESSION = "EXPRESSION"; //$NON-NLS-1$
/**
* Property we attach to a CTabItem to track the address associated with
* KEY_EXPRESSION. Value is a BigInteger
*/
private final static String KEY_EXPRESSION_ADDRESS = "EXPRESSION_ADDRESS"; //$NON-NLS-1$
public static final String PREF_DEFAULT_RENDERING = "org.eclipse.cdt.debug.ui.memory.memorybrowser.defaultRendering"; //$NON-NLS-1$
@ -547,7 +552,7 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM
@Override
public void run() {
try {
BigInteger newBase = getExpressionAddress(retrieval, expression, context, memorySpaceId);
final BigInteger newBase = getExpressionAddress(retrieval, expression, context, memorySpaceId);
IMemoryBlockExtension block = (IMemoryBlockExtension) renderingFinal.getMemoryBlock();
if (block.supportBaseAddressModification()) {
block.setBaseAddress(newBase);
@ -563,6 +568,7 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM
public void run() {
CTabItem selection = activeFolder.getSelection();
selection.setData(KEY_EXPRESSION, expression);
selection.setData(KEY_EXPRESSION_ADDRESS, newBase);
fGotoAddressBar.handleExpressionStatus(Status.OK_STATUS);
updateLabel(selection, renderingFinal);
}
@ -609,13 +615,36 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM
if (memorySpaceID != null) {
IMemoryBlockRetrieval retrieval = (IMemoryBlockRetrieval) tab.getParent().getData(KEY_RETRIEVAL);
if (retrieval instanceof IMemorySpaceAwareMemoryBlockRetrieval) {
label = ((IMemorySpaceAwareMemoryBlockRetrieval)retrieval).encodeAddress("0x" + viewportAddress.toString(16), memorySpaceID) + ' ' + renderingType;
label = ((IMemorySpaceAwareMemoryBlockRetrieval)retrieval).encodeAddress("0x" + viewportAddress.toString(16), memorySpaceID);
}
}
if (label == null) {
label = "0x" + viewportAddress.toString(16) + ' ' + renderingType;
label = "0x" + viewportAddress.toString(16);
}
// If the expression that was went to ("Go") is not a hex address,
// or it is but the user has scrolled/paged, then show the
// expression after the viewport hex address. Additionally, if some
// scrolling/paging has moved the viewport, also show the relative
// displacement. E.g.,
// "0x10020 - gSomeVar(+20) <Traditional>"
// (for a tab where the user did a "Go" to "gSomeVar" then paged
// down, and where gSomeVar is at 0x10000)
//
String expression = (String)tab.getData(KEY_EXPRESSION);
BigInteger evaluatedAddress = (BigInteger)tab.getData(KEY_EXPRESSION_ADDRESS);
if(expression != null && !expression.equals("0x" + viewportAddress.toString(16))) {
label += " - " + expression;
BigInteger delta = evaluatedAddress.subtract(viewportAddress);
if (!delta.equals(BigInteger.ZERO)) {
label += "(";
label += delta.signum() < 0 ? '+' : '-';
label += "0x" + delta.abs().toString(16) +")";
}
}
label += ' ' + renderingType;;
// Allow the memory block to customize the label. The platform's
// Memory view support this (it was done in the call to
// rendering.getLabel() above)
@ -969,7 +998,6 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM
public void widgetDefaultSelected(SelectionEvent e) {}
public void widgetSelected(SelectionEvent e) {
CTabItem tabItem = (CTabItem)e.item;
updateExpression(tabItem);
updateMemorySpaceControlSelection(tabItem);
fGotoAddressBar.loadSavedExpressions(context, fGotoMemorySpaceControl.isVisible() ? fGotoMemorySpaceControl.getText() : null);
getSite().getSelectionProvider().setSelection(new StructuredSelection(tabItem.getData(KEY_RENDERING)));
@ -980,9 +1008,6 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM
tabFolder.setData(KEY_RETRIEVAL, retrieval);
fContextFolders.put(retrieval, tabFolder);
fStackLayout.topControl = tabFolder;
// set empty initial expression
fGotoAddressBar.setExpressionText(""); //$NON-NLS-1$
fGotoAddressBar.loadSavedExpressions(context, fGotoMemorySpaceControl.isVisible() ? fGotoMemorySpaceControl.getText() : null);
}
// update debug context to the new selection
tabFolder.setData(KEY_CONTEXT, context);
@ -1015,7 +1040,6 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM
setMemorySpaceControlVisible(false);
}
updateExpression(activeFolder.getSelection());
updateMemorySpaceControlSelection(activeFolder.getSelection());
fGotoAddressBar.loadSavedExpressions(context, fGotoMemorySpaceControl.isVisible() ? fGotoMemorySpaceControl.getText() : null);
@ -1172,8 +1196,9 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM
tab.setData(KEY_MEMORY_SPACE, memorySpaceId);
tab.setData(KEY_CONTAINER, container);
tab.setData(KEY_RENDERING_TYPE, type);
tab.setData(KEY_EXPRESSION, expression);
tab.setData(KEY_EXPRESSION_ADDRESS, ((IMemoryBlockExtension)rendering.getMemoryBlock()).getBigBaseAddress());
getSite().getSelectionProvider().setSelection(new StructuredSelection(tab.getData(KEY_RENDERING)));
updateLabel(tab, rendering);
return rendering;
}