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

target/ppc: 6xx: Set SRRs directly in exception code 

The 6xx CPUs don't have alternate/hypervisor Save and Restore
Registers, so we can set SRR0 and SRR1 directly.

Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Message-Id: <20220203200957.1434641-12-farosas@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Fabiano Rosas 2022-02-09 09:08:56 +01:00 committed by Cédric Le Goater
parent 8f8c7932d4
commit c50eaed135
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/ppc/excp_helper.c
View File

@ -554,7 +554,6 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)
CPUState *cs = CPU(cpu); CPUState *cs = CPU(cpu);
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
target_ulong msr, new_msr, vector; target_ulong msr, new_msr, vector;
int srr0, srr1;
if (excp <= POWERPC_EXCP_NONE || excp >= POWERPC_EXCP_NB) { if (excp <= POWERPC_EXCP_NONE || excp >= POWERPC_EXCP_NB) {
cpu_abort(cs, "Invalid PowerPC exception %d. Aborting\n", excp); cpu_abort(cs, "Invalid PowerPC exception %d. Aborting\n", excp);
@ -573,10 +572,6 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)
*/ */
new_msr = env->msr & ((target_ulong)1 << MSR_ME); new_msr = env->msr & ((target_ulong)1 << MSR_ME);
/* target registers */
srr0 = SPR_SRR0;
srr1 = SPR_SRR1;
/* /*
* Hypervisor emulation assistance interrupt only exists on server * Hypervisor emulation assistance interrupt only exists on server
* arch 2.05 server or later. * arch 2.05 server or later.
@ -727,10 +722,6 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)
cpu_abort(cs, "Trying to deliver HV exception (MSR) %d with " cpu_abort(cs, "Trying to deliver HV exception (MSR) %d with "
"no HV support\n", excp); "no HV support\n", excp);
} }
if (srr0 == SPR_HSRR0) {
cpu_abort(cs, "Trying to deliver HV exception (HSRR) %d with "
"no HV support\n", excp);
}
} }
/* /*
@ -742,10 +733,10 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)
} }
/* Save PC */ /* Save PC */
env->spr[srr0] = env->nip; env->spr[SPR_SRR0] = env->nip;
/* Save MSR */ /* Save MSR */
env->spr[srr1] = msr; env->spr[SPR_SRR1] = msr;
powerpc_set_excp_state(cpu, vector, new_msr); powerpc_set_excp_state(cpu, vector, new_msr);
} }