OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

trace: simplify trace_mem functions

Browse Source 
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>
This commit is contained in:
Emilio G. Cota 2018-05-22 18:26:49 -04:00 committed by Stefan Hajnoczi
parent 32c072341f
commit 3d69b95e5e
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
trace/mem-internal.h
View File

@ -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 */

2
trace/mem.h
View File

@ -25,7 +25,7 @@ static uint8_t trace_mem_get_info(TCGMemOp op, bool store);
*
* Return a value for the 'info' argument in guest memory access traces.
*/
static uint8_t trace_mem_build_info(TCGMemOp size, bool sign_extend,
static uint8_t trace_mem_build_info(int size_shift, bool sign_extend,
TCGMemOp endianness, bool store);