Skip to content

Commit

Permalink
tcg: cpu_exec_{enter,exit} helpers
Browse files Browse the repository at this point in the history
Move invocation of CPUClass.cpu_exec_*() to separate helpers,
to make it easier to refactor that code later.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20201212155530.23098-10-cfontana@suse.de>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
  • Loading branch information
ehabkost committed Dec 16, 2020
1 parent 69483f3 commit 035ba06
Showing 1 changed file with 18 additions and 5 deletions.
23 changes: 18 additions & 5 deletions accel/tcg/cpu-exec.c
Expand Up @@ -236,9 +236,22 @@ static void cpu_exec_nocache(CPUState *cpu, int max_cycles,
}
#endif

void cpu_exec_step_atomic(CPUState *cpu)
static void cpu_exec_enter(CPUState *cpu)
{
CPUClass *cc = CPU_GET_CLASS(cpu);

cc->cpu_exec_enter(cpu);
}

static void cpu_exec_exit(CPUState *cpu)
{
CPUClass *cc = CPU_GET_CLASS(cpu);

cc->cpu_exec_exit(cpu);
}

void cpu_exec_step_atomic(CPUState *cpu)
{
TranslationBlock *tb;
target_ulong cs_base, pc;
uint32_t flags;
Expand All @@ -257,11 +270,11 @@ void cpu_exec_step_atomic(CPUState *cpu)

/* Since we got here, we know that parallel_cpus must be true. */
parallel_cpus = false;
cc->cpu_exec_enter(cpu);
cpu_exec_enter(cpu);
/* execute the generated code */
trace_exec_tb(tb, pc);
cpu_tb_exec(cpu, tb);
cc->cpu_exec_exit(cpu);
cpu_exec_exit(cpu);
} else {
/*
* The mmap_lock is dropped by tb_gen_code if it runs out of
Expand Down Expand Up @@ -713,7 +726,7 @@ int cpu_exec(CPUState *cpu)

rcu_read_lock();

cc->cpu_exec_enter(cpu);
cpu_exec_enter(cpu);

/* Calculate difference between guest clock and host clock.
* This delay includes the delay of the last cycle, so
Expand Down Expand Up @@ -775,7 +788,7 @@ int cpu_exec(CPUState *cpu)
}
}

cc->cpu_exec_exit(cpu);
cpu_exec_exit(cpu);
rcu_read_unlock();

return ret;
Expand Down

0 comments on commit 035ba06

Please sign in to comment.