diff --git a/debug/org.eclipse.cdt.gdb.ui/plugin.properties b/debug/org.eclipse.cdt.gdb.ui/plugin.properties index c95b292dea2..92a8b31798c 100644 --- a/debug/org.eclipse.cdt.gdb.ui/plugin.properties +++ b/debug/org.eclipse.cdt.gdb.ui/plugin.properties @@ -12,21 +12,12 @@ pluginName=GDB UI Common providerName=Eclipse CDT catchType.label = Event Type -catchSignal.label = Signal Caught -catchSignal.arg.label = Signal Number -catchCatch.label = Exception Caught -catchThrow.label = Exception Thrown +catchSyscall.label = syscall called +catchSyscall.arg.label = System call name or number +catchCatch.label = exception caught +catchThrow.label = exception thrown -#Note: fork, vfork and exec is not translatable words -catchFork.label = Stop on fork -catchVfork.label = Stop on vfork -catchExec.label = Stop on exec - -catchExit.label = Process exit -catchStop.label = Process suspend -catchStart.label = Process start -catchThreadExit.label = Thread exit -catchThreadStart.label = Thread start -catchThreadJoin.label = Thread join -catchLoad.label = Library load -catchUnload.label = Library unload +#Note: fork, vfork and exec are not translatable words +catchFork.label = fork called +catchVfork.label = vfork called +catchExec.label = exec called diff --git a/debug/org.eclipse.cdt.gdb.ui/plugin.xml b/debug/org.eclipse.cdt.gdb.ui/plugin.xml index 01a74382a97..47e02d678f2 100644 --- a/debug/org.eclipse.cdt.gdb.ui/plugin.xml +++ b/debug/org.eclipse.cdt.gdb.ui/plugin.xml @@ -12,11 +12,11 @@ label="%catchThrow.label" value="org.eclipse.cdt.debug.gdb.throw"/> + label="%catchSyscall.label" + value="org.eclipse.cdt.debug.gdb.catch_syscall"> + name="org.eclipse.cdt.debug.core.eventbreakpoint_event_arg" label="%catchSyscall.arg.label" + type="string" fieldEditor="org.eclipse.jface.preference.StringFieldEditor"/> - - - - - - - - diff --git a/debug/org.eclipse.cdt.gdb/src/org/eclipse/cdt/gdb/eventbkpts/IEventBreakpointConstants.java b/debug/org.eclipse.cdt.gdb/src/org/eclipse/cdt/gdb/eventbkpts/IEventBreakpointConstants.java index b75d658e97f..16d50151af0 100644 --- a/debug/org.eclipse.cdt.gdb/src/org/eclipse/cdt/gdb/eventbkpts/IEventBreakpointConstants.java +++ b/debug/org.eclipse.cdt.gdb/src/org/eclipse/cdt/gdb/eventbkpts/IEventBreakpointConstants.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2010 Freescale Semiconductor 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Freescale Semiconductor - Initial API and implementation + *******************************************************************************/ package org.eclipse.cdt.gdb.eventbkpts; public interface IEventBreakpointConstants { @@ -17,15 +27,6 @@ public interface IEventBreakpointConstants { */ public static final String EVENT_TYPE_THROW = "org.eclipse.cdt.debug.gdb.throw"; //$NON-NLS-1$ - /** - * An event breakpoint of this type suspends the target program when it - * catches a signal (POSIX). This type of event has a single parameter of - * type in, indicating the specific signal. - * - * @since 7.0 - */ - public static final String EVENT_TYPE_SIGNAL_CATCH = "org.eclipse.cdt.debug.gdb.signal"; //$NON-NLS-1$ - /** * An event breakpoint of this type suspends the target program when it * calls fork() (POSIX). This type of event has no parameters. @@ -52,67 +53,10 @@ public interface IEventBreakpointConstants { /** * An event breakpoint of this type suspends the target program when it - * calls exit() (POSIX). This type of event has no parameters. + * makes a system call (POSIX). This type of event takes a single parameter: + * the name or number of the system call. * * @since 7.0 */ - public static final String EVENT_TYPE_EXIT = "org.eclipse.cdt.debug.gdb.catch_exit"; //$NON-NLS-1$ - - /** - * An event breakpoint of this type suspends the target program when a new - * process starts. This type of event has no parameters. - * - * @since 7.0 - */ - public static final String EVENT_TYPE_PROCESS_START = "org.eclipse.cdt.debug.gdb.catch_start"; //$NON-NLS-1$ - - /** - * An event breakpoint of this type suspends the target program when a - * process exits. This type of event has no parameters. - * - * @since 7.0 - */ - public static final String EVENT_TYPE_PROCESS_STOP = "org.eclipse.cdt.debug.gdb.catch_stop"; //$NON-NLS-1$ - - /** - * An event breakpoint of this type suspends the target program when a new - * thread starts. This type of event has no parameters. - * - * @since 7.0 - */ - public static final String EVENT_TYPE_THREAD_START = "org.eclipse.cdt.debug.gdb.catch_thread_start"; //$NON-NLS-1$ - - /** - * An event breakpoint of this type suspends the target program when a - * thread exits. This type of event has no parameters. - * - * @since 7.0 - */ - public static final String EVENT_TYPE_THREAD_EXIT = "org.eclipse.cdt.debug.gdb.catch_thread_exit"; //$NON-NLS-1$ - - /** - * An event breakpoint of this type suspends the target program when a - * thread joins another one (waits for it to exit) This type of event has no - * parameters. - * - * @since 7.0 - */ - public static final String EVENT_TYPE_THREAD_JOIN = "org.eclipse.cdt.debug.gdb.catch_thread_join"; //$NON-NLS-1$ - - /** - * An event breakpoint of this type suspends the target program when it - * loads a library. This type of event has no parameters. - * - * @since 7.0 - */ - public static final String EVENT_TYPE_LIBRARY_LOAD = "org.eclipse.cdt.debug.gdb.catch_load"; //$NON-NLS-1$ - - /** - * An event breakpoint of this type suspends the target program when it - * unloads a library. This type of event has no parameters. - * - * @since 7.0 - */ - public static final String EVENT_TYPE_LIBRARY_UNLOAD = "org.eclipse.cdt.debug.gdb.catch_unload"; //$NON-NLS-1$ - + public static final String EVENT_TYPE_SYSCALL = "org.eclipse.cdt.debug.gdb.catch_syscall"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.gdb/src/org/eclipse/cdt/gdb/internal/eventbkpts/GdbCatchpoints.java b/debug/org.eclipse.cdt.gdb/src/org/eclipse/cdt/gdb/internal/eventbkpts/GdbCatchpoints.java index ce2ae65760e..87a917bc25d 100644 --- a/debug/org.eclipse.cdt.gdb/src/org/eclipse/cdt/gdb/internal/eventbkpts/GdbCatchpoints.java +++ b/debug/org.eclipse.cdt.gdb/src/org/eclipse/cdt/gdb/internal/eventbkpts/GdbCatchpoints.java @@ -24,18 +24,10 @@ public class GdbCatchpoints { // to event breakpoints selector sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_CATCH, "catch"); //$NON-NLS-1$ sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_THROW, "throw"); //$NON-NLS-1$ - sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_SIGNAL_CATCH, "signal"); //$NON-NLS-1$ sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_EXEC, "exec"); //$NON-NLS-1$ sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_FORK, "fork"); //$NON-NLS-1$ sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_VFORK, "vfork"); //$NON-NLS-1$ - sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_EXIT, "exit"); //$NON-NLS-1$ - sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_PROCESS_START, "start"); //$NON-NLS-1$ - sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_PROCESS_STOP, "stop"); //$NON-NLS-1$ - sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_THREAD_START, "thread_start"); //$NON-NLS-1$ - sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_THREAD_EXIT, "thread_exit"); //$NON-NLS-1$ - sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_THREAD_JOIN, "thread_join"); //$NON-NLS-1$ - sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_LIBRARY_LOAD, "load"); //$NON-NLS-1$ - sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_LIBRARY_UNLOAD, "unload"); //$NON-NLS-1$ + sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_SYSCALL, "syscall"); //$NON-NLS-1$ } /** diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java index a08fe7b883f..35b48051fc1 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java @@ -1201,9 +1201,9 @@ public class MICatchpointsTest extends BaseTestCase { @Test public void catchpointConversions() throws Throwable { assertEquals("catch", GdbCatchpoints.eventToGdbCatchpointKeyword(IEventBreakpointConstants.EVENT_TYPE_CATCH)); - assertEquals("signal", GdbCatchpoints.eventToGdbCatchpointKeyword(IEventBreakpointConstants.EVENT_TYPE_SIGNAL_CATCH)); + assertEquals("syscall", GdbCatchpoints.eventToGdbCatchpointKeyword(IEventBreakpointConstants.EVENT_TYPE_SYSCALL)); assertEquals(IEventBreakpointConstants.EVENT_TYPE_CATCH, GdbCatchpoints.gdbCatchpointKeywordToEvent("catch")); - assertEquals(IEventBreakpointConstants.EVENT_TYPE_SIGNAL_CATCH, GdbCatchpoints.gdbCatchpointKeywordToEvent("signal")); + assertEquals(IEventBreakpointConstants.EVENT_TYPE_SYSCALL, GdbCatchpoints.gdbCatchpointKeywordToEvent("syscall")); assertNull(GdbCatchpoints.gdbCatchpointKeywordToEvent("signa")); assertNull(GdbCatchpoints.gdbCatchpointKeywordToEvent("signals")); }