summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Gil2013-11-25 07:40:55 (EST)
committer Marc Khouzam2013-11-25 09:13:05 (EST)
commitbccbb89f68aa51658fd165c8cd993d388c135b61 (patch)
treeaa55ad2470e301c03b88eefda4bb2edd7500b3c3
parentceac5fd156fc05021cab937977446bd1ca56b495 (diff)
downloadorg.eclipse.cdt-bccbb89f68aa51658fd165c8cd993d388c135b61.zip
org.eclipse.cdt-bccbb89f68aa51658fd165c8cd993d388c135b61.tar.gz
org.eclipse.cdt-bccbb89f68aa51658fd165c8cd993d388c135b61.tar.bz2
Bug 421541 allow debugging of non C languagerefs/changes/15/18815/2
when sizeof(void *) cannot be evaluated, log an error instead of aborting the debug session. Change-Id: Ic6b0e53645626b2174d93b64942d3caf3cae5c86 Signed-off-by: Philippe Gil <gil@adacore.com> Reviewed-on: https://git.eclipse.org/r/18815 Reviewed-by: Marc Khouzam <marc.khouzam@ericsson.com> IP-Clean: Marc Khouzam <marc.khouzam@ericsson.com> Tested-by: Marc Khouzam <marc.khouzam@ericsson.com>
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBMemory.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBMemory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBMemory.java
index 82c0914..e6f994e 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBMemory.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBMemory.java
@@ -8,6 +8,7 @@
* Contributors:
* Mentor Graphics - Initial API and implementation
* John Dallaway - Add methods to get the endianness and address size (Bug 225609)
+ * Philippe Gil (AdaCore) - Don't fail initializeMemoryData if sizeof(void *) cannot be evaluated (Bug 421541)
*******************************************************************************/
package org.eclipse.cdt.dsf.gdb.service;
@@ -143,6 +144,13 @@ public class GDBMemory extends MIMemory implements IGDBMemory {
fAddressSizes.put(memContext, getData());
requestMonitor.done();
}
+ @Override
+ @ConfinedToDsfExecutor("fExecutor")
+ protected void handleError() {
+ // log the error, but go on initializing memory data.
+ GdbPlugin.getDefault().getLog().log(getStatus());
+ requestMonitor.done();
+ }
});
}
},