mirror of https://github.com/xemu-project/xemu.git
accel/tcg: Make cpu-exec-common.c a target agnostic unit
cpu_in_serial_context() is not target specific, move it declaration to "internal-common.h" (which we include in the 4 source files modified). Remove the unused "exec/exec-all.h" header from cpu-exec-common.c. There is no more target specific code in this file: make it target agnostic. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Anton Johansson <anjo@rev.ng> Message-Id: <20230914185718.76241-12-philmd@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
467bf3fc09
commit
43e7a2d3f9
|
@ -20,9 +20,8 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "sysemu/cpus.h"
|
#include "sysemu/cpus.h"
|
||||||
#include "sysemu/tcg.h"
|
#include "sysemu/tcg.h"
|
||||||
#include "exec/exec-all.h"
|
|
||||||
#include "qemu/plugin.h"
|
#include "qemu/plugin.h"
|
||||||
#include "internal-target.h"
|
#include "internal-common.h"
|
||||||
|
|
||||||
bool tcg_allowed;
|
bool tcg_allowed;
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
#include "exec/translate-all.h"
|
#include "exec/translate-all.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
#include "tb-hash.h"
|
#include "tb-hash.h"
|
||||||
|
#include "internal-common.h"
|
||||||
#include "internal-target.h"
|
#include "internal-target.h"
|
||||||
#ifdef CONFIG_PLUGIN
|
#ifdef CONFIG_PLUGIN
|
||||||
#include "qemu/plugin-memory.h"
|
#include "qemu/plugin-memory.h"
|
||||||
|
|
|
@ -9,9 +9,20 @@
|
||||||
#ifndef ACCEL_TCG_INTERNAL_COMMON_H
|
#ifndef ACCEL_TCG_INTERNAL_COMMON_H
|
||||||
#define ACCEL_TCG_INTERNAL_COMMON_H
|
#define ACCEL_TCG_INTERNAL_COMMON_H
|
||||||
|
|
||||||
|
#include "exec/translation-block.h"
|
||||||
|
|
||||||
extern int64_t max_delay;
|
extern int64_t max_delay;
|
||||||
extern int64_t max_advance;
|
extern int64_t max_advance;
|
||||||
|
|
||||||
void dump_exec_info(GString *buf);
|
void dump_exec_info(GString *buf);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Return true if CS is not running in parallel with other cpus, either
|
||||||
|
* because there are no other cpus or we are within an exclusive context.
|
||||||
|
*/
|
||||||
|
static inline bool cpu_in_serial_context(CPUState *cs)
|
||||||
|
{
|
||||||
|
return !(cs->tcg_cflags & CF_PARALLEL) || cpu_in_exclusive_context(cs);
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -93,15 +93,6 @@ static inline vaddr log_pc(CPUState *cpu, const TranslationBlock *tb)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Return true if CS is not running in parallel with other cpus, either
|
|
||||||
* because there are no other cpus or we are within an exclusive context.
|
|
||||||
*/
|
|
||||||
static inline bool cpu_in_serial_context(CPUState *cs)
|
|
||||||
{
|
|
||||||
return !(cs->tcg_cflags & CF_PARALLEL) || cpu_in_exclusive_context(cs);
|
|
||||||
}
|
|
||||||
|
|
||||||
extern bool one_insn_per_tb;
|
extern bool one_insn_per_tb;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
tcg_ss = ss.source_set()
|
tcg_ss = ss.source_set()
|
||||||
|
common_ss.add(when: 'CONFIG_TCG', if_true: files(
|
||||||
|
'cpu-exec-common.c',
|
||||||
|
))
|
||||||
tcg_ss.add(files(
|
tcg_ss.add(files(
|
||||||
'tcg-all.c',
|
'tcg-all.c',
|
||||||
'cpu-exec-common.c',
|
|
||||||
'cpu-exec.c',
|
'cpu-exec.c',
|
||||||
'tb-maint.c',
|
'tb-maint.c',
|
||||||
'tcg-runtime-gvec.c',
|
'tcg-runtime-gvec.c',
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
#include "tcg/tcg.h"
|
#include "tcg/tcg.h"
|
||||||
#include "tb-hash.h"
|
#include "tb-hash.h"
|
||||||
#include "tb-context.h"
|
#include "tb-context.h"
|
||||||
|
#include "internal-common.h"
|
||||||
#include "internal-target.h"
|
#include "internal-target.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
#include "qemu/atomic128.h"
|
#include "qemu/atomic128.h"
|
||||||
#include "trace/trace-root.h"
|
#include "trace/trace-root.h"
|
||||||
#include "tcg/tcg-ldst.h"
|
#include "tcg/tcg-ldst.h"
|
||||||
|
#include "internal-common.h"
|
||||||
#include "internal-target.h"
|
#include "internal-target.h"
|
||||||
|
|
||||||
__thread uintptr_t helper_retaddr;
|
__thread uintptr_t helper_retaddr;
|
||||||
|
|
Loading…
Reference in New Issue