35d08458a9
After previous Peter patch, they are redundant. This way we don't
assign them except when needed. Once there, there were lots of case
where the ".fields" indentation was wrong:
.fields = (VMStateField []) {
and
.fields = (VMStateField []) {
Change all the combinations to:
.fields = (VMStateField[]){
The biggest problem (appart from aesthetics) was that checkpatch complained
when we copy&pasted the code from one place to another.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
90 lines
2.6 KiB
C
90 lines
2.6 KiB
C
#include "hw/hw.h"
|
|
#include "hw/boards.h"
|
|
|
|
static int get_fpcr(QEMUFile *f, void *opaque, size_t size)
|
|
{
|
|
CPUAlphaState *env = opaque;
|
|
cpu_alpha_store_fpcr(env, qemu_get_be64(f));
|
|
return 0;
|
|
}
|
|
|
|
static void put_fpcr(QEMUFile *f, void *opaque, size_t size)
|
|
{
|
|
CPUAlphaState *env = opaque;
|
|
qemu_put_be64(f, cpu_alpha_load_fpcr(env));
|
|
}
|
|
|
|
static const VMStateInfo vmstate_fpcr = {
|
|
.name = "fpcr",
|
|
.get = get_fpcr,
|
|
.put = put_fpcr,
|
|
};
|
|
|
|
static VMStateField vmstate_env_fields[] = {
|
|
VMSTATE_UINTTL_ARRAY(ir, CPUAlphaState, 31),
|
|
VMSTATE_UINTTL_ARRAY(fir, CPUAlphaState, 31),
|
|
/* Save the architecture value of the fpcr, not the internally
|
|
expanded version. Since this architecture value does not
|
|
exist in memory to be stored, this requires a but of hoop
|
|
jumping. We want OFFSET=0 so that we effectively pass ENV
|
|
to the helper functions, and we need to fill in the name by
|
|
hand since there's no field of that name. */
|
|
{
|
|
.name = "fpcr",
|
|
.version_id = 0,
|
|
.size = sizeof(uint64_t),
|
|
.info = &vmstate_fpcr,
|
|
.flags = VMS_SINGLE,
|
|
.offset = 0
|
|
},
|
|
VMSTATE_UINTTL(pc, CPUAlphaState),
|
|
VMSTATE_UINTTL(unique, CPUAlphaState),
|
|
VMSTATE_UINTTL(lock_addr, CPUAlphaState),
|
|
VMSTATE_UINTTL(lock_value, CPUAlphaState),
|
|
/* Note that lock_st_addr is not saved; it is a temporary
|
|
used during the execution of the st[lq]_c insns. */
|
|
|
|
VMSTATE_UINT8(ps, CPUAlphaState),
|
|
VMSTATE_UINT8(intr_flag, CPUAlphaState),
|
|
VMSTATE_UINT8(pal_mode, CPUAlphaState),
|
|
VMSTATE_UINT8(fen, CPUAlphaState),
|
|
|
|
VMSTATE_UINT32(pcc_ofs, CPUAlphaState),
|
|
|
|
VMSTATE_UINTTL(trap_arg0, CPUAlphaState),
|
|
VMSTATE_UINTTL(trap_arg1, CPUAlphaState),
|
|
VMSTATE_UINTTL(trap_arg2, CPUAlphaState),
|
|
|
|
VMSTATE_UINTTL(exc_addr, CPUAlphaState),
|
|
VMSTATE_UINTTL(palbr, CPUAlphaState),
|
|
VMSTATE_UINTTL(ptbr, CPUAlphaState),
|
|
VMSTATE_UINTTL(vptptr, CPUAlphaState),
|
|
VMSTATE_UINTTL(sysval, CPUAlphaState),
|
|
VMSTATE_UINTTL(usp, CPUAlphaState),
|
|
|
|
VMSTATE_UINTTL_ARRAY(shadow, CPUAlphaState, 8),
|
|
VMSTATE_UINTTL_ARRAY(scratch, CPUAlphaState, 24),
|
|
|
|
VMSTATE_END_OF_LIST()
|
|
};
|
|
|
|
static const VMStateDescription vmstate_env = {
|
|
.name = "env",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.fields = vmstate_env_fields,
|
|
};
|
|
|
|
static VMStateField vmstate_cpu_fields[] = {
|
|
VMSTATE_CPU(),
|
|
VMSTATE_STRUCT(env, AlphaCPU, 1, vmstate_env, CPUAlphaState),
|
|
VMSTATE_END_OF_LIST()
|
|
};
|
|
|
|
const VMStateDescription vmstate_alpha_cpu = {
|
|
.name = "cpu",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.fields = vmstate_cpu_fields,
|
|
};
|