Patchwork [6/9] unicore32-softmmu: add generic cpu state save/load functions

login
register
mail settings
Submitter Guan Xuetao
Date May 25, 2012, 11:29 a.m.
Message ID <fe8aa39bbdc705447369352969d2bd6010189345.1337944756.git.gxt@mprc.pku.edu.cn>
Download mbox | patch
Permalink /patch/161304/
State New
Headers show

Comments

Guan Xuetao - May 25, 2012, 11:29 a.m.
This patch adds generic cpu state save/load functions for UniCore32 ISA.
All architecture related registers are saved or loaded, and no optimization.

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
---
 target-unicore32/machine.c |   99 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 99 insertions(+), 0 deletions(-)
 create mode 100644 target-unicore32/machine.c
Andreas Färber - May 25, 2012, 11:44 a.m.
Am 25.05.2012 13:29, schrieb Guan Xuetao:
> This patch adds generic cpu state save/load functions for UniCore32 ISA.
> All architecture related registers are saved or loaded, and no optimization.
> 
> Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
> ---
>  target-unicore32/machine.c |   99 ++++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 99 insertions(+), 0 deletions(-)
>  create mode 100644 target-unicore32/machine.c
> 
> diff --git a/target-unicore32/machine.c b/target-unicore32/machine.c
> new file mode 100644
> index 0000000..e8c52cd
> --- /dev/null
> +++ b/target-unicore32/machine.c
> @@ -0,0 +1,99 @@
> +/*
> + * Generic machine functions for UniCore32 ISA
> + *
> + * Copyright (C) 2010-2012 Guan Xuetao
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation, or any later version.
> + * See the COPYING file in the top-level directory.
> + */
> +#include "hw/hw.h"
> +
> +void cpu_save(QEMUFile *f, void *opaque)
> +{
> +    int i;
> +    CPUUniCore32State *env = (CPUUniCore32State *)opaque;
> +
> +    for (i = 0; i < 32; i++) {
> +        qemu_put_be32(f, env->regs[i]);
> +    }
> +    qemu_put_be32(f, cpu_asr_read(env));
> +    qemu_put_be32(f, env->bsr);
[snip]

Please use VMState instead.

Andreas
陳韋任 - May 25, 2012, 11:45 a.m.
Hi Guan,

> +void cpu_save(QEMUFile *f, void *opaque)
> +{
> +    int i;
> +    CPUUniCore32State *env = (CPUUniCore32State *)opaque;
> +
> +    for (i = 0; i < 32; i++) {
> +        qemu_put_be32(f, env->regs[i]);
> +    }
> +    qemu_put_be32(f, cpu_asr_read(env));
> +    qemu_put_be32(f, env->bsr);
> +    for (i = 0; i < 6; i++) {
> +        qemu_put_be32(f, env->banked_bsr[i]);
> +        qemu_put_be32(f, env->banked_r29[i]);
> +        qemu_put_be32(f, env->banked_r30[i]);
> +    }
> +
> +    qemu_put_be32(f, env->cp0.c0_cpuid);
> +    qemu_put_be32(f, env->cp0.c0_cachetype);
> +    qemu_put_be32(f, env->cp0.c1_sys);
> +    qemu_put_be32(f, env->cp0.c2_base);
> +    qemu_put_be32(f, env->cp0.c3_faultstatus);
> +    qemu_put_be32(f, env->cp0.c4_faultaddr);
> +    qemu_put_be32(f, env->cp0.c5_cacheop);
> +    qemu_put_be32(f, env->cp0.c6_tlbop);
> +
> +    qemu_put_be32(f, env->features);
> +
> +    if (env->features & UC32_HWCAP_UCF64) {
> +        for (i = 0;  i < 16; i++) {
> +            CPU_DoubleU u;
> +            u.d = env->ucf64.regs[i];
> +            qemu_put_be32(f, u.l.upper);
> +            qemu_put_be32(f, u.l.lower);
> +        }
> +        for (i = 0; i < 32; i++) {
> +            qemu_put_be32(f, env->ucf64.xregs[i]);
> +        }
> +    }
> +}

  Do you think use VMState rather then QEMUFile is a good idea?
I saw OpenRISC target got this kind of feedback before [1].

Regards,
chenwj

[1] http://lists.gnu.org/archive/html/qemu-devel/2012-05/msg02457.html
Guan Xuetao - May 28, 2012, 9:45 a.m.
> Am 25.05.2012 13:29, schrieb Guan Xuetao:
>> This patch adds generic cpu state save/load functions for UniCore32 ISA.
>> All architecture related registers are saved or loaded, and no
>> optimization.
>>
>> Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
>> ---
>>  target-unicore32/machine.c |   99
>> ++++++++++++++++++++++++++++++++++++++++++++
>>  1 files changed, 99 insertions(+), 0 deletions(-)
>>  create mode 100644 target-unicore32/machine.c
>>
>> diff --git a/target-unicore32/machine.c b/target-unicore32/machine.c
>> new file mode 100644
>> index 0000000..e8c52cd
>> --- /dev/null
>> +++ b/target-unicore32/machine.c
>> @@ -0,0 +1,99 @@
>> +/*
>> + * Generic machine functions for UniCore32 ISA
>> + *
>> + * Copyright (C) 2010-2012 Guan Xuetao
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation, or any later version.
>> + * See the COPYING file in the top-level directory.
>> + */
>> +#include "hw/hw.h"
>> +
>> +void cpu_save(QEMUFile *f, void *opaque)
>> +{
>> +    int i;
>> +    CPUUniCore32State *env = (CPUUniCore32State *)opaque;
>> +
>> +    for (i = 0; i < 32; i++) {
>> +        qemu_put_be32(f, env->regs[i]);
>> +    }
>> +    qemu_put_be32(f, cpu_asr_read(env));
>> +    qemu_put_be32(f, env->bsr);
> [snip]
>
> Please use VMState instead.
>
> Andreas

Thanks, I will try it.

Guan Xuetao

Patch

diff --git a/target-unicore32/machine.c b/target-unicore32/machine.c
new file mode 100644
index 0000000..e8c52cd
--- /dev/null
+++ b/target-unicore32/machine.c
@@ -0,0 +1,99 @@ 
+/*
+ * Generic machine functions for UniCore32 ISA
+ *
+ * Copyright (C) 2010-2012 Guan Xuetao
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation, or any later version.
+ * See the COPYING file in the top-level directory.
+ */
+#include "hw/hw.h"
+
+void cpu_save(QEMUFile *f, void *opaque)
+{
+    int i;
+    CPUUniCore32State *env = (CPUUniCore32State *)opaque;
+
+    for (i = 0; i < 32; i++) {
+        qemu_put_be32(f, env->regs[i]);
+    }
+    qemu_put_be32(f, cpu_asr_read(env));
+    qemu_put_be32(f, env->bsr);
+    for (i = 0; i < 6; i++) {
+        qemu_put_be32(f, env->banked_bsr[i]);
+        qemu_put_be32(f, env->banked_r29[i]);
+        qemu_put_be32(f, env->banked_r30[i]);
+    }
+
+    qemu_put_be32(f, env->cp0.c0_cpuid);
+    qemu_put_be32(f, env->cp0.c0_cachetype);
+    qemu_put_be32(f, env->cp0.c1_sys);
+    qemu_put_be32(f, env->cp0.c2_base);
+    qemu_put_be32(f, env->cp0.c3_faultstatus);
+    qemu_put_be32(f, env->cp0.c4_faultaddr);
+    qemu_put_be32(f, env->cp0.c5_cacheop);
+    qemu_put_be32(f, env->cp0.c6_tlbop);
+
+    qemu_put_be32(f, env->features);
+
+    if (env->features & UC32_HWCAP_UCF64) {
+        for (i = 0;  i < 16; i++) {
+            CPU_DoubleU u;
+            u.d = env->ucf64.regs[i];
+            qemu_put_be32(f, u.l.upper);
+            qemu_put_be32(f, u.l.lower);
+        }
+        for (i = 0; i < 32; i++) {
+            qemu_put_be32(f, env->ucf64.xregs[i]);
+        }
+    }
+}
+
+int cpu_load(QEMUFile *f, void *opaque, int version_id)
+{
+    CPUUniCore32State *env = (CPUUniCore32State *)opaque;
+    int i;
+    uint32_t val;
+
+    if (version_id != CPU_SAVE_VERSION) {
+        return -EINVAL;
+    }
+
+    for (i = 0; i < 32; i++) {
+        env->regs[i] = qemu_get_be32(f);
+    }
+    val = qemu_get_be32(f);
+    /* Avoid mode switch when restoring ASR.  */
+    env->uncached_asr = val & ASR_M;
+    cpu_asr_write(env, val, 0xffffffff);
+    env->bsr = qemu_get_be32(f);
+    for (i = 0; i < 6; i++) {
+        env->banked_bsr[i] = qemu_get_be32(f);
+        env->banked_r29[i] = qemu_get_be32(f);
+        env->banked_r30[i] = qemu_get_be32(f);
+    }
+
+    env->cp0.c0_cpuid = qemu_get_be32(f);
+    env->cp0.c0_cachetype = qemu_get_be32(f);
+    env->cp0.c1_sys = qemu_get_be32(f);
+    env->cp0.c2_base = qemu_get_be32(f);
+    env->cp0.c3_faultstatus = qemu_get_be32(f);
+    env->cp0.c4_faultaddr = qemu_get_be32(f);
+    env->cp0.c5_cacheop = qemu_get_be32(f);
+    env->cp0.c6_tlbop = qemu_get_be32(f);
+
+    if (env->features & UC32_HWCAP_UCF64) {
+        for (i = 0;  i < 16; i++) {
+            CPU_DoubleU u;
+            u.l.upper = qemu_get_be32(f);
+            u.l.lower = qemu_get_be32(f);
+            env->ucf64.regs[i] = u.d;
+        }
+        for (i = 0; i < 16; i++) {
+            env->ucf64.xregs[i] = qemu_get_be32(f);
+        }
+    }
+
+    return 0;
+}