[PATCH 2/4] sim: trace: use existing defines for the useful mask

[Mike Frysinger <vapier@gentoo.org>]

No point in duplicating the shift logic when we have macros already to
keep that all unified.

Committed.
---
 sim/common/ChangeLog   | 4 ++++
 sim/common/sim-trace.h | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 039c675..586f58d 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,9 @@
 2015-06-11  Mike Frysinger  <vapier@gentoo.org>
 
+	* sim-trace.h (TRACE_USEFUL_MASK): Change to TRACE_xxx defines.
+
+2015-06-11  Mike Frysinger  <vapier@gentoo.org>
+
 	* sim-trace.h (WITH_TRACE_P): New define.
 	(WITH_TRACE_INSN_P, WITH_TRACE_DECODE_P, WITH_TRACE_EXTRACT_P,
 	WITH_TRACE_LINENUM_P, WITH_TRACE_MEMORY_P, WITH_TRACE_MODEL_P,
diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h
index df995a6..3d91aa9 100644
--- a/sim/common/sim-trace.h
+++ b/sim/common/sim-trace.h
@@ -87,10 +87,7 @@ enum {
    splat on the screen everything under the sun making nothing easy to
    find.  */
 #define TRACE_USEFUL_MASK \
-((1 << TRACE_INSN_IDX) \
- | (1 << TRACE_LINENUM_IDX) \
- | (1 << TRACE_MEMORY_IDX) \
- | (1 << TRACE_MODEL_IDX))
+  (TRACE_insn | TRACE_linenum | TRACE_memory | TRACE_model)
 \f
 /* Masks so WITH_TRACE can have symbolic values.
    The case choice here is on purpose.  The lowercase parts are args to
-- 
2.4.1