sim: trace: use existing defines for the useful mask

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

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 039c6758daa25b4ac326e796328e3d44a9b2653e..586f58d43f261b258282a3bc7766927bcc947deb 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h
index df995a690a4ff736d5ea7e743d5e35df731b2814..3d91aa9a62c979c467dd2895bf886e0bbc468ef0 100644 (file)
--- 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