Skip to main content
summaryrefslogtreecommitdiffstats
path: root/jtag
diff options
context:
space:
mode:
authorJohn Cortell2010-05-07 12:10:41 -0400
committerJohn Cortell2010-05-07 12:10:41 -0400
commit443bcd6c99e2976283e3384c44322a99a985b98c (patch)
treeaa56daeefce458a0e06081ef8ac2997e24135e71 /jtag
parente0ee9359b1d2c42b705b0a32670eda2282494df1 (diff)
downloadorg.eclipse.cdt-443bcd6c99e2976283e3384c44322a99a985b98c.tar.gz
org.eclipse.cdt-443bcd6c99e2976283e3384c44322a99a985b98c.tar.xz
org.eclipse.cdt-443bcd6c99e2976283e3384c44322a99a985b98c.zip
Overhaul load. Turns out all we need is a simple implementation. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=310304#c34
Diffstat (limited to 'jtag')
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java15
1 files changed, 1 insertions, 14 deletions
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java
index 47260a3261..bb3d49ba64 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java
@@ -76,20 +76,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doLoadImage(java.lang.String, java.lang.String, java.util.Collection)
*/
public void doLoadImage(String imageFileName, String imageOffset, Collection<String> commands) {
- String file = escapeScpaces(imageFileName);
- if (imageOffset.length() > 0) {
- // 'restore' simply puts the program into memory.
- addCmd(commands, "restore " + file + " " + imageOffset);
- }
- else {
- // 'load' puts the program into memory and sets the PC. To see why
- // we do this when no offset is specified, see
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=310304#c20
- addCmd(commands, "load " + file);
- }
- // 'exec-file' specifies the program as the context for getting memory.
- // Basically, it tells gdb "this is the program we'll be debugging"
- addCmd(commands, "exec-file " + file);
+ addCmd(commands, "load " + escapeScpaces(imageFileName) + ' ' + imageOffset);
}
/* (non-Javadoc)

Back to the top