From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOeg2-0000bQ-CR for qemu-devel@nongnu.org; Fri, 14 Mar 2014 22:50:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOefw-0007aT-6p for qemu-devel@nongnu.org; Fri, 14 Mar 2014 22:50:22 -0400 Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]:54567) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOefv-0007aI-S6 for qemu-devel@nongnu.org; Fri, 14 Mar 2014 22:50:16 -0400 Received: by mail-pa0-f48.google.com with SMTP id hz1so3404767pad.21 for ; Fri, 14 Mar 2014 19:50:15 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Fri, 14 Mar 2014 19:48:49 -0700 Message-Id: <1394851732-25692-24-git-send-email-rth@twiddle.net> In-Reply-To: <1394851732-25692-1-git-send-email-rth@twiddle.net> References: <1394851732-25692-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 23/26] tcg-aarch64: Replace aarch64_ldst_op_data with AArch64LdstType List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, claudio.fontana@gmail.com The definition of op_type wasn't encoded for the proper shift for the field, making the implementations confusing. Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c index d6d3e86..fde3df7 100644 --- a/tcg/aarch64/tcg-target.c +++ b/tcg/aarch64/tcg-target.c @@ -242,12 +242,12 @@ static const enum aarch64_cond_code tcg_cond_to_aarch64[] = { [TCG_COND_LEU] = COND_LS, }; -enum aarch64_ldst_op_type { /* type of operation */ - LDST_ST = 0x0, /* store */ - LDST_LD = 0x4, /* load */ - LDST_LD_S_X = 0x8, /* load and sign-extend into Xt */ - LDST_LD_S_W = 0xc, /* load and sign-extend into Wt */ -}; +typedef enum { + LDST_ST = 0, /* store */ + LDST_LD = 1, /* load */ + LDST_LD_S_X = 2, /* load and sign-extend into Xt */ + LDST_LD_S_W = 3, /* load and sign-extend into Wt */ +} AArch64LdstType; /* We encode the format of the insn into the beginning of the name, so that we can have the preprocessor help "typecheck" the insn vs the output @@ -483,22 +483,19 @@ static void tcg_out_insn_3509(TCGContext *s, AArch64Insn insn, TCGType ext, } -static inline void tcg_out_ldst_9(TCGContext *s, TCGMemOp size, - enum aarch64_ldst_op_type op_type, - TCGReg rd, TCGReg rn, intptr_t offset) +static void tcg_out_ldst_9(TCGContext *s, TCGMemOp size, AArch64LdstType type, + TCGReg rd, TCGReg rn, intptr_t offset) { /* use LDUR with BASE register with 9bit signed unscaled offset */ - tcg_out32(s, 0x38000000 | size << 30 | op_type << 20 + tcg_out32(s, 0x38000000 | size << 30 | type << 22 | (offset & 0x1ff) << 12 | rn << 5 | rd); } /* tcg_out_ldst_12 expects a scaled unsigned immediate offset */ -static inline void tcg_out_ldst_12(TCGContext *s, TCGMemOp size, - enum aarch64_ldst_op_type op_type, - TCGReg rd, TCGReg rn, - tcg_target_ulong scaled_uimm) +static void tcg_out_ldst_12(TCGContext *s, TCGMemOp size, AArch64LdstType type, + TCGReg rd, TCGReg rn, tcg_target_ulong scaled_uimm) { - tcg_out32(s, 0x39000000 | size << 30 | op_type << 20 + tcg_out32(s, 0x39000000 | size << 30 | type << 22 | scaled_uimm << 10 | rn << 5 | rd); } @@ -628,21 +625,16 @@ static void tcg_out_movi(TCGContext *s, TCGType type, TCGReg rd, } } -static inline void tcg_out_ldst_r(TCGContext *s, TCGMemOp size, - enum aarch64_ldst_op_type op_type, - TCGReg rd, TCGReg base, TCGReg regoff) +static void tcg_out_ldst_r(TCGContext *s, TCGMemOp size, AArch64LdstType type, + TCGReg rd, TCGReg base, TCGReg regoff) { - /* load from memory to register using base + 64bit register offset */ - /* using f.e. STR Wt, [Xn, Xm] 0xb8600800|(regoff << 16)|(base << 5)|rd */ - /* the 0x6000 is for the "no extend field" */ - tcg_out32(s, 0x38206800 | size << 30 | op_type << 20 + tcg_out32(s, 0x38206800 | size << 30 | type << 22 | regoff << 16 | base << 5 | rd); } /* solve the whole ldst problem */ -static inline void tcg_out_ldst(TCGContext *s, TCGMemOp size, - enum aarch64_ldst_op_type type, - TCGReg rd, TCGReg rn, intptr_t offset) +static void tcg_out_ldst(TCGContext *s, TCGMemOp size, AArch64LdstType type, + TCGReg rd, TCGReg rn, intptr_t offset) { if (offset >= -256 && offset < 256) { tcg_out_ldst_9(s, size, type, rd, rn, offset); -- 1.8.5.3