[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v28 20/23] i386: make cpu_load_efer sysemu-only
From: |
Claudio Fontana |
Subject: |
[PATCH v28 20/23] i386: make cpu_load_efer sysemu-only |
Date: |
Mon, 22 Mar 2021 14:27:57 +0100 |
cpu_load_efer is now used only for sysemu code.
Therefore, move this function implementation to
sysemu-only section of helper.c
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
target/i386/cpu.h | 20 +++++---------------
target/i386/helper.c | 13 +++++++++++++
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 7ead176b99..fb603418cf 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1958,6 +1958,11 @@ static inline AddressSpace *cpu_addressspace(CPUState
*cs, MemTxAttrs attrs)
return cpu_get_address_space(cs, cpu_asidx_from_attrs(cs, attrs));
}
+/*
+ * load efer and update the corresponding hflags. XXX: do consistency
+ * checks with cpuid bits?
+ */
+void cpu_load_efer(CPUX86State *env, uint64_t val);
uint8_t x86_ldub_phys(CPUState *cs, hwaddr addr);
uint32_t x86_lduw_phys(CPUState *cs, hwaddr addr);
uint32_t x86_ldl_phys(CPUState *cs, hwaddr addr);
@@ -2054,21 +2059,6 @@ static inline uint32_t cpu_compute_eflags(CPUX86State
*env)
return eflags;
}
-
-/* load efer and update the corresponding hflags. XXX: do consistency
- checks with cpuid bits? */
-static inline void cpu_load_efer(CPUX86State *env, uint64_t val)
-{
- env->efer = val;
- env->hflags &= ~(HF_LMA_MASK | HF_SVME_MASK);
- if (env->efer & MSR_EFER_LMA) {
- env->hflags |= HF_LMA_MASK;
- }
- if (env->efer & MSR_EFER_SVME) {
- env->hflags |= HF_SVME_MASK;
- }
-}
-
static inline MemTxAttrs cpu_get_mem_attrs(CPUX86State *env)
{
return ((MemTxAttrs) { .secure = (env->hflags & HF_SMM_MASK) != 0 });
diff --git a/target/i386/helper.c b/target/i386/helper.c
index 618ad1c409..7304721a94 100644
--- a/target/i386/helper.c
+++ b/target/i386/helper.c
@@ -574,6 +574,19 @@ void do_cpu_sipi(X86CPU *cpu)
#endif
#ifndef CONFIG_USER_ONLY
+
+void cpu_load_efer(CPUX86State *env, uint64_t val)
+{
+ env->efer = val;
+ env->hflags &= ~(HF_LMA_MASK | HF_SVME_MASK);
+ if (env->efer & MSR_EFER_LMA) {
+ env->hflags |= HF_LMA_MASK;
+ }
+ if (env->efer & MSR_EFER_SVME) {
+ env->hflags |= HF_SVME_MASK;
+ }
+}
+
uint8_t x86_ldub_phys(CPUState *cs, hwaddr addr)
{
X86CPU *cpu = X86_CPU(cs);
--
2.26.2
- [PATCH v28 12/23] i386: move TCG bpt_helper into sysemu/, (continued)
- [PATCH v28 12/23] i386: move TCG bpt_helper into sysemu/, Claudio Fontana, 2021/03/22
- [PATCH v28 08/23] meson: add target_user_arch, Claudio Fontana, 2021/03/22
- [PATCH v28 14/23] i386: separate fpu_helper sysemu-only parts, Claudio Fontana, 2021/03/22
- [PATCH v28 15/23] i386: split svm_helper into sysemu and stub-only user, Claudio Fontana, 2021/03/22
- [PATCH v28 13/23] i386: split misc helper user stubs and sysemu part, Claudio Fontana, 2021/03/22
- [PATCH v28 18/23] target/i386: gdbstub: introduce aux functions to read/write CS64 regs, Claudio Fontana, 2021/03/22
- [PATCH v28 11/23] i386: split tcg excp_helper into sysemu and user parts, Claudio Fontana, 2021/03/22
- [PATCH v28 19/23] target/i386: gdbstub: only write CR0/CR2/CR3/EFER for sysemu, Claudio Fontana, 2021/03/22
- [PATCH v28 16/23] i386: split seg_helper into user-only and sysemu parts, Claudio Fontana, 2021/03/22
- [PATCH v28 21/23] accel: move call to accel_init_interfaces, Claudio Fontana, 2021/03/22
- [PATCH v28 20/23] i386: make cpu_load_efer sysemu-only,
Claudio Fontana <=
- [PATCH v28 22/23] accel: add init_accel_cpu for adapting accel behavior to CPU type, Claudio Fontana, 2021/03/22
- [PATCH v28 17/23] i386: split off sysemu part of cpu.c, Claudio Fontana, 2021/03/22
- [RFC v28 23/23] XXX RFC accel: add cpu_reset, Claudio Fontana, 2021/03/22
- Re: [PATCH v28 00/23] i386 cleanup PART 2, Paolo Bonzini, 2021/03/22