From: Claudio Fontana <claudio.fontana@huawei.com>
To: Richard Henderson <rth@twiddle.net>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, claudio.fontana@gmail.com
Subject: Re: [Qemu-devel] [PATCH 18/26] tcg-aarch64: Use TCGMemOp in qemu_ld/st
Date: Wed, 26 Mar 2014 10:39:35 +0100 [thread overview]
Message-ID: <5332A057.6000506@huawei.com> (raw)
In-Reply-To: <1394851732-25692-19-git-send-email-rth@twiddle.net>
On 15.03.2014 03:48, Richard Henderson wrote:
> Making the bswap conditional on the memop instead of a
> compile-time test instead.
too many insteads? :)
> Signed-off-by: Richard Henderson <rth@twiddle.net>
> ---
> tcg/aarch64/tcg-target.c | 131 +++++++++++++++++++++++------------------------
> 1 file changed, 63 insertions(+), 68 deletions(-)
>
> diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c
> index 26dc1ab..3920f99 100644
> --- a/tcg/aarch64/tcg-target.c
> +++ b/tcg/aarch64/tcg-target.c
> @@ -27,12 +27,6 @@ static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
> };
> #endif /* NDEBUG */
>
> -#ifdef TARGET_WORDS_BIGENDIAN
> - #define TCG_LDST_BSWAP 1
> -#else
> - #define TCG_LDST_BSWAP 0
> -#endif
> -
> static const int tcg_target_reg_alloc_order[] = {
> TCG_REG_X20, TCG_REG_X21, TCG_REG_X22, TCG_REG_X23,
> TCG_REG_X24, TCG_REG_X25, TCG_REG_X26, TCG_REG_X27,
> @@ -1104,7 +1098,7 @@ static void tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb)
> tcg_out_goto(s, (intptr_t)lb->raddr);
> }
>
> -static void add_qemu_ldst_label(TCGContext *s, int is_ld, int opc,
> +static void add_qemu_ldst_label(TCGContext *s, int is_ld, TCGMemOp opc,
> TCGReg data_reg, TCGReg addr_reg,
> int mem_index,
> uint8_t *raddr, uint8_t *label_ptr)
> @@ -1124,7 +1118,7 @@ static void add_qemu_ldst_label(TCGContext *s, int is_ld, int opc,
> slow path for the failure case, which will be patched later when finalizing
> the slow path. Generated code returns the host addend in X1,
> clobbers X0,X2,X3,TMP. */
> -static void tcg_out_tlb_read(TCGContext *s, TCGReg addr_reg, int s_bits,
> +static void tcg_out_tlb_read(TCGContext *s, TCGReg addr_reg, TCGMemOp s_bits,
> uint8_t **label_ptr, int mem_index, bool is_read)
> {
> TCGReg base = TCG_AREG0;
> @@ -1180,24 +1174,26 @@ static void tcg_out_tlb_read(TCGContext *s, TCGReg addr_reg, int s_bits,
>
> #endif /* CONFIG_SOFTMMU */
>
> -static void tcg_out_qemu_ld_direct(TCGContext *s, int opc, TCGReg data_r,
> - TCGReg addr_r, TCGReg off_r)
> +static void tcg_out_qemu_ld_direct(TCGContext *s, TCGMemOp memop,
> + TCGReg data_r, TCGReg addr_r, TCGReg off_r)
> {
> - switch (opc) {
> - case 0:
> + const TCGMemOp bswap = memop & MO_BSWAP;
> +
> + switch (memop & MO_SSIZE) {
> + case MO_UB:
> tcg_out_ldst_r(s, LDST_8, LDST_LD, data_r, addr_r, off_r);
> break;
> - case 0 | 4:
> + case MO_SB:
> tcg_out_ldst_r(s, LDST_8, LDST_LD_S_X, data_r, addr_r, off_r);
> break;
> - case 1:
> + case MO_UW:
> tcg_out_ldst_r(s, LDST_16, LDST_LD, data_r, addr_r, off_r);
> - if (TCG_LDST_BSWAP) {
> + if (bswap) {
> tcg_out_rev16(s, TCG_TYPE_I32, data_r, data_r);
> }
> break;
> - case 1 | 4:
> - if (TCG_LDST_BSWAP) {
> + case MO_SW:
> + if (bswap) {
> tcg_out_ldst_r(s, LDST_16, LDST_LD, data_r, addr_r, off_r);
> tcg_out_rev16(s, TCG_TYPE_I32, data_r, data_r);
> tcg_out_sxt(s, TCG_TYPE_I64, MO_16, data_r, data_r);
> @@ -1205,14 +1201,14 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, int opc, TCGReg data_r,
> tcg_out_ldst_r(s, LDST_16, LDST_LD_S_X, data_r, addr_r, off_r);
> }
> break;
> - case 2:
> + case MO_UL:
> tcg_out_ldst_r(s, LDST_32, LDST_LD, data_r, addr_r, off_r);
> - if (TCG_LDST_BSWAP) {
> + if (bswap) {
> tcg_out_rev(s, TCG_TYPE_I32, data_r, data_r);
> }
> break;
> - case 2 | 4:
> - if (TCG_LDST_BSWAP) {
> + case MO_SL:
> + if (bswap) {
> tcg_out_ldst_r(s, LDST_32, LDST_LD, data_r, addr_r, off_r);
> tcg_out_rev(s, TCG_TYPE_I32, data_r, data_r);
> tcg_out_sxt(s, TCG_TYPE_I64, MO_32, data_r, data_r);
> @@ -1220,9 +1216,9 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, int opc, TCGReg data_r,
> tcg_out_ldst_r(s, LDST_32, LDST_LD_S_X, data_r, addr_r, off_r);
> }
> break;
> - case 3:
> + case MO_Q:
> tcg_out_ldst_r(s, LDST_64, LDST_LD, data_r, addr_r, off_r);
> - if (TCG_LDST_BSWAP) {
> + if (bswap) {
> tcg_out_rev(s, TCG_TYPE_I64, data_r, data_r);
> }
> break;
> @@ -1231,47 +1227,47 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, int opc, TCGReg data_r,
> }
> }
>
> -static void tcg_out_qemu_st_direct(TCGContext *s, int opc, TCGReg data_r,
> - TCGReg addr_r, TCGReg off_r)
> +static void tcg_out_qemu_st_direct(TCGContext *s, TCGMemOp memop,
> + TCGReg data_r, TCGReg addr_r, TCGReg off_r)
> {
> - switch (opc) {
> - case 0:
> + const TCGMemOp bswap = memop & MO_BSWAP;
> +
> + switch (memop & MO_SIZE) {
> + case MO_8:
> tcg_out_ldst_r(s, LDST_8, LDST_ST, data_r, addr_r, off_r);
> break;
> - case 1:
> - if (TCG_LDST_BSWAP) {
> + case MO_16:
> + if (bswap) {
> tcg_out_rev16(s, TCG_TYPE_I32, TCG_REG_TMP, data_r);
> - tcg_out_ldst_r(s, LDST_16, LDST_ST, TCG_REG_TMP, addr_r, off_r);
> - } else {
> - tcg_out_ldst_r(s, LDST_16, LDST_ST, data_r, addr_r, off_r);
> + data_r = TCG_REG_TMP;
> }
> + tcg_out_ldst_r(s, LDST_16, LDST_ST, data_r, addr_r, off_r);
> break;
> - case 2:
> - if (TCG_LDST_BSWAP) {
> + case MO_32:
> + if (bswap) {
> tcg_out_rev(s, TCG_TYPE_I32, TCG_REG_TMP, data_r);
> - tcg_out_ldst_r(s, LDST_32, LDST_ST, TCG_REG_TMP, addr_r, off_r);
> - } else {
> - tcg_out_ldst_r(s, LDST_32, LDST_ST, data_r, addr_r, off_r);
> + data_r = TCG_REG_TMP;
> }
> + tcg_out_ldst_r(s, LDST_32, LDST_ST, data_r, addr_r, off_r);
> break;
> - case 3:
> - if (TCG_LDST_BSWAP) {
> + case MO_64:
> + if (bswap) {
> tcg_out_rev(s, TCG_TYPE_I64, TCG_REG_TMP, data_r);
> - tcg_out_ldst_r(s, LDST_64, LDST_ST, TCG_REG_TMP, addr_r, off_r);
> - } else {
> - tcg_out_ldst_r(s, LDST_64, LDST_ST, data_r, addr_r, off_r);
> + data_r = TCG_REG_TMP;
> }
> + tcg_out_ldst_r(s, LDST_64, LDST_ST, data_r, addr_r, off_r);
> break;
> default:
> tcg_abort();
> }
> }
>
> -static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc)
> +static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, TCGMemOp memop)
> {
> TCGReg addr_reg, data_reg;
> #ifdef CONFIG_SOFTMMU
> - int mem_index, s_bits;
> + int mem_index;
> + TCGMemOp s_bits;
> uint8_t *label_ptr;
> #endif
> data_reg = args[0];
> @@ -1279,22 +1275,23 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc)
>
> #ifdef CONFIG_SOFTMMU
> mem_index = args[2];
> - s_bits = opc & 3;
> + s_bits = memop & MO_SIZE;
> tcg_out_tlb_read(s, addr_reg, s_bits, &label_ptr, mem_index, 1);
> - tcg_out_qemu_ld_direct(s, opc, data_reg, addr_reg, TCG_REG_X1);
> - add_qemu_ldst_label(s, 1, opc, data_reg, addr_reg,
> + tcg_out_qemu_ld_direct(s, memop, data_reg, addr_reg, TCG_REG_X1);
> + add_qemu_ldst_label(s, 1, memop, data_reg, addr_reg,
> mem_index, s->code_ptr, label_ptr);
> #else /* !CONFIG_SOFTMMU */
> - tcg_out_qemu_ld_direct(s, opc, data_reg, addr_reg,
> + tcg_out_qemu_ld_direct(s, memop, data_reg, addr_reg,
> GUEST_BASE ? TCG_REG_GUEST_BASE : TCG_REG_XZR);
> #endif /* CONFIG_SOFTMMU */
> }
>
> -static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int opc)
> +static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, TCGMemOp memop)
> {
> TCGReg addr_reg, data_reg;
> #ifdef CONFIG_SOFTMMU
> - int mem_index, s_bits;
> + int mem_index;
> + TCGMemOp s_bits;
> uint8_t *label_ptr;
> #endif
> data_reg = args[0];
> @@ -1302,14 +1299,14 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, int opc)
>
> #ifdef CONFIG_SOFTMMU
> mem_index = args[2];
> - s_bits = opc & 3;
> + s_bits = memop & MO_SIZE;
>
> tcg_out_tlb_read(s, addr_reg, s_bits, &label_ptr, mem_index, 0);
> - tcg_out_qemu_st_direct(s, opc, data_reg, addr_reg, TCG_REG_X1);
> - add_qemu_ldst_label(s, 0, opc, data_reg, addr_reg,
> + tcg_out_qemu_st_direct(s, memop, data_reg, addr_reg, TCG_REG_X1);
> + add_qemu_ldst_label(s, 0, memop, data_reg, addr_reg,
> mem_index, s->code_ptr, label_ptr);
> #else /* !CONFIG_SOFTMMU */
> - tcg_out_qemu_st_direct(s, opc, data_reg, addr_reg,
> + tcg_out_qemu_st_direct(s, memop, data_reg, addr_reg,
> GUEST_BASE ? TCG_REG_GUEST_BASE : TCG_REG_XZR);
> #endif /* CONFIG_SOFTMMU */
> }
> @@ -1582,40 +1579,38 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
> break;
>
> case INDEX_op_qemu_ld8u:
> - tcg_out_qemu_ld(s, args, 0 | 0);
> + tcg_out_qemu_ld(s, args, MO_UB);
> break;
> case INDEX_op_qemu_ld8s:
> - tcg_out_qemu_ld(s, args, 4 | 0);
> + tcg_out_qemu_ld(s, args, MO_SB);
> break;
> case INDEX_op_qemu_ld16u:
> - tcg_out_qemu_ld(s, args, 0 | 1);
> + tcg_out_qemu_ld(s, args, MO_TEUW);
> break;
> case INDEX_op_qemu_ld16s:
> - tcg_out_qemu_ld(s, args, 4 | 1);
> + tcg_out_qemu_ld(s, args, MO_TESW);
> break;
> case INDEX_op_qemu_ld32u:
> - tcg_out_qemu_ld(s, args, 0 | 2);
> + case INDEX_op_qemu_ld32:
> + tcg_out_qemu_ld(s, args, MO_TEUL);
> break;
> case INDEX_op_qemu_ld32s:
> - tcg_out_qemu_ld(s, args, 4 | 2);
> - break;
> - case INDEX_op_qemu_ld32:
> - tcg_out_qemu_ld(s, args, 0 | 2);
> + tcg_out_qemu_ld(s, args, MO_TESL);
> break;
> case INDEX_op_qemu_ld64:
> - tcg_out_qemu_ld(s, args, 0 | 3);
> + tcg_out_qemu_ld(s, args, MO_TEQ);
> break;
> case INDEX_op_qemu_st8:
> - tcg_out_qemu_st(s, args, 0);
> + tcg_out_qemu_st(s, args, MO_UB);
> break;
> case INDEX_op_qemu_st16:
> - tcg_out_qemu_st(s, args, 1);
> + tcg_out_qemu_st(s, args, MO_TEUW);
> break;
> case INDEX_op_qemu_st32:
> - tcg_out_qemu_st(s, args, 2);
> + tcg_out_qemu_st(s, args, MO_TEUL);
> break;
> case INDEX_op_qemu_st64:
> - tcg_out_qemu_st(s, args, 3);
> + tcg_out_qemu_st(s, args, MO_TEQ);
> break;
>
> case INDEX_op_bswap32_i64:
>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
next prev parent reply other threads:[~2014-03-26 9:39 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-15 2:48 [Qemu-devel] [PATCH 00/26] tcg/aarch64 improvements, part 3 Richard Henderson
2014-03-15 2:48 ` [Qemu-devel] [PATCH 01/26] tcg-aarch64: Properly detect SIGSEGV writes Richard Henderson
2014-03-24 11:05 ` Claudio Fontana
2014-03-24 15:33 ` Richard Henderson
2014-03-24 11:45 ` Claudio Fontana
2014-03-24 12:17 ` Peter Maydell
2014-03-24 12:41 ` Peter Maydell
2014-03-24 15:27 ` Richard Henderson
2014-03-15 2:48 ` [Qemu-devel] [PATCH 02/26] tcg-aarch64: Use intptr_t apropriately Richard Henderson
2014-03-24 12:12 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 03/26] tcg-aarch64: Use TCGType and TCGMemOp constants Richard Henderson
2014-03-24 12:52 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 04/26] tcg-aarch64: Use MOVN in tcg_out_movi Richard Henderson
2014-03-24 14:06 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 05/26] tcg-aarch64: Use ORRI " Richard Henderson
2014-03-24 14:06 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 06/26] tcg-aarch64: Special case small constants " Richard Henderson
2014-03-24 14:08 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 07/26] tcg-aarch64: Use adrp " Richard Henderson
2014-03-24 14:05 ` Claudio Fontana
2014-03-24 15:36 ` Richard Henderson
2014-03-26 9:34 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 08/26] tcg-aarch64: Use symbolic names for branches Richard Henderson
2014-03-24 15:31 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 09/26] tcg-aarch64: Create tcg_out_brcond Richard Henderson
2014-03-24 15:31 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 10/26] tcg-aarch64: Use CBZ and CBNZ Richard Henderson
2014-03-24 15:32 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 11/26] tcg-aarch64: Reuse FP and LR in translated code Richard Henderson
2014-03-28 9:48 ` Claudio Fontana
2014-03-28 13:23 ` Richard Henderson
2014-03-15 2:48 ` [Qemu-devel] [PATCH 12/26] tcg-aarch64: Introduce tcg_out_insn_3314 Richard Henderson
2014-03-15 2:48 ` [Qemu-devel] [PATCH 13/26] tcg-aarch64: Rearrange prologue insn order Richard Henderson
2014-03-15 2:48 ` [Qemu-devel] [PATCH 14/26] tcg-aarch64: Implement tcg_register_jit Richard Henderson
2014-03-15 2:48 ` [Qemu-devel] [PATCH 15/26] tcg-aarch64: Avoid add with zero in tlb load Richard Henderson
2014-03-26 9:36 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 16/26] tcg-aarch64: Use tcg_out_call for qemu_ld/st Richard Henderson
2014-03-26 9:37 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 17/26] tcg-aarch64: Use ADR to pass the return address to the ld/st helpers Richard Henderson
2014-03-26 9:38 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 18/26] tcg-aarch64: Use TCGMemOp in qemu_ld/st Richard Henderson
2014-03-26 9:39 ` Claudio Fontana [this message]
2014-03-15 2:48 ` [Qemu-devel] [PATCH 19/26] tcg-aarch64: Implement TCG_TARGET_HAS_new_ldst Richard Henderson
2014-03-26 9:40 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 20/26] tcg-aarch64: Introduce tcg_out_insn_3507 Richard Henderson
2014-03-26 9:40 ` Claudio Fontana
2014-03-15 2:48 ` [Qemu-devel] [PATCH 21/26] tcg-aarch64: Merge aarch64_ldst_get_data/type into tcg_out_op Richard Henderson
2014-03-15 2:48 ` [Qemu-devel] [PATCH 22/26] tcg-aarch64: Replace aarch64_ldst_op_data with TCGMemOp Richard Henderson
2014-03-15 2:48 ` [Qemu-devel] [PATCH 23/26] tcg-aarch64: Replace aarch64_ldst_op_data with AArch64LdstType Richard Henderson
2014-03-15 2:48 ` [Qemu-devel] [PATCH 24/26] tcg-aarch64: Prefer unsigned offsets before signed offsets for ldst Richard Henderson
2014-03-15 2:48 ` [Qemu-devel] [PATCH 25/26] tcg-aarch64: Merge tcg_out_movr with tcg_out_mov Richard Henderson
2014-03-15 2:48 ` [Qemu-devel] [PATCH 26/26] tcg-aarch64: Support stores of zero Richard Henderson
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=5332A057.6000506@huawei.com \
--to=claudio.fontana@huawei.com \
--cc=claudio.fontana@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.