ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-sh4: move intr_at_halt out of cpu_halted() 

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>
This commit is contained in:
Aurelien Jarno 2011-02-24 12:31:41 +01:00
parent 8a231487bc
commit efac415471
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-sh4/cpu.h
View File

@ -184,7 +184,7 @@ typedef struct CPUSH4State {
uint32_t cvr; /* Cache Version Register */ uint32_t cvr; /* Cache Version Register */
void *intc_handle; void *intc_handle;
int intr_at_halt; /* SR_BL ignored during sleep */ int in_sleep; /* SR_BL ignored during sleep */
memory_content *movcal_backup; memory_content *movcal_backup;
memory_content **movcal_backup_tail; memory_content **movcal_backup_tail;
} CPUSH4State; } CPUSH4State;

1
target-sh4/exec.h
View File

@ -37,7 +37,6 @@ static inline int cpu_halted(CPUState *env) {
return 0; return 0;
if (cpu_has_work(env)) { if (cpu_has_work(env)) {
env->halted = 0; env->halted = 0;
env->intr_at_halt = 1;
return 0; return 0;
} }
return EXCP_HALTED; return EXCP_HALTED;

4
target-sh4/helper.c
View File

@ -90,11 +90,11 @@ void do_interrupt(CPUState * env)
if (do_exp && env->exception_index != 0x1e0) { if (do_exp && env->exception_index != 0x1e0) {
env->exception_index = 0x000; /* masked exception -> reset */ env->exception_index = 0x000; /* masked exception -> reset */
} }
if (do_irq && !env->intr_at_halt) { if (do_irq && !env->in_sleep) {
return; /* masked */ return; /* masked */
} }
env->intr_at_halt = 0;
} }
env->in_sleep = 0;
if (do_irq) { if (do_irq) {
irq_vector = sh_intc_get_pending_vector(env->intc_handle, irq_vector = sh_intc_get_pending_vector(env->intc_handle,

1
target-sh4/op_helper.c
View File

@ -119,6 +119,7 @@ void helper_debug(void)
void helper_sleep(uint32_t next_pc) void helper_sleep(uint32_t next_pc)
{ {
env->halted = 1; env->halted = 1;
env->in_sleep = 1;
env->exception_index = EXCP_HLT; env->exception_index = EXCP_HLT;
env->pc = next_pc; env->pc = next_pc;
cpu_loop_exit(); cpu_loop_exit();