mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect exception_index use

Browse Source 
env->exception_index should be cleared with -1, not 0.

See also 821b19fe923ac49a24cdb4af902584fdd019cee6.

Spotted by Igor Kovalenko.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2010-02-14 07:23:50 +00:00
parent b5937f2978
commit ee0dc6d393
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-alpha/helper.c
View File

@ -467,7 +467,7 @@ void do_interrupt (CPUState *env)
env->ipr[IPR_EXC_ADDR] = env->pc | 1;
excp = env->exception_index;
env->exception_index = 0;
env->exception_index = -1;
env->error_code = 0;
/* XXX: disable interrupts and memory mapping */
if (env->ipr[IPR_PAL_BASE] != -1ULL) {

4
target-s390x/kvm.c
View File

@ -186,7 +186,7 @@ static void kvm_s390_interrupt_internal(CPUState *env, int type, uint32_t parm,
}
env->halted = 0;
env->exception_index = 0;
env->exception_index = -1;
kvmint.type = type;
kvmint.parm = parm;
@ -325,7 +325,7 @@ static int s390_cpu_restart(CPUState *env)
{
kvm_s390_interrupt(env, KVM_S390_RESTART, 0);
env->halted = 0;
env->exception_index = 0;
env->exception_index = -1;
qemu_cpu_kick(env);
dprintf("DONE: SIGP cpu restart: %p\n", env);
return 0;

2
target-sh4/helper.c
View File

@ -38,7 +38,7 @@ int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw,
int mmu_idx, int is_softmmu)
{
env->tea = address;
env->exception_index = 0;
env->exception_index = -1;
switch (rw) {
case 0:
env->exception_index = 0x0a0;