[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 08/10] target-arm: remove final users of pstate_w
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v2 08/10] target-arm: remove final users of pstate_write |
Date: |
Thu, 10 Jul 2014 16:50:05 +0100 |
This converts all users of pstate_write to use the common state
save/restore functionality.
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/linux-user/signal.c b/linux-user/signal.c
index b6f9ef4..b1958a5 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -1274,7 +1274,7 @@ static int target_restore_sigframe(CPUARMState *env,
__get_user(env->xregs[31], &sf->uc.tuc_mcontext.sp);
__get_user(env->pc, &sf->uc.tuc_mcontext.pc);
__get_user(pstate, &sf->uc.tuc_mcontext.pstate);
- pstate_write(env, pstate);
+ restore_state_from_spsr(env, pstate);
__get_user(magic, &aux->fpsimd.head.magic);
__get_user(size, &aux->fpsimd.head.size);
diff --git a/target-arm/gdbstub64.c b/target-arm/gdbstub64.c
index 76d1b91..366335a 100644
--- a/target-arm/gdbstub64.c
+++ b/target-arm/gdbstub64.c
@@ -63,7 +63,7 @@ int aarch64_cpu_gdb_write_register(CPUState *cs, uint8_t
*mem_buf, int n)
return 8;
case 33:
/* SPSR */
- pstate_write(env, tmp);
+ restore_state_from_spsr(env, tmp);
return 4;
}
/* Unknown register. */
diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c
index 03cd64f..990b084 100644
--- a/target-arm/helper-a64.c
+++ b/target-arm/helper-a64.c
@@ -507,9 +507,8 @@ void aarch64_cpu_do_interrupt(CPUState *cs)
env->condexec_bits = 0;
}
- // TODO: restore_state_from_spsr()
- env->aarch64 = 1;
- pstate_write(env, PSTATE_DAIF | PSTATE_MODE_EL1h);
+ /* start IRQ with a clean program state */
+ restore_state_from_spsr(env, PSTATE_DAIF | PSTATE_MODE_EL1h);
env->pc = addr;
cs->interrupt_request |= CPU_INTERRUPT_EXITTB;
diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c
index eaf6ff8..7a022a6 100644
--- a/target-arm/kvm64.c
+++ b/target-arm/kvm64.c
@@ -230,7 +230,7 @@ int kvm_arch_get_registers(CPUState *cs)
if (ret) {
return ret;
}
- pstate_write(env, val);
+ restore_state_from_spsr(env, val);
/* KVM puts SP_EL0 in regs.sp and SP_EL1 in regs.sp_el1. On the
* QEMU side we keep the current SP in xregs[31] as well.
--
2.0.1
- [Qemu-devel] [PATCH v2 02/10] target-arm/cpu.h: common pstate save/restore, (continued)
- [Qemu-devel] [PATCH v2 02/10] target-arm/cpu.h: common pstate save/restore, Alex Bennée, 2014/07/10
- [Qemu-devel] [PATCH v2 03/10] target-arm: Support save/load for 64 bit CPUs, Alex Bennée, 2014/07/10
- [Qemu-devel] [PATCH v2 04/10] target-arm: replace cpsr/xpsr/pstate_read calls, Alex Bennée, 2014/07/10
- [Qemu-devel] [PATCH v2 05/10] arm/nwfps: replace cpsr_write with set_condition_codes, Alex Bennée, 2014/07/10
- [Qemu-devel] [PATCH v2 06/10] linux-user/main.c: __kernel_cmpxchg set env->CF directly, Alex Bennée, 2014/07/10
- [Qemu-devel] [PATCH v2 07/10] target-arm: remove last users of cpsr_write, Alex Bennée, 2014/07/10
- [Qemu-devel] [PATCH v2 08/10] target-arm: remove final users of pstate_write,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 09/10] target-arm/kvm.c: better error reporting, Alex Bennée, 2014/07/10
- [Qemu-devel] [PATCH v2 10/10] target-arm/kvm: make reg sync code common between kvm32/64, Alex Bennée, 2014/07/10