Re: [Qemu-devel] [PATCH v2 03/10] target-arm: Support save/load for 64 bit CPUs

[Peter Maydell]

On 10 July 2014 16:50, Alex Bennée <address@hidden> wrote:
> This enables the saving and restoring of machine state by including the
> current program state (*psr) and xregs. The save_state_to_spsr hides the
> details of if the processor is in 32 or 64 bit mode at the time.
>
> Signed-off-by: Alex Bennée <address@hidden>
>
> ---
>
> v2 (ajb)
>   - use common state save functions
>   - re-base to latest origin/master
>   - clean up commented out code
>
> diff --git a/target-arm/machine.c b/target-arm/machine.c
> index 3bcc7cc..759610c 100644
> --- a/target-arm/machine.c
> +++ b/target-arm/machine.c
> @@ -120,30 +120,27 @@ static const VMStateDescription vmstate_thumb2ee = {
>      }
>  };
>
> -static int get_cpsr(QEMUFile *f, void *opaque, size_t size)
> +static int get_psr(QEMUFile *f, void *opaque, size_t size)
>  {
>      ARMCPU *cpu = opaque;
>      CPUARMState *env = &cpu->env;
>      uint32_t val = qemu_get_be32(f);
>
> -    /* Avoid mode switch when restoring CPSR */
> -    env->uncached_cpsr = val & CPSR_M;
> -    cpsr_write(env, val, 0xffffffff);
> +    restore_state_from_spsr(env, val);
>      return 0;
>  }
>
> -static void put_cpsr(QEMUFile *f, void *opaque, size_t size)
> +static void put_psr(QEMUFile *f, void *opaque, size_t size)
>  {
>      ARMCPU *cpu = opaque;
>      CPUARMState *env = &cpu->env;
> -
> -    qemu_put_be32(f, cpsr_read(env));
> +    qemu_put_be32(f, save_state_to_spsr(env));
>  }
>
> -static const VMStateInfo vmstate_cpsr = {
> +static const VMStateInfo vmstate_psr = {
>      .name = "cpsr",
> -    .get = get_cpsr,
> -    .put = put_cpsr,
> +    .get = get_psr,
> +    .put = put_psr,
>  };
>
>  static void cpu_pre_save(void *opaque)
> @@ -218,17 +215,19 @@ static int cpu_post_load(void *opaque, int version_id)
>
>  const VMStateDescription vmstate_arm_cpu = {
>      .name = "cpu",
> -    .version_id = 20,
> -    .minimum_version_id = 20,
> +    .version_id = 21,
> +    .minimum_version_id = 21,
>      .pre_save = cpu_pre_save,
>      .post_load = cpu_post_load,
>      .fields = (VMStateField[]) {
>          VMSTATE_UINT32_ARRAY(env.regs, ARMCPU, 16),
> +        VMSTATE_UINT64_ARRAY(env.xregs, ARMCPU, 32),
> +        VMSTATE_UINT64(env.pc, ARMCPU),
>          {
> -            .name = "cpsr",
> +            .name = "psr",

Why do we rename "cpsr" to "psr" here but not in the
vmstate_psr itself above? (Personally I would call this
"pstate" or just leave it as "cpsr", but naming here isn't
a big deal I think.)

>              .version_id = 0,
>              .size = sizeof(uint32_t),
> -            .info = &vmstate_cpsr,
> +            .info = &vmstate_psr,
>              .flags = VMS_SINGLE,
>              .offset = 0,
>          },

thanks
-- PMM