Attachment #167385 for bug #310304

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




package org.eclipse.cdt.debug.core;

import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;

import org.eclipse.cdt.debug.core.model.ICWatchpoint;
import org.eclipse.cdt.debug.core.model.ICWatchpoint2;
import org.eclipse.cdt.debug.internal.core.model.CFloatingPointValue;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;

import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.IStatusHandler;
import org.eclipse.debug.core.model.IBreakpoint;
import org.w3c.dom.Document;

import com.ibm.icu.text.MessageFormat;

/**
 * Utility methods.
 */

        }
        return new Path(path);
    }

	/**
	 * Returns the ICProject associated with the project setting in the Main tab
	 * of a CDT launch configuration, or throws a CoreException providing a
	 * reason (e.g., the setting is empty, the project no longer exists, the
	 * isn't a CDT one, etc).
	 * 
	 * @param config
	 *            the launch configuration
	 * @return an ICProject; never null.
	 * @throws CoreException
	 * @since 7.0
	 */
	public static ICProject verifyCProject(ILaunchConfiguration config) throws CoreException {
		String name = CDebugUtils.getProjectName(config);
		if (name == null) {
			throwCoreException(DebugCoreMessages.getString("CDebugUtils.C_Project_not_specified"),  //$NON-NLS-1$
					ICDTLaunchConfigurationConstants.ERR_UNSPECIFIED_PROJECT);
		}
		ICProject cproject = CDebugUtils.getCProject(config);
		if (cproject == null) {
			IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
			if (!proj.exists()) {
				throwCoreException(DebugCoreMessages.getFormattedString("CDebugUtils.Project_NAME_does_not_exist", name),  //$NON-NLS-1$
						ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
			} else if (!proj.isOpen()) {
				throwCoreException(DebugCoreMessages.getFormattedString("CDebugUtils.Project_NAME_is_closed", name), //$NON-NLS-1$
						ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
			}
			throwCoreException(DebugCoreMessages.getString("CDebugUtils.Not_a_C_CPP_project"),  //$NON-NLS-1$
					ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
		}
		return cproject;
	}

	/**
	 * Returns an IPath for the file referenced in the <i>C/C++ Application</i>
	 * setting of a CDT launch configuration. Typically, the file is obtained by
	 * combining the <i>C/C++ Application</i> setting with the <i>Project</i>
	 * setting. If unable to combine and resolve these settings to a valid file,
	 * a CoreException is thrown that provides the reason why. There are many
	 * such possible reasons (a problem with the <i>Project</i> setting, an
	 * empty <i>C/C++ Application</i> setting, the combined settings doesn't
	 * resolve to an existing file, etc).
	 * 
	 * @param config
	 *            the launch configuration
	 * @param ignoreProjectSetting
	 *            if true, resolve the file using only the <i>C/C++
	 *            Application</i> setting. Do not take the <i>Project</i>
	 *            setting into account.
	 * @return an IPath; never null
	 * @throws CoreException
	 * @since 7.0
	 */
	public static IPath verifyProgramPath(ILaunchConfiguration config, boolean ignoreProjectSetting) throws CoreException {
		ICProject cproject = null;
		if (!ignoreProjectSetting) {
			cproject = verifyCProject(config);	// will throw exception if project setting not valid
		}
		IPath programPath = CDebugUtils.getProgramPath(config);
		if (programPath == null || programPath.isEmpty()) {
			throwCoreException(DebugCoreMessages.getString("CDebugUtils.Program_file_not_specified"), //$NON-NLS-1$
					ICDTLaunchConfigurationConstants.ERR_UNSPECIFIED_PROGRAM);
		}
		
		if (programPath != null) {	// this check is here only to avoid warning; compiler can't tell we'll throw an exception above
			if (!programPath.isAbsolute() && (cproject != null)) {
				// See if we can brute-force append the program path to the
				// project location. This allows us to support the program file
				// being outside the project, even outside the workspace, without
				// requiring a linked resource (e.g., the setting could be 
				// "..\..\some\dir\myprogram.exe")
				IPath location = cproject.getProject().getLocation();
				if (location != null) {
					programPath = location.append(programPath);
					if (!programPath.toFile().exists()) {
						// Try looking in the project for the file. This
						// supports linked resources.
						IFile projFile = null;
						try {
							projFile = cproject.getProject().getFile(CDebugUtils.getProgramPath(config));
						}
						catch (IllegalArgumentException exc) {
							// thrown if relative path that resolves to a root file (e.g., "..\somefile")							
						}	
						if (projFile != null && projFile.exists()) {
							programPath = projFile.getLocation();
						}
					}
				}
			}
			if (!programPath.toFile().exists()) {
				throwCoreException(
						DebugCoreMessages.getString("CDebugUtils.Program_file_does_not_exist"), //$NON-NLS-1$
						new FileNotFoundException(
								DebugCoreMessages.getFormattedString("CDebugUtils.PROGRAM_PATH_not_found", programPath.toOSString())), //$NON-NLS-1$
						ICDTLaunchConfigurationConstants.ERR_PROGRAM_NOT_EXIST);
			}
		}
		return programPath;
	}

	/**
	 * Variant that expects (requires) the launch configuration to have a valid
	 * <i>Project</i> setting. See
	 * {@link #verifyProgramPath(ILaunchConfiguration, boolean)}
	 * 
	 * @since 7.0
	 */
	public static IPath verifyProgramPath(ILaunchConfiguration config) throws CoreException {
		return verifyProgramPath(config, false); 
	}
	
	/** Throws a CoreException. Clutter-reducing utility method. */
	private static void throwCoreException(String msg, int code) throws CoreException {
		throwCoreException(msg, null, code);
	}

	/** Throws a CoreException. Clutter-reducing utility method. */
	private static void throwCoreException(String msg, Exception innerException, int code) throws CoreException {
		throw new CoreException(new Status(IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), code, msg, innerException));
	}
}

Lines 13-18 Link Here

(-)src/org/eclipse/cdt/debug/core/DebugCoreMessages.java (+10 lines)
13	import java.util.MissingResourceException;	13	import java.util.MissingResourceException;
14	import java.util.ResourceBundle;	14	import java.util.ResourceBundle;
15		15
		16	import com.ibm.icu.text.MessageFormat;
		17
16	public class DebugCoreMessages {	18	public class DebugCoreMessages {
17		19
18	private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.core.DebugCoreMessages";//$NON-NLS-1$	20	private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.core.DebugCoreMessages";//$NON-NLS-1$
Lines 22-27 Link Here
22	private DebugCoreMessages() {	24	private DebugCoreMessages() {
23	}	25	}
24		26
		27	static String getFormattedString(String key, String arg) {
		28	return MessageFormat.format(getString(key), new String[]{arg});
		29	}
		30
		31	static String getFormattedString(String key, String[] args) {
		32	return MessageFormat.format(getString(key), args);
		33	}
		34
25	public static String getString( String key ) {	35	public static String getString( String key ) {
26	try {	36	try {
27	return RESOURCE_BUNDLE.getString( key );	37	return RESOURCE_BUNDLE.getString( key );

Lines 23-26 Link Here

(-)src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties (+8 lines)
23	CDebugUtils.Hardware=Hardware	23	CDebugUtils.Hardware=Hardware
24	CDebugUtils.Temporary=Temporary	24	CDebugUtils.Temporary=Temporary
25	CDebugUtils.Software=Software	25	CDebugUtils.Software=Software
		26	CDebugUtils.C_Project_not_specified=A project was not specified in the launch configuration.
		27	CDebugUtils.Not_a_C_CPP_project=The project specified in the launch configuration is not a C/C++ one.
		28	CDebugUtils.PROGRAM_PATH_not_found={0} not found
		29	CDebugUtils.Program_file_does_not_exist=The program file specified in the launch configuration does not exist
		30	CDebugUtils.Program_file_not_specified=A program file was not specified in the launch configuration.
		31	CDebugUtils.Project_NAME_does_not_exist=Project {0} does not exist. Please check that your launch configuration specifies a valid project in your workspace.
		32	CDebugUtils.Project_NAME_is_closed=Project {0} is closed
		33
26	CDIDebugModel.0=Unable to parser binary information from file	34	CDIDebugModel.0=Unable to parser binary information from file




import java.util.List;
import java.util.Properties;

import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.GDBJtagDeviceContribution;
import org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.GDBJtagDeviceContributionFactory;
import org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice;

            // Below steps are specific to JTag hardware debugging
            
        /*
         * Retrieve the IGDBJtagDevice instance
         */
        new Step() {
			@Override

				rm.done();
            }},
        /*
         * Execute symbol loading
         */
        new Step() {
			@Override
			public void execute(RequestMonitor rm) {
				ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
				try {
					if (config.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS)) {
						String symbolsFileName = null;

						// New setting in Helios. Default is true. Check for existence
						// in order to support older launch configs
						if (config.hasAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS) &&
								config.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS)) {
							IPath programFile = CDebugUtils.verifyProgramPath(config);
							if (programFile != null) {
								symbolsFileName = programFile.toOSString();
							}
						}
						else {
							symbolsFileName = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, IGDBJtagConstants.DEFAULT_SYMBOLS_FILE_NAME);
							if (symbolsFileName.length() > 0) {
								symbolsFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName);
							} else {
								symbolsFileName = null;
							}
						}
						
						if (symbolsFileName == null) {
		        			rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, Messages.getString("GDBJtagDebugger.err_no_img_file"), null)); //$NON-NLS-1$
		        			rm.done();
		        			return;
						}

						// Escape windows path separator characters TWICE, once for Java and once for GDB.						
						symbolsFileName = symbolsFileName.replace("\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$

						String symbolsOffset = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, IGDBJtagConstants.DEFAULT_SYMBOLS_OFFSET);
						if (symbolsOffset.length() > 0) {
							symbolsOffset = "0x" + symbolsOffset;					
						}
						List<String> commands = new ArrayList<String>();
						fGdbJtagDevice.doLoadSymbol(symbolsFileName, symbolsOffset, commands);
						queueCommands(commands, rm);									
						
					} else {
						rm.done();
					}
				} catch (CoreException e) {
        			rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Cannot load symbol", e)); //$NON-NLS-1$
        			rm.done();
				}
			}},

        /*
         * Hook up to remote target
         */
        new Step() {

			public void execute(RequestMonitor rm) {
				ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
				try {
					if (config.getAttribute(IGDBJtagConstants.ATTR_DO_RESET, IGDBJtagConstants.DEFAULT_DO_RESET)) {
						List<String> commands = new ArrayList<String>();
						fGdbJtagDevice.doReset(commands);
						queueCommands(commands, rm);

			public void execute(RequestMonitor rm) {
				ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
				try {
					if (config.getAttribute(IGDBJtagConstants.ATTR_DO_HALT, IGDBJtagConstants.DEFAULT_DO_HALT)) {
						List<String> commands = new ArrayList<String>();
						fGdbJtagDevice.doHalt(commands);
						queueCommands(commands, rm);								

			public void execute(RequestMonitor rm) {
				ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
				try {
					String userCmd = config.getAttribute(IGDBJtagConstants.ATTR_INIT_COMMANDS, IGDBJtagConstants.DEFAULT_INIT_COMMANDS);
					userCmd = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(userCmd);
					if (userCmd.length() > 0) {
						String[] commands = userCmd.split("\\r?\\n"); //$NON-NLS-1$
						
						CountingRequestMonitor crm = new CountingRequestMonitor(getExecutor(), rm);
						crm.setDoneCount(commands.length);
						for (int i = 0; i < commands.length; ++i) {
							fCommandControl.queueCommand(
							    new CLICommand<MIInfo>(fCommandControl.getContext(), commands[i]),
							    new DataRequestMonitor<MIInfo>(getExecutor(), crm));
						}
					}
					else {
						rm.done();
					}
				} catch (CoreException e) {
        			rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Cannot run user defined init commands", e)); //$NON-NLS-1$

			public void execute(RequestMonitor rm) {
				ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
				try {
					String imageFileName = null;
					if (config.getAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE)) {
						// New setting in Helios. Default is true. Check for existence
						// in order to support older launch configs
						if (config.hasAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE) &&
								config.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_IMAGE)) {
							IPath programFile = CDebugUtils.verifyProgramPath(config);
							if (programFile != null) {
								imageFileName = programFile.toOSString();
							}
						} else {
							rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Image name cannot be empty", null)); //$NON-NLS-1$
							rm.done();
						}
						else {
							imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME); //$NON-NLS-1$
							if (imageFileName.length() > 0) {
								imageFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName);
							} else {
								imageFileName = null;
							}
						}
						
						if (imageFileName == null) {
		        			rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, Messages.getString("GDBJtagDebugger.err_no_img_file"), null)); //$NON-NLS-1$
		        			rm.done();
		        			return;
						}

						// Escape windows path separator characters TWICE, once for Java and once for GDB.						
						imageFileName = imageFileName.replace("\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$

						String imageOffset = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET);
						if (imageOffset.length() > 0) {
							imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET); //$NON-NLS-2$ //$NON-NLS-4$					
						}
						List<String> commands = new ArrayList<String>();
						fGdbJtagDevice.doLoadImage(imageFileName, imageOffset, commands);
						queueCommands(commands, rm);									
					} 
					else {
						rm.done();
					}
				} catch (CoreException e) {

        			rm.done();
				}
			}},
        /*
         * Execute symbol loading
         */
        new Step() {
			@Override
			public void execute(RequestMonitor rm) {
				ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
				try {
					if (config.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS)) {
						// Escape windows path separator characters TWICE, once for Java and once for GDB.
						String symbolsFileName = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, ""); //$NON-NLS-1$
						if (symbolsFileName.length() > 0) {
							symbolsFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName).replace("\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
							String symbolsOffset = "0x" + config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, ""); //$NON-NLS-1$ //$NON-NLS-2$
							List<String> commands = new ArrayList<String>();
							fGdbJtagDevice.doLoadSymbol(symbolsFileName, symbolsOffset, commands);
							queueCommands(commands, rm);									
						} else {
							rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Symbol name cannot be empty", null)); //$NON-NLS-1$
							rm.done();
						}
					} else {
						rm.done();
					}
				} catch (CoreException e) {
        			rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Cannot load symbol", e)); //$NON-NLS-1$
        			rm.done();
				}
			}
        },
        /* 
         * Start tracking the breakpoints once we know we are connected to the target (necessary for remote debugging) 
         */

				ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
				try {
					if (config.getAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER)) {
						String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_PC_REGISTER)); //$NON-NLS-1$
						List<String> commands = new ArrayList<String>();
						fGdbJtagDevice.doSetPC(pcRegister, commands);
						queueCommands(commands, rm);								

				ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
				try {
					if (config.getAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT)) {
						String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT); //$NON-NLS-1$
						List<String> commands = new ArrayList<String>();
						fGdbJtagDevice.doStopAt(stopAt, commands);
						queueCommands(commands, rm);								

			public void execute(RequestMonitor rm) {
				ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
				try {
					String userCmd = config.getAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, IGDBJtagConstants.DEFAULT_RUN_COMMANDS); //$NON-NLS-1$
					if (userCmd.length() > 0) {
						userCmd = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(userCmd);
						String[] commands = userCmd.split("\\r?\\n"); //$NON-NLS-1$
						
						CountingRequestMonitor crm = new CountingRequestMonitor(getExecutor(), rm);
						crm.setDoneCount(commands.length);
						for (int i = 0; i < commands.length; ++i) {
							fCommandControl.queueCommand(
							    new CLICommand<MIInfo>(fCommandControl.getContext(), commands[i]),
							    new DataRequestMonitor<MIInfo>(getExecutor(), crm));
						}
					}
					else {
						rm.done();
					}
				} catch (CoreException e) {
        			rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Cannot run user defined run commands", e)); //$NON-NLS-1$

	private IGDBJtagDevice getGDBJtagDevice (ILaunchConfiguration config) 
	throws CoreException, NullPointerException {
		IGDBJtagDevice gdbJtagDevice = null;
		String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, IGDBJtagConstants.DEFAULT_JTAG_DEVICE); //$NON-NLS-1$
		GDBJtagDeviceContribution[] availableDevices = GDBJtagDeviceContributionFactory.getInstance().getGDBJtagDeviceContribution();
		for (GDBJtagDeviceContribution availableDevice : availableDevices) {
			if (jtagDeviceName.equals(availableDevice.getDeviceName())) {
				gdbJtagDevice = availableDevice.getDevice();
				gdbJtagDevice = availableDevices[i].getDevice();
				break;
			}
		}





import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.core.cdi.ICDISession;
import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;

import org.eclipse.cdt.debug.mi.core.command.MIGDBSetNewConsole;
import org.eclipse.cdt.debug.mi.core.output.MIInfo;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;


			List<String> commands = new ArrayList<String>();

			// hook up to remote target
			if (submonitor.isCanceled()) {
				throw new OperationCanceledException();
			}
			// execute symbol load
			boolean doLoadSymbols = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS);
			if (doLoadSymbols) {
				String symbolsFileName = null;
				// New setting in Helios. Default is true. Check for existence
				// in order to support older launch configs
				if (config.hasAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS) &&
						config.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS)) {
					IPath programFile = CDebugUtils.verifyProgramPath(config);
					if (programFile != null) {
						symbolsFileName = programFile.toOSString();
					}
				}
				else {
					symbolsFileName = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, IGDBJtagConstants.DEFAULT_SYMBOLS_FILE_NAME);
					if (symbolsFileName.length() > 0) {
						symbolsFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName);
					}
				}
				if (symbolsFileName == null) {
					// The launch config GUI should prevent this from happening, but just in case					
					throw new CoreException(new Status( IStatus.ERROR,
							Activator.getUniqueIdentifier(),
							-1, Messages.getString("GDBJtagDebugger.err_no_sym_file"), null));
				}

					// Escape windows path separator characters TWICE, once for Java and once for GDB.
				symbolsFileName = symbolsFileName.replace("\\", "\\\\");

					String symbolsOffset = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, IGDBJtagConstants.DEFAULT_SYMBOLS_OFFSET);
				if (symbolsOffset.length() > 0) {
					symbolsOffset = "0x" + symbolsOffset;					
				}
				commands.clear();
				gdbJtagDevice.doLoadSymbol(symbolsFileName, symbolsOffset, commands);
				monitor.beginTask(Messages.getString("GDBJtagDebugger.loading_symbols"), 1); //$NON-NLS-1$				
				executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(15));
			}

			if (submonitor.isCanceled()) {
				throw new OperationCanceledException();
			}
			
			// hook up to remote target
			boolean useRemote = config.getAttribute(IGDBJtagConstants.ATTR_USE_REMOTE_TARGET, IGDBJtagConstants.DEFAULT_USE_REMOTE_TARGET);
			if (useRemote) {
				submonitor.subTask(Messages.getString("GDBJtagDebugger.2")); //$NON-NLS-1$
				try {
					commands.clear();				
					if (gdbJtagDevice instanceof IGDBJtagConnection) { 
						URI	connection = new URI(config.getAttribute(IGDBJtagConstants.ATTR_CONNECTION, IGDBJtagConstants.DEFAULT_CONNECTION));
						IGDBJtagConnection device = (IGDBJtagConnection)gdbJtagDevice;

			submonitor.setWorkRemaining(80); // compensate for optional work above

			// Run device-specific code to reset the board
			if (config.getAttribute(IGDBJtagConstants.ATTR_DO_RESET, IGDBJtagConstants.DEFAULT_DO_RESET)) {
				commands.clear();
				gdbJtagDevice.doReset(commands);
				int defaultDelay = gdbJtagDevice.getDefaultDelay();

			submonitor.setWorkRemaining(65); // compensate for optional work above

			// Run device-specific code to halt the board
			if (config.getAttribute(IGDBJtagConstants.ATTR_DO_HALT, IGDBJtagConstants.DEFAULT_DO_HALT)) {
				commands.clear();
				gdbJtagDevice.doHalt(commands);
				executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(15));

			// execute load
			boolean doLoad = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE);
			if (doLoad) {
				String imageFileName = null;

				// New setting in Helios. Default is true. Check for existence
				// in order to support older launch configs
				if (config.hasAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE) &&
						config.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_IMAGE)) {
					IPath programFile = CDebugUtils.verifyProgramPath(config);
					if (programFile != null) {
						imageFileName = programFile.toOSString();
					}
				}
				else {
					imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME);
					if (imageFileName.length() > 0) {
						imageFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName);
					}
				}
				if (imageFileName == null) {
					// The launch config GUI should prevent this from happening, but just in case
					throw new CoreException(new Status( IStatus.ERROR,
							Activator.getUniqueIdentifier(),
							-1, Messages.getString("GDBJtagDebugger.err_no_img_file"), null));
				}
				imageFileName = imageFileName.replace("\\", "\\\\");

				String imageOffset = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET);
				if (imageOffset.length() > 0) {
					imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET);					
				String symbolsFileName = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, ""); //$NON-NLS-1$
				if (symbolsFileName.length() > 0) {
					symbolsFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName).replace("\\", "\\\\");
					String symbolsOffset = "0x" + config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, ""); //$NON-NLS-2$
					commands.clear();
					gdbJtagDevice.doLoadSymbol(symbolsFileName, symbolsOffset, commands);
					executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(15));
				}
	
				commands.clear();
				gdbJtagDevice.doLoadImage(imageFileName, imageOffset, commands);
				monitor.beginTask(Messages.getString("GDBJtagDebugger.loading_image"), 1); //$NON-NLS-1$
				executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));


			}
			submonitor.setWorkRemaining(15); // compensate for optional work above
		} catch (OperationCanceledException e) {
			if (launch != null && launch.canTerminate()) {
				launch.terminate();

			// Set program counter
			boolean setPc = config.getAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER);
			if (setPc) {
				String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_PC_REGISTER)); //$NON-NLS-1$
				gdbJtagDevice.doSetPC(pcRegister, commands);
				executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));
			}

			monitor.beginTask(Messages.getString("GDBJtagDebugger.18"), 1); //$NON-NLS-1$
			boolean setStopAt = config.getAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT);
			if (setStopAt) {
				String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT); //$NON-NLS-1$
				commands.clear();
				gdbJtagDevice.doStopAt(stopAt, commands);
				executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));

	private void executeGDBScript(String script, MISession miSession, 
			IProgressMonitor monitor) throws CoreException {
		// Try to execute any extra command
		if (script == null || script.length() == 0)
			return;
		script = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(script);
		String[] commands = script.split("\\r?\\n");

	private IGDBJtagDevice getGDBJtagDevice (ILaunchConfiguration config) 
		throws CoreException, NullPointerException {
		IGDBJtagDevice gdbJtagDevice = null;
		String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, IGDBJtagConstants.DEFAULT_JTAG_DEVICE); //$NON-NLS-1$
		GDBJtagDeviceContribution[] availableDevices = GDBJtagDeviceContributionFactory.
			getInstance().getGDBJtagDeviceContribution();
		for (int i = 0; i < availableDevices.length; i++) {




/*******************************************************************************
 * Copyright (c) 2007 - 2010 QNX Software Systems and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *******************************************************************************/
package org.eclipse.cdt.debug.gdbjtag.core;

import java.io.File;

import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.debug.core.CDIDebugModel;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDISession;


		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
			GDBJtagDebugger debugger = new GDBJtagDebugger();
			ICProject project = CDebugUtils.verifyCProject(configuration);
			IPath exePath = CDebugUtils.verifyProgramPath(configuration);
			ICDISession session = debugger.createSession(launch, null, submonitor.newChild(1));
			ICDISession session = debugger.createSession(launch, exeFile, submonitor.newChild(1));
			IBinaryObject exeBinary = null;
			if ( exePath != null ) {
				exeBinary = verifyBinary(project, exePath);

Lines 1-5 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/core/IGDBJtagConstants.java (-5 / +23 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007 - 2008 QNX Software Systems and others.	2	* Copyright (c) 2007 - 2010 QNX Software Systems and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 52-66 Link Here
52	public static final String ATTR_STOP_AT = Activator.PLUGIN_ID + ".stopAt"; //$NON-NLS-1$	52	public static final String ATTR_STOP_AT = Activator.PLUGIN_ID + ".stopAt"; //$NON-NLS-1$
53	public static final String ATTR_SET_RESUME = Activator.PLUGIN_ID + ".setResume"; //$NON-NLS-1$	53	public static final String ATTR_SET_RESUME = Activator.PLUGIN_ID + ".setResume"; //$NON-NLS-1$
54	public static final String ATTR_RUN_COMMANDS = Activator.PLUGIN_ID + ".runCommands"; //$NON-NLS-1$	54	public static final String ATTR_RUN_COMMANDS = Activator.PLUGIN_ID + ".runCommands"; //$NON-NLS-1$
55		55	/** @since 7.0 */ public static final String ATTR_USE_PROJ_BINARY_FOR_IMAGE = Activator.PLUGIN_ID + ".useProjBinaryForImage"; //$NON-NLS-1$
		56	/** @since 7.0 */ public static final String ATTR_USE_FILE_FOR_IMAGE = Activator.PLUGIN_ID + ".useFileForImage"; //$NON-NLS-1$
		57	/** @since 7.0 */ public static final String ATTR_USE_PROJ_BINARY_FOR_SYMBOLS = Activator.PLUGIN_ID + ".useProjBinaryForSymbols"; //$NON-NLS-1$
		58	/** @since 7.0 */ public static final String ATTR_USE_FILE_FOR_SYMBOLS = Activator.PLUGIN_ID + ".useFileForSymbols"; //$NON-NLS-1$
		59
56	public static final boolean DEFAULT_DO_RESET = true;	60	public static final boolean DEFAULT_DO_RESET = true;
57	public static final boolean DEFAULT_DO_HALT = true;	61	public static final boolean DEFAULT_DO_HALT = true;
58	public static final int DEFAULT_DELAY = 3;	62	public static final int DEFAULT_DELAY = 3;
59	public static final boolean DEFAULT_LOAD_IMAGE = false;	63	public static final boolean DEFAULT_LOAD_IMAGE = true;
60	public static final boolean DEFAULT_LOAD_SYMBOLS = false;	64	public static final boolean DEFAULT_LOAD_SYMBOLS = true;
61	public static final boolean DEFAULT_SET_PC_REGISTER = false;	65	public static final boolean DEFAULT_SET_PC_REGISTER = false;
62	public static final boolean DEFAULT_SET_STOP_AT = false;	66	public static final boolean DEFAULT_SET_STOP_AT = false;
63	public static final boolean DEFAULT_SET_RESUME = false;	67	public static final boolean DEFAULT_SET_RESUME = false;
64	public static final boolean DEFAULT_USE_DEFAULT_RUN = true;	68	public static final boolean DEFAULT_USE_DEFAULT_RUN = true;
65		69
		70	/** @since 7.0 */ public static final String DEFAULT_INIT_COMMANDS = ""; //$NON-NLS-1$
		71	/** @since 7.0 */ public static final String DEFAULT_IMAGE_FILE_NAME = ""; //$NON-NLS-1$
		72	/** @since 7.0 */ public static final String DEFAULT_SYMBOLS_FILE_NAME = ""; //$NON-NLS-1$
		73	/** @since 7.0 */ public static final String DEFAULT_RUN_COMMANDS = ""; //$NON-NLS-1$
		74	/** @since 7.0 */ public static final boolean DEFAULT_USE_PROJ_BINARY_FOR_IMAGE = true;
		75	/** @since 7.0 */ public static final boolean DEFAULT_USE_FILE_FOR_IMAGE = false;
		76	/** @since 7.0 */ public static final boolean DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS = true;
		77	/** @since 7.0 */ public static final boolean DEFAULT_USE_FILE_FOR_SYMBOLS = false;
		78	/** @since 7.0 */ public static final String DEFAULT_IMAGE_OFFSET = ""; //$NON-NLS-1$
		79	/** @since 7.0 */ public static final String DEFAULT_SYMBOLS_OFFSET = ""; //$NON-NLS-1$
		80	/** @since 7.0 */ public static final String DEFAULT_PC_REGISTER = ""; //$NON-NLS-1$
		81	/** @since 7.0 */ public static final String DEFAULT_STOP_AT = ""; //$NON-NLS-1$
		82	/** @since 7.0 */ public static final String DEFAULT_JTAG_DEVICE = ""; //$NON-NLS-1$
		83
66	}	84	}

Lines 1-5 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/core/Message.properties (-2 / +6 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2008 QNX Software Systems and others.	2	# Copyright (c) 2008 - 2010 QNX Software Systems and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 15-19 Link Here
15	GDBJtagDebugger.21=GDB command:	15	GDBJtagDebugger.21=GDB command:
16	GDBJtagDebugger.22=Failed command	16	GDBJtagDebugger.22=Failed command
17	GDBJtagDebugger.3=Executing init commands	17	GDBJtagDebugger.3=Executing init commands
18	GDBJtagDebugger.5=Loading image	18	GDBJtagDebugger.loading_image=Loading image
		19	GDBJtagDebugger.loading_symbols=Loading symbolics
19	src.common.No_answer=No answer	20	src.common.No_answer=No answer
		21
		22	GDBJtagDebugger.err_no_sym_file=Symbolics loading was requested but file was not specified or not found.
		23	GDBJtagDebugger.err_no_img_file=Image loading was requested but file was not specified or not found.

Lines 77-84 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java (-4 / +19 lines)
77	*/	77	*/
78	public void doLoadImage(String imageFileName, String imageOffset, Collection<String> commands) {	78	public void doLoadImage(String imageFileName, String imageOffset, Collection<String> commands) {
79	String file = escapeScpaces(imageFileName);	79	String file = escapeScpaces(imageFileName);
80	String cmd = "restore " + file + " " + imageOffset; //$NON-NLS-1$ //$NON-NLS-2$	80	if (imageOffset.length() > 0) {
81	addCmd(commands, cmd);	81	// 'restore' simply puts the program into memory.
		82	addCmd(commands, "restore " + file + " " + imageOffset);
		83	}
		84	else {
		85	// 'load' puts the program into memory and sets the PC. To see why
		86	// we do this when no offset is specified, see
		87	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=310304#c20
		88	addCmd(commands, "load " + file);
		89	}
		90	// 'exec-file' specifies the program as the context for getting memory.
		91	// Basically, it tells gdb "this is the program we'll be debugging"
		92	addCmd(commands, "exec-file " + file);
82	}	93	}
83		94
84	/* (non-Javadoc)	95	/* (non-Javadoc)
Lines 86-93 Link Here
86	*/	97	*/
87	public void doLoadSymbol(String symbolFileName, String symbolOffset, Collection<String> commands) {	98	public void doLoadSymbol(String symbolFileName, String symbolOffset, Collection<String> commands) {
88	String file = escapeScpaces(symbolFileName);	99	String file = escapeScpaces(symbolFileName);
89	String cmd = "add-sym " + file + " " + symbolOffset; //$NON-NLS-1$ //$NON-NLS-2$	100	if (symbolOffset == null \|\| (symbolOffset.length() == 0)) {
90	addCmd(commands, cmd);	101	addCmd(commands, "symbol-file " + file);
		102	}
		103	else {
		104	addCmd(commands, "add-sym " + file + " " + symbolOffset);
		105	}
91	}	106	}
92		107
93	protected String escapeScpaces(String file) {	108	protected String escapeScpaces(String file) {




		gdbCommand.setLayoutData(gd);
		gdbCommand.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob(); // provides much better performance for Text listeners
			}
		});


		jtagDevice.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				updateDeviceIpPort(jtagDevice.getText());
				scheduleUpdateJob(); // provides much better performance for Text listeners
			}
		});
		


		ipAddress.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob(); // provides much better performance for Text listeners
			}
		});
		portNumber.addVerifyListener(new VerifyListener() {

		});
		portNumber.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob(); // provides much better performance for Text listeners
			}
		});

		connection.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob(); // provides much better performance for Text listeners
			}
		});	
	}




		gdbCommand.setLayoutData(gd);
		gdbCommand.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();	// provides much better performance for Text listeners 
			}
		});


		commandFactory.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				commandFactoryChanged();
				scheduleUpdateJob(); // provides much better performance for Text listeners
			}
		});
	}

		miProtocol = new Combo(comp, SWT.READ_ONLY | SWT.DROP_DOWN);
		miProtocol.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob(); // provides much better performance for Text listeners
			}
		});
	}

		jtagDevice.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				updateDeviceIpPort(jtagDevice.getText());
				scheduleUpdateJob(); // provides much better performance for Text listeners
			}
		});
		


		ipAddress.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob(); // provides much better performance for Text listeners
			}
		});
		portNumber.addVerifyListener(new VerifyListener() {

		});
		portNumber.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob(); // provides much better performance for Text listeners
			}
		});

		connection.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob(); // provides much better performance for Text listeners
			}
		});		
	}





import java.io.File;

import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.gdbjtag.core.IGDBJtagConstants;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;

import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.events.VerifyListener;
import org.eclipse.swt.graphics.Image;

	boolean resume = false;
	
	Text runCommands;
	
	// New GUI added to address bug 310304
	private Button useProjectBinaryForImage;
	private Button useFileForImage;
	private Button useProjectBinaryForSymbols;
	private Button useFileForSymbols;
	private Label imageOffsetLabel;
	private Label symbolsOffsetLabel;
	private Label projBinaryLabel1;
	private Label projBinaryLabel2;

	public String getName() {
		return TAB_NAME;

		});
		delay.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
		

		initCommands.setLayoutData(gd);
		initCommands.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent evt) {
				scheduleUpdateJob();
			}
		});
		

		comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		comp.setLayout(layout);
		
		SelectionListener radioButtonListener = new SelectionListener() {
			public void widgetSelected(SelectionEvent e) {
				updateLaunchConfigurationDialog();
				updateUseFileEnablement();
			}
			public void widgetDefaultSelected(SelectionEvent e) {
			}
		};
		
		useProjectBinaryForImage = new Button(comp, SWT.RADIO);
		useProjectBinaryForImage.setText(Messages.getString("GDBJtagStartupTab.useProjectBinary_Label"));
		useProjectBinaryForImage.setToolTipText(Messages.getString("GDBJtagStartupTab.useProjectBinary_ToolTip"));
		gd = new GridData();
		gd.horizontalSpan = 1;
		useProjectBinaryForImage.setLayoutData(gd);
		useProjectBinaryForImage.addSelectionListener(radioButtonListener);
		
		projBinaryLabel1 = new Label(comp, SWT.NONE);
		gd = new GridData(GridData.FILL_HORIZONTAL);
		gd.horizontalSpan = 3;
		projBinaryLabel1.setLayoutData(gd);
		
		useFileForImage = new Button(comp, SWT.RADIO);
		useFileForImage.setText(Messages.getString("GDBJtagStartupTab.useFile_Label"));
		gd = new GridData();
		gd.horizontalSpan = 1;
		useFileForImage.setLayoutData(gd);
		useFileForImage.addSelectionListener(radioButtonListener);		

		imageFileName = new Text(comp, SWT.BORDER);
		gd = new GridData(GridData.FILL_HORIZONTAL);
		gd.horizontalSpan = 1;
		imageFileName.setLayoutData(gd);
		imageFileName.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
		

			}
		});	
		
		imageOffsetLabel = new Label(comp, SWT.NONE);
		imageOffsetLabel.setText(Messages.getString("GDBJtagStartupTab.imageOffsetLabel_Text"));
		imageOffset = new Text(comp, SWT.BORDER);
		gd = new GridData();

		});
		imageOffset.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
		
		
		loadSymbols = new Button(group, SWT.CHECK);
		loadSymbols.setText(Messages.getString("GDBJtagStartupTab.loadSymbols_Text"));
		gd = new GridData();

		layout.numColumns = 4;
		comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		comp.setLayout(layout);

		useProjectBinaryForSymbols = new Button(comp, SWT.RADIO);
		useProjectBinaryForSymbols.setText(Messages.getString("GDBJtagStartupTab.useProjectBinary_Label"));
		useProjectBinaryForSymbols.setToolTipText(Messages.getString("GDBJtagStartupTab.useProjectBinary_ToolTip"));
		gd = new GridData();
		gd.horizontalSpan = 1;
		useProjectBinaryForSymbols.setLayoutData(gd);
		useProjectBinaryForSymbols.addSelectionListener(radioButtonListener);
		
		projBinaryLabel2 = new Label(comp, SWT.NONE);
		gd = new GridData(GridData.FILL_HORIZONTAL);
		gd.horizontalSpan = 3;
		projBinaryLabel2.setLayoutData(gd);
		
		useFileForSymbols = new Button(comp, SWT.RADIO);
		useFileForSymbols.setText(Messages.getString("GDBJtagStartupTab.useFile_Label"));
		gd = new GridData();
		gd.horizontalSpan = 1;
		useFileForSymbols.setLayoutData(gd);
		useFileForSymbols.addSelectionListener(radioButtonListener);
		
		Label symbolLabel = new Label(comp, SWT.NONE);
		symbolLabel.setText(Messages.getString("GDBJtagStartupTab.symbolsLabel_Text"));	
		symbolsFileName = new Text(comp, SWT.BORDER);
		gd = new GridData(GridData.FILL_HORIZONTAL);
		gd.horizontalSpan = 1;
		symbolsFileName.setLayoutData(gd);
		symbolsFileName.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});	
		

			}
		});
		
		symbolsOffsetLabel = new Label(comp, SWT.NONE);
		symbolsOffsetLabel.setText(Messages.getString("GDBJtagStartupTab.symbolsOffsetLabel_Text"));
		symbolsOffset = new Text(comp, SWT.BORDER);
		gd = new GridData();

		});
		symbolsOffset.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
		
	}
	
	private void updateUseFileEnablement() {
		boolean enabled = loadImage.getSelection() && useFileForImage.getSelection();
		imageFileName.setEnabled(enabled);
		imageFileBrowseWs.setEnabled(enabled);
		imageFileBrowse.setEnabled(enabled);
		
		enabled = loadSymbols.getSelection() && useFileForSymbols.getSelection();
		symbolsFileName.setEnabled(enabled);
		symbolsFileBrowseWs.setEnabled(enabled);
		symbolsFileBrowse.setEnabled(enabled);
	}

	public void createRunOptionGroup(Composite parent) {
		Group group = new Group(parent, SWT.NONE);
		GridLayout layout = new GridLayout();

		});
		pcRegister.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
		

		stopAt.setLayoutData(gd);
		stopAt.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});



	private void loadImageChanged() {
		boolean enabled = loadImage.getSelection();
		useProjectBinaryForImage.setEnabled(enabled);
		useFileForImage.setEnabled(enabled);
		imageFileBrowse.setEnabled(enabled);
		imageOffset.setEnabled(enabled);
		imageOffsetLabel.setEnabled(enabled);
		updateUseFileEnablement();
	}
	
	private void loadSymbolsChanged() {
		boolean enabled = loadSymbols.getSelection();
		useProjectBinaryForSymbols.setEnabled(enabled);
		useFileForSymbols.setEnabled(enabled);
		symbolsFileBrowse.setEnabled(enabled);
		symbolsOffset.setEnabled(enabled);
		symbolsOffsetLabel.setEnabled(enabled);
		updateUseFileEnablement();		
	}
	
	private void pcRegisterChanged() {

		runCommands.setLayoutData(gd);
		runCommands.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent evt) {
				scheduleUpdateJob();
			}
		});
	}

		setMessage(null);

		if (loadImage.getSelection()) {
			if (!useProjectBinaryForImage.getSelection()) {
				if (imageFileName.getText().trim().length() == 0) {
					setErrorMessage(Messages.getString("GDBJtagStartupTab.imageFileName_not_specified"));
					return false;
				}
	
				try {
					String path = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName.getText().trim());
					IPath filePath = new Path(path);
					if (!filePath.toFile().exists()) {
						setErrorMessage(Messages.getString("GDBJtagStartupTab.imageFileName_does_not_exist"));
						return false;
					}
				} catch (CoreException e) { // string substitution throws this if expression doesn't resolve 
					setErrorMessage(Messages.getString("GDBJtagStartupTab.imageFileName_does_not_exist"));
					return false;
				}
			} catch (CoreException e) {
				Activator.getDefault().getLog().log(e.getStatus());
			}
		} else {
			setErrorMessage(null);
		}
		if (loadSymbols.getSelection()) {
			if (!useProjectBinaryForSymbols.getSelection()) {
				if (symbolsFileName.getText().trim().length() == 0) {
					setErrorMessage(Messages.getString("GDBJtagStartupTab.symbolsFileName_not_specified"));
					return false;
				}
			
				try {
					String path = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName.getText().trim());
					IPath filePath = new Path(path);
					if (!filePath.toFile().exists()) {
						setErrorMessage(Messages.getString("GDBJtagStartupTab.symbolsFileName_does_not_exist"));
						return false;
					}
				} catch (CoreException e) { // string substitution throws this if expression doesn't resolve 
					setErrorMessage(Messages.getString("GDBJtagStartupTab.symbolsFileName_does_not_exist"));
					return false;
				}
			} catch (CoreException e) {
				Activator.getDefault().getLog().log(e.getStatus());
			}
		} else {
			setErrorMessage(null);

	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
	 */
//	protected void updateLaunchConfigurationDialog() {
//		super.updateLaunchConfigurationDialog();
//		isValid(getLaunchConfigurationDialog());
//	}
	
	public void initializeFrom(ILaunchConfiguration configuration) {
		try {
			// Initialization Commands
			doReset.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_DO_RESET, IGDBJtagConstants.DEFAULT_DO_RESET));
			doResetChanged();
			doHalt.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_DO_HALT, IGDBJtagConstants.DEFAULT_DO_HALT));
			delay.setText(String.valueOf(configuration.getAttribute(IGDBJtagConstants.ATTR_DELAY, IGDBJtagConstants.DEFAULT_DELAY)));
			doHalt.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_DO_HALT, IGDBJtagConstants.DEFAULT_DO_HALT));
			initCommands.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_INIT_COMMANDS, IGDBJtagConstants.DEFAULT_INIT_COMMANDS));
			
			// Load Image...
			loadImage.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE));
			useProjectBinaryForImage.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_IMAGE));
			useFileForImage.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_USE_FILE_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_FILE_FOR_IMAGE));
			imageFileName.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME));
			imageOffset.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET));
			
			//.. and Symbols
			imageOffset.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, "")); //$NON-NLS-1$
			loadSymbols.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS));
			useProjectBinaryForSymbols.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS));
			useFileForSymbols.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_USE_FILE_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_FILE_FOR_SYMBOLS));
			symbolsFileName.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, IGDBJtagConstants.DEFAULT_SYMBOLS_FILE_NAME));
			symbolsOffset.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, IGDBJtagConstants.DEFAULT_SYMBOLS_OFFSET));
			
			// Runtime Options
			setPcRegister.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER));
			pcRegister.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, IGDBJtagConstants.DEFAULT_PC_REGISTER));
			pcRegister.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, "")); //$NON-NLS-1$
			setStopAt.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT));
			stopAt.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT));
			stopAt.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, "")); //$NON-NLS-1$
			setResume.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_SET_RESUME, IGDBJtagConstants.DEFAULT_SET_RESUME));
			
			// Run Commands
			runCommands.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, IGDBJtagConstants.DEFAULT_RUN_COMMANDS));

			String programName = CDebugUtils.getProgramName(configuration);
			if (programName != null) {
				int lastSlash = programName.indexOf('\\');
				if (lastSlash >= 0) {
					programName = programName.substring(lastSlash + 1);
				}
				lastSlash = programName.indexOf('/');
				if (lastSlash >= 0) {
					programName = programName.substring(lastSlash + 1);
				}
				projBinaryLabel1.setText(programName);
				projBinaryLabel2.setText(programName);
			}
		
			doResetChanged();
			loadImageChanged();
			loadSymbolsChanged();
			pcRegisterChanged();
			stopAtChanged();
			resumeChanged();
			updateUseFileEnablement();
			
		} catch (CoreException e) {
			Activator.getDefault().getLog().log(e.getStatus());
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
	 */
	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
		
		// Initialization Commands
		configuration.setAttribute(IGDBJtagConstants.ATTR_DO_RESET, doReset.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_DELAY, Integer.parseInt(delay.getText()));
		configuration.setAttribute(IGDBJtagConstants.ATTR_DO_HALT, doHalt.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_INIT_COMMANDS, initCommands.getText());
		
		// Load Image...
		configuration.setAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, loadImage.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE, useProjectBinaryForImage.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_FILE_FOR_IMAGE, useFileForImage.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, imageFileName.getText().trim());
		configuration.setAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, imageOffset.getText());
		
		//.. and Symbols
		configuration.setAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, loadSymbols.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS, useProjectBinaryForSymbols.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_FILE_FOR_SYMBOLS, useFileForSymbols.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, symbolsFileName.getText().trim());
		configuration.setAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, symbolsOffset.getText());
		
		// Runtime Options
		configuration.setAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, setPcRegister.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, pcRegister.getText());
		configuration.setAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, setStopAt.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_STOP_AT, stopAt.getText());
		configuration.setAttribute(IGDBJtagConstants.ATTR_SET_RESUME, setResume.getSelection());
		
		// Run Commands
		configuration.setAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, runCommands.getText());
	}

	/* (non-Javadoc)
	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
	 */
	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
		// Initialization Commands
		configuration.setAttribute(IGDBJtagConstants.ATTR_DO_RESET, IGDBJtagConstants.DEFAULT_DO_RESET);
		configuration.setAttribute(IGDBJtagConstants.ATTR_DELAY, IGDBJtagConstants.DEFAULT_DELAY);
		configuration.setAttribute(IGDBJtagConstants.ATTR_DO_HALT, IGDBJtagConstants.DEFAULT_DO_HALT);
		configuration.setAttribute(IGDBJtagConstants.ATTR_INIT_COMMANDS, IGDBJtagConstants.DEFAULT_INIT_COMMANDS);

		// Load Image...
		configuration.setAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE);
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_IMAGE);
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_FILE_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_FILE_FOR_IMAGE);
		configuration.setAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME);
		configuration.setAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET);

		//.. and Symbols
		configuration.setAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS);
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS);
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_FILE_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_FILE_FOR_SYMBOLS);
		configuration.setAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, IGDBJtagConstants.DEFAULT_SYMBOLS_FILE_NAME);
		configuration.setAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, IGDBJtagConstants.DEFAULT_SYMBOLS_OFFSET);
		
		// Runtime Options
		configuration.setAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER);
		configuration.setAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, IGDBJtagConstants.DEFAULT_PC_REGISTER);
		configuration.setAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT);
		configuration.setAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT);
		configuration.setAttribute(IGDBJtagConstants.ATTR_SET_RESUME, IGDBJtagConstants.DEFAULT_SET_RESUME);

		// Run Commands
		configuration.setAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, IGDBJtagConstants.DEFAULT_RUN_COMMANDS); 
	}
}

Lines 31-36 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/ui/JtagUi.properties (+3 lines)
31	GDBJtagStartupTab.symbolsFileBrowseWs_Title=Select symbols file	31	GDBJtagStartupTab.symbolsFileBrowseWs_Title=Select symbols file
32	GDBJtagStartupTab.symbolsFileBrowse_Title=Select symbols file	32	GDBJtagStartupTab.symbolsFileBrowse_Title=Select symbols file
33	GDBJtagStartupTab.symbolsOffsetLabel_Text=Symbols offset (hex):	33	GDBJtagStartupTab.symbolsOffsetLabel_Text=Symbols offset (hex):
		34	GDBJtagStartupTab.useProjectBinary_Label=Use project binary:
		35	GDBJtagStartupTab.useFile_Label=Use file:
		36	GDBJtagStartupTab.useProjectBinary_ToolTip=Use C/C++ application specified in the Main tab.
34		37
35	GDBJtagStartupTab.runOptionGroup_Text=Runtime Options	38	GDBJtagStartupTab.runOptionGroup_Text=Runtime Options
36	GDBJtagStartupTab.setPcRegister_Text=Set program counter at (hex):	39	GDBJtagStartupTab.setPcRegister_Text=Set program counter at (hex):




	 */
	@Deprecated
	protected IFile getProgramFile(ILaunchConfiguration config) throws CoreException {
		ICProject cproject = CDebugUtils.verifyCProject(config);
		String fileName = CDebugUtils.getProgramName(config);
		if (fileName == null) {
			abort(LaunchMessages.getString("AbstractCLaunchDelegate.Program_file_not_specified"), null, //$NON-NLS-1$

		return programPath;
	}

	/**
	 * @deprecated use {@link CDebugUtils#verifyCProject(ILaunchConfiguration)}
	 */
	protected ICProject verifyCProject(ILaunchConfiguration config) throws CoreException {
		return CDebugUtils.verifyCProject(config);
		if (name == null) {
			abort(LaunchMessages.getString("AbstractCLaunchDelegate.C_Project_not_specified"), null, //$NON-NLS-1$
					ICDTLaunchConfigurationConstants.ERR_UNSPECIFIED_PROJECT);
		}
		ICProject cproject = CDebugUtils.getCProject(config);
		if (cproject == null) {
			IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
			if (!proj.exists()) {
				abort(
						LaunchMessages.getFormattedString("AbstractCLaunchDelegate.Project_NAME_does_not_exist", name), null, //$NON-NLS-1$
						ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
			} else if (!proj.isOpen()) {
				abort(LaunchMessages.getFormattedString("AbstractCLaunchDelegate.Project_NAME_is_closed", name), null, //$NON-NLS-1$
						ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
			}
			abort(LaunchMessages.getString("AbstractCLaunchDelegate.Not_a_C_CPP_project"), null, //$NON-NLS-1$
					ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
		}
		return cproject;
	}

	/**
	 * @deprecated use {@link CDebugUtils#verifyProgramPath(ILaunchConfiguration)
	 */
	protected IPath verifyProgramPath(ILaunchConfiguration config) throws CoreException {
		return CDebugUtils.verifyProgramPath(config);
		IPath programPath = CDebugUtils.getProgramPath(config);
		if (programPath == null || programPath.isEmpty()) {
			abort(LaunchMessages.getString("AbstractCLaunchDelegate.Program_file_not_specified"), null, //$NON-NLS-1$
					ICDTLaunchConfigurationConstants.ERR_UNSPECIFIED_PROGRAM);
		}
		if (!programPath.isAbsolute()) {
			IPath location = cproject.getProject().getLocation();
			if (location != null) {
				programPath = location.append(programPath);
				if (!programPath.toFile().exists()) {
					// Try the old way, which is required to support linked resources.
					IFile projFile = null;
					try {
						projFile = project.getFile(CDebugUtils.getProgramPath(config));
					}
					catch (IllegalArgumentException exc) {}	// thrown if relative path that resolves to a root file (e.g., "..\somefile")
					if (projFile != null && projFile.exists()) {
						programPath = projFile.getLocation();
					}
				}
			}
		}
		if (!programPath.toFile().exists()) {
			abort(
					LaunchMessages.getString("AbstractCLaunchDelegate.Program_file_does_not_exist"), //$NON-NLS-1$
					new FileNotFoundException(
							LaunchMessages.getFormattedString(
																"AbstractCLaunchDelegate.PROGRAM_PATH_not_found", programPath.toOSString())), //$NON-NLS-1$
					ICDTLaunchConfigurationConstants.ERR_PROGRAM_NOT_EXIST);
		}
		return programPath;
	}

	protected IPath verifyProgramFile(ILaunchConfiguration config) throws CoreException {

Lines 53-60 Link Here

(-)src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java (-2 / +2 lines)
53	}	53	}
54	try {	54	try {
55	monitor.worked(1);	55	monitor.worked(1);
56	IPath exePath = verifyProgramPath(config);	56	IPath exePath = CDebugUtils.verifyProgramPath(config);
57	ICProject project = verifyCProject(config);	57	ICProject project = CDebugUtils.verifyCProject(config);
58	IBinaryObject exeFile = verifyBinary(project, exePath);	58	IBinaryObject exeFile = verifyBinary(project, exePath);
59		59
60	ICDebugConfiguration debugConfig = getDebugConfig(config);	60	ICDebugConfiguration debugConfig = getDebugConfig(config);

Lines 1-5 Link Here

(-)src/org/eclipse/cdt/launch/internal/LocalAttachLaunchDelegate.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004, 2006 QNX Software Systems and others.	2	* Copyright (c) 2004, 2010 QNX Software Systems and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 62-68 Link Here
62	}	62	}
63	try {	63	try {
64	monitor.worked(1);	64	monitor.worked(1);
65	ICProject cproject = verifyCProject(config);	65	ICProject cproject = CDebugUtils.verifyCProject(config);
66	IPath exePath = CDebugUtils.getProgramPath(config);	66	IPath exePath = CDebugUtils.getProgramPath(config);
67	if (exePath != null && !exePath.isEmpty()) {	67	if (exePath != null && !exePath.isEmpty()) {
68	if (!exePath.isAbsolute()) {	68	if (!exePath.isAbsolute()) {




/*******************************************************************************
 * Copyright (c) 2004, 2010 QNX Software Systems and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.debug.core.CDIDebugModel;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.ICDIDebugger;
import org.eclipse.cdt.debug.core.ICDIDebugger2;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;

		}
		monitor.worked( 1 );
		try {
			IPath exePath = CDebugUtils.verifyProgramPath( config );
			File wd = getWorkingDirectory( config );
			if ( wd == null ) {
				wd = new File( System.getProperty( "user.home", "." ) ); //$NON-NLS-1$ //$NON-NLS-2$

		monitor.subTask( LaunchMessages.getString( "LocalCDILaunchDelegate.2" ) ); //$NON-NLS-1$
		ICDISession dsession = null;
		try {
			IPath exePath = CDebugUtils.verifyProgramPath( config );
			ICProject project = CDebugUtils.verifyCProject( config );
			IBinaryObject exeFile = null;
			if ( exePath != null ) {
				exeFile = verifyBinary( project, exePath );

			}
			cancel( "", -1 ); //$NON-NLS-1$
		}
		IPath exePath = CDebugUtils.verifyProgramPath( config );
		if (exePath == null) {
			exePath= getProgramPathForPid(pid);
		}
		ICProject project = CDebugUtils.verifyCProject( config );
		IBinaryObject exeFile = null;
		if ( exePath != null ) {
			exeFile = verifyBinary( project, exePath );

		ICDebugConfiguration debugConfig = getDebugConfig( config );
		String path = config.getAttribute( ICDTLaunchConfigurationConstants.ATTR_COREFILE_PATH, (String)null );
		if ( path == null || path.length() == 0) {
			ICProject project = CDebugUtils.verifyCProject( config );
			IPath corefile = promptForCoreFilePath( (IProject)project.getResource(), debugConfig );
			if ( corefile == null ) {
				cancel( LaunchMessages.getString( "LocalCDILaunchDelegate.6" ), ICDTLaunchConfigurationConstants.ERR_NO_COREFILE ); //$NON-NLS-1$

			cancel( "", -1 ); //$NON-NLS-1$
		}

		IPath exePath = CDebugUtils.verifyProgramPath( config );
		ICProject project = CDebugUtils.verifyCProject( config );
		IBinaryObject exeFile = null;
		if ( exePath != null ) {
			exeFile = verifyBinary( project, exePath );


	private ICDISession launchOldDebugSession( ILaunchConfiguration config, ILaunch launch, ICDIDebugger debugger, IProgressMonitor monitor ) throws CoreException {
		IBinaryObject exeFile = null;
		IPath exePath = CDebugUtils.verifyProgramPath( config );
		ICProject project = CDebugUtils.verifyCProject( config );
		if ( exePath != null ) {
			exeFile = verifyBinary( project, exePath );
		}

	}

	private ICDISession launchDebugSession( ILaunchConfiguration config, ILaunch launch, ICDIDebugger2 debugger, IProgressMonitor monitor ) throws CoreException {
		IPath path = CDebugUtils.verifyProgramPath( config );
		File exeFile = path != null ? path.toFile() : null;
		return debugger.createSession( launch, exeFile, monitor );
	}




/*******************************************************************************
 * Copyright (c) 2005, 2010 QNX Software Systems and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.debug.core.CDIDebugModel;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.core.ICDebugConfiguration;
import org.eclipse.cdt.debug.core.cdi.CDIException;

		}
		try {
			monitor.worked(1);
			IPath exePath = CDebugUtils.verifyProgramPath(config);
			ICProject project = CDebugUtils.verifyCProject(config);
			if (exePath != null) {
				exeFile = verifyBinary(project, exePath);
			}

Return to bug 310304

Lines 24-29 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDebugger.java (-28 / +87 lines)
24		24
25	import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;	25	import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
26	import org.eclipse.cdt.debug.core.CDebugCorePlugin;	26	import org.eclipse.cdt.debug.core.CDebugCorePlugin;
		27	import org.eclipse.cdt.debug.core.CDebugUtils;
27	import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;	28	import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
28	import org.eclipse.cdt.debug.core.cdi.ICDISession;	29	import org.eclipse.cdt.debug.core.cdi.ICDISession;
29	import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;	30	import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
Lines 41-46 Link Here
41	import org.eclipse.cdt.debug.mi.core.command.MIGDBSetNewConsole;	42	import org.eclipse.cdt.debug.mi.core.command.MIGDBSetNewConsole;
42	import org.eclipse.cdt.debug.mi.core.output.MIInfo;	43	import org.eclipse.cdt.debug.mi.core.output.MIInfo;
43	import org.eclipse.core.runtime.CoreException;	44	import org.eclipse.core.runtime.CoreException;
		45	import org.eclipse.core.runtime.IPath;
44	import org.eclipse.core.runtime.IProgressMonitor;	46	import org.eclipse.core.runtime.IProgressMonitor;
45	import org.eclipse.core.runtime.IStatus;	47	import org.eclipse.core.runtime.IStatus;
46	import org.eclipse.core.runtime.MultiStatus;	48	import org.eclipse.core.runtime.MultiStatus;
Lines 117-130 Link Here
117		119
118	List<String> commands = new ArrayList<String>();	120	List<String> commands = new ArrayList<String>();
119		121
120	// hook up to remote target
121	if (submonitor.isCanceled()) {	122	if (submonitor.isCanceled()) {
122	throw new OperationCanceledException();	123	throw new OperationCanceledException();
123	}	124	}
		125	// execute symbol load
		126	boolean doLoadSymbols = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS);
		127	if (doLoadSymbols) {
		128	String symbolsFileName = null;
		129	// New setting in Helios. Default is true. Check for existence
		130	// in order to support older launch configs
		131	if (config.hasAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS) &&
		132	config.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS)) {
		133	IPath programFile = CDebugUtils.verifyProgramPath(config);
		134	if (programFile != null) {
		135	symbolsFileName = programFile.toOSString();
		136	}
		137	}
		138	else {
		139	symbolsFileName = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, IGDBJtagConstants.DEFAULT_SYMBOLS_FILE_NAME);
		140	if (symbolsFileName.length() > 0) {
		141	symbolsFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName);
		142	}
		143	}
		144	if (symbolsFileName == null) {
		145	// The launch config GUI should prevent this from happening, but just in case
		146	throw new CoreException(new Status( IStatus.ERROR,
		147	Activator.getUniqueIdentifier(),
		148	-1, Messages.getString("GDBJtagDebugger.err_no_sym_file"), null));
		149	}
		150
		151	// Escape windows path separator characters TWICE, once for Java and once for GDB.
		152	symbolsFileName = symbolsFileName.replace("\\", "\\\\");
		153
		154	String symbolsOffset = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, IGDBJtagConstants.DEFAULT_SYMBOLS_OFFSET);
		155	if (symbolsOffset.length() > 0) {
		156	symbolsOffset = "0x" + symbolsOffset;
		157	}
		158	commands.clear();
		159	gdbJtagDevice.doLoadSymbol(symbolsFileName, symbolsOffset, commands);
		160	monitor.beginTask(Messages.getString("GDBJtagDebugger.loading_symbols"), 1); //$NON-NLS-1$
		161	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(15));
		162	}
		163
		164	if (submonitor.isCanceled()) {
		165	throw new OperationCanceledException();
		166	}
		167
		168	// hook up to remote target
124	boolean useRemote = config.getAttribute(IGDBJtagConstants.ATTR_USE_REMOTE_TARGET, IGDBJtagConstants.DEFAULT_USE_REMOTE_TARGET);	169	boolean useRemote = config.getAttribute(IGDBJtagConstants.ATTR_USE_REMOTE_TARGET, IGDBJtagConstants.DEFAULT_USE_REMOTE_TARGET);
125	if (useRemote) {	170	if (useRemote) {
126	submonitor.subTask(Messages.getString("GDBJtagDebugger.2")); //$NON-NLS-1$	171	submonitor.subTask(Messages.getString("GDBJtagDebugger.2")); //$NON-NLS-1$
127	try {	172	try {
		173	commands.clear();
128	if (gdbJtagDevice instanceof IGDBJtagConnection) {	174	if (gdbJtagDevice instanceof IGDBJtagConnection) {
129	URI connection = new URI(config.getAttribute(IGDBJtagConstants.ATTR_CONNECTION, IGDBJtagConstants.DEFAULT_CONNECTION));	175	URI connection = new URI(config.getAttribute(IGDBJtagConstants.ATTR_CONNECTION, IGDBJtagConstants.DEFAULT_CONNECTION));
130	IGDBJtagConnection device = (IGDBJtagConnection)gdbJtagDevice;	176	IGDBJtagConnection device = (IGDBJtagConnection)gdbJtagDevice;
Lines 149-155 Link Here
149	submonitor.setWorkRemaining(80); // compensate for optional work above	195	submonitor.setWorkRemaining(80); // compensate for optional work above
150		196
151	// Run device-specific code to reset the board	197	// Run device-specific code to reset the board
152	if (config.getAttribute(IGDBJtagConstants.ATTR_DO_RESET, true)) {	198	if (config.getAttribute(IGDBJtagConstants.ATTR_DO_RESET, IGDBJtagConstants.DEFAULT_DO_RESET)) {
153	commands.clear();	199	commands.clear();
154	gdbJtagDevice.doReset(commands);	200	gdbJtagDevice.doReset(commands);
155	int defaultDelay = gdbJtagDevice.getDefaultDelay();	201	int defaultDelay = gdbJtagDevice.getDefaultDelay();
Lines 159-165 Link Here
159	submonitor.setWorkRemaining(65); // compensate for optional work above	205	submonitor.setWorkRemaining(65); // compensate for optional work above
160		206
161	// Run device-specific code to halt the board	207	// Run device-specific code to halt the board
162	if (config.getAttribute(IGDBJtagConstants.ATTR_DO_HALT, true)) {	208	if (config.getAttribute(IGDBJtagConstants.ATTR_DO_HALT, IGDBJtagConstants.DEFAULT_DO_HALT)) {
163	commands.clear();	209	commands.clear();
164	gdbJtagDevice.doHalt(commands);	210	gdbJtagDevice.doHalt(commands);
165	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(15));	211	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(15));
Lines 172-202 Link Here
172	// execute load	218	// execute load
173	boolean doLoad = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE);	219	boolean doLoad = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE);
174	if (doLoad) {	220	if (doLoad) {
175	// Escape windows path separator characters TWICE, once for Java and once for GDB.	221	String imageFileName = null;
176	String imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, ""); //$NON-NLS-1$	222
177	if (imageFileName.length() > 0) {	223	// New setting in Helios. Default is true. Check for existence
178	monitor.beginTask(Messages.getString("GDBJtagDebugger.5"), 1); //$NON-NLS-1$	224	// in order to support older launch configs
179	imageFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName).replace("\\", "\\\\");	225	if (config.hasAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE) &&
180	String imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, ""); //$NON-NLS-2$ //$NON-NLS-4$	226	config.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_IMAGE)) {
181	commands.clear();	227	IPath programFile = CDebugUtils.verifyProgramPath(config);
182	gdbJtagDevice.doLoadImage(imageFileName, imageOffset, commands);	228	if (programFile != null) {
183	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));	229	imageFileName = programFile.toOSString();
		230	}
184	}	231	}
185	}	232	else {
186	submonitor.setWorkRemaining(15); // compensate for optional work above	233	imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME);
		234	if (imageFileName.length() > 0) {
		235	imageFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName);
		236	}
		237	}
		238	if (imageFileName == null) {
		239	// The launch config GUI should prevent this from happening, but just in case
		240	throw new CoreException(new Status( IStatus.ERROR,
		241	Activator.getUniqueIdentifier(),
		242	-1, Messages.getString("GDBJtagDebugger.err_no_img_file"), null));
		243	}
		244	imageFileName = imageFileName.replace("\\", "\\\\");
187		245
188	// execute symbol load	246	String imageOffset = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET);
189	boolean doLoadSymbols = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS);	247	if (imageOffset.length() > 0) {
190	if (doLoadSymbols) {	248	imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET);
191	String symbolsFileName = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, ""); //$NON-NLS-1$
192	if (symbolsFileName.length() > 0) {
193	symbolsFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName).replace("\\", "\\\\");
194	String symbolsOffset = "0x" + config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, ""); //$NON-NLS-2$
195	commands.clear();
196	gdbJtagDevice.doLoadSymbol(symbolsFileName, symbolsOffset, commands);
197	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(15));
198	}	249	}
		250
		251	commands.clear();
		252	gdbJtagDevice.doLoadImage(imageFileName, imageOffset, commands);
		253	monitor.beginTask(Messages.getString("GDBJtagDebugger.loading_image"), 1); //$NON-NLS-1$
		254	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));
		255
		256
199	}	257	}
		258	submonitor.setWorkRemaining(15); // compensate for optional work above
200	} catch (OperationCanceledException e) {	259	} catch (OperationCanceledException e) {
201	if (launch != null && launch.canTerminate()) {	260	if (launch != null && launch.canTerminate()) {
202	launch.terminate();	261	launch.terminate();
Lines 229-235 Link Here
229	// Set program counter	288	// Set program counter
230	boolean setPc = config.getAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER);	289	boolean setPc = config.getAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER);
231	if (setPc) {	290	if (setPc) {
232	String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, "")); //$NON-NLS-1$	291	String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_PC_REGISTER)); //$NON-NLS-1$
233	gdbJtagDevice.doSetPC(pcRegister, commands);	292	gdbJtagDevice.doSetPC(pcRegister, commands);
234	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));	293	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));
235	}	294	}
Lines 239-245 Link Here
239	monitor.beginTask(Messages.getString("GDBJtagDebugger.18"), 1); //$NON-NLS-1$	298	monitor.beginTask(Messages.getString("GDBJtagDebugger.18"), 1); //$NON-NLS-1$
240	boolean setStopAt = config.getAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT);	299	boolean setStopAt = config.getAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT);
241	if (setStopAt) {	300	if (setStopAt) {
242	String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, ""); //$NON-NLS-1$	301	String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT); //$NON-NLS-1$
243	commands.clear();	302	commands.clear();
244	gdbJtagDevice.doStopAt(stopAt, commands);	303	gdbJtagDevice.doStopAt(stopAt, commands);
245	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));	304	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));
Lines 266-272 Link Here
266	private void executeGDBScript(String script, MISession miSession,	325	private void executeGDBScript(String script, MISession miSession,
267	IProgressMonitor monitor) throws CoreException {	326	IProgressMonitor monitor) throws CoreException {
268	// Try to execute any extra command	327	// Try to execute any extra command
269	if (script == null)	328	if (script == null \|\| script.length() == 0)
270	return;	329	return;
271	script = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(script);	330	script = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(script);
272	String[] commands = script.split("\\r?\\n");	331	String[] commands = script.split("\\r?\\n");
Lines 309-315 Link Here
309	private IGDBJtagDevice getGDBJtagDevice (ILaunchConfiguration config)	368	private IGDBJtagDevice getGDBJtagDevice (ILaunchConfiguration config)
310	throws CoreException, NullPointerException {	369	throws CoreException, NullPointerException {
311	IGDBJtagDevice gdbJtagDevice = null;	370	IGDBJtagDevice gdbJtagDevice = null;
312	String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, ""); //$NON-NLS-1$	371	String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, IGDBJtagConstants.DEFAULT_JTAG_DEVICE); //$NON-NLS-1$
313	GDBJtagDeviceContribution[] availableDevices = GDBJtagDeviceContributionFactory.	372	GDBJtagDeviceContribution[] availableDevices = GDBJtagDeviceContributionFactory.
314	getInstance().getGDBJtagDeviceContribution();	373	getInstance().getGDBJtagDeviceContribution();
315	for (int i = 0; i < availableDevices.length; i++) {	374	for (int i = 0; i < availableDevices.length; i++) {

Lines 159-165 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java (-5 / +5 lines)
159	gdbCommand.setLayoutData(gd);	159	gdbCommand.setLayoutData(gd);
160	gdbCommand.addModifyListener(new ModifyListener() {	160	gdbCommand.addModifyListener(new ModifyListener() {
161	public void modifyText(ModifyEvent e) {	161	public void modifyText(ModifyEvent e) {
162	updateLaunchConfigurationDialog();	162	scheduleUpdateJob(); // provides much better performance for Text listeners
163	}	163	}
164	});	164	});
165		165
Lines 216-222 Link Here
216	jtagDevice.addModifyListener(new ModifyListener() {	216	jtagDevice.addModifyListener(new ModifyListener() {
217	public void modifyText(ModifyEvent e) {	217	public void modifyText(ModifyEvent e) {
218	updateDeviceIpPort(jtagDevice.getText());	218	updateDeviceIpPort(jtagDevice.getText());
219	updateLaunchConfigurationDialog();	219	scheduleUpdateJob(); // provides much better performance for Text listeners
220	}	220	}
221	});	221	});
222		222
Lines 275-281 Link Here
275		275
276	ipAddress.addModifyListener(new ModifyListener() {	276	ipAddress.addModifyListener(new ModifyListener() {
277	public void modifyText(ModifyEvent e) {	277	public void modifyText(ModifyEvent e) {
278	updateLaunchConfigurationDialog();	278	scheduleUpdateJob(); // provides much better performance for Text listeners
279	}	279	}
280	});	280	});
281	portNumber.addVerifyListener(new VerifyListener() {	281	portNumber.addVerifyListener(new VerifyListener() {
Lines 285-297 Link Here
285	});	285	});
286	portNumber.addModifyListener(new ModifyListener() {	286	portNumber.addModifyListener(new ModifyListener() {
287	public void modifyText(ModifyEvent e) {	287	public void modifyText(ModifyEvent e) {
288	updateLaunchConfigurationDialog();	288	scheduleUpdateJob(); // provides much better performance for Text listeners
289	}	289	}
290	});	290	});
291		291
292	connection.addModifyListener(new ModifyListener() {	292	connection.addModifyListener(new ModifyListener() {
293	public void modifyText(ModifyEvent e) {	293	public void modifyText(ModifyEvent e) {
294	updateLaunchConfigurationDialog();	294	scheduleUpdateJob(); // provides much better performance for Text listeners
295	}	295	}
296	});	296	});
297	}	297	}

Lines 160-166 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java (-7 / +7 lines)
160	gdbCommand.setLayoutData(gd);	160	gdbCommand.setLayoutData(gd);
161	gdbCommand.addModifyListener(new ModifyListener() {	161	gdbCommand.addModifyListener(new ModifyListener() {
162	public void modifyText(ModifyEvent e) {	162	public void modifyText(ModifyEvent e) {
163	updateLaunchConfigurationDialog();	163	scheduleUpdateJob(); // provides much better performance for Text listeners
164	}	164	}
165	});	165	});
166		166
Lines 200-206 Link Here
200	commandFactory.addModifyListener(new ModifyListener() {	200	commandFactory.addModifyListener(new ModifyListener() {
201	public void modifyText(ModifyEvent e) {	201	public void modifyText(ModifyEvent e) {
202	commandFactoryChanged();	202	commandFactoryChanged();
203	updateLaunchConfigurationDialog();	203	scheduleUpdateJob(); // provides much better performance for Text listeners
204	}	204	}
205	});	205	});
206	}	206	}
Lines 215-221 Link Here
215	miProtocol = new Combo(comp, SWT.READ_ONLY \| SWT.DROP_DOWN);	215	miProtocol = new Combo(comp, SWT.READ_ONLY \| SWT.DROP_DOWN);
216	miProtocol.addModifyListener(new ModifyListener() {	216	miProtocol.addModifyListener(new ModifyListener() {
217	public void modifyText(ModifyEvent e) {	217	public void modifyText(ModifyEvent e) {
218	updateLaunchConfigurationDialog();	218	scheduleUpdateJob(); // provides much better performance for Text listeners
219	}	219	}
220	});	220	});
221	}	221	}
Lines 285-291 Link Here
285	jtagDevice.addModifyListener(new ModifyListener() {	285	jtagDevice.addModifyListener(new ModifyListener() {
286	public void modifyText(ModifyEvent e) {	286	public void modifyText(ModifyEvent e) {
287	updateDeviceIpPort(jtagDevice.getText());	287	updateDeviceIpPort(jtagDevice.getText());
288	updateLaunchConfigurationDialog();	288	scheduleUpdateJob(); // provides much better performance for Text listeners
289	}	289	}
290	});	290	});
291		291
Lines 344-350 Link Here
344		344
345	ipAddress.addModifyListener(new ModifyListener() {	345	ipAddress.addModifyListener(new ModifyListener() {
346	public void modifyText(ModifyEvent e) {	346	public void modifyText(ModifyEvent e) {
347	updateLaunchConfigurationDialog();	347	scheduleUpdateJob(); // provides much better performance for Text listeners
348	}	348	}
349	});	349	});
350	portNumber.addVerifyListener(new VerifyListener() {	350	portNumber.addVerifyListener(new VerifyListener() {
Lines 354-366 Link Here
354	});	354	});
355	portNumber.addModifyListener(new ModifyListener() {	355	portNumber.addModifyListener(new ModifyListener() {
356	public void modifyText(ModifyEvent e) {	356	public void modifyText(ModifyEvent e) {
357	updateLaunchConfigurationDialog();	357	scheduleUpdateJob(); // provides much better performance for Text listeners
358	}	358	}
359	});	359	});
360		360
361	connection.addModifyListener(new ModifyListener() {	361	connection.addModifyListener(new ModifyListener() {
362	public void modifyText(ModifyEvent e) {	362	public void modifyText(ModifyEvent e) {
363	updateLaunchConfigurationDialog();	363	scheduleUpdateJob(); // provides much better performance for Text listeners
364	}	364	}
365	});	365	});
366	}	366	}

Lines 398-404 Link Here

(-)src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java (-53 / +9 lines)
398	*/	398	*/
399	@Deprecated	399	@Deprecated
400	protected IFile getProgramFile(ILaunchConfiguration config) throws CoreException {	400	protected IFile getProgramFile(ILaunchConfiguration config) throws CoreException {
401	ICProject cproject = verifyCProject(config);	401	ICProject cproject = CDebugUtils.verifyCProject(config);
402	String fileName = CDebugUtils.getProgramName(config);	402	String fileName = CDebugUtils.getProgramName(config);
403	if (fileName == null) {	403	if (fileName == null) {
404	abort(LaunchMessages.getString("AbstractCLaunchDelegate.Program_file_not_specified"), null, //$NON-NLS-1$	404	abort(LaunchMessages.getString("AbstractCLaunchDelegate.Program_file_not_specified"), null, //$NON-NLS-1$
Lines 417-478 Link Here
417	return programPath;	417	return programPath;
418	}	418	}
419		419
		420	/**
		421	* @deprecated use {@link CDebugUtils#verifyCProject(ILaunchConfiguration)}
		422	*/
420	protected ICProject verifyCProject(ILaunchConfiguration config) throws CoreException {	423	protected ICProject verifyCProject(ILaunchConfiguration config) throws CoreException {
421	String name = CDebugUtils.getProjectName(config);	424	return CDebugUtils.verifyCProject(config);
422	if (name == null) {
423	abort(LaunchMessages.getString("AbstractCLaunchDelegate.C_Project_not_specified"), null, //$NON-NLS-1$
424	ICDTLaunchConfigurationConstants.ERR_UNSPECIFIED_PROJECT);
425	}
426	ICProject cproject = CDebugUtils.getCProject(config);
427	if (cproject == null) {
428	IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
429	if (!proj.exists()) {
430	abort(
431	LaunchMessages.getFormattedString("AbstractCLaunchDelegate.Project_NAME_does_not_exist", name), null, //$NON-NLS-1$
432	ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
433	} else if (!proj.isOpen()) {
434	abort(LaunchMessages.getFormattedString("AbstractCLaunchDelegate.Project_NAME_is_closed", name), null, //$NON-NLS-1$
435	ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
436	}
437	abort(LaunchMessages.getString("AbstractCLaunchDelegate.Not_a_C_CPP_project"), null, //$NON-NLS-1$
438	ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
439	}
440	return cproject;
441	}	425	}
442		426
		427	/**
		428	* @deprecated use {@link CDebugUtils#verifyProgramPath(ILaunchConfiguration)
		429	*/
443	protected IPath verifyProgramPath(ILaunchConfiguration config) throws CoreException {	430	protected IPath verifyProgramPath(ILaunchConfiguration config) throws CoreException {
444	ICProject cproject = verifyCProject(config);	431	return CDebugUtils.verifyProgramPath(config);
445	IPath programPath = CDebugUtils.getProgramPath(config);
446	if (programPath == null \|\| programPath.isEmpty()) {
447	abort(LaunchMessages.getString("AbstractCLaunchDelegate.Program_file_not_specified"), null, //$NON-NLS-1$
448	ICDTLaunchConfigurationConstants.ERR_UNSPECIFIED_PROGRAM);
449	}
450	if (!programPath.isAbsolute()) {
451	IPath location = cproject.getProject().getLocation();
452	if (location != null) {
453	programPath = location.append(programPath);
454	if (!programPath.toFile().exists()) {
455	// Try the old way, which is required to support linked resources.
456	IFile projFile = null;
457	try {
458	projFile = project.getFile(CDebugUtils.getProgramPath(config));
459	}
460	catch (IllegalArgumentException exc) {} // thrown if relative path that resolves to a root file (e.g., "..\somefile")
461	if (projFile != null && projFile.exists()) {
462	programPath = projFile.getLocation();
463	}
464	}
465	}
466	}
467	if (!programPath.toFile().exists()) {
468	abort(
469	LaunchMessages.getString("AbstractCLaunchDelegate.Program_file_does_not_exist"), //$NON-NLS-1$
470	new FileNotFoundException(
471	LaunchMessages.getFormattedString(
472	"AbstractCLaunchDelegate.PROGRAM_PATH_not_found", programPath.toOSString())), //$NON-NLS-1$
473	ICDTLaunchConfigurationConstants.ERR_PROGRAM_NOT_EXIST);
474	}
475	return programPath;
476	}	432	}
477		433
478	protected IPath verifyProgramFile(ILaunchConfiguration config) throws CoreException {	434	protected IPath verifyProgramFile(ILaunchConfiguration config) throws CoreException {

Lines 12-21 Link Here

(-)src/org/eclipse/cdt/debug/core/CDebugUtils.java (-1 / +128 lines)
12	package org.eclipse.cdt.debug.core;	12	package org.eclipse.cdt.debug.core;
13		13
14	import java.io.ByteArrayOutputStream;	14	import java.io.ByteArrayOutputStream;
		15	import java.io.FileNotFoundException;
15	import java.io.IOException;	16	import java.io.IOException;
16	import java.nio.charset.Charset;	17	import java.nio.charset.Charset;
17	import java.nio.charset.CharsetDecoder;	18	import java.nio.charset.CharsetDecoder;
18	import com.ibm.icu.text.MessageFormat;
19	import java.util.ArrayList;	19	import java.util.ArrayList;
20	import java.util.Arrays;	20	import java.util.Arrays;
21	import java.util.Iterator;	21	import java.util.Iterator;
Lines 40-45 Link Here
40	import org.eclipse.cdt.debug.core.model.ICWatchpoint;	40	import org.eclipse.cdt.debug.core.model.ICWatchpoint;
41	import org.eclipse.cdt.debug.core.model.ICWatchpoint2;	41	import org.eclipse.cdt.debug.core.model.ICWatchpoint2;
42	import org.eclipse.cdt.debug.internal.core.model.CFloatingPointValue;	42	import org.eclipse.cdt.debug.internal.core.model.CFloatingPointValue;
		43	import org.eclipse.core.resources.IFile;
43	import org.eclipse.core.resources.IMarker;	44	import org.eclipse.core.resources.IMarker;
44	import org.eclipse.core.resources.IProject;	45	import org.eclipse.core.resources.IProject;
45	import org.eclipse.core.resources.ResourcesPlugin;	46	import org.eclipse.core.resources.ResourcesPlugin;
Lines 47-58 Link Here
47	import org.eclipse.core.runtime.IPath;	48	import org.eclipse.core.runtime.IPath;
48	import org.eclipse.core.runtime.IStatus;	49	import org.eclipse.core.runtime.IStatus;
49	import org.eclipse.core.runtime.Path;	50	import org.eclipse.core.runtime.Path;
		51	import org.eclipse.core.runtime.Status;
50	import org.eclipse.debug.core.DebugPlugin;	52	import org.eclipse.debug.core.DebugPlugin;
51	import org.eclipse.debug.core.ILaunchConfiguration;	53	import org.eclipse.debug.core.ILaunchConfiguration;
52	import org.eclipse.debug.core.IStatusHandler;	54	import org.eclipse.debug.core.IStatusHandler;
53	import org.eclipse.debug.core.model.IBreakpoint;	55	import org.eclipse.debug.core.model.IBreakpoint;
54	import org.w3c.dom.Document;	56	import org.w3c.dom.Document;
55		57
		58	import com.ibm.icu.text.MessageFormat;
		59
56	/**	60	/**
57	* Utility methods.	61	* Utility methods.
58	*/	62	*/
Lines 561-564 Link Here
561	}	565	}
562	return new Path(path);	566	return new Path(path);
563	}	567	}
		568
		569	/**
		570	* Returns the ICProject associated with the project setting in the Main tab
		571	* of a CDT launch configuration, or throws a CoreException providing a
		572	* reason (e.g., the setting is empty, the project no longer exists, the
		573	* isn't a CDT one, etc).
		574	*
		575	* @param config
		576	* the launch configuration
		577	* @return an ICProject; never null.
		578	* @throws CoreException
		579	* @since 7.0
		580	*/
		581	public static ICProject verifyCProject(ILaunchConfiguration config) throws CoreException {
		582	String name = CDebugUtils.getProjectName(config);
		583	if (name == null) {
		584	throwCoreException(DebugCoreMessages.getString("CDebugUtils.C_Project_not_specified"), //$NON-NLS-1$
		585	ICDTLaunchConfigurationConstants.ERR_UNSPECIFIED_PROJECT);
		586	}
		587	ICProject cproject = CDebugUtils.getCProject(config);
		588	if (cproject == null) {
		589	IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
		590	if (!proj.exists()) {
		591	throwCoreException(DebugCoreMessages.getFormattedString("CDebugUtils.Project_NAME_does_not_exist", name), //$NON-NLS-1$
		592	ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
		593	} else if (!proj.isOpen()) {
		594	throwCoreException(DebugCoreMessages.getFormattedString("CDebugUtils.Project_NAME_is_closed", name), //$NON-NLS-1$
		595	ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
		596	}
		597	throwCoreException(DebugCoreMessages.getString("CDebugUtils.Not_a_C_CPP_project"), //$NON-NLS-1$
		598	ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
		599	}
		600	return cproject;
		601	}
		602
		603	/**
		604	* Returns an IPath for the file referenced in the <i>C/C++ Application</i>
		605	* setting of a CDT launch configuration. Typically, the file is obtained by
		606	* combining the <i>C/C++ Application</i> setting with the <i>Project</i>
		607	* setting. If unable to combine and resolve these settings to a valid file,
		608	* a CoreException is thrown that provides the reason why. There are many
		609	* such possible reasons (a problem with the <i>Project</i> setting, an
		610	* empty <i>C/C++ Application</i> setting, the combined settings doesn't
		611	* resolve to an existing file, etc).
		612	*
		613	* @param config
		614	* the launch configuration
		615	* @param ignoreProjectSetting
		616	* if true, resolve the file using only the <i>C/C++
		617	* Application</i> setting. Do not take the <i>Project</i>
		618	* setting into account.
		619	* @return an IPath; never null
		620	* @throws CoreException
		621	* @since 7.0
		622	*/
		623	public static IPath verifyProgramPath(ILaunchConfiguration config, boolean ignoreProjectSetting) throws CoreException {
		624	ICProject cproject = null;
		625	if (!ignoreProjectSetting) {
		626	cproject = verifyCProject(config); // will throw exception if project setting not valid
		627	}
		628	IPath programPath = CDebugUtils.getProgramPath(config);
		629	if (programPath == null \|\| programPath.isEmpty()) {
		630	throwCoreException(DebugCoreMessages.getString("CDebugUtils.Program_file_not_specified"), //$NON-NLS-1$
		631	ICDTLaunchConfigurationConstants.ERR_UNSPECIFIED_PROGRAM);
632	}
633
634	if (programPath != null) { // this check is here only to avoid warning; compiler can't tell we'll throw an exception above
635	if (!programPath.isAbsolute() && (cproject != null)) {
636	// See if we can brute-force append the program path to the
637	// project location. This allows us to support the program file
638	// being outside the project, even outside the workspace, without
639	// requiring a linked resource (e.g., the setting could be
640	// "..\..\some\dir\myprogram.exe")
641	IPath location = cproject.getProject().getLocation();
642	if (location != null) {
643	programPath = location.append(programPath);
644	if (!programPath.toFile().exists()) {
645	// Try looking in the project for the file. This
646	// supports linked resources.
647	IFile projFile = null;
648	try {
649	projFile = cproject.getProject().getFile(CDebugUtils.getProgramPath(config));
650	}
651	catch (IllegalArgumentException exc) {
652	// thrown if relative path that resolves to a root file (e.g., "..\somefile")
653	}
654	if (projFile != null && projFile.exists()) {
655	programPath = projFile.getLocation();
656	}
657	}
658	}
659	}
660	if (!programPath.toFile().exists()) {
661	throwCoreException(
662	DebugCoreMessages.getString("CDebugUtils.Program_file_does_not_exist"), //$NON-NLS-1$
663	new FileNotFoundException(
664	DebugCoreMessages.getFormattedString("CDebugUtils.PROGRAM_PATH_not_found", programPath.toOSString())), //$NON-NLS-1$
665	ICDTLaunchConfigurationConstants.ERR_PROGRAM_NOT_EXIST);
666	}
667	}
668	return programPath;
669	}
670
671	/**
672	* Variant that expects (requires) the launch configuration to have a valid
673	* <i>Project</i> setting. See
674	* {@link #verifyProgramPath(ILaunchConfiguration, boolean)}
675	*
676	* @since 7.0
677	*/
678	public static IPath verifyProgramPath(ILaunchConfiguration config) throws CoreException {
679	return verifyProgramPath(config, false);
680	}
681
682	/** Throws a CoreException. Clutter-reducing utility method. */
683	private static void throwCoreException(String msg, int code) throws CoreException {
684	throwCoreException(msg, null, code);
685	}
686
687	/** Throws a CoreException. Clutter-reducing utility method. */
688	private static void throwCoreException(String msg, Exception innerException, int code) throws CoreException {
689	throw new CoreException(new Status(IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), code, msg, innerException));
690	}
564	}	691	}

Lines 27-32 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java (-72 / +131 lines)
27	import java.util.List;	27	import java.util.List;
28	import java.util.Properties;	28	import java.util.Properties;
29		29
		30	import org.eclipse.cdt.debug.core.CDebugUtils;
30	import org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.GDBJtagDeviceContribution;	31	import org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.GDBJtagDeviceContribution;
31	import org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.GDBJtagDeviceContributionFactory;	32	import org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.GDBJtagDeviceContributionFactory;
32	import org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice;	33	import org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice;
Lines 350-356 Link Here
350	// Below steps are specific to JTag hardware debugging	351	// Below steps are specific to JTag hardware debugging
351		352
352	/*	353	/*
353	* Retrieve the JTag device	354	* Retrieve the IGDBJtagDevice instance
354	*/	355	*/
355	new Step() {	356	new Step() {
356	@Override	357	@Override
Lines 370-375 Link Here
370	rm.done();	371	rm.done();
371	}},	372	}},
372	/*	373	/*
		374	* Execute symbol loading
		375	*/
		376	new Step() {
		377	@Override
		378	public void execute(RequestMonitor rm) {
		379	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
		380	try {
		381	if (config.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS)) {
		382	String symbolsFileName = null;
		383
		384	// New setting in Helios. Default is true. Check for existence
		385	// in order to support older launch configs
		386	if (config.hasAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS) &&
		387	config.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS)) {
		388	IPath programFile = CDebugUtils.verifyProgramPath(config);
		389	if (programFile != null) {
		390	symbolsFileName = programFile.toOSString();
		391	}
		392	}
		393	else {
		394	symbolsFileName = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, IGDBJtagConstants.DEFAULT_SYMBOLS_FILE_NAME);
		395	if (symbolsFileName.length() > 0) {
		396	symbolsFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName);
		397	} else {
		398	symbolsFileName = null;
		399	}
		400	}
		401
		402	if (symbolsFileName == null) {
		403	rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, Messages.getString("GDBJtagDebugger.err_no_img_file"), null)); //$NON-NLS-1$
		404	rm.done();
		405	return;
		406	}
		407
		408	// Escape windows path separator characters TWICE, once for Java and once for GDB.
		409	symbolsFileName = symbolsFileName.replace("\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
		410
		411	String symbolsOffset = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, IGDBJtagConstants.DEFAULT_SYMBOLS_OFFSET);
		412	if (symbolsOffset.length() > 0) {
		413	symbolsOffset = "0x" + symbolsOffset;
		414	}
		415	List<String> commands = new ArrayList<String>();
		416	fGdbJtagDevice.doLoadSymbol(symbolsFileName, symbolsOffset, commands);
		417	queueCommands(commands, rm);
		418
		419	} else {
		420	rm.done();
		421	}
		422	} catch (CoreException e) {
		423	rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Cannot load symbol", e)); //$NON-NLS-1$
		424	rm.done();
		425	}
		426	}},
		427
		428	/*
373	* Hook up to remote target	429	* Hook up to remote target
374	*/	430	*/
375	new Step() {	431	new Step() {
Lines 410-416 Link Here
410	public void execute(RequestMonitor rm) {	466	public void execute(RequestMonitor rm) {
411	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();	467	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
412	try {	468	try {
413	if (config.getAttribute(IGDBJtagConstants.ATTR_DO_RESET, true)) {	469	if (config.getAttribute(IGDBJtagConstants.ATTR_DO_RESET, IGDBJtagConstants.DEFAULT_DO_RESET)) {
414	List<String> commands = new ArrayList<String>();	470	List<String> commands = new ArrayList<String>();
415	fGdbJtagDevice.doReset(commands);	471	fGdbJtagDevice.doReset(commands);
416	queueCommands(commands, rm);	472	queueCommands(commands, rm);
Lines 447-453 Link Here
447	public void execute(RequestMonitor rm) {	503	public void execute(RequestMonitor rm) {
448	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();	504	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
449	try {	505	try {
450	if (config.getAttribute(IGDBJtagConstants.ATTR_DO_HALT, true)) {	506	if (config.getAttribute(IGDBJtagConstants.ATTR_DO_HALT, IGDBJtagConstants.DEFAULT_DO_HALT)) {
451	List<String> commands = new ArrayList<String>();	507	List<String> commands = new ArrayList<String>();
452	fGdbJtagDevice.doHalt(commands);	508	fGdbJtagDevice.doHalt(commands);
453	queueCommands(commands, rm);	509	queueCommands(commands, rm);
Lines 467-482 Link Here
467	public void execute(RequestMonitor rm) {	523	public void execute(RequestMonitor rm) {
468	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();	524	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
469	try {	525	try {
470	String userCmd = config.getAttribute(IGDBJtagConstants.ATTR_INIT_COMMANDS, ""); //$NON-NLS-1$	526	String userCmd = config.getAttribute(IGDBJtagConstants.ATTR_INIT_COMMANDS, IGDBJtagConstants.DEFAULT_INIT_COMMANDS);
471	userCmd = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(userCmd);	527	userCmd = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(userCmd);
472	String[] commands = userCmd.split("\\r?\\n"); //$NON-NLS-1$	528	if (userCmd.length() > 0) {
473		529	String[] commands = userCmd.split("\\r?\\n"); //$NON-NLS-1$
474	CountingRequestMonitor crm = new CountingRequestMonitor(getExecutor(), rm);	530
475	crm.setDoneCount(commands.length);	531	CountingRequestMonitor crm = new CountingRequestMonitor(getExecutor(), rm);
476	for (int i = 0; i < commands.length; ++i) {	532	crm.setDoneCount(commands.length);
477	fCommandControl.queueCommand(	533	for (int i = 0; i < commands.length; ++i) {
478	new CLICommand<MIInfo>(fCommandControl.getContext(), commands[i]),	534	fCommandControl.queueCommand(
479	new DataRequestMonitor<MIInfo>(getExecutor(), crm));	535	new CLICommand<MIInfo>(fCommandControl.getContext(), commands[i]),
		536	new DataRequestMonitor<MIInfo>(getExecutor(), crm));
		537	}
		538	}
		539	else {
		540	rm.done();
480	}	541	}
481	} catch (CoreException e) {	542	} catch (CoreException e) {
482	rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Cannot run user defined init commands", e)); //$NON-NLS-1$	543	rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Cannot run user defined init commands", e)); //$NON-NLS-1$
Lines 491-510 Link Here
491	public void execute(RequestMonitor rm) {	552	public void execute(RequestMonitor rm) {
492	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();	553	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
493	try {	554	try {
		555	String imageFileName = null;
494	if (config.getAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE)) {	556	if (config.getAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE)) {
495	// Escape windows path separator characters TWICE, once for Java and once for GDB.	557	// New setting in Helios. Default is true. Check for existence
496	String imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, ""); //$NON-NLS-1$	558	// in order to support older launch configs
497	if (imageFileName.length() > 0) {	559	if (config.hasAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE) &&
498	imageFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName).replace("\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$	560	config.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_IMAGE)) {
499	String imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$	561	IPath programFile = CDebugUtils.verifyProgramPath(config);
500	List<String> commands = new ArrayList<String>();	562	if (programFile != null) {
501	fGdbJtagDevice.doLoadImage(imageFileName, imageOffset, commands);	563	imageFileName = programFile.toOSString();
502	queueCommands(commands, rm);	564	}
503	} else {
504	rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Image name cannot be empty", null)); //$NON-NLS-1$
505	rm.done();
506	}	565	}
507	} else {	566	else {
		567	imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME); //$NON-NLS-1$
		568	if (imageFileName.length() > 0) {
		569	imageFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName);
		570	} else {
		571	imageFileName = null;
		572	}
		573	}
		574
		575	if (imageFileName == null) {
		576	rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, Messages.getString("GDBJtagDebugger.err_no_img_file"), null)); //$NON-NLS-1$
		577	rm.done();
		578	return;
		579	}
		580
		581	// Escape windows path separator characters TWICE, once for Java and once for GDB.
		582	imageFileName = imageFileName.replace("\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
		583
		584	String imageOffset = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET);
		585	if (imageOffset.length() > 0) {
		586	imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET); //$NON-NLS-2$ //$NON-NLS-4$
		587	}
		588	List<String> commands = new ArrayList<String>();
		589	fGdbJtagDevice.doLoadImage(imageFileName, imageOffset, commands);
		590	queueCommands(commands, rm);
		591	}
		592	else {
508	rm.done();	593	rm.done();
509	}	594	}
510	} catch (CoreException e) {	595	} catch (CoreException e) {
Lines 512-547 Link Here
512	rm.done();	597	rm.done();
513	}	598	}
514	}},	599	}},
515	/*
516	* Execute symbol loading
517	*/
518	new Step() {
519	@Override
520	public void execute(RequestMonitor rm) {
521	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
522	try {
523	if (config.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS)) {
524	// Escape windows path separator characters TWICE, once for Java and once for GDB.
525	String symbolsFileName = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, ""); //$NON-NLS-1$
526	if (symbolsFileName.length() > 0) {
527	symbolsFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName).replace("\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
528	String symbolsOffset = "0x" + config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, ""); //$NON-NLS-1$ //$NON-NLS-2$
529	List<String> commands = new ArrayList<String>();
530	fGdbJtagDevice.doLoadSymbol(symbolsFileName, symbolsOffset, commands);
531	queueCommands(commands, rm);
532	} else {
533	rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Symbol name cannot be empty", null)); //$NON-NLS-1$
534	rm.done();
535	}
536	} else {
537	rm.done();
538	}
539	} catch (CoreException e) {
540	rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Cannot load symbol", e)); //$NON-NLS-1$
541	rm.done();
542	}
543	}
544	},
545	/*	600	/*
546	* Start tracking the breakpoints once we know we are connected to the target (necessary for remote debugging)	601	* Start tracking the breakpoints once we know we are connected to the target (necessary for remote debugging)
547	*/	602	*/
Lines 566-572 Link Here
566	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();	621	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
567	try {	622	try {
568	if (config.getAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER)) {	623	if (config.getAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER)) {
569	String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, "")); //$NON-NLS-1$	624	String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_PC_REGISTER)); //$NON-NLS-1$
570	List<String> commands = new ArrayList<String>();	625	List<String> commands = new ArrayList<String>();
571	fGdbJtagDevice.doSetPC(pcRegister, commands);	626	fGdbJtagDevice.doSetPC(pcRegister, commands);
572	queueCommands(commands, rm);	627	queueCommands(commands, rm);
Lines 587-593 Link Here
587	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();	642	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
588	try {	643	try {
589	if (config.getAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT)) {	644	if (config.getAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT)) {
590	String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, ""); //$NON-NLS-1$	645	String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT); //$NON-NLS-1$
591	List<String> commands = new ArrayList<String>();	646	List<String> commands = new ArrayList<String>();
592	fGdbJtagDevice.doStopAt(stopAt, commands);	647	fGdbJtagDevice.doStopAt(stopAt, commands);
593	queueCommands(commands, rm);	648	queueCommands(commands, rm);
Lines 628-643 Link Here
628	public void execute(RequestMonitor rm) {	683	public void execute(RequestMonitor rm) {
629	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();	684	ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
630	try {	685	try {
631	String userCmd = config.getAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, ""); //$NON-NLS-1$	686	String userCmd = config.getAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, IGDBJtagConstants.DEFAULT_RUN_COMMANDS); //$NON-NLS-1$
632	userCmd = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(userCmd);	687	if (userCmd.length() > 0) {
633	String[] commands = userCmd.split("\\r?\\n"); //$NON-NLS-1$	688	userCmd = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(userCmd);
634		689	String[] commands = userCmd.split("\\r?\\n"); //$NON-NLS-1$
635	CountingRequestMonitor crm = new CountingRequestMonitor(getExecutor(), rm);	690
636	crm.setDoneCount(commands.length);	691	CountingRequestMonitor crm = new CountingRequestMonitor(getExecutor(), rm);
637	for (int i = 0; i < commands.length; ++i) {	692	crm.setDoneCount(commands.length);
638	fCommandControl.queueCommand(	693	for (int i = 0; i < commands.length; ++i) {
639	new CLICommand<MIInfo>(fCommandControl.getContext(), commands[i]),	694	fCommandControl.queueCommand(
640	new DataRequestMonitor<MIInfo>(getExecutor(), crm));	695	new CLICommand<MIInfo>(fCommandControl.getContext(), commands[i]),
		696	new DataRequestMonitor<MIInfo>(getExecutor(), crm));
		697	}
		698	}
		699	else {
		700	rm.done();
641	}	701	}
642	} catch (CoreException e) {	702	} catch (CoreException e) {
643	rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Cannot run user defined run commands", e)); //$NON-NLS-1$	703	rm.setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, "Cannot run user defined run commands", e)); //$NON-NLS-1$
Lines 703-714 Link Here
703	private IGDBJtagDevice getGDBJtagDevice (ILaunchConfiguration config)	763	private IGDBJtagDevice getGDBJtagDevice (ILaunchConfiguration config)
704	throws CoreException, NullPointerException {	764	throws CoreException, NullPointerException {
705	IGDBJtagDevice gdbJtagDevice = null;	765	IGDBJtagDevice gdbJtagDevice = null;
706	String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, ""); //$NON-NLS-1$	766	String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, IGDBJtagConstants.DEFAULT_JTAG_DEVICE); //$NON-NLS-1$
707	GDBJtagDeviceContribution[] availableDevices = GDBJtagDeviceContributionFactory.	767	GDBJtagDeviceContribution[] availableDevices = GDBJtagDeviceContributionFactory.getInstance().getGDBJtagDeviceContribution();
708	getInstance().getGDBJtagDeviceContribution();	768	for (GDBJtagDeviceContribution availableDevice : availableDevices) {
709	for (int i = 0; i < availableDevices.length; i++) {	769	if (jtagDeviceName.equals(availableDevice.getDeviceName())) {
710	if (jtagDeviceName.equals(availableDevices[i].getDeviceName())) {	770	gdbJtagDevice = availableDevice.getDevice();
711	gdbJtagDevice = availableDevices[i].getDevice();
712	break;	771	break;
713	}	772	}
714	}	773	}