mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-02 05:45:58 +02:00
Remove any reference to registers. They are now manage
by the RegisterManager.
This commit is contained in:
parent
d9ecab58a7
commit
4a90b847b5
1 changed files with 2 additions and 22 deletions
|
@ -9,11 +9,9 @@ import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.eclipse.cdt.debug.core.cdi.CDIException;
|
import org.eclipse.cdt.debug.core.cdi.CDIException;
|
||||||
import org.eclipse.cdt.debug.core.cdi.ICDICondition;
|
|
||||||
import org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager;
|
import org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager;
|
||||||
import org.eclipse.cdt.debug.core.cdi.model.ICDIArgument;
|
import org.eclipse.cdt.debug.core.cdi.model.ICDIArgument;
|
||||||
import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression;
|
import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression;
|
||||||
import org.eclipse.cdt.debug.core.cdi.model.ICDIRegister;
|
|
||||||
import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable;
|
import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable;
|
||||||
import org.eclipse.cdt.debug.mi.core.MIException;
|
import org.eclipse.cdt.debug.mi.core.MIException;
|
||||||
import org.eclipse.cdt.debug.mi.core.MISession;
|
import org.eclipse.cdt.debug.mi.core.MISession;
|
||||||
|
@ -66,11 +64,7 @@ public class VariableManager extends SessionObject implements ICDIExpressionMana
|
||||||
Element[] elements = getElements();
|
Element[] elements = getElements();
|
||||||
for (int i = 0; i < elements.length; i++) {
|
for (int i = 0; i < elements.length; i++) {
|
||||||
if (elements[i].name.equals(name)) {
|
if (elements[i].name.equals(name)) {
|
||||||
// For the Var object the register is always the same
|
if (elements[i].stackframe.equals(stack)) {
|
||||||
// no need to check the stackframe.
|
|
||||||
if (elements[i].variable instanceof Register) {
|
|
||||||
return elements[i];
|
|
||||||
} else if (elements[i].stackframe.equals(stack)) {
|
|
||||||
return elements[i];
|
return elements[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -116,8 +110,7 @@ public class VariableManager extends SessionObject implements ICDIExpressionMana
|
||||||
}
|
}
|
||||||
if (! changes[i].isInScope()) {
|
if (! changes[i].isInScope()) {
|
||||||
// Only remove ICDIVariables.
|
// Only remove ICDIVariables.
|
||||||
if (! (element.variable instanceof Expression ||
|
if (! (element.variable instanceof Expression)) {
|
||||||
element.variable instanceof Register)) {
|
|
||||||
removeElement(changes[i]);
|
removeElement(changes[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -254,19 +247,6 @@ public class VariableManager extends SessionObject implements ICDIExpressionMana
|
||||||
return cexp;
|
return cexp;
|
||||||
}
|
}
|
||||||
|
|
||||||
ICDIRegister createRegister(StackFrame stack, String name) throws CDIException {
|
|
||||||
Element element = createElement(stack, "$" + name);
|
|
||||||
Register reg;
|
|
||||||
if (element.variable != null && element.variable instanceof Register) {
|
|
||||||
reg = (Register)element.variable;
|
|
||||||
} else {
|
|
||||||
reg = new Register(stack, name, element.miVar);
|
|
||||||
element.variable = reg;
|
|
||||||
addElement(element);
|
|
||||||
}
|
|
||||||
return reg;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#createExpression(String)
|
* @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#createExpression(String)
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Add table
Reference in a new issue