diff options
| author | Eric Farman <farman@linux.vnet.ibm.com> | 2015-05-07 14:35:44 -0400 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2015-05-27 17:52:03 +0200 |
| commit | c498d8e36e2998fb67de21a34ece633d356a4834 (patch) | |
| tree | 5b767101eb99af8c7adefdec65cbae2f737325f0 /target-s390x/kvm.c | |
| parent | 0915aed5842bd4dbe396b92d4f3b846ae29ad663 (diff) | |
| download | qemu-c498d8e36e2998fb67de21a34ece633d356a4834.tar.gz | |
s390x: Common access to floating point registers
Provide a routine to access the correct floating point register,
to simplify future expansion.
Suggested-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Eric Farman <farman@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'target-s390x/kvm.c')
| -rw-r--r-- | target-s390x/kvm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index ea18015793..1a40a94a51 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -339,7 +339,7 @@ int kvm_arch_put_registers(CPUState *cs, int level) /* Floating point */ for (i = 0; i < 16; i++) { - fpu.fprs[i] = env->fregs[i].ll; + fpu.fprs[i] = get_freg(env, i)->ll; } fpu.fpc = env->fpc; @@ -474,7 +474,7 @@ int kvm_arch_get_registers(CPUState *cs) return r; } for (i = 0; i < 16; i++) { - env->fregs[i].ll = fpu.fprs[i]; + get_freg(env, i)->ll = fpu.fprs[i]; } env->fpc = fpu.fpc; @@ -1363,6 +1363,7 @@ static int kvm_s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch) static const uint8_t ar_id = 1; uint64_t ckc = cpu->env.ckc >> 8; void *mem; + int i; hwaddr len = SAVE_AREA_SIZE; mem = cpu_physical_memory_map(addr, &len, 1); @@ -1377,7 +1378,9 @@ static int kvm_s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch) if (store_arch) { cpu_physical_memory_write(offsetof(LowCore, ar_access_id), &ar_id, 1); } - memcpy(mem, &cpu->env.fregs, 128); + for (i = 0; i < 16; ++i) { + *((uint64 *)mem + i) = get_freg(&cpu->env, i)->ll; + } memcpy(mem + 128, &cpu->env.regs, 128); memcpy(mem + 256, &cpu->env.psw, 16); memcpy(mem + 280, &cpu->env.psa, 4); |