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

target/ppc: updated vscr manipulation in machine.c 

Updated the code in machine.c to use the generic ppc_{store,get}_vscr
instead of helper style functions, so it can build without TCG

Signed-off-by: Bruno Larsen (billionai) <bruno.larsen@eldorado.org.br>
Message-Id: <20210512140813.112884-7-bruno.larsen@eldorado.org.br>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Bruno Larsen (billionai) 2021-05-12 11:08:08 -03:00 committed by David Gibson
parent c19940db0f
commit 87aff23827
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/ppc/machine.c
View File

@ -8,7 +8,6 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "kvm_ppc.h" #include "kvm_ppc.h"
#include "exec/helper-proto.h"
static void post_load_update_msr(CPUPPCState *env) static void post_load_update_msr(CPUPPCState *env)
{ {
@ -107,7 +106,7 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int version_id)
ppc_store_sdr1(env, sdr1); ppc_store_sdr1(env, sdr1);
} }
qemu_get_be32s(f, &vscr); qemu_get_be32s(f, &vscr);
helper_mtvscr(env, vscr); ppc_store_vscr(env, vscr);
qemu_get_be64s(f, &env->spe_acc); qemu_get_be64s(f, &env->spe_acc);
qemu_get_be32s(f, &env->spe_fscr); qemu_get_be32s(f, &env->spe_fscr);
qemu_get_betls(f, &env->msr_mask); qemu_get_betls(f, &env->msr_mask);
@ -456,7 +455,7 @@ static int get_vscr(QEMUFile *f, void *opaque, size_t size,
const VMStateField *field) const VMStateField *field)
{ {
PowerPCCPU *cpu = opaque; PowerPCCPU *cpu = opaque;
helper_mtvscr(&cpu->env, qemu_get_be32(f)); ppc_store_vscr(&cpu->env, qemu_get_be32(f));
return 0; return 0;
} }
@ -464,7 +463,7 @@ static int put_vscr(QEMUFile *f, void *opaque, size_t size,
const VMStateField *field, JSONWriter *vmdesc) const VMStateField *field, JSONWriter *vmdesc)
{ {
PowerPCCPU *cpu = opaque; PowerPCCPU *cpu = opaque;
qemu_put_be32(f, helper_mfvscr(&cpu->env)); qemu_put_be32(f, ppc_get_vscr(&cpu->env));
return 0; return 0;
} }