falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/mips_cpc: make VP correctly start from the reset vector 

When VP enters the Run state it starts execution from the reset vector.
Currently used CPU_INTERRUPT_WAKE does not do that if reset exception
base has been modified. Therefore fix that by simply resetting given VP.

Drop the usage of CPU_INTERRUPT_WAKE also in VP_STOP and instead raise
the CPU_INTERRUPT_HALT to halt a VP.

Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
This commit is contained in:
Leon Alrae 2016-06-09 10:46:51 +01:00
parent 89777fd10f
commit dff94251f0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/misc/mips_cpc.c
View File

@ -37,7 +37,7 @@ static void cpc_run_vp(MIPSCPCState *cpc, uint64_t vp_run)
CPU_FOREACH(cs) { CPU_FOREACH(cs) {
uint64_t i = 1ULL << cs->cpu_index; uint64_t i = 1ULL << cs->cpu_index;
if (i & vp_run & ~cpc->vp_running) { if (i & vp_run & ~cpc->vp_running) {
cpu_interrupt(cs, CPU_INTERRUPT_WAKE); cpu_reset(cs);
cpc->vp_running |= i; cpc->vp_running |= i;
} }
} }
@ -50,8 +50,7 @@ static void cpc_stop_vp(MIPSCPCState *cpc, uint64_t vp_stop)
CPU_FOREACH(cs) { CPU_FOREACH(cs) {
uint64_t i = 1ULL << cs->cpu_index; uint64_t i = 1ULL << cs->cpu_index;
if (i & vp_stop & cpc->vp_running) { if (i & vp_stop & cpc->vp_running) {
cs->halted = 1; cpu_interrupt(cs, CPU_INTERRUPT_HALT);
cpu_reset_interrupt(cs, CPU_INTERRUPT_WAKE);
cpc->vp_running &= ~i; cpc->vp_running &= ~i;
} }
} }