[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/12] target-i386: Remove redundant HF_SOFTMMU_MASK
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 12/12] target-i386: Remove redundant HF_SOFTMMU_MASK |
Date: |
Tue, 19 Jul 2016 10:34:19 +0200 |
From: Sergey Fedorov <address@hidden>
'HF_SOFTMMU_MASK' is only set when 'CONFIG_SOFTMMU' is defined. So
there's no need in this flag: test 'CONFIG_SOFTMMU' instead.
Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Sergey Fedorov <address@hidden>
Signed-off-by: Sergey Fedorov <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
target-i386/cpu.c | 3 ---
target-i386/cpu.h | 3 ---
target-i386/translate.c | 12 ++++--------
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index fc209ee..6e49e4c 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2725,9 +2725,6 @@ static void x86_cpu_reset(CPUState *s)
/* init to reset state */
-#ifdef CONFIG_SOFTMMU
- env->hflags |= HF_SOFTMMU_MASK;
-#endif
env->hflags2 |= HF2_GIF_MASK;
cpu_x86_update_cr0(env, 0x60000010);
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 776efe6..5b14a72 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -130,8 +130,6 @@
positions to ease oring with eflags. */
/* current cpl */
#define HF_CPL_SHIFT 0
-/* true if soft mmu is being used */
-#define HF_SOFTMMU_SHIFT 2
/* true if hardware interrupts must be disabled for next instruction */
#define HF_INHIBIT_IRQ_SHIFT 3
/* 16 or 32 segments */
@@ -161,7 +159,6 @@
#define HF_MPX_IU_SHIFT 26 /* BND registers in-use */
#define HF_CPL_MASK (3 << HF_CPL_SHIFT)
-#define HF_SOFTMMU_MASK (1 << HF_SOFTMMU_SHIFT)
#define HF_INHIBIT_IRQ_MASK (1 << HF_INHIBIT_IRQ_SHIFT)
#define HF_CS32_MASK (1 << HF_CS32_SHIFT)
#define HF_SS32_MASK (1 << HF_SS32_SHIFT)
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 7dea18b..e81fce7 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -8224,9 +8224,9 @@ void gen_intermediate_code(CPUX86State *env,
TranslationBlock *tb)
dc->popl_esp_hack = 0;
/* select memory access functions */
dc->mem_index = 0;
- if (flags & HF_SOFTMMU_MASK) {
- dc->mem_index = cpu_mmu_index(env, false);
- }
+#ifdef CONFIG_SOFTMMU
+ dc->mem_index = cpu_mmu_index(env, false);
+#endif
dc->cpuid_features = env->features[FEAT_1_EDX];
dc->cpuid_ext_features = env->features[FEAT_1_ECX];
dc->cpuid_ext2_features = env->features[FEAT_8000_0001_EDX];
@@ -8239,11 +8239,7 @@ void gen_intermediate_code(CPUX86State *env,
TranslationBlock *tb)
#endif
dc->flags = flags;
dc->jmp_opt = !(dc->tf || cs->singlestep_enabled ||
- (flags & HF_INHIBIT_IRQ_MASK)
-#ifndef CONFIG_SOFTMMU
- || (flags & HF_SOFTMMU_MASK)
-#endif
- );
+ (flags & HF_INHIBIT_IRQ_MASK));
/* Do not optimize repz jumps at all in icount mode, because
rep movsS instructions are execured with different paths
in !repz_opt and repz_opt modes. The first one was used
--
2.7.4
- [Qemu-devel] [PULL 03/12] hw/i386: add device tree support, (continued)
- [Qemu-devel] [PULL 03/12] hw/i386: add device tree support, Paolo Bonzini, 2016/07/19
- [Qemu-devel] [PULL 04/12] compiler: never omit assertions if using a static analysis tool, Paolo Bonzini, 2016/07/19
- [Qemu-devel] [PULL 08/12] cpu-exec: Move down some declarations in cpu_exec(), Paolo Bonzini, 2016/07/19
- [Qemu-devel] [PULL 07/12] exec: avoid realloc in phys_map_node_reserve, Paolo Bonzini, 2016/07/19
- [Qemu-devel] [PULL 10/12] block/iscsi: fix rounding in iscsi_allocationmap_set, Paolo Bonzini, 2016/07/19
- [Qemu-devel] [PULL 09/12] Move README to markdown, Paolo Bonzini, 2016/07/19
- [Qemu-devel] [PULL 06/12] checkpatch: consider git extended headers valid patches, Paolo Bonzini, 2016/07/19
- [Qemu-devel] [PULL 12/12] target-i386: Remove redundant HF_SOFTMMU_MASK,
Paolo Bonzini <=
- [Qemu-devel] [PULL 11/12] block/iscsi: allow caching of the allocation map, Paolo Bonzini, 2016/07/19
- Re: [Qemu-devel] [PULL v2 00/12] Misc patches for 2.7 hard freeze from 2016-07-18, Peter Maydell, 2016/07/19