aboutsummaryrefslogtreecommitdiff
path: root/trace/mem-internal.h
diff options
context:
space:
mode:
authorEmilio G. Cota <cota@braap.org>2018-05-22 18:26:49 -0400
committerStefan Hajnoczi <stefanha@redhat.com>2018-06-27 11:09:24 +0100
commit3d69b95e5e2ef4c5acfa2b2aaa93e2fad9eeeaa1 (patch)
treedd21bd0826c8e9fe2d6ced7bc282ec6d128f43e5 /trace/mem-internal.h
parent32c072341f0d17ddc7443bd4c0adb9d2ed55fbd4 (diff)
trace: simplify trace_mem functions
Add some defines for the mem_info bits, simplify trace_mem_build_info, and also simplify trace_mem_get_info by making it a wrapper around trace_mem_build_info. This paves the way for increasing size_shift by one bit. Signed-off-by: Emilio G. Cota <cota@braap.org> Message-id: 1527028012-21888-3-git-send-email-cota@braap.org Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'trace/mem-internal.h')
-rw-r--r--trace/mem-internal.h40
1 files changed, 18 insertions, 22 deletions
diff --git a/trace/mem-internal.h b/trace/mem-internal.h
index ddda934253..b684e2750c 100644
--- a/trace/mem-internal.h
+++ b/trace/mem-internal.h
@@ -10,37 +10,33 @@
#ifndef TRACE__MEM_INTERNAL_H
#define TRACE__MEM_INTERNAL_H
-static inline uint8_t trace_mem_get_info(TCGMemOp op, bool store)
+#define TRACE_MEM_SZ_SHIFT_MASK 0x3 /* size shift mask */
+#define TRACE_MEM_SE (1ULL << 2) /* sign extended (y/n) */
+#define TRACE_MEM_BE (1ULL << 3) /* big endian (y/n) */
+#define TRACE_MEM_ST (1ULL << 4) /* store (y/n) */
+
+static inline uint8_t trace_mem_build_info(
+ int size_shift, bool sign_extend, TCGMemOp endianness, bool store)
{
- uint8_t res = op;
- bool be = (op & MO_BSWAP) == MO_BE;
+ uint8_t res;
- /* remove untraced fields */
- res &= (1ULL << 4) - 1;
- /* make endianness absolute */
- res &= ~MO_BSWAP;
- if (be) {
- res |= 1ULL << 3;
+ res = size_shift & TRACE_MEM_SZ_SHIFT_MASK;
+ if (sign_extend) {
+ res |= TRACE_MEM_SE;
+ }
+ if (endianness == MO_BE) {
+ res |= TRACE_MEM_BE;
}
- /* add fields */
if (store) {
- res |= 1ULL << 4;
+ res |= TRACE_MEM_ST;
}
-
return res;
}
-static inline uint8_t trace_mem_build_info(
- TCGMemOp size, bool sign_extend, TCGMemOp endianness, bool store)
+static inline uint8_t trace_mem_get_info(TCGMemOp op, bool store)
{
- uint8_t res = 0;
- res |= size;
- res |= (sign_extend << 2);
- if (endianness == MO_BE) {
- res |= (1ULL << 3);
- }
- res |= (store << 4);
- return res;
+ return trace_mem_build_info(op & MO_SIZE, !!(op & MO_SIGN),
+ op & MO_BSWAP, store);
}
#endif /* TRACE__MEM_INTERNAL_H */