+2015-11-11 Marcin Kościelnicki <koriakin@0x04.net>
+
+ * gdb.trace/change-loc.h: include "trace-common.h", remove SYMBOL
+ macro.
+ (func5): Removed.
+ (func4): Use FAST_TRACEPOINT_LABEL.
+ * gdb.trace/ftrace-lock.c: include "trace-common.h", remove SYMBOL
+ macro.
+ (func): Removed.
+ (thread_function): Use FAST_TRACEPOINT_LABEL.
+ * gdb.trace/ftrace.c: include "trace-common.h", remove SYMBOL macro.
+ (func): Remove.
+ (marker): Use FAST_TRACEPOINT_LABEL.
+ * gdb.trace/pendshr1.c: include "trace-common.h", remove SYMBOL macro.
+ (pendfunc1): Remove.
+ (pendfunc): Use FAST_TRACEPOINT_LABEL.
+ * gdb.trace/pendshr2.c: include "trace-common.h", remove SYMBOL macro.
+ (foo): Remove.
+ (pendfunc2): Use FAST_TRACEPOINT_LABEL.
+ * gdb.trace/trace-break.c: include "trace-common.h", remove SYMBOL
+ macro.
+ (func): Remove.
+ (marker): Use FAST_TRACEPOINT_LABEL.
+ * gdb.trace/trace-common.h: New header.
+ * gdb.trace/trace-condition.c: include "trace-common.h", remove SYMBOL
+ macro.
+ (func): Remove.
+ (marker): Use FAST_TRACEPOINT_LABEL.
+ * gdb.trace/trace-mt.c: include "trace-common.h", remove SYMBOL macro.
+ (func): Remove.
+ (thread_function): Use FAST_TRACEPOINT_LABEL.
+
2015-11-10 Marcin Kościelnicki <koriakin@0x04.net>
* gdb.trace/backtrace.exp: Use global fpreg/spreg definition, add $
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef SYMBOL_PREFIX
-#define SYMBOL(str) SYMBOL_PREFIX #str
-#else
-#define SYMBOL(str) #str
-#endif
-
-/* Called from asm. */
-static void __attribute__((used))
-func5 (void)
-{}
+#include "trace-common.h"
static void
func4 (void)
{
- /* `set_tracepoint' is the label where we'll set multiple tracepoints and
- breakpoints at. The insn at the label must the large enough to
- fit a fast tracepoint jump. */
- asm (" .global " SYMBOL(set_tracepoint) "\n"
- SYMBOL(set_tracepoint) ":\n"
-#if (defined __x86_64__ || defined __i386__)
- " call " SYMBOL(func5) "\n"
-#elif (defined __aarch64__)
- " nop\n"
-#endif
- );
-
+ FAST_TRACEPOINT_LABEL(set_tracepoint);
}
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <pthread.h>
-
-#ifdef SYMBOL_PREFIX
-#define SYMBOL(str) SYMBOL_PREFIX #str
-#else
-#define SYMBOL(str) #str
-#endif
+#include "trace-common.h"
/* Called if the testcase failed. */
static void
}
}
-/* Called from asm. */
-static void __attribute__((used))
-func (void)
-{
-}
-
static void *
thread_function (void *arg)
{
- /* `set_point' is the label at which to set a fast tracepoint. The
- insn at the label must be large enough to fit a fast tracepoint
- jump. */
- asm (" .global " SYMBOL (set_point) "\n"
- SYMBOL (set_point) ":\n"
-#if (defined __x86_64__ || defined __i386__)
- " call " SYMBOL (func) "\n"
-#elif (defined __aarch64__)
- " nop\n"
-#endif
- );
+ FAST_TRACEPOINT_LABEL(set_point);
}
static void
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef SYMBOL_PREFIX
-#define SYMBOL(str) SYMBOL_PREFIX #str
-#else
-#define SYMBOL(str) #str
-#endif
+#include "trace-common.h"
int globvar;
begin (void)
{}
-/* Called from asm. */
-static void __attribute__((used))
-func (void)
-{}
-
static void
marker (int anarg)
{
- /* `set_point' is the label at which to set a fast tracepoint. The
- insn at the label must be large enough to fit a fast tracepoint
- jump. */
- asm (" .global " SYMBOL(set_point) "\n"
- SYMBOL(set_point) ":\n"
-#if (defined __x86_64__ || defined __i386__)
- " call " SYMBOL(func) "\n"
-#elif (defined __aarch64__)
- " nop\n"
-#endif
- );
+ FAST_TRACEPOINT_LABEL(set_point);
++anarg;
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef SYMBOL_PREFIX
-#define SYMBOL(str) SYMBOL_PREFIX #str
-#else
-#define SYMBOL(str) #str
-#endif
-
-static void
-pendfunc1 (void)
-{
- int x = 0;
- int y = x + 4;
-}
+#include "trace-common.h"
void
pendfunc (int x)
{
- /* `set_point1' is the label where we'll set multiple tracepoints and
- breakpoints at. The insn at the label must the large enough to
- fit a fast tracepoint jump. */
- asm (" .global " SYMBOL(set_point1) "\n"
- SYMBOL(set_point1) ":\n"
-#if (defined __x86_64__ || defined __i386__)
- " call " SYMBOL(pendfunc1) "\n"
-#elif (defined __aarch64__)
- " nop\n"
-#endif
- );
+ FAST_TRACEPOINT_LABEL(set_point1);
}
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef SYMBOL_PREFIX
-#define SYMBOL(str) SYMBOL_PREFIX #str
-#else
-#define SYMBOL(str) #str
-#endif
-
-static void
-foo ()
-{}
+#include "trace-common.h"
void
pendfunc2 (int x)
{
- /* `set_point2' is the label where we'll set multiple tracepoints and
- breakpoints at. The insn at the label must the large enough to
- fit a fast tracepoint jump. */
- asm (" .global " SYMBOL(set_point2) "\n"
- SYMBOL(set_point2) ":\n"
-#if (defined __x86_64__ || defined __i386__)
- " call " SYMBOL(foo) "\n"
-#elif (defined __aarch64__)
- " nop\n"
-#endif
- );
+ FAST_TRACEPOINT_LABEL(set_point2);
}
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef SYMBOL_PREFIX
-#define SYMBOL(str) SYMBOL_PREFIX #str
-#else
-#define SYMBOL(str) #str
-#endif
-
-/* Called from asm. */
-static void __attribute__((used))
-func (void)
-{}
+#include "trace-common.h"
static void
marker (void)
int a = 0;
int b = a;
- /* `set_point' is the label where we'll set multiple tracepoints and
- breakpoints at. The insn at the label must the large enough to
- fit a fast tracepoint jump. */
- asm (" .global " SYMBOL(set_point) "\n"
- SYMBOL(set_point) ":\n"
-#if (defined __x86_64__ || defined __i386__)
- " call " SYMBOL(func) "\n"
-#elif (defined __aarch64__)
- " nop\n"
-#endif
- );
+ FAST_TRACEPOINT_LABEL(set_point);
- asm (" .global " SYMBOL(after_set_point) "\n"
- SYMBOL(after_set_point) ":\n"
-#if (defined __x86_64__ || defined __i386__)
- " call " SYMBOL(func) "\n"
-#elif (defined __aarch64__)
- " nop\n"
-#endif
- );
+ FAST_TRACEPOINT_LABEL(after_set_point);
}
static void
--- /dev/null
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2011-2015 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifdef SYMBOL_PREFIX
+#define SYMBOL(str) SYMBOL_PREFIX #str
+#else
+#define SYMBOL(str) #str
+#endif
+
+/* FAST_TRACEPOINT_LABEL expands to an assembly instruction large enough to fit
+ a fast tracepoint jump. The parameter is the label where we'll set
+ tracepoints and breakpoints. */
+
+#if (defined __x86_64__ || defined __i386__)
+
+static void
+x86_trace_dummy ()
+{
+ int x = 0;
+ int y = x + 4;
+}
+
+#define FAST_TRACEPOINT_LABEL(name) \
+ asm (" .global " SYMBOL(name) "\n" \
+ SYMBOL(name) ":\n" \
+ " call " SYMBOL(x86_trace_dummy) "\n" \
+ )
+
+#elif (defined __aarch64__)
+
+#define FAST_TRACEPOINT_LABEL(name) \
+ asm (" .global " SYMBOL(name) "\n" \
+ SYMBOL(name) ":\n" \
+ " nop\n" \
+ )
+
+#else
+
+#error "unsupported architecture for trace tests"
+
+#endif
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef SYMBOL_PREFIX
-#define SYMBOL(str) SYMBOL_PREFIX #str
-#else
-#define SYMBOL(str) #str
-#endif
+#include "trace-common.h"
int globvar;
{
}
-/* Called from asm. */
-static void __attribute__((used))
-func (void)
-{
-}
-
static void
marker (int anarg)
{
- /* `set_point' is the label at which to set a fast tracepoint. The
- insn at the label must be large enough to fit a fast tracepoint
- jump. */
- asm (" .global " SYMBOL (set_point) "\n"
- SYMBOL (set_point) ":\n"
-#if (defined __x86_64__ || defined __i386__)
- " call " SYMBOL (func) "\n"
-#elif (defined __aarch64__)
- " nop\n"
-#endif
- );
+ FAST_TRACEPOINT_LABEL(set_point);
}
static void
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <pthread.h>
-
-#ifdef SYMBOL_PREFIX
-#define SYMBOL(str) SYMBOL_PREFIX #str
-#else
-#define SYMBOL(str) #str
-#endif
-/* Called from asm. */
-static void __attribute__((used))
-func (void)
-{}
+#include "trace-common.h"
static void *
thread_function(void *arg)
{
- /* `set_point1' is the label at which to set a fast tracepoint. The
- insn at the label must be large enough to fit a fast tracepoint
- jump. */
- asm (" .global " SYMBOL(set_point1) "\n"
- SYMBOL(set_point1) ":\n"
-#if (defined __x86_64__ || defined __i386__)
- " call " SYMBOL(func) "\n"
-#elif (defined __aarch64__)
- " nop\n"
-#endif
- );
+ FAST_TRACEPOINT_LABEL(set_point1);
}
static void