From 956abd7934e6b2f7c68a5bac77cb50889e1f2585 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Tue, 1 Feb 2005 21:09:33 +0000 Subject: [PATCH] 2005-02-01 Alain Magloire Part of Fix for PR 84165 We check in the expression is a number and add a "*" for address watchpoint * cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java --- debug/org.eclipse.cdt.debug.mi.core/ChangeLog | 6 ++++++ .../eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog index 0ac6324a306..9c988c7280d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog @@ -1,3 +1,9 @@ +2005-02-01 Alain Magloire + Part of Fix for PR 84165 + We check in the expression is a number and + add a "*" for address watchpoint + * cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java + 2005-01-20 Mikhail Khodjaiants Fix for bug 83355: The disable/enable breakpoints durning debugging acts weird. * cdi\org\eclipse\cdt\debug\mi\core\cdi\model\Breakpoint.java diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java index 125ccec2a95..1ecee3eac4e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java @@ -698,6 +698,14 @@ public class BreakpointManager extends Manager { boolean read = ( !((watchType & ICDIWatchpoint.WRITE) == ICDIWatchpoint.WRITE) && (watchType & ICDIWatchpoint.READ) == ICDIWatchpoint.READ ); + try { + // Check if this an address watchpoint, and add a '*' + Integer.decode(expression); + expression = '*' + expression; + } catch (NumberFormatException e) { + // + } + MISession miSession = target.getMISession(); boolean state = suspendInferior(target); CommandFactory factory = miSession.getCommandFactory();