inline cpu_halted into sole caller

All implementations are now the same, and there is only one caller,
so inline the function there.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Paolo Bonzini 2011-03-12 17:43:56 +01:00 committed by Blue Swirl
parent 38a42e7c52
commit eda48c344f
12 changed files with 7 additions and 124 deletions

View file

@ -208,8 +208,13 @@ int cpu_exec(CPUState *env1)
uint8_t *tc_ptr;
unsigned long next_tb;
if (cpu_halted(env1) == EXCP_HALTED)
return EXCP_HALTED;
if (env1->halted) {
if (!cpu_has_work(env1)) {
return EXCP_HALTED;
}
env1->halted = 0;
}
cpu_single_env = env1;