Commit 32c07234 authored by Emilio G. Cota's avatar Emilio G. Cota Committed by Stefan Hajnoczi
Browse files

trace: fix misreporting of TCG access sizes for user-space 



trace_mem_build_info expects a size_shift for its first argument. Fix it.

Signed-off-by: default avatarEmilio G. Cota <cota@braap.org>
Message-id: 1527028012-21888-2-git-send-email-cota@braap.org
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 00928a42

include/exec/cpu_ldst_useronly_template.h

+8 −3
Original line number Diff line number Diff line
@@ -33,20 +33,24 @@ 
#define SUFFIX q

#define USUFFIX q

#define DATA_TYPE uint64_t

#define SHIFT 3

#elif DATA_SIZE == 4

#define SUFFIX l

#define USUFFIX l

#define DATA_TYPE uint32_t

#define SHIFT 2

#elif DATA_SIZE == 2

#define SUFFIX w

#define USUFFIX uw

#define DATA_TYPE uint16_t

#define DATA_STYPE int16_t

#define SHIFT 1

#elif DATA_SIZE == 1

#define SUFFIX b

#define USUFFIX ub

#define DATA_TYPE uint8_t

#define DATA_STYPE int8_t

#define SHIFT 0

#else

#error unsupported data size

#endif
@@ -63,7 +67,7 @@ glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr) 
#if !defined(CODE_ACCESS)

    trace_guest_mem_before_exec(

        ENV_GET_CPU(env), ptr,

        trace_mem_build_info(DATA_SIZE, false, MO_TE, false));

        trace_mem_build_info(SHIFT, false, MO_TE, false));

#endif

    return glue(glue(ld, USUFFIX), _p)(g2h(ptr));

}
@@ -87,7 +91,7 @@ glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr) 
#if !defined(CODE_ACCESS)

    trace_guest_mem_before_exec(

        ENV_GET_CPU(env), ptr,

        trace_mem_build_info(DATA_SIZE, true, MO_TE, false));

        trace_mem_build_info(SHIFT, true, MO_TE, false));

#endif

    return glue(glue(lds, SUFFIX), _p)(g2h(ptr));

}
@@ -113,7 +117,7 @@ glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr, 
#if !defined(CODE_ACCESS)

    trace_guest_mem_before_exec(

        ENV_GET_CPU(env), ptr,

        trace_mem_build_info(DATA_SIZE, false, MO_TE, true));

        trace_mem_build_info(SHIFT, false, MO_TE, true));

#endif

    glue(glue(st, SUFFIX), _p)(g2h(ptr), v);

}
@@ -136,3 +140,4 @@ glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, 
#undef SUFFIX

#undef USUFFIX

#undef DATA_SIZE

#undef SHIFT