All targets except SH4 have the same cpu_halted() routine, and it has only one caller. It is therefore a good candidate for inlining. The difference is the handling of the intr_at_halt, which is necessary to ignore SR.BL when sleeping. Move intr_at_halt handling out of it, by setting this variable while executing the sleep instruction, and clearing it when the CPU has been woken-up by an interrupt, whatever the state of SR.BL. Also rename this variable in_sleep. Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
56 lines
1.4 KiB
C
56 lines
1.4 KiB
C
/*
|
|
* SH4 emulation
|
|
*
|
|
* Copyright (c) 2005 Samuel Tardieu
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef _EXEC_SH4_H
|
|
#define _EXEC_SH4_H
|
|
|
|
#include "config.h"
|
|
#include "dyngen-exec.h"
|
|
|
|
register struct CPUSH4State *env asm(AREG0);
|
|
|
|
#include "cpu.h"
|
|
#include "exec-all.h"
|
|
|
|
static inline int cpu_has_work(CPUState *env)
|
|
{
|
|
return (env->interrupt_request & CPU_INTERRUPT_HARD);
|
|
}
|
|
|
|
static inline int cpu_halted(CPUState *env) {
|
|
if (!env->halted)
|
|
return 0;
|
|
if (cpu_has_work(env)) {
|
|
env->halted = 0;
|
|
return 0;
|
|
}
|
|
return EXCP_HALTED;
|
|
}
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
#include "softmmu_exec.h"
|
|
#endif
|
|
|
|
static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
|
|
{
|
|
env->pc = tb->pc;
|
|
env->flags = tb->flags;
|
|
}
|
|
|
|
#endif /* _EXEC_SH4_H */
|