mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

Bug 312848: Remove CDI-GDB pref to enable distinct code and data spaces

Browse source
This commit is contained in:
John Cortell 2010-05-13 23:16:44 +00:00
parent 8b8214494e
commit b3ddbdf187
5 changed files with 2 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
View file

@ -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();

13
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/IMIConstants.java
View file

@ -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;
}

1
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java
View file

@ -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);
}
}

7
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java
View file

@ -327,8 +327,6 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
private BooleanFieldEditor fRefreshSolibsButton;
private BooleanFieldEditor fMemorySpacesButton;
private MIPreferenceStore fMICorePreferenceStore = new MIPreferenceStore( MIPlugin.getDefault().getPluginPreferences() );
/**
@ -360,8 +358,6 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
composite.setLayoutData( data );
createSpacer( composite, 1 );
createCommunicationPreferences( composite );
createSpacer( composite, 1 );
fMemorySpacesButton = createCheckbox(IMIConstants.PREF_ENABLE_MEMORY_SPACES, PreferenceMessages.getString( "MIPreferencePage.7" ), composite ); //$NON-NLS-1$
return composite;
}
@ -402,7 +398,6 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
fDebugTimeoutText.loadDefault();
fLaunchTimeoutText.loadDefault();
fRefreshSolibsButton.loadDefault();
fMemorySpacesButton.loadDefault();
}
/*
@ -444,7 +439,6 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
fDebugTimeoutText.store();
fLaunchTimeoutText.store();
fRefreshSolibsButton.store();
fMemorySpacesButton.store();
}
private MIIntegerFieldEditor createTimeoutField( String preference, String label, Composite parent ) {
@ -482,7 +476,6 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer
fDebugTimeoutText.dispose();
fLaunchTimeoutText.dispose();
fRefreshSolibsButton.dispose();
fMemorySpacesButton.dispose();
super.dispose();
}

2
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/PreferenceMessages.properties
View file

@ -16,4 +16,4 @@ MIPreferencePage.2=&Debugger timeout (ms):
MIPreferencePage.3=&Launch timeout (ms):
MIPreferencePage.4=Value must be an integer between {0} and {1}.
MIPreferencePage.6=Automatically refresh modules
MIPreferencePage.7=Support distinct code and data memory spaces