[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 29/50] target/i386: Add stub generator for helper_set_dr
From: |
Richard Henderson |
Subject: |
[PATCH v2 29/50] target/i386: Add stub generator for helper_set_dr |
Date: |
Fri, 14 May 2021 10:13:21 -0500 |
This removes an ifdef from the middle of disas_insn,
and ensures that the branch is not reachable.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/i386/tcg/translate.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index 18f1c0342f..a510dd10b1 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -179,6 +179,19 @@ typedef struct DisasContext {
#define REX_B(S) 0
#endif
+/*
+ * Many sysemu-only helpers are not reachable for user-only.
+ * Define stub generators here, so that we need not either sprinkle
+ * ifdefs through the translator, nor provide the helper function.
+ */
+#define STUB_HELPER(NAME, ...) \
+ static inline void gen_helper_##NAME(__VA_ARGS__) \
+ { qemu_build_not_reached(); }
+
+#ifdef CONFIG_USER_ONLY
+STUB_HELPER(set_dr, TCGv_env env, TCGv_i32 reg, TCGv val)
+#endif
+
static void gen_eob(DisasContext *s);
static void gen_jr(DisasContext *s, TCGv dest);
static void gen_jmp(DisasContext *s, target_ulong eip);
@@ -8075,7 +8088,6 @@ static target_ulong disas_insn(DisasContext *s, CPUState
*cpu)
case 0x121: /* mov reg, drN */
case 0x123: /* mov drN, reg */
if (check_cpl0(s)) {
-#ifndef CONFIG_USER_ONLY
modrm = x86_ldub_code(env, s);
/* Ignore the mod bits (assume (modrm&0xc0)==0xc0).
* AMD documentation (24594.pdf) and testing of
@@ -8104,7 +8116,6 @@ static target_ulong disas_insn(DisasContext *s, CPUState
*cpu)
gen_helper_get_dr(s->T0, cpu_env, s->tmp2_i32);
gen_op_mov_reg_v(s, ot, rm, s->T0);
}
-#endif /* !CONFIG_USER_ONLY */
}
break;
case 0x106: /* clts */
--
2.25.1
- [PATCH v2 31/50] target/i386: Assert !GUEST for user-only, (continued)
- [PATCH v2 31/50] target/i386: Assert !GUEST for user-only, Richard Henderson, 2021/05/14
- [PATCH v2 33/50] target/i386: Eliminate SVM helpers for user-only, Richard Henderson, 2021/05/14
- [PATCH v2 24/50] target/i386: Reduce DisasContext popl_esp_hack and rip_offset to uint8_t, Richard Henderson, 2021/05/14
- [PATCH v2 22/50] target/i386: Reduce DisasContext.prefix to uint8_t, Richard Henderson, 2021/05/14
- [PATCH v2 30/50] target/i386: Assert !SVME for user-only, Richard Henderson, 2021/05/14
- [PATCH v2 29/50] target/i386: Add stub generator for helper_set_dr,
Richard Henderson <=
- [PATCH v2 36/50] target/i386: Tidy svm_check_intercept from tcg, Richard Henderson, 2021/05/14
- [PATCH v2 37/50] target/i386: Remove pc_start argument to gen_svm_check_intercept, Richard Henderson, 2021/05/14
- [PATCH v2 38/50] target/i386: Remove user stub for cpu_vmexit, Richard Henderson, 2021/05/14
- [PATCH v2 39/50] target/i386: Cleanup read_crN, write_crN, lmsw, Richard Henderson, 2021/05/14
- [PATCH v2 28/50] target/i386: Reorder DisasContext members, Richard Henderson, 2021/05/14