Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Cortell2010-05-13 19:16:44 -0400
committerJohn Cortell2010-05-13 19:16:44 -0400
commitb3ddbdf187eea2ab8e4d1a9b9def176f742e977c (patch)
tree738a1b98ee911ccd640a5e8bea3c03640f3102ac /debug/org.eclipse.cdt.debug.mi.core
parent8b8214494e968b3131e6d91678d94398a3a40130 (diff)
downloadorg.eclipse.cdt-b3ddbdf187eea2ab8e4d1a9b9def176f742e977c.tar.gz
org.eclipse.cdt-b3ddbdf187eea2ab8e4d1a9b9def176f742e977c.tar.xz
org.eclipse.cdt-b3ddbdf187eea2ab8e4d1a9b9def176f742e977c.zip
Bug 312848: Remove CDI-GDB pref to enable distinct code and data spaces
Diffstat (limited to 'debug/org.eclipse.cdt.debug.mi.core')
-rw-r--r--debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java23
-rw-r--r--debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/IMIConstants.java13
-rw-r--r--debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java1
3 files changed, 1 insertions, 36 deletions
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
index 578b0da805..cbef50c23e 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
@@ -39,7 +39,6 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIGlobalVariableDescriptor;
import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;
import org.eclipse.cdt.debug.core.cdi.model.ICDILineBreakpoint;
import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock;
-import org.eclipse.cdt.debug.core.cdi.model.ICDIMemorySpaceManagement;
import org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction;
import org.eclipse.cdt.debug.core.cdi.model.ICDIRegister;
import org.eclipse.cdt.debug.core.cdi.model.ICDIRegisterDescriptor;
@@ -54,10 +53,8 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIThread;
import org.eclipse.cdt.debug.core.cdi.model.ICDIWatchpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.cdt.debug.mi.core.CoreProcess;
-import org.eclipse.cdt.debug.mi.core.IMIConstants;
import org.eclipse.cdt.debug.mi.core.MIException;
import org.eclipse.cdt.debug.mi.core.MIInferior;
-import org.eclipse.cdt.debug.mi.core.MIPlugin;
import org.eclipse.cdt.debug.mi.core.MISession;
import org.eclipse.cdt.debug.mi.core.RxThread;
import org.eclipse.cdt.debug.mi.core.cdi.BreakpointManager;
@@ -102,7 +99,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIThreadSelectInfo;
/**
*/
-public class Target extends SessionObject implements ICDITarget, ICDIBreakpointManagement3, ICDIAddressToSource, ICDIMemorySpaceManagement, ICDIExecuteMoveInstructionPointer {
+public class Target extends SessionObject implements ICDITarget, ICDIBreakpointManagement3, ICDIAddressToSource, ICDIExecuteMoveInstructionPointer {
MISession miSession;
ICDITargetConfiguration fConfiguration;
@@ -1323,24 +1320,6 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM
}
}
- public String addressToString(BigInteger address, String memorySpaceID) {
- return null; // use CDT's built-in encoding/decoding <memspace>:<addr-hex>
- }
-
- public BigInteger stringToAddress(String str, StringBuffer memorySpaceID_out)
- throws CDIException {
- return null; // use CDT's built-in encoding/decoding <memspace>:<addr-hex>
- }
-
- public String[] getMemorySpaces() {
- if (MIPlugin.getDefault().getPluginPreferences().getBoolean(IMIConstants.PREF_ENABLE_MEMORY_SPACES)) {
- return new String[] { CODE_MEMORY_SPACE, DATA_MEMORY_SPACE };
- }
- else {
- return new String[0];
- }
- }
-
public ICDIEventBreakpoint setEventBreakpoint(String type, String arg, int cdiType, ICDICondition condition, boolean deferred,
boolean enabled) throws CDIException {
BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager();
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/IMIConstants.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/IMIConstants.java
index a7de1d7dae..29d5298fc3 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/IMIConstants.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/IMIConstants.java
@@ -63,18 +63,5 @@ public interface IMIConstants
* The default value of the for <code>PREF_SHARED_LIBRARIES_AUTO_REFRESH</code> property
*/
public static final boolean DEF_PREF_SHARED_LIBRARIES_AUTO_REFRESH = true;
-
- /**
- * Boolean preference controlling whether memory spaces will be supported.
- * gdb has implicit awareness of two memory spaces: "code" and "data". Most
- * users don't need that capability, though, and so we expose it in the UI
- * only if the user turns it on.
- */
- public static final String PREF_ENABLE_MEMORY_SPACES = PLUGIN_ID + ".PREF_ENABLE_MEMORY_SPACES"; //$NON-NLS-1$
-
- /**
- * The default value of the for <code>PREF_ENABLE_MEMORY_SPACES</code> property
- */
- public static final boolean DEF_PREF_ENABLE_MEMORY_SPACES = false;
}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java
index 54ca15a8b2..9ac45d2d38 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java
@@ -28,6 +28,5 @@ public class MIPreferenceInitializer extends AbstractPreferenceInitializer {
MIPlugin.getDefault().getPluginPreferences().setDefault(IMIConstants.PREF_REQUEST_TIMEOUT, IMIConstants.DEF_REQUEST_TIMEOUT);
MIPlugin.getDefault().getPluginPreferences().setDefault(IMIConstants.PREF_REQUEST_LAUNCH_TIMEOUT, IMIConstants.DEF_REQUEST_LAUNCH_TIMEOUT);
MIPlugin.getDefault().getPluginPreferences().setDefault(IMIConstants.PREF_SHARED_LIBRARIES_AUTO_REFRESH, IMIConstants.DEF_PREF_SHARED_LIBRARIES_AUTO_REFRESH);
- MIPlugin.getDefault().getPluginPreferences().setDefault(IMIConstants.PREF_ENABLE_MEMORY_SPACES, IMIConstants.DEF_PREF_ENABLE_MEMORY_SPACES);
}
}

Back to the top