SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/ppc: Fix XER access in monitor

Browse Source 
We can't read env->xer directly, as it does not contain some bits of
XER. Instead, we should have a callback that uses cpu_read_xer to read
the complete register.

Fixes: da91a00f191f ("target-ppc: Split out SO, OV, CA fields from XER")
Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
Message-Id: <20211014223234.127012-5-matheus.ferst@eldorado.org.br>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Matheus Ferst 2021-10-14 19:32:34 -03:00 committed by David Gibson
parent 10de052188
commit 3938cacdb2
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/ppc/monitor.c
View File

@ -44,6 +44,13 @@ static target_long monitor_get_ccr(Monitor *mon, const struct MonitorDef *md,
return u; return u;
} }
static target_long monitor_get_xer(Monitor *mon, const struct MonitorDef *md,
int val)
{
CPUArchState *env = mon_get_cpu_env(mon);
return cpu_read_xer(env);
}
static target_long monitor_get_decr(Monitor *mon, const struct MonitorDef *md, static target_long monitor_get_decr(Monitor *mon, const struct MonitorDef *md,
int val) int val)
{ {
@ -85,7 +92,7 @@ const MonitorDef monitor_defs[] = {
{ "decr", 0, &monitor_get_decr, }, { "decr", 0, &monitor_get_decr, },
{ "ccr|cr", 0, &monitor_get_ccr, }, { "ccr|cr", 0, &monitor_get_ccr, },
/* Machine state register */ /* Machine state register */
{ "xer", offsetof(CPUPPCState, xer) }, { "xer", 0, &monitor_get_xer },
{ "msr", offsetof(CPUPPCState, msr) }, { "msr", offsetof(CPUPPCState, msr) },
{ "tbu", 0, &monitor_get_tbu, }, { "tbu", 0, &monitor_get_tbu, },
{ "tbl", 0, &monitor_get_tbl, }, { "tbl", 0, &monitor_get_tbl, },