From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYafl-0005BM-49 for qemu-devel@nongnu.org; Fri, 11 Apr 2014 08:35:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYafg-0007sS-Me for qemu-devel@nongnu.org; Fri, 11 Apr 2014 08:35:09 -0400 Received: from lhrrgout.huawei.com ([194.213.3.17]:51023) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYafg-0007r5-F6 for qemu-devel@nongnu.org; Fri, 11 Apr 2014 08:35:04 -0400 Message-ID: <5347E170.9040803@huawei.com> Date: Fri, 11 Apr 2014 14:34:56 +0200 From: Claudio Fontana MIME-Version: 1.0 References: <1396555000-8205-1-git-send-email-rth@twiddle.net> <1396555000-8205-23-git-send-email-rth@twiddle.net> In-Reply-To: <1396555000-8205-23-git-send-email-rth@twiddle.net> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 22/26] tcg-aarch64: Merge aarch64_ldst_get_data/type into tcg_out_op List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson , qemu-devel@nongnu.org Cc: claudio.fontana@gmail.com On 03.04.2014 21:56, Richard Henderson wrote: > Signed-off-by: Richard Henderson > --- > tcg/aarch64/tcg-target.c | 115 +++++++++++++---------------------------------- > 1 file changed, 32 insertions(+), 83 deletions(-) > > diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c > index de7490d..5ecc20c 100644 > --- a/tcg/aarch64/tcg-target.c > +++ b/tcg/aarch64/tcg-target.c > @@ -355,78 +355,6 @@ typedef enum { > I3510_ANDS = 0x6a000000, > } AArch64Insn; > > -static inline enum aarch64_ldst_op_data > -aarch64_ldst_get_data(TCGOpcode tcg_op) > -{ > - switch (tcg_op) { > - case INDEX_op_ld8u_i32: > - case INDEX_op_ld8s_i32: > - case INDEX_op_ld8u_i64: > - case INDEX_op_ld8s_i64: > - case INDEX_op_st8_i32: > - case INDEX_op_st8_i64: > - return LDST_8; > - > - case INDEX_op_ld16u_i32: > - case INDEX_op_ld16s_i32: > - case INDEX_op_ld16u_i64: > - case INDEX_op_ld16s_i64: > - case INDEX_op_st16_i32: > - case INDEX_op_st16_i64: > - return LDST_16; > - > - case INDEX_op_ld_i32: > - case INDEX_op_st_i32: > - case INDEX_op_ld32u_i64: > - case INDEX_op_ld32s_i64: > - case INDEX_op_st32_i64: > - return LDST_32; > - > - case INDEX_op_ld_i64: > - case INDEX_op_st_i64: > - return LDST_64; > - > - default: > - tcg_abort(); > - } > -} > - > -static inline enum aarch64_ldst_op_type > -aarch64_ldst_get_type(TCGOpcode tcg_op) > -{ > - switch (tcg_op) { > - case INDEX_op_st8_i32: > - case INDEX_op_st16_i32: > - case INDEX_op_st8_i64: > - case INDEX_op_st16_i64: > - case INDEX_op_st_i32: > - case INDEX_op_st32_i64: > - case INDEX_op_st_i64: > - return LDST_ST; > - > - case INDEX_op_ld8u_i32: > - case INDEX_op_ld16u_i32: > - case INDEX_op_ld8u_i64: > - case INDEX_op_ld16u_i64: > - case INDEX_op_ld_i32: > - case INDEX_op_ld32u_i64: > - case INDEX_op_ld_i64: > - return LDST_LD; > - > - case INDEX_op_ld8s_i32: > - case INDEX_op_ld16s_i32: > - return LDST_LD_S_W; > - > - case INDEX_op_ld8s_i64: > - case INDEX_op_ld16s_i64: > - case INDEX_op_ld32s_i64: > - return LDST_LD_S_X; > - > - default: > - tcg_abort(); > - } > -} > - > static inline uint32_t tcg_in32(TCGContext *s) > { > uint32_t v = *(uint32_t *)s->code_ptr; > @@ -1368,30 +1296,51 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, > tcg_out_goto_label(s, a0); > break; > > - case INDEX_op_ld_i32: > - case INDEX_op_ld_i64: > case INDEX_op_ld8u_i32: > - case INDEX_op_ld8s_i32: > - case INDEX_op_ld16u_i32: > - case INDEX_op_ld16s_i32: > case INDEX_op_ld8u_i64: > + tcg_out_ldst(s, LDST_8, LDST_LD, a0, a1, a2); > + break; > + case INDEX_op_ld8s_i32: > + tcg_out_ldst(s, LDST_8, LDST_LD_S_W, a0, a1, a2); > + break; > case INDEX_op_ld8s_i64: > + tcg_out_ldst(s, LDST_8, LDST_LD_S_X, a0, a1, a2); > + break; > + case INDEX_op_ld16u_i32: > case INDEX_op_ld16u_i64: > + tcg_out_ldst(s, LDST_16, LDST_LD, a0, a1, a2); > + break; > + case INDEX_op_ld16s_i32: > + tcg_out_ldst(s, LDST_16, LDST_LD_S_W, a0, a1, a2); > + break; > case INDEX_op_ld16s_i64: > + tcg_out_ldst(s, LDST_16, LDST_LD_S_X, a0, a1, a2); > + break; > + case INDEX_op_ld_i32: > case INDEX_op_ld32u_i64: > + tcg_out_ldst(s, LDST_32, LDST_LD, a0, a1, a2); > + break; > case INDEX_op_ld32s_i64: > - tcg_out_ldst(s, aarch64_ldst_get_data(opc), aarch64_ldst_get_type(opc), > - a0, a1, a2); > + tcg_out_ldst(s, LDST_32, LDST_LD_S_X, a0, a1, a2); > break; > - case INDEX_op_st_i32: > - case INDEX_op_st_i64: > + case INDEX_op_ld_i64: > + tcg_out_ldst(s, LDST_64, LDST_LD, a0, a1, a2); > + break; > + > case INDEX_op_st8_i32: > case INDEX_op_st8_i64: > + tcg_out_ldst(s, LDST_8, LDST_ST, REG0(0), a1, a2); > + break; > case INDEX_op_st16_i32: > case INDEX_op_st16_i64: > + tcg_out_ldst(s, LDST_16, LDST_ST, REG0(0), a1, a2); > + break; > + case INDEX_op_st_i32: > case INDEX_op_st32_i64: > - tcg_out_ldst(s, aarch64_ldst_get_data(opc), aarch64_ldst_get_type(opc), > - REG0(0), a1, a2); > + tcg_out_ldst(s, LDST_32, LDST_ST, REG0(0), a1, a2); > + break; > + case INDEX_op_st_i64: > + tcg_out_ldst(s, LDST_64, LDST_ST, REG0(0), a1, a2); > break; > > case INDEX_op_add_i32: > Reviewed-by: Claudio Fontana