Skip to main content
summaryrefslogtreecommitdiffstats
path: root/dsf
diff options
context:
space:
mode:
authorAnton Leherbauer2015-07-14 09:16:45 -0400
committerAnton Leherbauer2015-07-14 09:16:45 -0400
commit02026595cc2eeddee36080037acd42b953bf8e24 (patch)
treefbb95a902cea80c07b338c520f27f342d82d048a /dsf
parent7861db94e1e964c2c17b5cfdc3d736d501c74a81 (diff)
downloadorg.eclipse.cdt-02026595cc2eeddee36080037acd42b953bf8e24.tar.gz
org.eclipse.cdt-02026595cc2eeddee36080037acd42b953bf8e24.tar.xz
org.eclipse.cdt-02026595cc2eeddee36080037acd42b953bf8e24.zip
Fix Disassembly creating 64-bit address breakpoint for 32-bit target
Diffstat (limited to 'dsf')
-rw-r--r--dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblySelection.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblySelection.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblySelection.java
index efd6f0271f..ca9abf37ab 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblySelection.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblySelection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2010 Wind River Systems, Inc. and others.
+ * Copyright (c) 2009, 2015 Wind River Systems, Inc. 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
@@ -20,6 +20,7 @@ import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.DisassemblyPosition;
import org.eclipse.cdt.debug.internal.ui.disassembly.dsf.LabelPosition;
import org.eclipse.cdt.dsf.debug.internal.ui.disassembly.SourcePosition;
import org.eclipse.cdt.dsf.debug.internal.ui.disassembly.model.DisassemblyDocument;
+import org.eclipse.cdt.utils.Addr32;
import org.eclipse.cdt.utils.Addr64;
import org.eclipse.core.filesystem.URIUtil;
import org.eclipse.core.resources.IFile;
@@ -78,7 +79,10 @@ public class DisassemblySelection implements IDisassemblySelection {
}
if (docAddress != null) {
try {
- fStartAddress = new Addr64(docAddress);
+ if (docAddress.bitLength() > 32)
+ fStartAddress = new Addr64(docAddress);
+ else
+ fStartAddress = new Addr32(docAddress.longValue());
} catch (RuntimeException rte) {
// not a valid address
fStartAddress = null;

Back to the top