From patchwork Fri Jan 7 22:43:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 77932 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 22C19B715B for ; Sat, 8 Jan 2011 10:16:32 +1100 (EST) Received: from [127.0.0.1] (port=46417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PbL9r-0005T7-Ox for incoming@patchwork.ozlabs.org; Fri, 07 Jan 2011 17:51:43 -0500 Received: from [140.186.70.92] (port=49313 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PbL37-000296-MR for qemu-devel@nongnu.org; Fri, 07 Jan 2011 17:44:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PbL1o-0003MV-R5 for qemu-devel@nongnu.org; Fri, 07 Jan 2011 17:43:27 -0500 Received: from a.mail.sonic.net ([64.142.16.245]:46704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PbL1o-0003Lq-Eh for qemu-devel@nongnu.org; Fri, 07 Jan 2011 17:43:24 -0500 Received: from are.twiddle.net (are.twiddle.net [75.101.38.216]) by a.mail.sonic.net (8.13.8.Beta0-Sonic/8.13.7) with ESMTP id p07Mh6jB001774 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 7 Jan 2011 14:43:07 -0800 Received: from are.twiddle.net (localhost [127.0.0.1]) by are.twiddle.net (8.14.4/8.14.4) with ESMTP id p07Mh6QI000949; Fri, 7 Jan 2011 14:43:06 -0800 Received: (from rth@localhost) by are.twiddle.net (8.14.4/8.14.4/Submit) id p07Mh66o000948; Fri, 7 Jan 2011 14:43:06 -0800 From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 7 Jan 2011 14:43:00 -0800 Message-Id: <1294440183-885-5-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1294440183-885-1-git-send-email-rth@twiddle.net> References: <1294440183-885-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Alexander Graf , Aurelien Jarno Subject: [Qemu-devel] [PATCH 4/7] tcg-ia64: Implement deposit operation. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Richard Henderson --- tcg/ia64/tcg-target.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ tcg/ia64/tcg-target.h | 2 + 2 files changed, 94 insertions(+), 0 deletions(-) diff --git a/tcg/ia64/tcg-target.c b/tcg/ia64/tcg-target.c index 3ddf434..2708d55 100644 --- a/tcg/ia64/tcg-target.c +++ b/tcg/ia64/tcg-target.c @@ -237,6 +237,7 @@ enum { OPC_CMP4_LT_A6 = 0x18400000000ull, OPC_CMP4_LTU_A6 = 0x1a400000000ull, OPC_CMP4_EQ_A6 = 0x1c400000000ull, + OPC_DEP_I15 = 0x08000000000ull, OPC_DEP_Z_I12 = 0x0a600000000ull, OPC_EXTR_I11 = 0x0a400002000ull, OPC_EXTR_U_I11 = 0x0a400000000ull, @@ -508,6 +509,19 @@ static inline uint64_t tcg_opc_i12(int qp, uint64_t opc, int r1, | (qp & 0x3f); } +static inline uint64_t tcg_opc_i15(int qp, uint64_t opc, int r1, + int r2, int r3, int len, uint64_t len, + uint64_t cpos) +{ + return opc + | ((cpos & 0x3f) << 31) + | ((len & 0x0f) << 27) + | ((r3 & 0x7f) << 20) + | ((r2 & 0x7f) << 13) + | ((r1 & 0x7f) << 6) + | (qp & 0x3f); +} + static inline uint64_t tcg_opc_i18(int qp, uint64_t opc, uint64_t imm) { return opc @@ -1335,6 +1349,73 @@ static inline void tcg_out_bswap64(TCGContext *s, TCGArg ret, TCGArg arg) tcg_opc_i3 (TCG_REG_P0, OPC_MUX1_I3, ret, arg, 0xb)); } +static void tcg_out_deposit_i32(TCGContext *s, TCGArg out, TCGArg in, + TCGArg val, unsigned ofs, unsigned len) +{ + uint64_t nop_m = tcg_opc_m48(TCG_REG_P0, OPC_NOP_M48, 0); + + if (val == 0) { + tcg_out_bundle(s, mmI, nop_m, nop_m, + tcg_opc_i12(TCG_REG_P0, OPC_DEP_Z_I12, out, in, + len - 1, 63 - ofs)); + } else if (len <= 16) { + tcg_out_bundle(s, mmI, nop_m, nop_m, + tcg_opc_i15(TCG_REG_P0, OPC_DEP_I15, out, in, val, + len - 1, 63 - ofs)); + } else { + tcg_out_bundle(s, miI, nop_m, + tcg_opc_i11(TCG_REG_P0, OPC_EXTR_U_I11, TCG_REG_R2, + val, 16, 31 - 16), + tcg_opc_i15(TCG_REG_P0, OPC_DEP_I15, out, in, val, + 16 - 1, 63 - ofs)); + tcg_out_bundle(s, mmI, nop_m, nop_m, + tcg_opc_i15(TCG_REG_P0, OPC_DEP_I15, out, out, + TCG_REG_R2, len - 16 - 1, 63 - (ofs + 16))); + } +} + +static void tcg_out_deposit_i64(TCGContext *s, TCGArg out, TCGArg in, + TCGArg val, unsigned ofs, unsigned len) +{ + uint64_t nop_m = tcg_opc_m48(TCG_REG_P0, OPC_NOP_M48, 0); + + if (val == 0) { + tcg_out_bundle(s, mmI, nop_m, nop_m, + tcg_opc_i12(TCG_REG_P0, OPC_DEP_Z_I12, out, in, + len - 1, 63 - ofs)); + } else if (len <= 16) { + tcg_out_bundle(s, mmI, nop_m, nop_m, + tcg_opc_i15(TCG_REG_P0, OPC_DEP_I15, out, in, val, + len - 1, 63 - ofs)); + } else { + uint64_t ror = 0, shrp, rol = 0; + + if (ofs) { + ror = tcg_opc_i10(TCG_REG_P0, OPC_SHRP_I10, TCG_REG_R2, + in, in, ofs); + in = TCG_REG_R2; + } + + shrp = tcg_opc_i10(TCG_REG_P0, OPC_SHRP_I10, out, in, val, len); + + ofs = (ofs - len) & 63; + if (ofs) { + rol = tcg_opc_i10(TCG_REG_P0, OPC_SHRP_I10, out, out, out, 64-ofs); + } + + if (ror) { + tcg_out_bundle(s, mII, nop_m, ror, shrp); + if (rol) { + tcg_out_bundle(s, mmI, nop_m, nop_m, rol); + } + } else if (rol) { + tcg_out_bundle(s, mII, nop_m, shrp, rol); + } else { + tcg_out_bundle(s, mmI, nop_m, nop_m, shrp); + } + } +} + static inline uint64_t tcg_opc_cmp_a(int qp, TCGCond cond, TCGArg arg1, TCGArg arg2, int cmp4) { @@ -2063,6 +2144,15 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, tcg_out_rotr_i64(s, args[0], args[1], args[2], const_args[2]); break; + case INDEX_op_deposit_i32: + tcg_out_deposit_i32(s, args[0], args[1], args[2], + (args[3] >> 8) & 31, args[3] & 31); + break; + case INDEX_op_deposit_i64: + tcg_out_deposit_i64(s, args[0], args[1], args[2], + (args[3] >> 8) & 63, args[3] & 63); + break; + case INDEX_op_ext8s_i32: case INDEX_op_ext8s_i64: tcg_out_ext(s, OPC_SXT1_I29, args[0], args[1]); @@ -2192,6 +2282,7 @@ static const TCGTargetOpDef ia64_op_defs[] = { { INDEX_op_shr_i32, { "r", "rZ", "ri" } }, { INDEX_op_rotl_i32, { "r", "rZ", "ri" } }, { INDEX_op_rotr_i32, { "r", "rZ", "ri" } }, + { INDEX_op_deposit_i32, { "r", "rZ", "rZ" } }, { INDEX_op_ext8s_i32, { "r", "rZ"} }, { INDEX_op_ext8u_i32, { "r", "rZ"} }, @@ -2238,6 +2329,7 @@ static const TCGTargetOpDef ia64_op_defs[] = { { INDEX_op_shr_i64, { "r", "rZ", "ri" } }, { INDEX_op_rotl_i64, { "r", "rZ", "ri" } }, { INDEX_op_rotr_i64, { "r", "rZ", "ri" } }, + { INDEX_op_deposit_i64, { "r", "rZ", "rZ" } }, { INDEX_op_ext8s_i64, { "r", "rZ"} }, { INDEX_op_ext8u_i64, { "r", "rZ"} }, diff --git a/tcg/ia64/tcg-target.h b/tcg/ia64/tcg-target.h index e56e88f..80e3534 100644 --- a/tcg/ia64/tcg-target.h +++ b/tcg/ia64/tcg-target.h @@ -131,6 +131,8 @@ enum { #define TCG_TARGET_HAS_orc_i64 #define TCG_TARGET_HAS_rot_i32 #define TCG_TARGET_HAS_rot_i64 +#define TCG_TARGET_HAS_deposit_i32 +#define TCG_TARGET_HAS_deposit_i64 /* optional instructions automatically implemented */ #undef TCG_TARGET_HAS_neg_i32 /* sub r1, r0, r3 */