mirror of
https://github.com/qemu/qemu.git
synced 2024-11-24 03:13:44 +08:00
exec: [tcg] Track which vCPU is performing translation and execution
Information is tracked inside the TCGContext structure, and later used by tracing events with the 'tcg' and 'vcpu' properties. The 'cpu' field is used to check tracing of translation-time events ("*_trans"). The 'tcg_env' field is used to pass it to execution-time events ("*_exec"). Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <rth@twiddle.net> Message-id: 146549350162.18437.3033661139638458143.stgit@fimbulvetr.bsc.es Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
5edbd4e304
commit
7c2550432a
@ -151,6 +151,7 @@ void alpha_translate_init(void)
|
||||
done_init = 1;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
|
||||
for (i = 0; i < 31; i++) {
|
||||
cpu_std_ir[i] = tcg_global_mem_new_i64(cpu_env,
|
||||
|
@ -85,6 +85,7 @@ void arm_translate_init(void)
|
||||
int i;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
|
||||
for (i = 0; i < 16; i++) {
|
||||
cpu_R[i] = tcg_global_mem_new_i32(cpu_env,
|
||||
|
@ -3374,6 +3374,7 @@ void cris_initialize_tcg(void)
|
||||
int i;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
cc_x = tcg_global_mem_new(cpu_env,
|
||||
offsetof(CPUCRISState, cc_x), "cc_x");
|
||||
cc_src = tcg_global_mem_new(cpu_env,
|
||||
|
@ -1250,6 +1250,7 @@ void cris_initialize_crisv10_tcg(void)
|
||||
int i;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
cc_x = tcg_global_mem_new(cpu_env,
|
||||
offsetof(CPUCRISState, cc_x), "cc_x");
|
||||
cc_src = tcg_global_mem_new(cpu_env,
|
||||
|
@ -8152,6 +8152,7 @@ void tcg_x86_init(void)
|
||||
initialized = true;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
cpu_cc_op = tcg_global_mem_new_i32(cpu_env,
|
||||
offsetof(CPUX86State, cc_op), "cc_op");
|
||||
cpu_cc_dst = tcg_global_mem_new(cpu_env, offsetof(CPUX86State, cc_dst),
|
||||
|
@ -1202,6 +1202,7 @@ void lm32_translate_init(void)
|
||||
int i;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(cpu_R); i++) {
|
||||
cpu_R[i] = tcg_global_mem_new(cpu_env,
|
||||
|
@ -78,6 +78,7 @@ void m68k_tcg_init(void)
|
||||
int i;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
|
||||
#define DEFO32(name, offset) \
|
||||
QREG_##name = tcg_global_mem_new_i32(cpu_env, \
|
||||
|
@ -1878,6 +1878,7 @@ void mb_tcg_init(void)
|
||||
int i;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
|
||||
env_debug = tcg_global_mem_new(cpu_env,
|
||||
offsetof(CPUMBState, debug),
|
||||
|
@ -20005,6 +20005,7 @@ void mips_tcg_init(void)
|
||||
return;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
|
||||
TCGV_UNUSED(cpu_gpr[0]);
|
||||
for (i = 1; i < 32; i++)
|
||||
|
@ -106,6 +106,7 @@ void moxie_translate_init(void)
|
||||
return;
|
||||
}
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
cpu_pc = tcg_global_mem_new_i32(cpu_env,
|
||||
offsetof(CPUMoxieState, pc), "$pc");
|
||||
for (i = 0; i < 16; i++)
|
||||
|
@ -78,6 +78,7 @@ void openrisc_translate_init(void)
|
||||
int i;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
cpu_sr = tcg_global_mem_new(cpu_env,
|
||||
offsetof(CPUOpenRISCState, sr), "sr");
|
||||
env_flags = tcg_global_mem_new_i32(cpu_env,
|
||||
|
@ -88,6 +88,7 @@ void ppc_translate_init(void)
|
||||
return;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
|
||||
p = cpu_reg_names;
|
||||
cpu_reg_names_size = sizeof(cpu_reg_names);
|
||||
|
@ -169,6 +169,7 @@ void s390x_translate_init(void)
|
||||
int i;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
psw_addr = tcg_global_mem_new_i64(cpu_env,
|
||||
offsetof(CPUS390XState, psw.addr),
|
||||
"psw_addr");
|
||||
|
@ -101,6 +101,7 @@ void sh4_translate_init(void)
|
||||
return;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
|
||||
for (i = 0; i < 24; i++)
|
||||
cpu_gregs[i] = tcg_global_mem_new_i32(cpu_env,
|
||||
|
@ -5404,6 +5404,7 @@ void gen_intermediate_code_init(CPUSPARCState *env)
|
||||
inited = 1;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
|
||||
cpu_regwptr = tcg_global_mem_new_ptr(cpu_env,
|
||||
offsetof(CPUSPARCState, regwptr),
|
||||
|
@ -2443,6 +2443,7 @@ void tilegx_tcg_init(void)
|
||||
int i;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
cpu_pc = tcg_global_mem_new_i64(cpu_env, offsetof(CPUTLGState, pc), "pc");
|
||||
for (i = 0; i < TILEGX_R_COUNT; i++) {
|
||||
cpu_regs[i] = tcg_global_mem_new_i64(cpu_env,
|
||||
|
@ -8835,6 +8835,7 @@ void tricore_tcg_init(void)
|
||||
return;
|
||||
}
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
/* reg init */
|
||||
for (i = 0 ; i < 16 ; i++) {
|
||||
cpu_gpr_a[i] = tcg_global_mem_new(cpu_env,
|
||||
|
@ -70,6 +70,7 @@ void uc32_translate_init(void)
|
||||
int i;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
|
||||
for (i = 0; i < 32; i++) {
|
||||
cpu_R[i] = tcg_global_mem_new_i32(cpu_env,
|
||||
|
@ -219,6 +219,7 @@ void xtensa_translate_init(void)
|
||||
int i;
|
||||
|
||||
cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
|
||||
tcg_ctx.tcg_env = cpu_env;
|
||||
cpu_pc = tcg_global_mem_new_i32(cpu_env,
|
||||
offsetof(CPUXtensaState, pc), "pc");
|
||||
|
||||
|
@ -599,6 +599,10 @@ struct TCGContext {
|
||||
|
||||
TBContext tb_ctx;
|
||||
|
||||
/* Track which vCPU triggers events */
|
||||
CPUState *cpu; /* *_trans */
|
||||
TCGv_env tcg_env; /* *_exec */
|
||||
|
||||
/* The TCGBackendData structure is private to tcg-target.inc.c. */
|
||||
struct TCGBackendData *be;
|
||||
|
||||
|
@ -1182,7 +1182,9 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
|
||||
|
||||
tcg_func_start(&tcg_ctx);
|
||||
|
||||
tcg_ctx.cpu = ENV_GET_CPU(env);
|
||||
gen_intermediate_code(env, tb);
|
||||
tcg_ctx.cpu = NULL;
|
||||
|
||||
trace_translate_block(tb, tb->pc, tb->tc_ptr);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user