aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-06-12 15:52:07 +0545
committerMike Frysinger <vapier@gentoo.org>2015-06-12 06:21:38 -0400
commitbffcfec8c3a15b669579b67d5b626c4d14b2b6df (patch)
tree7c1889082f9d83c6d7648707206f83caea6694cc /sim
parent53d2389fd01ea7eaa83bb2727efd64c9904951ec (diff)
downloadgdb-bffcfec8c3a15b669579b67d5b626c4d14b2b6df.zip
gdb-bffcfec8c3a15b669579b67d5b626c4d14b2b6df.tar.gz
gdb-bffcfec8c3a15b669579b67d5b626c4d14b2b6df.tar.bz2
sim: trace: add WITH_TRACE_ANY_P helper
We have STRACE_ANY_P and TRACE_ANY_P, so add WITH_TRACE_ANY_P to fill out the API. This lets us wrap the internal configure symbol.
Diffstat (limited to 'sim')
-rw-r--r--sim/common/ChangeLog8
-rw-r--r--sim/common/sim-module.c2
-rw-r--r--sim/common/sim-trace.c8
-rw-r--r--sim/common/sim-trace.h9
4 files changed, 19 insertions, 8 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 1557449..403ba0f 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,13 @@
2015-06-12 Mike Frysinger <vapier@gentoo.org>
+ * sim-module.c (modules): Change WITH_TRACE to WITH_TRACE_ANY_P.
+ * sim-trace.c (trace_option_handler): Likewise.
+ * sim-trace.h (WITH_TRACE_ANY_P): Define.
+ (STRACE_ANY_P): Use WITH_TRACE_ANY_P.
+ (TRACE_ANY_P): Likewise.
+
+2015-06-12 Mike Frysinger <vapier@gentoo.org>
+
* cgen-run.c (sim_resume): Rename TRACE_INSN_FINI to
CGEN_TRACE_INSN_FINI.
* cgen-trace.c: Rename trace_insn to cgen_trace_insn,
diff --git a/sim/common/sim-module.c b/sim/common/sim-module.c
index fd9b587..2d8e7dc 100644
--- a/sim/common/sim-module.c
+++ b/sim/common/sim-module.c
@@ -46,7 +46,7 @@ static MODULE_INSTALL_FN * const modules[] = {
#if WITH_ENGINE
sim_engine_install,
#endif
-#if WITH_TRACE
+#if WITH_TRACE_ANY_P
trace_install,
#endif
#if WITH_PROFILE
diff --git a/sim/common/sim-trace.c b/sim/common/sim-trace.c
index 915965d..f00fe9b 100644
--- a/sim/common/sim-trace.c
+++ b/sim/common/sim-trace.c
@@ -232,7 +232,7 @@ trace_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
switch (opt)
{
case 't' :
- if (! WITH_TRACE)
+ if (!WITH_TRACE_ANY_P)
sim_io_eprintf (sd, "Tracing not compiled in, `-t' ignored\n");
else
return set_trace_option_mask (sd, "trace", TRACE_USEFUL_MASK, arg);
@@ -352,7 +352,7 @@ trace_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
#ifdef SIM_HAVE_ADDR_RANGE
case OPTION_TRACE_RANGE :
- if (WITH_TRACE)
+ if (WITH_TRACE_ANY_P)
{
int cpu_nr;
char *chp = arg;
@@ -378,7 +378,7 @@ trace_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
break;
case OPTION_TRACE_FUNCTION :
- if (WITH_TRACE)
+ if (WITH_TRACE_ANY_P)
{
/*wip: need to compute function range given name*/
}
@@ -395,7 +395,7 @@ trace_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
break;
case OPTION_TRACE_FILE :
- if (! WITH_TRACE)
+ if (!WITH_TRACE_ANY_P)
sim_io_eprintf (sd, "Tracing not compiled in, `--trace-file' ignored\n");
else
{
diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h
index 5d6919a..822940b 100644
--- a/sim/common/sim-trace.h
+++ b/sim/common/sim-trace.h
@@ -107,8 +107,11 @@ enum {
#define TRACE_syscall (1 << TRACE_SYSCALL_IDX)
#define TRACE_debug (1 << TRACE_DEBUG_IDX)
-/* Preprocessor macros to simplify tests of WITH_TRACE. */
+/* Return non-zero if tracing of idx is enabled (compiled in). */
#define WITH_TRACE_P(idx) (WITH_TRACE & (1 << idx))
+
+/* Preprocessor macros to simplify tests of WITH_TRACE. */
+#define WITH_TRACE_ANY_P (WITH_TRACE)
#define WITH_TRACE_INSN_P WITH_TRACE_P (TRACE_INSN_IDX)
#define WITH_TRACE_DECODE_P WITH_TRACE_P (TRACE_DECODE_IDX)
#define WITH_TRACE_EXTRACT_P WITH_TRACE_P (TRACE_EXTRACT_IDX)
@@ -193,7 +196,7 @@ typedef struct _trace_data {
(WITH_TRACE_P (idx) && STATE_TRACE_FLAGS (sd)[idx] != 0)
/* Non-zero if --trace-<xxxx> was specified for SD. */
-#define STRACE_ANY_P(sd) ((WITH_TRACE) && (STATE_TRACE_DATA (sd)->trace_any_p))
+#define STRACE_ANY_P(sd) (WITH_TRACE_ANY_P && (STATE_TRACE_DATA (sd)->trace_any_p))
#define STRACE_INSN_P(sd) STRACE_P (sd, TRACE_INSN_IDX)
#define STRACE_DECODE_P(sd) STRACE_P (sd, TRACE_DECODE_IDX)
#define STRACE_EXTRACT_P(sd) STRACE_P (sd, TRACE_EXTRACT_IDX)
@@ -218,7 +221,7 @@ typedef struct _trace_data {
(WITH_TRACE_P (idx) && CPU_TRACE_FLAGS (cpu)[idx] != 0)
/* Non-zero if --trace-<xxxx> was specified for CPU. */
-#define TRACE_ANY_P(cpu) ((WITH_TRACE) && (CPU_TRACE_DATA (cpu)->trace_any_p))
+#define TRACE_ANY_P(cpu) (WITH_TRACE_ANY_P && (CPU_TRACE_DATA (cpu)->trace_any_p))
#define TRACE_INSN_P(cpu) TRACE_P (cpu, TRACE_INSN_IDX)
#define TRACE_DECODE_P(cpu) TRACE_P (cpu, TRACE_DECODE_IDX)
#define TRACE_EXTRACT_P(cpu) TRACE_P (cpu, TRACE_EXTRACT_IDX)