From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH 05/28] translator: Use cpu_ld*_code instead of open-coding
Date: Wed, 11 Dec 2019 20:00:16 -0800 [thread overview]
Message-ID: <20191212040039.26546-6-richard.henderson@linaro.org> (raw)
In-Reply-To: <20191212040039.26546-1-richard.henderson@linaro.org>
The DO_LOAD macros replicate the distinction already performed
by the cpu_ldst.h functions. Use them.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/cpu_ldst.h | 11 ---------
include/exec/translator.h | 48 +++++++++++----------------------------
2 files changed, 13 insertions(+), 46 deletions(-)
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index cf8af36dbc..399ff6c3da 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -129,11 +129,6 @@ static inline void clear_helper_retaddr(void)
#include "exec/cpu_ldst_useronly_template.h"
#undef MEMSUFFIX
-/*
- * Code access is deprecated in favour of translator_ld* functions
- * (see translator.h). However there are still users that need to
- * converted so for now these stay.
- */
#define MEMSUFFIX _code
#define CODE_ACCESS
#define DATA_SIZE 1
@@ -455,12 +450,6 @@ void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val,
#undef CPU_MMU_INDEX
#undef MEMSUFFIX
-/*
- * Code access is deprecated in favour of translator_ld* functions
- * (see translator.h). However there are still users that need to
- * converted so for now these stay.
- */
-
#define CPU_MMU_INDEX (cpu_mmu_index(env, true))
#define MEMSUFFIX _code
#define SOFTMMU_CODE_ACCESS
diff --git a/include/exec/translator.h b/include/exec/translator.h
index 459dd72aab..638e1529c5 100644
--- a/include/exec/translator.h
+++ b/include/exec/translator.h
@@ -148,41 +148,19 @@ void translator_loop_temp_check(DisasContextBase *db);
/*
* Translator Load Functions
*
- * These are intended to replace the old cpu_ld*_code functions and
- * are mandatory for front-ends that have been migrated to the common
- * translator_loop. These functions are only intended to be called
- * from the translation stage and should not be called from helper
- * functions. Those functions should be converted to encode the
- * relevant information at translation time.
+ * These are intended to replace the direct usage of the cpu_ld*_code
+ * functions and are mandatory for front-ends that have been migrated
+ * to the common translator_loop. These functions are only intended
+ * to be called from the translation stage and should not be called
+ * from helper functions. Those functions should be converted to encode
+ * the relevant information at translation time.
*/
-#ifdef CONFIG_USER_ONLY
-
-#define DO_LOAD(type, name, shift) \
- do { \
- set_helper_retaddr(1); \
- ret = name ## _p(g2h(pc)); \
- clear_helper_retaddr(); \
- } while (0)
-
-#else
-
-#define DO_LOAD(type, name, shift) \
- do { \
- int mmu_idx = cpu_mmu_index(env, true); \
- TCGMemOpIdx oi = make_memop_idx(shift, mmu_idx); \
- ret = helper_ret_ ## name ## _cmmu(env, pc, oi, 0); \
- } while (0)
-
-#endif
-
-#define GEN_TRANSLATOR_LD(fullname, name, type, shift, swap_fn) \
+#define GEN_TRANSLATOR_LD(fullname, type, load_fn, swap_fn) \
static inline type \
fullname ## _swap(CPUArchState *env, abi_ptr pc, bool do_swap) \
{ \
- type ret; \
- DO_LOAD(type, name, shift); \
- \
+ type ret = load_fn(env, pc); \
if (do_swap) { \
ret = swap_fn(ret); \
} \
@@ -195,11 +173,11 @@ void translator_loop_temp_check(DisasContextBase *db);
return fullname ## _swap(env, pc, false); \
}
-GEN_TRANSLATOR_LD(translator_ldub, ldub, uint8_t, 0, /* no swap */ )
-GEN_TRANSLATOR_LD(translator_ldsw, ldsw, int16_t, 1, bswap16)
-GEN_TRANSLATOR_LD(translator_lduw, lduw, uint16_t, 1, bswap16)
-GEN_TRANSLATOR_LD(translator_ldl, ldl, uint32_t, 2, bswap32)
-GEN_TRANSLATOR_LD(translator_ldq, ldq, uint64_t, 3, bswap64)
+GEN_TRANSLATOR_LD(translator_ldub, uint8_t, cpu_ldub_code, /* no swap */)
+GEN_TRANSLATOR_LD(translator_ldsw, int16_t, cpu_ldsw_code, bswap16)
+GEN_TRANSLATOR_LD(translator_lduw, uint16_t, cpu_lduw_code, bswap16)
+GEN_TRANSLATOR_LD(translator_ldl, uint32_t, cpu_ldl_code, bswap32)
+GEN_TRANSLATOR_LD(translator_ldq, uint64_t, cpu_ldq_code, bswap64)
#undef GEN_TRANSLATOR_LD
#endif /* EXEC__TRANSLATOR_H */
--
2.20.1
next prev parent reply other threads:[~2019-12-12 4:05 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 4:00 [PATCH 00/28] cputlb: Remove support for MMU_MODE*_SUFFIX Richard Henderson
2019-12-12 4:00 ` [PATCH 01/28] target/xtensa: Use probe_access for itlb_hit_test Richard Henderson
2019-12-12 18:45 ` Max Filippov
2019-12-12 4:00 ` [PATCH 02/28] cputlb: Use trace_mem_get_info instead of trace_mem_build_info Richard Henderson
2019-12-12 4:00 ` [PATCH 03/28] trace: Remove trace_mem_build_info_no_se_[bl]e Richard Henderson
2019-12-12 4:00 ` [PATCH 04/28] cputlb: Move body of cpu_ldst_template.h out of line Richard Henderson
2019-12-12 4:00 ` Richard Henderson [this message]
2019-12-12 4:00 ` [PATCH 06/28] cputlb: Rename helper_ret_ld*_cmmu to cpu_ld*_code Richard Henderson
2019-12-12 9:33 ` Aleksandar Markovic
2019-12-12 4:00 ` [PATCH 07/28] cputlb: Provide cpu_(ld,st}*_mmuidx_ra for user-only Richard Henderson
2019-12-12 4:00 ` [PATCH 08/28] target/i386: Use cpu_*_mmuidx_ra instead of templates Richard Henderson
2019-12-12 7:19 ` Paolo Bonzini
2019-12-12 4:00 ` [PATCH 09/28] target/s390x: Include tcg.h in mem_helper.c Richard Henderson
2019-12-12 10:36 ` David Hildenbrand
2019-12-12 4:00 ` [PATCH 10/28] target/arm: Include tcg.h in sve_helper.c Richard Henderson
2019-12-12 4:00 ` [PATCH 11/28] accel/tcg: Include tcg.h in tcg-runtime.c Richard Henderson
2019-12-12 12:28 ` Alex Bennée
2019-12-12 4:00 ` [PATCH 12/28] linux-user: Include tcg.h in syscall.c Richard Henderson
2019-12-12 4:00 ` [PATCH 13/28] linux-user: Include trace-root.h in syscall-trace.h Richard Henderson
2019-12-12 4:00 ` [PATCH 14/28] cputlb: Expand cpu_ldst_useronly_template.h in user-exec.c Richard Henderson
2019-12-12 20:02 ` Aleksandar Markovic
2019-12-12 4:00 ` [PATCH 15/28] target/nios2: Remove MMU_MODE{0,1}_SUFFIX Richard Henderson
2019-12-12 4:00 ` [PATCH 16/28] target/alpha: " Richard Henderson
2019-12-12 4:00 ` [PATCH 17/28] target/cris: " Richard Henderson
2019-12-12 4:00 ` [PATCH 18/28] target/i386: Remove MMU_MODE{0,1,2}_SUFFIX Richard Henderson
2019-12-12 8:11 ` Paolo Bonzini
2019-12-12 4:00 ` [PATCH 19/28] target/microblaze: " Richard Henderson
2019-12-12 4:00 ` [PATCH 20/28] target/sh4: Remove MMU_MODE{0,1}_SUFFIX Richard Henderson
2019-12-12 4:00 ` [PATCH 21/28] target/unicore32: " Richard Henderson
2019-12-12 4:00 ` [PATCH 22/28] target/xtensa: Remove MMU_MODE{0,1,2,3}_SUFFIX Richard Henderson
2019-12-12 18:46 ` Max Filippov
2019-12-12 4:00 ` [PATCH 23/28] target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0, 1}_SUFFIX Richard Henderson
2019-12-12 8:53 ` [PATCH 23/28] target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0,1}_SUFFIX Laurent Vivier
2019-12-12 9:44 ` [PATCH 23/28] target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0, 1}_SUFFIX Laurent Vivier
2019-12-12 14:27 ` Richard Henderson
2019-12-12 4:00 ` [PATCH 24/28] target/mips: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX Richard Henderson
2019-12-12 9:32 ` Aleksandar Markovic
2019-12-12 4:00 ` [PATCH 25/28] target/s390x: " Richard Henderson
2019-12-12 10:38 ` David Hildenbrand
2019-12-12 4:00 ` [PATCH 26/28] target/ppc: " Richard Henderson
2019-12-12 5:13 ` David Gibson
2019-12-12 4:00 ` [PATCH 27/28] cputlb: Remove support for MMU_MODE*_SUFFIX Richard Henderson
2019-12-12 4:00 ` [PATCH 28/28] cputlb: Expand cpu_ldst_template.h in cputlb.c Richard Henderson
2019-12-12 10:00 ` Aleksandar Markovic
2019-12-12 20:34 ` [PATCH 00/28] cputlb: Remove support for MMU_MODE*_SUFFIX Aleksandar Markovic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191212040039.26546-6-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).