clang's C11 atomic_fetch_*() functions only take a C11 atomic type pointer argument. QEMU uses direct types (int, etc) and this causes a compiler error when a QEMU code calls these functions in a source file that also included <stdatomic.h> via a system header file: $ CC=clang CXX=clang++ ./configure ... && make ../util/async.c:79:17: error: address argument to atomic operation must be a pointer to _Atomic type ('unsigned int *' invalid) Avoid using atomic_*() names in QEMU's atomic.h since that namespace is used by <stdatomic.h>. Prefix QEMU's APIs with 'q' so that atomic.h and <stdatomic.h> can co-exist. I checked /usr/include on my machine and searched GitHub for existing "qatomic_" users but there seem to be none. This patch was generated using: $ git grep -h -o '\<atomic\(64\)\?_[a-z0-9_]\+' include/qemu/atomic.h | \ sort -u >/tmp/changed_identifiers $ for identifier in $(</tmp/changed_identifiers); do sed -i "s%\<$identifier\>%q$identifier%g" \ $(git grep -I -l "\<$identifier\>") done I manually fixed line-wrap issues and misaligned rST tables. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20200923105646.47864-1-stefanha@redhat.com>
52 lines
1.4 KiB
C
52 lines
1.4 KiB
C
/*
|
|
* Copyright (C) 2017, Emilio G. Cota <cota@braap.org>
|
|
*
|
|
* License: GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
#ifndef EXEC_TB_LOOKUP_H
|
|
#define EXEC_TB_LOOKUP_H
|
|
|
|
#ifdef NEED_CPU_H
|
|
#include "cpu.h"
|
|
#else
|
|
#include "exec/poison.h"
|
|
#endif
|
|
|
|
#include "exec/exec-all.h"
|
|
#include "exec/tb-hash.h"
|
|
|
|
/* Might cause an exception, so have a longjmp destination ready */
|
|
static inline TranslationBlock *
|
|
tb_lookup__cpu_state(CPUState *cpu, target_ulong *pc, target_ulong *cs_base,
|
|
uint32_t *flags, uint32_t cf_mask)
|
|
{
|
|
CPUArchState *env = (CPUArchState *)cpu->env_ptr;
|
|
TranslationBlock *tb;
|
|
uint32_t hash;
|
|
|
|
cpu_get_tb_cpu_state(env, pc, cs_base, flags);
|
|
hash = tb_jmp_cache_hash_func(*pc);
|
|
tb = qatomic_rcu_read(&cpu->tb_jmp_cache[hash]);
|
|
|
|
cf_mask &= ~CF_CLUSTER_MASK;
|
|
cf_mask |= cpu->cluster_index << CF_CLUSTER_SHIFT;
|
|
|
|
if (likely(tb &&
|
|
tb->pc == *pc &&
|
|
tb->cs_base == *cs_base &&
|
|
tb->flags == *flags &&
|
|
tb->trace_vcpu_dstate == *cpu->trace_dstate &&
|
|
(tb_cflags(tb) & (CF_HASH_MASK | CF_INVALID)) == cf_mask)) {
|
|
return tb;
|
|
}
|
|
tb = tb_htable_lookup(cpu, *pc, *cs_base, *flags, cf_mask);
|
|
if (tb == NULL) {
|
|
return NULL;
|
|
}
|
|
qatomic_set(&cpu->tb_jmp_cache[hash], tb);
|
|
return tb;
|
|
}
|
|
|
|
#endif /* EXEC_TB_LOOKUP_H */
|