mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trace: Fold mem-internal.h into mem.h

Browse Source 
Since the last thing that mem.h does is include mem-internal.h,
the symbols are not actually private.

Tested-by: Cole Robinson <crobinso@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-07-16 18:04:32 -07:00
parent a754f7f34e
commit 785ea711b1
3 changed files with 40 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/core.c
View File

@ -27,7 +27,7 @@
#include "exec/helper-proto.h" #include "exec/helper-proto.h"
#include "tcg/tcg.h" #include "tcg/tcg.h"
#include "tcg/tcg-op.h" #include "tcg/tcg-op.h"
#include "trace/mem-internal.h" /* mem_info macros */ #include "trace/mem.h" /* mem_info macros */
#include "plugin.h" #include "plugin.h"
#include "qemu/compiler.h" #include "qemu/compiler.h"

50
trace/mem-internal.h
View File

@ -1,50 +0,0 @@
/*
* Helper functions for guest memory tracing
*
* Copyright (C) 2016 Lluís Vilanova <vilanova@ac.upc.edu>
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#ifndef TRACE__MEM_INTERNAL_H
#define TRACE__MEM_INTERNAL_H
#define TRACE_MEM_SZ_SHIFT_MASK 0xf /* size shift mask */
#define TRACE_MEM_SE (1ULL << 4) /* sign extended (y/n) */
#define TRACE_MEM_BE (1ULL << 5) /* big endian (y/n) */
#define TRACE_MEM_ST (1ULL << 6) /* store (y/n) */
#define TRACE_MEM_MMU_SHIFT 8 /* mmu idx */
static inline uint16_t trace_mem_build_info(
int size_shift, bool sign_extend, MemOp endianness,
bool store, unsigned int mmu_idx)
{
uint16_t res;
res = size_shift & TRACE_MEM_SZ_SHIFT_MASK;
if (sign_extend) {
res |= TRACE_MEM_SE;
}
if (endianness == MO_BE) {
res |= TRACE_MEM_BE;
}
if (store) {
res |= TRACE_MEM_ST;
}
#ifdef CONFIG_SOFTMMU
res |= mmu_idx << TRACE_MEM_MMU_SHIFT;
#endif
return res;
}
static inline uint16_t trace_mem_get_info(MemOp op,
unsigned int mmu_idx,
bool store)
{
return trace_mem_build_info(op & MO_SIZE, !!(op & MO_SIGN),
op & MO_BSWAP, store,
mmu_idx);
}
#endif /* TRACE__MEM_INTERNAL_H */

50
trace/mem.h
View File

@ -12,24 +12,52 @@
#include "tcg/tcg.h" #include "tcg/tcg.h"
#define TRACE_MEM_SZ_SHIFT_MASK 0xf /* size shift mask */
/** #define TRACE_MEM_SE (1ULL << 4) /* sign extended (y/n) */
* trace_mem_get_info: #define TRACE_MEM_BE (1ULL << 5) /* big endian (y/n) */
* #define TRACE_MEM_ST (1ULL << 6) /* store (y/n) */
* Return a value for the 'info' argument in guest memory access traces. #define TRACE_MEM_MMU_SHIFT 8 /* mmu idx */
*/
static uint16_t trace_mem_get_info(MemOp op, unsigned int mmu_idx, bool store);
/** /**
* trace_mem_build_info: * trace_mem_build_info:
* *
* Return a value for the 'info' argument in guest memory access traces. * Return a value for the 'info' argument in guest memory access traces.
*/ */
static uint16_t trace_mem_build_info(int size_shift, bool sign_extend, static inline uint16_t trace_mem_build_info(int size_shift, bool sign_extend,
MemOp endianness, bool store, MemOp endianness, bool store,
unsigned int mmuidx); unsigned int mmu_idx)
{
uint16_t res;
res = size_shift & TRACE_MEM_SZ_SHIFT_MASK;
if (sign_extend) {
res |= TRACE_MEM_SE;
}
if (endianness == MO_BE) {
res |= TRACE_MEM_BE;
}
if (store) {
res |= TRACE_MEM_ST;
}
#ifdef CONFIG_SOFTMMU
res |= mmu_idx << TRACE_MEM_MMU_SHIFT;
#endif
return res;
}
#include "trace/mem-internal.h" /**
* trace_mem_get_info:
*
* Return a value for the 'info' argument in guest memory access traces.
*/
static inline uint16_t trace_mem_get_info(MemOp op,
unsigned int mmu_idx,
bool store)
{
return trace_mem_build_info(op & MO_SIZE, !!(op & MO_SIGN),
op & MO_BSWAP, store,
mmu_idx);
}
#endif /* TRACE__MEM_H */ #endif /* TRACE__MEM_H */