From nobody Sun May 5 05:52:57 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1679304563; cv=none; d=zohomail.com; s=zohoarc; b=HcHhs9JzPzYhm7lG1mRrqTRO6hkXRgCRL6hCbrVYXUYgg2BYerJqpdIuprhdiBQutuPDOScLVI+Et2743bESIHU4R+o+o14fWac5cXoPEEOpxO9d18GgE4/7HqZviQwu1RmNYobCq9PfNMuszX8S9JUuOiWvnvHoOyc+BhVM6rY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679304563; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GrrbdlI1Sm376zB61v7VsKEu6ocRrJ3h05UOV8XH/xk=; b=Y1DSOKvsA2ZoWMeZIxg7m+ggfQGp3MnO23fMRqnXtWbAmBvRZB17H2SOk/CjcLhsmdkvTHuUihQ2KnZwJ7a6DK8bFZq5yoLWPJypbg8BZ0x1NjUs5mPlUF9LLD5ogmM29mNTRcQUdtGiyQ7LfrzMajN9lm+B2jdKtb+JmGEZUBw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1679304563871704.9186757225315; Mon, 20 Mar 2023 02:29:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peBow-0004Ua-2u; Mon, 20 Mar 2023 05:28:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peBop-0004Tu-Gj for qemu-devel@nongnu.org; Mon, 20 Mar 2023 05:28:43 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peBol-0000E4-C4 for qemu-devel@nongnu.org; Mon, 20 Mar 2023 05:28:43 -0400 Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32K903VT006666; Mon, 20 Mar 2023 09:28:36 GMT Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3pd6kgmae4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Mar 2023 09:28:35 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 32K9SYC6004231 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Mar 2023 09:28:34 GMT Received: from hu-mliebel-lv.qualcomm.com (10.49.16.6) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 20 Mar 2023 02:28:34 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=GrrbdlI1Sm376zB61v7VsKEu6ocRrJ3h05UOV8XH/xk=; b=BmSyQCDm4OF3OCe7p70loVf2xVOJoXl7svX1DPhap9ZJJPaDG+RJC44M32SIdqVVkmYq 0+yxoYz1bI5Wjzv5cYHttc39fztWx1LRfDqN3kGwS26WRlPX+bklb7iIKdEpoU9LGWPL P1vyUvExZGCC5n60H7aZ7+/3IpeGSLDIi5OQ0W/ku0yoroks065qczMS/p4pB5OBCU4f UA60MoTnDTJCOCqM4Dr0ZPu824qJA6ibGQr4GkMHQdKn+EWgeZ1ZUpLzxa3lT0+aTgRd TFQG7oCU2MbOEqSzufiftzhM1xsQBtZdMy1pzHdBawW/bfYeHUcTKAeBg8dE7Os18FB0 7Q== From: Marco Liebel To: CC: Taylor Simpson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Markus Armbruster" , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Marco Liebel Subject: [PATCH v3 1/2] Use f-strings in python scripts Date: Mon, 20 Mar 2023 02:25:32 -0700 Message-ID: <20230320092533.2859433-2-quic_mliebel@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230320092533.2859433-1-quic_mliebel@quicinc.com> References: <20230320092533.2859433-1-quic_mliebel@quicinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: qwa-bkcvyuZIZuq2qgG5f9e2H88ctWEw X-Proofpoint-ORIG-GUID: qwa-bkcvyuZIZuq2qgG5f9e2H88ctWEw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-20_06,2023-03-16_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 impostorscore=0 malwarescore=0 adultscore=0 priorityscore=1501 mlxlogscore=968 clxscore=1015 mlxscore=0 lowpriorityscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303200080 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=quic_mliebel@quicinc.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @quicinc.com) X-ZM-MESSAGEID: 1679304566149100007 Content-Type: text/plain; charset="utf-8" Replace python 2 format string with f-strings Signed-off-by: Marco Liebel Reviewed-by: Taylor Simpson Tested-by: Taylor Simpson --- target/hexagon/gen_analyze_funcs.py | 115 ++++----- target/hexagon/gen_helper_funcs.py | 54 ++-- target/hexagon/gen_helper_protos.py | 10 +- target/hexagon/gen_idef_parser_funcs.py | 8 +- target/hexagon/gen_op_attribs.py | 4 +- target/hexagon/gen_op_regs.py | 10 +- target/hexagon/gen_opcodes_def.py | 2 +- target/hexagon/gen_printinsn.py | 14 +- target/hexagon/gen_shortcode.py | 2 +- target/hexagon/gen_tcg_func_table.py | 2 +- target/hexagon/gen_tcg_funcs.py | 317 +++++++++++------------- target/hexagon/hex_common.py | 4 +- 12 files changed, 243 insertions(+), 299 deletions(-) diff --git a/target/hexagon/gen_analyze_funcs.py b/target/hexagon/gen_analy= ze_funcs.py index ebd3e7afb9..1e246209e8 100755 --- a/target/hexagon/gen_analyze_funcs.py +++ b/target/hexagon/gen_analyze_funcs.py @@ -29,57 +29,49 @@ def is_predicated(tag): return 'A_CONDEXEC' in hex_common.attribdict[tag] =20 def analyze_opn_old(f, tag, regtype, regid, regno): - regN =3D "%s%sN" % (regtype, regid) + regN =3D f"{regtype}{regid}N" predicated =3D "true" if is_predicated(tag) else "false" if (regtype =3D=3D "R"): if (regid in {"ss", "tt"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") elif (regid in {"dd", "ee", "xx", "yy"}): - f.write(" const int %s =3D insn->regno[%d];\n" % (regN, reg= no)) - f.write(" ctx_log_reg_write_pair(ctx, %s, %s);\n" % \ - (regN, predicated)) + f.write(f" const int {regN} =3D insn->regno[{regno}];\n") + f.write(f" ctx_log_reg_write_pair(ctx, {regN}, {predicated}= );\n") elif (regid in {"s", "t", "u", "v"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") elif (regid in {"d", "e", "x", "y"}): - f.write(" const int %s =3D insn->regno[%d];\n" % (regN, reg= no)) - f.write(" ctx_log_reg_write(ctx, %s, %s);\n" % \ - (regN, predicated)) + f.write(f" const int {regN} =3D insn->regno[{regno}];\n") + f.write(f" ctx_log_reg_write(ctx, {regN}, {predicated});\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "P"): if (regid in {"s", "t", "u", "v"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") elif (regid in {"d", "e", "x"}): - f.write(" const int %s =3D insn->regno[%d];\n" % (regN, reg= no)) - f.write(" ctx_log_pred_write(ctx, %s);\n" % (regN)) + f.write(f" const int {regN} =3D insn->regno[{regno}];\n") + f.write(f" ctx_log_pred_write(ctx, {regN});\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "C"): if (regid =3D=3D "ss"): - f.write("// const int %s =3D insn->regno[%d] + HEX_REG_SA0;= \n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}] " + "+ HEX_REG_SA0;\n") elif (regid =3D=3D "dd"): - f.write(" const int %s =3D insn->regno[%d] + HEX_REG_SA0;\n= " % \ - (regN, regno)) - f.write(" ctx_log_reg_write_pair(ctx, %s, %s);\n" % \ - (regN, predicated)) + f.write(f" const int {regN} =3D insn->regno[{regno}] " + "+ HEX_REG_SA0;\n") + f.write(f" ctx_log_reg_write_pair(ctx, {regN}, {predicated}= );\n") elif (regid =3D=3D "s"): - f.write("// const int %s =3D insn->regno[%d] + HEX_REG_SA0;= \n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}] " + "+ HEX_REG_SA0;\n") elif (regid =3D=3D "d"): - f.write(" const int %s =3D insn->regno[%d] + HEX_REG_SA0;\n= " % \ - (regN, regno)) - f.write(" ctx_log_reg_write(ctx, %s, %s);\n" % \ - (regN, predicated)) + f.write(f" const int {regN} =3D insn->regno[{regno}] " + "+ HEX_REG_SA0;\n") + f.write(f" ctx_log_reg_write(ctx, {regN}, {predicated});\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "M"): if (regid =3D=3D "u"): - f.write("// const int %s =3D insn->regno[%d];\n"% \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "V"): @@ -89,84 +81,67 @@ def analyze_opn_old(f, tag, regtype, regid, regno): elif (hex_common.is_tmp_result(tag)): newv =3D "EXT_TMP" if (regid in {"dd", "xx"}): - f.write(" const int %s =3D insn->regno[%d];\n" %\ - (regN, regno)) - f.write(" ctx_log_vreg_write_pair(ctx, %s, %s, %s);\n" % \ - (regN, newv, predicated)) + f.write(f" const int {regN} =3D insn->regno[{regno}];\n") + f.write(f" ctx_log_vreg_write_pair(ctx, {regN}, {newv}, " + f"{predicated});\n") elif (regid in {"uu", "vv"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") elif (regid in {"s", "u", "v", "w"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") elif (regid in {"d", "x", "y"}): - f.write(" const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) - f.write(" ctx_log_vreg_write(ctx, %s, %s, %s);\n" % \ - (regN, newv, predicated)) + f.write(f" const int {regN} =3D insn->regno[{regno}];\n") + f.write(f" ctx_log_vreg_write(ctx, {regN}, {newv}, " + f"{predicated});\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "Q"): if (regid in {"d", "e", "x"}): - f.write(" const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) - f.write(" ctx_log_qreg_write(ctx, %s);\n" % (regN)) + f.write(f" const int {regN} =3D insn->regno[{regno}];\n") + f.write(f" ctx_log_qreg_write(ctx, {regN});\n") elif (regid in {"s", "t", "u", "v"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "G"): if (regid in {"dd"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") elif (regid in {"d"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") elif (regid in {"ss"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") elif (regid in {"s"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "S"): if (regid in {"dd"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") elif (regid in {"d"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") elif (regid in {"ss"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") elif (regid in {"s"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) else: print("Bad register parse: ", regtype, regid) =20 def analyze_opn_new(f, tag, regtype, regid, regno): - regN =3D "%s%sN" % (regtype, regid) + regN =3D f"{regtype}{regid}N" if (regtype =3D=3D "N"): if (regid in {"s", "t"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "P"): if (regid in {"t", "u", "v"}): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "O"): if (regid =3D=3D "s"): - f.write("// const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) else: @@ -199,7 +174,7 @@ def analyze_opn(f, tag, regtype, regid, toss, numregs, = i): ## } ## def gen_analyze_func(f, tag, regs, imms): - f.write("static void analyze_%s(DisasContext *ctx)\n" %tag) + f.write(f"static void analyze_{tag}(DisasContext *ctx)\n") f.write('{\n') =20 f.write(" Insn *insn G_GNUC_UNUSED =3D ctx->insn;\n") diff --git a/target/hexagon/gen_helper_funcs.py b/target/hexagon/gen_helper= _funcs.py index 7a224b66e6..dc67eaf716 100755 --- a/target/hexagon/gen_helper_funcs.py +++ b/target/hexagon/gen_helper_funcs.py @@ -38,23 +38,23 @@ def gen_helper_return_type_pair(f,regtype,regid,regno): =20 def gen_helper_arg(f,regtype,regid,regno): if regno > 0 : f.write(", " ) - f.write("int32_t %s%sV" % (regtype,regid)) + f.write(f"int32_t {regtype}{regid}V") =20 def gen_helper_arg_new(f,regtype,regid,regno): if regno >=3D 0 : f.write(", " ) - f.write("int32_t %s%sN" % (regtype,regid)) + f.write(f"int32_t {regtype}{regid}N") =20 def gen_helper_arg_pair(f,regtype,regid,regno): if regno >=3D 0 : f.write(", ") - f.write("int64_t %s%sV" % (regtype,regid)) + f.write(f"int64_t {regtype}{regid}V") =20 def gen_helper_arg_ext(f,regtype,regid,regno): if regno > 0 : f.write(", ") - f.write("void *%s%sV_void" % (regtype,regid)) + f.write(f"void *{regtype}{regid}V_void") =20 def gen_helper_arg_ext_pair(f,regtype,regid,regno): if regno > 0 : f.write(", ") - f.write("void *%s%sV_void" % (regtype,regid)) + f.write(f"void *{regtype}{regid}V_void") =20 def gen_helper_arg_opn(f,regtype,regid,i,tag): if (hex_common.is_pair(regid)): @@ -76,27 +76,25 @@ def gen_helper_arg_opn(f,regtype,regid,i,tag): print("Bad register parse: ",regtype,regid,toss,numregs) =20 def gen_helper_arg_imm(f,immlett): - f.write(", int32_t %s" % (hex_common.imm_name(immlett))) + f.write(f", int32_t {hex_common.imm_name(immlett)}") =20 def gen_helper_dest_decl(f,regtype,regid,regno,subfield=3D""): - f.write(" int32_t %s%sV%s =3D 0;\n" % \ - (regtype,regid,subfield)) + f.write(f" int32_t {regtype}{regid}V{subfield} =3D 0;\n") =20 def gen_helper_dest_decl_pair(f,regtype,regid,regno,subfield=3D""): - f.write(" int64_t %s%sV%s =3D 0;\n" % \ - (regtype,regid,subfield)) + f.write(f" int64_t {regtype}{regid}V{subfield} =3D 0;\n") =20 def gen_helper_dest_decl_ext(f,regtype,regid): if (regtype =3D=3D "Q"): - f.write(" /* %s%sV is *(MMQReg *)(%s%sV_void) */\n" % \ - (regtype,regid,regtype,regid)) + f.write(f" /* {regtype}{regid}V is *(MMQReg *)" + f"({regtype}{regid}V_void) */\n") else: - f.write(" /* %s%sV is *(MMVector *)(%s%sV_void) */\n" % \ - (regtype,regid,regtype,regid)) + f.write(f" /* {regtype}{regid}V is *(MMVector *)" + f"({regtype}{regid}V_void) */\n") =20 def gen_helper_dest_decl_ext_pair(f,regtype,regid,regno): - f.write(" /* %s%sV is *(MMVectorPair *))%s%sV_void) */\n" % \ - (regtype,regid,regtype, regid)) + f.write(f" /* {regtype}{regid}V is *(MMVectorPair *))" + f"{regtype}{regid}V_void) */\n") =20 def gen_helper_dest_decl_opn(f,regtype,regid,i): if (hex_common.is_pair(regid)): @@ -114,21 +112,21 @@ def gen_helper_dest_decl_opn(f,regtype,regid,i): =20 def gen_helper_src_var_ext(f,regtype,regid): if (regtype =3D=3D "Q"): - f.write(" /* %s%sV is *(MMQReg *)(%s%sV_void) */\n" % \ - (regtype,regid,regtype,regid)) + f.write(f" /* {regtype}{regid}V is *(MMQReg *)" + f"({regtype}{regid}V_void) */\n") else: - f.write(" /* %s%sV is *(MMVector *)(%s%sV_void) */\n" % \ - (regtype,regid,regtype,regid)) + f.write(f" /* {regtype}{regid}V is *(MMVector *)" + f"({regtype}{regid}V_void) */\n") =20 def gen_helper_src_var_ext_pair(f,regtype,regid,regno): - f.write(" /* %s%sV%s is *(MMVectorPair *)(%s%sV%s_void) */\n" % \ - (regtype,regid,regno,regtype,regid,regno)) + f.write(f" /* {regtype}{regid}V{regno} is *(MMVectorPair *)" + f"({regtype}{regid}V{regno}_void) */\n") =20 def gen_helper_return(f,regtype,regid,regno): - f.write(" return %s%sV;\n" % (regtype,regid)) + f.write(f" return {regtype}{regid}V;\n") =20 def gen_helper_return_pair(f,regtype,regid,regno): - f.write(" return %s%sV;\n" % (regtype,regid)) + f.write(f" return {regtype}{regid}V;\n") =20 def gen_helper_dst_write_ext(f,regtype,regid): return @@ -181,8 +179,8 @@ def gen_helper_function(f, tag, tagregs, tagimms): =20 if (numscalarresults > 1): ## The helper is bogus when there is more than one result - f.write("void HELPER(%s)(CPUHexagonState *env) { BOGUS_HELPER(%s);= }\n" - % (tag, tag)) + f.write(f"void HELPER({tag})(CPUHexagonState *env) " + f"{{ BOGUS_HELPER({tag}); }}\n") else: ## The return type of the function is the type of the destination ## register (if scalar) @@ -205,7 +203,7 @@ def gen_helper_function(f, tag, tagregs, tagimms): =20 if (numscalarresults =3D=3D 0): f.write("void") - f.write(" HELPER(%s)(CPUHexagonState *env" % tag) + f.write(f" HELPER({tag})(CPUHexagonState *env") =20 ## Arguments include the vector destination operands i =3D 1 @@ -290,7 +288,7 @@ def gen_helper_function(f, tag, tagregs, tagimms): if 'A_FPOP' in hex_common.attribdict[tag]: f.write(' arch_fpop_start(env);\n'); =20 - f.write(" %s\n" % hex_common.semdict[tag]) + f.write(f" {hex_common.semdict[tag]}\n") =20 if 'A_FPOP' in hex_common.attribdict[tag]: f.write(' arch_fpop_end(env);\n'); diff --git a/target/hexagon/gen_helper_protos.py b/target/hexagon/gen_helpe= r_protos.py index ddddc9e4f0..d795f32047 100755 --- a/target/hexagon/gen_helper_protos.py +++ b/target/hexagon/gen_helper_protos.py @@ -47,9 +47,9 @@ =20 def gen_def_helper_opn(f, tag, regtype, regid, toss, numregs, i): if (hex_common.is_pair(regid)): - f.write(", %s" % (def_helper_types_pair[regtype])) + f.write(f", {def_helper_types_pair[regtype]}") elif (hex_common.is_single(regid)): - f.write(", %s" % (def_helper_types[regtype])) + f.write(f", {def_helper_types[regtype]}") else: print("Bad register parse: ",regtype,regid,toss,numregs) =20 @@ -77,7 +77,7 @@ def gen_helper_prototype(f, tag, tagregs, tagimms): =20 if (numscalarresults > 1): ## The helper is bogus when there is more than one result - f.write('DEF_HELPER_1(%s, void, env)\n' % tag) + f.write(f'DEF_HELPER_1({tag}, void, env)\n') else: ## Figure out how many arguments the helper will take if (numscalarresults =3D=3D 0): @@ -88,7 +88,7 @@ def gen_helper_prototype(f, tag, tagregs, tagimms): if hex_common.need_PC(tag): def_helper_size +=3D 1 if hex_common.helper_needs_next_PC(tag): def_helper_size +=3D 1 if hex_common.need_condexec_reg(tag, regs): def_helper_size += =3D 1 - f.write('DEF_HELPER_%s(%s' % (def_helper_size, tag)) + f.write(f'DEF_HELPER_{def_helper_size}({tag}') ## The return type is void f.write(', void' ) else: @@ -99,7 +99,7 @@ def gen_helper_prototype(f, tag, tagregs, tagimms): if hex_common.need_PC(tag): def_helper_size +=3D 1 if hex_common.need_condexec_reg(tag, regs): def_helper_size += =3D 1 if hex_common.helper_needs_next_PC(tag): def_helper_size +=3D 1 - f.write('DEF_HELPER_%s(%s' % (def_helper_size, tag)) + f.write(f'DEF_HELPER_{def_helper_size}({tag}') =20 ## Generate the qemu DEF_HELPER type for each result ## Iterate over this list twice diff --git a/target/hexagon/gen_idef_parser_funcs.py b/target/hexagon/gen_i= def_parser_funcs.py index 917753d6d8..60be8e37b6 100644 --- a/target/hexagon/gen_idef_parser_funcs.py +++ b/target/hexagon/gen_idef_parser_funcs.py @@ -110,20 +110,20 @@ def main(): and hex_common.is_new_val(regtype, regid,= tag)) =20 if is_pair or is_single_old: - arguments.append("%s%s%sV" % (prefix, regtype, regid)) + arguments.append(f"{prefix}{regtype}{regid}V") elif is_single_new: - arguments.append("%s%s%sN" % (prefix, regtype, regid)) + arguments.append(f"{prefix}{regtype}{regid}N") else: print("Bad register parse: ",regtype,regid,toss,numreg= s) =20 for immlett,bits,immshift in imms: arguments.append(hex_common.imm_name(immlett)) =20 - f.write("%s(%s) {\n" % (tag, ", ".join(arguments))) + f.write(f"{tag}({', '.join(arguments)}) {{\n") f.write(" "); if hex_common.need_ea(tag): f.write("size4u_t EA; "); - f.write("%s\n" % hex_common.semdict[tag]) + f.write(f"{hex_common.semdict[tag]}\n") f.write("}\n\n") =20 if __name__ =3D=3D "__main__": diff --git a/target/hexagon/gen_op_attribs.py b/target/hexagon/gen_op_attri= bs.py index 6a1a1ca21d..fc705375d4 100755 --- a/target/hexagon/gen_op_attribs.py +++ b/target/hexagon/gen_op_attribs.py @@ -32,8 +32,8 @@ def main(): ## with open(sys.argv[3], 'w') as f: for tag in hex_common.tags: - f.write('OP_ATTRIB(%s,ATTRIBS(%s))\n' % \ - (tag, ','.join(sorted(hex_common.attribdict[tag])))) + f.write(f'OP_ATTRIB({tag},ATTRIBS(' + f'{",".join(sorted(hex_common.attribdict[tag]))}))\n') =20 if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/gen_op_regs.py b/target/hexagon/gen_op_regs.py index e8137d4a12..5f0ae20722 100755 --- a/target/hexagon/gen_op_regs.py +++ b/target/hexagon/gen_op_regs.py @@ -85,25 +85,25 @@ def main(): if hex_common.attribinfo[attrib]['wreg']: wregs.append(strip_reg_prefix(attribinfo[attrib]['wreg= '])) regids +=3D calculate_regid_letters(tag) - f.write('REGINFO(%s,"%s",\t/*RD:*/\t"%s",\t/*WR:*/\t"%s")\n' %= \ - (tag,regids,",".join(rregs),",".join(wregs))) + f.write(f'REGINFO({tag},"{regids}",\t/*RD:*/\t"{",".join(rregs= )}",' + f'\t/*WR:*/\t"{",".join(wregs)}")\n') =20 for tag in hex_common.tags: imms =3D tagimms[tag] - f.write( 'IMMINFO(%s' % tag) + f.write(f'IMMINFO({tag}') if not imms: f.write(''','u',0,0,'U',0,0''') for sign,size,shamt in imms: if sign =3D=3D 'r': sign =3D 's' if not shamt: shamt =3D "0" - f.write(''','%s',%s,%s''' % (sign,size,shamt)) + f.write(f''','{sign}',{size},{shamt}''') if len(imms) =3D=3D 1: if sign.isupper(): myu =3D 'u' else: myu =3D 'U' - f.write(''','%s',0,0''' % myu) + f.write(f''','{myu}',0,0''') f.write(')\n') =20 if __name__ =3D=3D "__main__": diff --git a/target/hexagon/gen_opcodes_def.py b/target/hexagon/gen_opcodes= _def.py index fa604a8db9..550949cbc6 100755 --- a/target/hexagon/gen_opcodes_def.py +++ b/target/hexagon/gen_opcodes_def.py @@ -30,7 +30,7 @@ def main(): ## with open(sys.argv[3], 'w') as f: for tag in hex_common.tags: - f.write ( "OPCODE(%s),\n" % (tag) ) + f.write(f"OPCODE({tag}),\n") =20 if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/gen_printinsn.py b/target/hexagon/gen_printinsn= .py index 12737bf8a0..fe02572922 100755 --- a/target/hexagon/gen_printinsn.py +++ b/target/hexagon/gen_printinsn.py @@ -119,7 +119,7 @@ def main(): if ("A_VECX" in hex_common.attribdict[tag]): macname =3D "DEF_VECX_PRINTINFO" else: macname =3D "DEF_PRINTINFO" - f.write('%s(%s,"%s%%s"' % (macname,tag,beh)) + f.write(f'{macname}({tag},"{beh}%s"') regs_or_imms =3D \ hex_common.reg_or_immre.findall(hex_common.behdict[tag]) ri =3D 0 @@ -132,14 +132,14 @@ def main(): else: regno =3D ri if len(b) =3D=3D 1: - f.write(', insn->regno[%d]' % regno) + f.write(f', insn->regno[{regno}]') if 'S' in a: - f.write(', sreg2str(insn->regno[%d])' % regno) + f.write(f', sreg2str(insn->regno[{regno}])') elif 'C' in a: - f.write(', creg2str(insn->regno[%d])' % regno) + f.write(f', creg2str(insn->regno[{regno}])') elif len(b) =3D=3D 2: - f.write(', insn->regno[%d] + 1, insn->regno[%d]' %= \ - (regno,regno)) + f.write(f', insn->regno[{regno}] + 1' + f', insn->regno[{regno}]') else: print("Put some stuff to handle quads here") if b not in seenregs: @@ -165,7 +165,7 @@ def main(): else: f.write(',""') ii =3D 0 - f.write(', insn->immed[%d]' % ii) + f.write(f', insn->immed[{ii}]') # append empty string so there is at least one more arg f.write(',"")\n') =20 diff --git a/target/hexagon/gen_shortcode.py b/target/hexagon/gen_shortcode= .py index 9b589d0189..ea0965d306 100755 --- a/target/hexagon/gen_shortcode.py +++ b/target/hexagon/gen_shortcode.py @@ -23,7 +23,7 @@ import hex_common =20 def gen_shortcode(f, tag): - f.write('DEF_SHORTCODE(%s, %s)\n' % (tag, hex_common.semdict[tag])) + f.write(f'DEF_SHORTCODE({tag}, {hex_common.semdict[tag]})\n') =20 def main(): hex_common.read_semantics_file(sys.argv[1]) diff --git a/target/hexagon/gen_tcg_func_table.py b/target/hexagon/gen_tcg_= func_table.py index 4809d3273e..ec9ca20561 100755 --- a/target/hexagon/gen_tcg_func_table.py +++ b/target/hexagon/gen_tcg_func_table.py @@ -49,7 +49,7 @@ def main(): if ( tag =3D=3D "Y6_diag1" ) : continue =20 - f.write(" [%s] =3D generate_%s,\n" % (tag, tag)) + f.write(f" [{tag}] =3D generate_{tag},\n") f.write("};\n\n") =20 f.write("#endif /* HEXAGON_FUNC_TABLE_H */\n") diff --git a/target/hexagon/gen_tcg_funcs.py b/target/hexagon/gen_tcg_funcs= .py index fa93e185ce..285b3abe3a 100755 --- a/target/hexagon/gen_tcg_funcs.py +++ b/target/hexagon/gen_tcg_funcs.py @@ -29,170 +29,151 @@ def gen_decl_ea_tcg(f, tag): f.write(" TCGv EA G_GNUC_UNUSED =3D tcg_temp_new();\n") =20 def genptr_decl_pair_writable(f, tag, regtype, regid, regno): - regN=3D"%s%sN" % (regtype,regid) + regN=3Df"{regtype}{regid}N" if (regtype =3D=3D "R"): - f.write(" const int %s =3D insn->regno[%d];\n" % (regN, regno)) + f.write(f" const int {regN} =3D insn->regno[{regno}];\n") elif (regtype =3D=3D "C"): - f.write(" const int %s =3D insn->regno[%d] + HEX_REG_SA0;\n" % \ - (regN, regno)) + f.write(f" const int {regN} =3D insn->regno[{regno}] + HEX_REG_= SA0;\n") else: print("Bad register parse: ", regtype, regid) - f.write(" TCGv_i64 %s%sV =3D get_result_gpr_pair(ctx, %s);\n" % \ - (regtype, regid, regN)) + f.write(f" TCGv_i64 {regtype}{regid}V =3D " + f"get_result_gpr_pair(ctx, {regN});\n") =20 def genptr_decl_writable(f, tag, regtype, regid, regno): - regN=3D"%s%sN" % (regtype,regid) + regN=3Df"{regtype}{regid}N" if (regtype =3D=3D "R"): - f.write(" const int %s =3D insn->regno[%d];\n" % (regN, regno)) - f.write(" TCGv %s%sV =3D get_result_gpr(ctx, %s);\n" % \ - (regtype, regid, regN)) + f.write(f" const int {regN} =3D insn->regno[{regno}];\n") + f.write(f" TCGv {regtype}{regid}V =3D get_result_gpr(ctx, {regN= });\n") elif (regtype =3D=3D "C"): - f.write(" const int %s =3D insn->regno[%d] + HEX_REG_SA0;\n" % \ - (regN, regno)) - f.write(" TCGv %s%sV =3D get_result_gpr(ctx, %s);\n" % \ - (regtype, regid, regN)) + f.write(f" const int {regN} =3D insn->regno[{regno}] + HEX_REG_= SA0;\n") + f.write(f" TCGv {regtype}{regid}V =3D get_result_gpr(ctx, {regN= });\n") elif (regtype =3D=3D "P"): - f.write(" const int %s =3D insn->regno[%d];\n" % (regN, regno)) - f.write(" TCGv %s%sV =3D tcg_temp_new();\n" % \ - (regtype, regid)) + f.write(f" const int {regN} =3D insn->regno[{regno}];\n") + f.write(f" TCGv {regtype}{regid}V =3D tcg_temp_new();\n") else: print("Bad register parse: ", regtype, regid) =20 def genptr_decl(f, tag, regtype, regid, regno): - regN=3D"%s%sN" % (regtype,regid) + regN=3Df"{regtype}{regid}N" if (regtype =3D=3D "R"): if (regid in {"ss", "tt"}): - f.write(" TCGv_i64 %s%sV =3D tcg_temp_new_i64();\n" % \ - (regtype, regid)) - f.write(" const int %s =3D insn->regno[%d];\n" % \ - (regN, regno)) + f.write(f" TCGv_i64 {regtype}{regid}V =3D tcg_temp_new_i64(= );\n") + f.write(f" const int {regN} =3D insn->regno[{regno}];\n") elif (regid in {"dd", "ee", "xx", "yy"}): genptr_decl_pair_writable(f, tag, regtype, regid, regno) elif (regid in {"s", "t", "u", "v"}): - f.write(" TCGv %s%sV =3D hex_gpr[insn->regno[%d]];\n" % \ - (regtype, regid, regno)) + f.write(f" TCGv {regtype}{regid}V =3D " + f"hex_gpr[insn->regno[{regno}]];\n") elif (regid in {"d", "e", "x", "y"}): genptr_decl_writable(f, tag, regtype, regid, regno) else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "P"): if (regid in {"s", "t", "u", "v"}): - f.write(" TCGv %s%sV =3D hex_pred[insn->regno[%d]];\n" % \ - (regtype, regid, regno)) + f.write(f" TCGv {regtype}{regid}V =3D " + f"hex_pred[insn->regno[{regno}]];\n") elif (regid in {"d", "e", "x"}): genptr_decl_writable(f, tag, regtype, regid, regno) else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "C"): if (regid =3D=3D "ss"): - f.write(" TCGv_i64 %s%sV =3D tcg_temp_new_i64();\n" % \ - (regtype, regid)) - f.write(" const int %s =3D insn->regno[%d] + HEX_REG_SA0;\n= " % \ - (regN, regno)) + f.write(f" TCGv_i64 {regtype}{regid}V =3D " + f"tcg_temp_new_i64();\n") + f.write(f" const int {regN} =3D insn->regno[{regno}] + " + "HEX_REG_SA0;\n") elif (regid =3D=3D "dd"): genptr_decl_pair_writable(f, tag, regtype, regid, regno) elif (regid =3D=3D "s"): - f.write(" TCGv %s%sV =3D tcg_temp_new();\n" % \ - (regtype, regid)) - f.write(" const int %s%sN =3D insn->regno[%d] + HEX_REG_SA0= ;\n" % \ - (regtype, regid, regno)) + f.write(f" TCGv {regtype}{regid}V =3D tcg_temp_new();\n") + f.write(f" const int {regtype}{regid}N =3D insn->regno[{reg= no}] + " + "HEX_REG_SA0;\n") elif (regid =3D=3D "d"): genptr_decl_writable(f, tag, regtype, regid, regno) else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "M"): if (regid =3D=3D "u"): - f.write(" const int %s%sN =3D insn->regno[%d];\n"% \ - (regtype, regid, regno)) - f.write(" TCGv %s%sV =3D hex_gpr[%s%sN + HEX_REG_M0];\n" % \ - (regtype, regid, regtype, regid)) + f.write(f" const int {regtype}{regid}N =3D " + f"insn->regno[{regno}];\n") + f.write(f" TCGv {regtype}{regid}V =3D hex_gpr[{regtype}{reg= id}N + " + "HEX_REG_M0];\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "V"): if (regid in {"dd"}): - f.write(" const int %s%sN =3D insn->regno[%d];\n" %\ - (regtype, regid, regno)) - f.write(" const intptr_t %s%sV_off =3D\n" %\ - (regtype, regid)) + f.write(f" const int {regtype}{regid}N =3D " + f"insn->regno[{regno}];\n") + f.write(f" const intptr_t {regtype}{regid}V_off =3D\n") if (hex_common.is_tmp_result(tag)): - f.write(" ctx_tmp_vreg_off(ctx, %s%sN, 2, true);\n"= % \ - (regtype, regid)) + f.write(f" ctx_tmp_vreg_off(ctx, {regtype}{regid}N,= 2, " + "true);\n") else: - f.write(" ctx_future_vreg_off(ctx, %s%sN," % \ - (regtype, regid)) + f.write(f" ctx_future_vreg_off(ctx, {regtype}{regid= }N,") f.write(" 2, true);\n") if (not hex_common.skip_qemu_helper(tag)): - f.write(" TCGv_ptr %s%sV =3D tcg_temp_new_ptr();\n" % \ - (regtype, regid)) - f.write(" tcg_gen_addi_ptr(%s%sV, cpu_env, %s%sV_off);\= n" % \ - (regtype, regid, regtype, regid)) + f.write(f" TCGv_ptr {regtype}{regid}V =3D " + "tcg_temp_new_ptr();\n") + f.write(f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env,= " + f"{regtype}{regid}V_off);\n") elif (regid in {"uu", "vv", "xx"}): - f.write(" const int %s%sN =3D insn->regno[%d];\n" % \ - (regtype, regid, regno)) - f.write(" const intptr_t %s%sV_off =3D\n" % \ - (regtype, regid)) - f.write(" offsetof(CPUHexagonState, %s%sV);\n" % \ - (regtype, regid)) + f.write(f" const int {regtype}{regid}N =3D " + f"insn->regno[{regno}];\n") + f.write(f" const intptr_t {regtype}{regid}V_off =3D\n") + f.write(f" offsetof(CPUHexagonState, {regtype}{regid}V)= ;\n") if (not hex_common.skip_qemu_helper(tag)): - f.write(" TCGv_ptr %s%sV =3D tcg_temp_new_ptr();\n" % \ - (regtype, regid)) - f.write(" tcg_gen_addi_ptr(%s%sV, cpu_env, %s%sV_off);\= n" % \ - (regtype, regid, regtype, regid)) + f.write(f" TCGv_ptr {regtype}{regid}V =3D " + "tcg_temp_new_ptr();\n") + f.write(f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env,= " + f"{regtype}{regid}V_off);\n") elif (regid in {"s", "u", "v", "w"}): - f.write(" const int %s%sN =3D insn->regno[%d];\n" % \ - (regtype, regid, regno)) - f.write(" const intptr_t %s%sV_off =3D\n" % \ - (regtype, regid)) - f.write(" vreg_src_off(ctx, %s%sN);\n" % \ - (regtype, regid)) + f.write(f" const int {regtype}{regid}N =3D " + f"insn->regno[{regno}];\n") + f.write(f" const intptr_t {regtype}{regid}V_off =3D\n") + f.write(f" vreg_src_off(ctx, {regtype}{regid}N);\n") if (not hex_common.skip_qemu_helper(tag)): - f.write(" TCGv_ptr %s%sV =3D tcg_temp_new_ptr();\n" % \ - (regtype, regid)) + f.write(f" TCGv_ptr {regtype}{regid}V =3D " + "tcg_temp_new_ptr();\n") elif (regid in {"d", "x", "y"}): - f.write(" const int %s%sN =3D insn->regno[%d];\n" % \ - (regtype, regid, regno)) - f.write(" const intptr_t %s%sV_off =3D\n" % \ - (regtype, regid)) + f.write(f" const int {regtype}{regid}N =3D " + f"insn->regno[{regno}];\n") + f.write(f" const intptr_t {regtype}{regid}V_off =3D\n") if (regid =3D=3D "y"): f.write(" offsetof(CPUHexagonState, vtmp);\n") elif (hex_common.is_tmp_result(tag)): - f.write(" ctx_tmp_vreg_off(ctx, %s%sN, 1, true);\n"= % \ - (regtype, regid)) + f.write(f" ctx_tmp_vreg_off(ctx, {regtype}{regid}N,= 1, " + "true);\n") else: - f.write(" ctx_future_vreg_off(ctx, %s%sN," % \ - (regtype, regid)) + f.write(f" ctx_future_vreg_off(ctx, {regtype}{regid= }N,") f.write(" 1, true);\n"); =20 if (not hex_common.skip_qemu_helper(tag)): - f.write(" TCGv_ptr %s%sV =3D tcg_temp_new_ptr();\n" % \ - (regtype, regid)) - f.write(" tcg_gen_addi_ptr(%s%sV, cpu_env, %s%sV_off);\= n" % \ - (regtype, regid, regtype, regid)) + f.write(f" TCGv_ptr {regtype}{regid}V =3D " + "tcg_temp_new_ptr();\n") + f.write(f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env,= " + f"{regtype}{regid}V_off);\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "Q"): if (regid in {"d", "e", "x"}): - f.write(" const int %s%sN =3D insn->regno[%d];\n" % \ - (regtype, regid, regno)) - f.write(" const intptr_t %s%sV_off =3D\n" % \ - (regtype, regid)) - f.write(" get_result_qreg(ctx, %s%sN);\n" % \ - (regtype, regid)) + f.write(f" const int {regtype}{regid}N =3D " + f"insn->regno[{regno}];\n") + f.write(f" const intptr_t {regtype}{regid}V_off =3D\n") + f.write(f" get_result_qreg(ctx, {regtype}{regid}N);\n") if (not hex_common.skip_qemu_helper(tag)): - f.write(" TCGv_ptr %s%sV =3D tcg_temp_new_ptr();\n" % \ - (regtype, regid)) - f.write(" tcg_gen_addi_ptr(%s%sV, cpu_env, %s%sV_off);\= n" % \ - (regtype, regid, regtype, regid)) + f.write(f" TCGv_ptr {regtype}{regid}V =3D " + "tcg_temp_new_ptr();\n") + f.write(f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env,= " + f"{regtype}{regid}V_off);\n") elif (regid in {"s", "t", "u", "v"}): - f.write(" const int %s%sN =3D insn->regno[%d];\n" % \ - (regtype, regid, regno)) - f.write(" const intptr_t %s%sV_off =3D\n" %\ - (regtype, regid)) - f.write(" offsetof(CPUHexagonState, QRegs[%s%sN]);\n" %= \ - (regtype, regid)) + f.write(f" const int {regtype}{regid}N =3D " + f"insn->regno[{regno}];\n") + f.write(f" const intptr_t {regtype}{regid}V_off =3D\n") + f.write(f" offsetof(CPUHexagonState, " + f"QRegs[{regtype}{regid}N]);\n") if (not hex_common.skip_qemu_helper(tag)): - f.write(" TCGv_ptr %s%sV =3D tcg_temp_new_ptr();\n" % \ - (regtype, regid)) + f.write(f" TCGv_ptr {regtype}{regid}V =3D " + "tcg_temp_new_ptr();\n") else: print("Bad register parse: ", regtype, regid) else: @@ -201,29 +182,28 @@ def genptr_decl(f, tag, regtype, regid, regno): def genptr_decl_new(f, tag, regtype, regid, regno): if (regtype =3D=3D "N"): if (regid in {"s", "t"}): - f.write(" TCGv %s%sN =3D hex_new_value[insn->regno[%d]];\n"= % \ - (regtype, regid, regno)) + f.write(f" TCGv {regtype}{regid}N =3D " + f"hex_new_value[insn->regno[{regno}]];\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "P"): if (regid in {"t", "u", "v"}): - f.write(" TCGv %s%sN =3D hex_new_pred_value[insn->regno[%d]= ];\n" % \ - (regtype, regid, regno)) + f.write(f" TCGv {regtype}{regid}N =3D " + f"hex_new_pred_value[insn->regno[{regno}]];\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "O"): if (regid =3D=3D "s"): - f.write(" const intptr_t %s%sN_num =3D insn->regno[%d];\n" = % \ - (regtype, regid, regno)) + f.write(f" const intptr_t {regtype}{regid}N_num =3D " + f"insn->regno[{regno}];\n") if (hex_common.skip_qemu_helper(tag)): - f.write(" const intptr_t %s%sN_off =3D\n" % \ - (regtype, regid)) - f.write(" ctx_future_vreg_off(ctx, %s%sN_num," % \ - (regtype, regid)) + f.write(f" const intptr_t {regtype}{regid}N_off =3D\n") + f.write(" ctx_future_vreg_off(ctx, " + f"{regtype}{regid}N_num,") f.write(" 1, true);\n") else: - f.write(" TCGv %s%sN =3D tcg_constant_tl(%s%sN_num);\n"= % \ - (regtype, regid, regtype, regid)) + f.write(f" TCGv {regtype}{regid}N =3D " + f"tcg_constant_tl({regtype}{regid}N_num);\n") else: print("Bad register parse: ", regtype, regid) else: @@ -247,38 +227,37 @@ def genptr_decl_imm(f,immlett): i =3D 1 else: i =3D 0 - f.write(" int %s =3D insn->immed[%d];\n" % \ - (hex_common.imm_name(immlett), i)) + f.write(f" int {hex_common.imm_name(immlett)} =3D insn->immed[{i}];= \n") =20 def genptr_src_read(f, tag, regtype, regid): if (regtype =3D=3D "R"): if (regid in {"ss", "tt", "xx", "yy"}): - f.write(" tcg_gen_concat_i32_i64(%s%sV, hex_gpr[%s%sN],\n" = % \ - (regtype, regid, regtype, regid)) - f.write(" hex_gpr[%s%sN + 1]);= \n" % \ - (regtype, regid)) + f.write(f" tcg_gen_concat_i32_i64({regtype}{regid}V, " + f"hex_gpr[{regtype}{regid}N],\n") + f.write(f" hex_gpr[{regtype}" + f"{regid}N + 1]);\n") elif (regid in {"x", "y"}): ## For read/write registers, we need to get the original value= into ## the result TCGv. For conditional instructions, this is don= e in ## gen_start_packet. For unconditional instructions, we do it= here. if ('A_CONDEXEC' not in hex_common.attribdict[tag]): - f.write(" tcg_gen_mov_tl(%s%sV, hex_gpr[%s%sN]);\n" % \ - (regtype, regid, regtype, regid)) + f.write(f" tcg_gen_mov_tl({regtype}{regid}V, " + f"hex_gpr[{regtype}{regid}N]);\n") elif (regid not in {"s", "t", "u", "v"}): print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "P"): if (regid =3D=3D "x"): - f.write(" tcg_gen_mov_tl(%s%sV, hex_pred[%s%sN]);\n" % \ - (regtype, regid, regtype, regid)) + f.write(f" tcg_gen_mov_tl({regtype}{regid}V, " + f"hex_pred[{regtype}{regid}N]);\n") elif (regid not in {"s", "t", "u", "v"}): print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "C"): if (regid =3D=3D "ss"): - f.write(" gen_read_ctrl_reg_pair(ctx, %s%sN, %s%sV);\n" % \ - (regtype, regid, regtype, regid)) + f.write(f" gen_read_ctrl_reg_pair(ctx, {regtype}{regid}N, " + f"{regtype}{regid}V);\n") elif (regid =3D=3D "s"): - f.write(" gen_read_ctrl_reg(ctx, %s%sN, %s%sV);\n" % \ - (regtype, regid, regtype, regid)) + f.write(f" gen_read_ctrl_reg(ctx, {regtype}{regid}N, " + f"{regtype}{regid}V);\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "M"): @@ -286,39 +265,32 @@ def genptr_src_read(f, tag, regtype, regid): print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "V"): if (regid in {"uu", "vv", "xx"}): - f.write(" tcg_gen_gvec_mov(MO_64, %s%sV_off,\n" % \ - (regtype, regid)) - f.write(" vreg_src_off(ctx, %s%sN),\n" % \ - (regtype, regid)) + f.write(f" tcg_gen_gvec_mov(MO_64, {regtype}{regid}V_off,\n= ") + f.write(f" vreg_src_off(ctx, {regtype}{regid}N),\n") f.write(" sizeof(MMVector), sizeof(MMVector));\n") f.write(" tcg_gen_gvec_mov(MO_64,\n") - f.write(" %s%sV_off + sizeof(MMVector),\n" % \ - (regtype, regid)) - f.write(" vreg_src_off(ctx, %s%sN ^ 1),\n" % \ - (regtype, regid)) + f.write(f" {regtype}{regid}V_off + sizeof(MMVector),\n") + f.write(f" vreg_src_off(ctx, {regtype}{regid}N ^ 1),\n") f.write(" sizeof(MMVector), sizeof(MMVector));\n") elif (regid in {"s", "u", "v", "w"}): if (not hex_common.skip_qemu_helper(tag)): - f.write(" tcg_gen_addi_ptr(%s%sV, cpu_env, %s%sV_off);\= n" % \ - (regtype, regid, regtype, regid)) + f.write(f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env,= " + f"{regtype}{regid}V_off);\n") elif (regid in {"x", "y"}): - f.write(" tcg_gen_gvec_mov(MO_64, %s%sV_off,\n" % \ - (regtype, regid)) - f.write(" vreg_src_off(ctx, %s%sN),\n" % \ - (regtype, regid)) + f.write(f" tcg_gen_gvec_mov(MO_64, {regtype}{regid}V_off,\n= ") + f.write(f" vreg_src_off(ctx, {regtype}{regid}N),\n") f.write(" sizeof(MMVector), sizeof(MMVector));\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "Q"): if (regid in {"s", "t", "u", "v"}): if (not hex_common.skip_qemu_helper(tag)): - f.write(" tcg_gen_addi_ptr(%s%sV, cpu_env, %s%sV_off);\= n" % \ - (regtype, regid, regtype, regid)) + f.write(f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env,= " + f"{regtype}{regid}V_off);\n") elif (regid in {"x"}): - f.write(" tcg_gen_gvec_mov(MO_64, %s%sV_off,\n" % \ - (regtype, regid)) - f.write(" offsetof(CPUHexagonState, QRegs[%s%sN]),\n" %= \ - (regtype, regid)) + f.write(f" tcg_gen_gvec_mov(MO_64, {regtype}{regid}V_off,\n= ") + f.write(f" offsetof(CPUHexagonState, " + f"QRegs[{regtype}{regid}N]),\n") f.write(" sizeof(MMQReg), sizeof(MMQReg));\n") else: print("Bad register parse: ", regtype, regid) @@ -354,50 +326,50 @@ def genptr_src_read_opn(f,regtype,regid,tag): def gen_helper_call_opn(f, tag, regtype, regid, toss, numregs, i): if (i > 0): f.write(", ") if (hex_common.is_pair(regid)): - f.write("%s%sV" % (regtype,regid)) + f.write(f"{regtype}{regid}V") elif (hex_common.is_single(regid)): if hex_common.is_old_val(regtype, regid, tag): - f.write("%s%sV" % (regtype,regid)) + f.write(f"{regtype}{regid}V") elif hex_common.is_new_val(regtype, regid, tag): - f.write("%s%sN" % (regtype,regid)) + f.write(f"{regtype}{regid}N") else: print("Bad register parse: ",regtype,regid,toss,numregs) else: print("Bad register parse: ",regtype,regid,toss,numregs) =20 def gen_helper_decl_imm(f,immlett): - f.write(" TCGv tcgv_%s =3D tcg_constant_tl(%s);\n" % \ - (hex_common.imm_name(immlett), hex_common.imm_name(immlett))) + f.write(f" TCGv tcgv_{hex_common.imm_name(immlett)} =3D " + f"tcg_constant_tl({hex_common.imm_name(immlett)});\n") =20 def gen_helper_call_imm(f,immlett): - f.write(", tcgv_%s" % hex_common.imm_name(immlett)) + f.write(f", tcgv_{hex_common.imm_name(immlett)}") =20 def genptr_dst_write_pair(f, tag, regtype, regid): - f.write(" gen_log_reg_write_pair(%s%sN, %s%sV);\n" % \ - (regtype, regid, regtype, regid)) + f.write(f" gen_log_reg_write_pair({regtype}{regid}N, " + f"{regtype}{regid}V);\n") =20 def genptr_dst_write(f, tag, regtype, regid): if (regtype =3D=3D "R"): if (regid in {"dd", "xx", "yy"}): genptr_dst_write_pair(f, tag, regtype, regid) elif (regid in {"d", "e", "x", "y"}): - f.write(" gen_log_reg_write(%s%sN, %s%sV);\n" % \ - (regtype, regid, regtype, regid)) + f.write(f" gen_log_reg_write({regtype}{regid}N, " + f"{regtype}{regid}V);\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "P"): if (regid in {"d", "e", "x"}): - f.write(" gen_log_pred_write(ctx, %s%sN, %s%sV);\n" % \ - (regtype, regid, regtype, regid)) + f.write(f" gen_log_pred_write(ctx, {regtype}{regid}N, " + f"{regtype}{regid}V);\n") else: print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "C"): if (regid =3D=3D "dd"): - f.write(" gen_write_ctrl_reg_pair(ctx, %s%sN, %s%sV);\n" % \ - (regtype, regid, regtype, regid)) + f.write(f" gen_write_ctrl_reg_pair(ctx, {regtype}{regid}N, " + f"{regtype}{regid}V);\n") elif (regid =3D=3D "d"): - f.write(" gen_write_ctrl_reg(ctx, %s%sN, %s%sV);\n" % \ - (regtype, regid, regtype, regid)) + f.write(f" gen_write_ctrl_reg(ctx, {regtype}{regid}N, " + f"{regtype}{regid}V);\n") else: print("Bad register parse: ", regtype, regid) else: @@ -406,17 +378,16 @@ def genptr_dst_write(f, tag, regtype, regid): def genptr_dst_write_ext(f, tag, regtype, regid, newv=3D"EXT_DFL"): if (regtype =3D=3D "V"): if (regid in {"xx"}): - f.write(" gen_log_vreg_write_pair(ctx, %s%sV_off, %s%sN, " = % \ - (regtype, regid, regtype, regid)) - f.write("%s);\n" % \ - (newv)) + f.write(f" gen_log_vreg_write_pair(ctx, {regtype}{regid}V_o= ff, " + f"{regtype}{regid}N, {newv});\n") elif (regid in {"y"}): - f.write(" gen_log_vreg_write(ctx, %s%sV_off, %s%sN, %s);\n"= % \ - (regtype, regid, regtype, regid, newv)) + f.write(f" gen_log_vreg_write(ctx, {regtype}{regid}V_off, " + f"{regtype}{regid}N, {newv});\n") elif (regid not in {"dd", "d", "x"}): print("Bad register parse: ", regtype, regid) elif (regtype =3D=3D "Q"): if (regid not in {"d", "e", "x"}): + print("Bad register parse: ", regtype, regid) else: print("Bad register parse: ", regtype, regid) @@ -465,7 +436,7 @@ def genptr_dst_write_opn(f,regtype, regid, tag): ## is gen_helper_A2_add(RdV, cpu_env, RsV, RtV); ## def gen_tcg_func(f, tag, regs, imms): - f.write("static void generate_%s(DisasContext *ctx)\n" %tag) + f.write(f"static void generate_{tag}(DisasContext *ctx)\n") f.write('{\n') =20 f.write(" Insn *insn __attribute__((unused)) =3D ctx->insn;\n") @@ -496,11 +467,11 @@ def gen_tcg_func(f, tag, regs, imms): if (hex_common.is_pair(regid) or (hex_common.is_single(regid) and hex_common.is_old_val(regtype, regid, tag))): - declared.append("%s%sV" % (regtype, regid)) + declared.append(f"{regtype}{regid}V") if regtype =3D=3D "M": - declared.append("%s%sN" % (regtype, regid)) + declared.append(f"{regtype}{regid}N") elif hex_common.is_new_val(regtype, regid, tag): - declared.append("%s%sN" % (regtype,regid)) + declared.append(f"{regtype}{regid}N") else: print("Bad register parse: ",regtype,regid,toss,numregs) =20 @@ -509,10 +480,10 @@ def gen_tcg_func(f, tag, regs, imms): declared.append(hex_common.imm_name(immlett)) =20 arguments =3D ", ".join(["ctx", "ctx->insn", "ctx->pkt"] + declare= d) - f.write(" emit_%s(%s);\n" % (tag, arguments)) + f.write(f" emit_{tag}({arguments});\n") =20 elif ( hex_common.skip_qemu_helper(tag) ): - f.write(" fGEN_TCG_%s(%s);\n" % (tag, hex_common.semdict[tag])) + f.write(f" fGEN_TCG_{tag}({hex_common.semdict[tag]});\n") else: ## Generate the call to the helper for immlett,bits,immshift in imms: @@ -528,7 +499,7 @@ def gen_tcg_func(f, tag, regs, imms): f.write(" TCGv PC =3D tcg_constant_tl(ctx->pkt->pc);\n") if hex_common.helper_needs_next_PC(tag): f.write(" TCGv next_PC =3D tcg_constant_tl(ctx->next_PC);\n= ") - f.write(" gen_helper_%s(" % (tag)) + f.write(f" gen_helper_{tag}(") i=3D0 ## If there is a scalar result, it is the return type for regtype,regid,toss,numregs in regs: diff --git a/target/hexagon/hex_common.py b/target/hexagon/hex_common.py index 0200a66cb6..9f9da81e20 100755 --- a/target/hexagon/hex_common.py +++ b/target/hexagon/hex_common.py @@ -55,7 +55,7 @@ def expand_macro_attribs(macro,allmac_re): for submacro in l: if not submacro: continue if not macros[submacro]: - raise Exception("Couldn't find macro: <%s>" % l) + raise Exception(f"Couldn't find macro: <{l}>") macro.attribs |=3D expand_macro_attribs( macros[submacro], allmac_re) finished_macros.add(macro.key) @@ -258,7 +258,7 @@ def is_idef_parser_enabled(tag): return tag in idef_parser_enabled =20 def imm_name(immlett): - return "%siV" % immlett + return f"{immlett}iV" =20 def read_semantics_file(name): eval_line =3D "" --=20 2.25.1 From nobody Sun May 5 05:52:57 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1679304610; cv=none; d=zohomail.com; s=zohoarc; b=LScirdAj6J08te6adsFe4Nq69yWqGUYZtizP6VN6Fmld0renvf8fIC6d7sGAnqn79CBhaLzWmKwjxgO5myuL5PpoueJQbu1hLbT+iZfj3VLLGxwNk5qGXy57SrxBYUHkHd4YnbCJmVEtwtt4oY5PfDoiIqGVhrAlGKr1FDCOfpY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679304610; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PfmyxdWQwoOnoaGPkQPnMnhufQQqQa5N5fG7PcDLKu8=; b=XbDoE0fu1HmGmcE14gLnbsuRdHA/Y3iyFmLuZ6GPgmbPqVBk0eXZKmM90VmS0sEXnexasCsgTMOkn5hr+aqmWvaQS5YbGCEGwhyweckrF5zQ+Dknkj6DH3WzUxgdJjI7/YwxEdp60RI6YsbVqdr4UTPQTodEgxpx+7+kJ3W2PJA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1679304610376823.6512361950539; Mon, 20 Mar 2023 02:30:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peBox-0004Ui-RA; Mon, 20 Mar 2023 05:28:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peBoq-0004U1-UW for qemu-devel@nongnu.org; Mon, 20 Mar 2023 05:28:46 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peBom-0000EB-GZ for qemu-devel@nongnu.org; Mon, 20 Mar 2023 05:28:44 -0400 Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32K8NhNp006833; Mon, 20 Mar 2023 09:28:38 GMT Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3pe25q9xmd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Mar 2023 09:28:37 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 32K9SaZ4030570 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Mar 2023 09:28:36 GMT Received: from hu-mliebel-lv.qualcomm.com (10.49.16.6) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 20 Mar 2023 02:28:35 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=PfmyxdWQwoOnoaGPkQPnMnhufQQqQa5N5fG7PcDLKu8=; b=bDZPuFmEkYDPAuW1yjgo2FJA1Xja4Jo4kcwBNpOwsqYGE+01vKQ5xKzgWUHS0JEY7dYI xr7sw6ija8X+GnpZlGO5BXu+kwdPIb6lK2mPjvRFj2zjA9Jz7sVE5A+Yo55QybRj1A/G UC9addPkV5LNW4wLESopWyF2UB8gPjwz4p/wUV5oIhLreBZn8bGjMFyv57a4gPCaBei6 DgP4GiwMmfA2TL2KhKRONJz5wi9JnKCnjr7oaiqUDTlzOGpwKlR5zn6oc7tAcg8ZXWkr 9cV7Bqg9drjS9BF6TL4bEzOZUBS1mgMj5r8AzzS0dAcdht4vw15WPL7gt9B93AlqjWDI 2g== From: Marco Liebel To: CC: Taylor Simpson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Markus Armbruster" , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Marco Liebel Subject: [PATCH v3 2/2] Use black code style for python scripts Date: Mon, 20 Mar 2023 02:25:33 -0700 Message-ID: <20230320092533.2859433-3-quic_mliebel@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230320092533.2859433-1-quic_mliebel@quicinc.com> References: <20230320092533.2859433-1-quic_mliebel@quicinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: XTG7u8xc_IXUPaVeOEMAFPfGoYLPEzz5 X-Proofpoint-ORIG-GUID: XTG7u8xc_IXUPaVeOEMAFPfGoYLPEzz5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-20_06,2023-03-16_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 malwarescore=0 suspectscore=0 clxscore=1015 bulkscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303200080 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=quic_mliebel@quicinc.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @quicinc.com) X-ZM-MESSAGEID: 1679304612293100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Marco Liebel Acked-by: Taylor Simpson Tested-by: Taylor Simpson --- target/hexagon/dectree.py | 396 ++++++++------- target/hexagon/gen_analyze_funcs.py | 135 +++--- target/hexagon/gen_helper_funcs.py | 338 +++++++------ target/hexagon/gen_helper_protos.py | 165 ++++--- target/hexagon/gen_idef_parser_funcs.py | 75 +-- target/hexagon/gen_op_attribs.py | 10 +- target/hexagon/gen_op_regs.py | 77 +-- target/hexagon/gen_opcodes_def.py | 4 +- target/hexagon/gen_printinsn.py | 80 +-- target/hexagon/gen_shortcode.py | 17 +- target/hexagon/gen_tcg_func_table.py | 14 +- target/hexagon/gen_tcg_funcs.py | 614 +++++++++++++----------- target/hexagon/hex_common.py | 177 ++++--- 13 files changed, 1191 insertions(+), 911 deletions(-) diff --git a/target/hexagon/dectree.py b/target/hexagon/dectree.py index 29467ec7d7..f28e3b4d5b 100755 --- a/target/hexagon/dectree.py +++ b/target/hexagon/dectree.py @@ -23,94 +23,109 @@ import sys import iset =20 -encs =3D {tag : ''.join(reversed(iset.iset[tag]['enc'].replace(' ', ''))) - for tag in iset.tags if iset.iset[tag]['enc'] !=3D 'MISSING ENCODING'} - -enc_classes =3D set([iset.iset[tag]['enc_class'] for tag in encs.keys()]) -subinsn_enc_classes =3D \ - set([enc_class for enc_class in enc_classes \ - if enc_class.startswith('SUBINSN_')]) -ext_enc_classes =3D \ - set([enc_class for enc_class in enc_classes \ - if enc_class not in ('NORMAL', '16BIT') and \ - not enc_class.startswith('SUBINSN_')]) +encs =3D { + tag: "".join(reversed(iset.iset[tag]["enc"].replace(" ", ""))) + for tag in iset.tags + if iset.iset[tag]["enc"] !=3D "MISSING ENCODING" +} + +enc_classes =3D set([iset.iset[tag]["enc_class"] for tag in encs.keys()]) +subinsn_enc_classes =3D set( + [enc_class for enc_class in enc_classes if enc_class.startswith("SUBIN= SN_")] +) +ext_enc_classes =3D set( + [ + enc_class + for enc_class in enc_classes + if enc_class not in ("NORMAL", "16BIT") and not enc_class.startswi= th("SUBINSN_") + ] +) =20 try: subinsn_groupings =3D iset.subinsn_groupings except AttributeError: subinsn_groupings =3D {} =20 -for (tag, subinsn_grouping) in subinsn_groupings.items(): - encs[tag] =3D ''.join(reversed(subinsn_grouping['enc'].replace(' ', ''= ))) +for tag, subinsn_grouping in subinsn_groupings.items(): + encs[tag] =3D "".join(reversed(subinsn_grouping["enc"].replace(" ", ""= ))) =20 -dectree_normal =3D {'leaves' : set()} -dectree_16bit =3D {'leaves' : set()} -dectree_subinsn_groupings =3D {'leaves' : set()} -dectree_subinsns =3D {name : {'leaves' : set()} for name in subinsn_enc_cl= asses} -dectree_extensions =3D {name : {'leaves' : set()} for name in ext_enc_clas= ses} +dectree_normal =3D {"leaves": set()} +dectree_16bit =3D {"leaves": set()} +dectree_subinsn_groupings =3D {"leaves": set()} +dectree_subinsns =3D {name: {"leaves": set()} for name in subinsn_enc_clas= ses} +dectree_extensions =3D {name: {"leaves": set()} for name in ext_enc_classe= s} =20 for tag in encs.keys(): if tag in subinsn_groupings: - dectree_subinsn_groupings['leaves'].add(tag) + dectree_subinsn_groupings["leaves"].add(tag) continue - enc_class =3D iset.iset[tag]['enc_class'] - if enc_class.startswith('SUBINSN_'): + enc_class =3D iset.iset[tag]["enc_class"] + if enc_class.startswith("SUBINSN_"): if len(encs[tag]) !=3D 32: - encs[tag] =3D encs[tag] + '0' * (32 - len(encs[tag])) - dectree_subinsns[enc_class]['leaves'].add(tag) - elif enc_class =3D=3D '16BIT': + encs[tag] =3D encs[tag] + "0" * (32 - len(encs[tag])) + dectree_subinsns[enc_class]["leaves"].add(tag) + elif enc_class =3D=3D "16BIT": if len(encs[tag]) !=3D 16: - raise Exception('Tag "{}" has enc_class "{}" and not an encodi= ng ' + - 'width of 16 bits!'.format(tag, enc_class)) - dectree_16bit['leaves'].add(tag) + raise Exception( + 'Tag "{}" has enc_class "{}" and not an encoding ' + + "width of 16 bits!".format(tag, enc_class) + ) + dectree_16bit["leaves"].add(tag) else: if len(encs[tag]) !=3D 32: - raise Exception('Tag "{}" has enc_class "{}" and not an encodi= ng ' + - 'width of 32 bits!'.format(tag, enc_class)) - if enc_class =3D=3D 'NORMAL': - dectree_normal['leaves'].add(tag) + raise Exception( + 'Tag "{}" has enc_class "{}" and not an encoding ' + + "width of 32 bits!".format(tag, enc_class) + ) + if enc_class =3D=3D "NORMAL": + dectree_normal["leaves"].add(tag) else: - dectree_extensions[enc_class]['leaves'].add(tag) + dectree_extensions[enc_class]["leaves"].add(tag) =20 faketags =3D set() -for (tag, enc) in iset.enc_ext_spaces.items(): +for tag, enc in iset.enc_ext_spaces.items(): faketags.add(tag) - encs[tag] =3D ''.join(reversed(enc.replace(' ', ''))) - dectree_normal['leaves'].add(tag) + encs[tag] =3D "".join(reversed(enc.replace(" ", ""))) + dectree_normal["leaves"].add(tag) =20 faketags |=3D set(subinsn_groupings.keys()) =20 + def every_bit_counts(bitset): for i in range(1, len(next(iter(bitset)))): - if len(set([bits[:i] + bits[i+1:] for bits in bitset])) =3D=3D len= (bitset): + if len(set([bits[:i] + bits[i + 1 :] for bits in bitset])) =3D=3D = len(bitset): return False return True =20 + def auto_separate(node): - tags =3D node['leaves'] + tags =3D node["leaves"] if len(tags) <=3D 1: return enc_width =3D len(encs[next(iter(tags))]) - opcode_bit_for_all =3D \ - [all([encs[tag][i] in '01' \ - for tag in tags]) for i in range(enc_width)] - opcode_bit_is_0_for_all =3D \ - [opcode_bit_for_all[i] and all([encs[tag][i] =3D=3D '0' \ - for tag in tags]) for i in range(enc_width)] - opcode_bit_is_1_for_all =3D \ - [opcode_bit_for_all[i] and all([encs[tag][i] =3D=3D '1' \ - for tag in tags]) for i in range(enc_width)] - differentiator_opcode_bit =3D \ - [opcode_bit_for_all[i] and \ - not (opcode_bit_is_0_for_all[i] or \ - opcode_bit_is_1_for_all[i]) \ - for i in range(enc_width)] + opcode_bit_for_all =3D [ + all([encs[tag][i] in "01" for tag in tags]) for i in range(enc_wid= th) + ] + opcode_bit_is_0_for_all =3D [ + opcode_bit_for_all[i] and all([encs[tag][i] =3D=3D "0" for tag in = tags]) + for i in range(enc_width) + ] + opcode_bit_is_1_for_all =3D [ + opcode_bit_for_all[i] and all([encs[tag][i] =3D=3D "1" for tag in = tags]) + for i in range(enc_width) + ] + differentiator_opcode_bit =3D [ + opcode_bit_for_all[i] + and not (opcode_bit_is_0_for_all[i] or opcode_bit_is_1_for_all[i]) + for i in range(enc_width) + ] best_width =3D 0 for width in range(4, 0, -1): for lsb in range(enc_width - width, -1, -1): - bitset =3D set([encs[tag][lsb:lsb+width] for tag in tags]) - if all(differentiator_opcode_bit[lsb:lsb+width]) and \ - (len(bitset) =3D=3D len(tags) or every_bit_counts(bitset)): + bitset =3D set([encs[tag][lsb : lsb + width] for tag in tags]) + if all(differentiator_opcode_bit[lsb : lsb + width]) and ( + len(bitset) =3D=3D len(tags) or every_bit_counts(bitset) + ): best_width =3D width best_lsb =3D lsb caught_all_tags =3D len(bitset) =3D=3D len(tags) @@ -118,33 +133,37 @@ def auto_separate(node): if best_width !=3D 0: break if best_width =3D=3D 0: - raise Exception('Could not find a way to differentiate the encodin= gs ' + - 'of the following tags:\n{}'.format('\n'.join(tag= s))) + raise Exception( + "Could not find a way to differentiate the encodings " + + "of the following tags:\n{}".format("\n".join(tags)) + ) if caught_all_tags: for width in range(1, best_width): for lsb in range(enc_width - width, -1, -1): - bitset =3D set([encs[tag][lsb:lsb+width] for tag in tags]) - if all(differentiator_opcode_bit[lsb:lsb+width]) and \ - len(bitset) =3D=3D len(tags): + bitset =3D set([encs[tag][lsb : lsb + width] for tag in ta= gs]) + if all(differentiator_opcode_bit[lsb : lsb + width]) and l= en( + bitset + ) =3D=3D len(tags): best_width =3D width best_lsb =3D lsb break else: continue break - node['separator_lsb'] =3D best_lsb - node['separator_width'] =3D best_width - node['children'] =3D [] - for value in range(2 ** best_width): + node["separator_lsb"] =3D best_lsb + node["separator_width"] =3D best_width + node["children"] =3D [] + for value in range(2**best_width): child =3D {} - bits =3D ''.join(reversed('{:0{}b}'.format(value, best_width))) - child['leaves'] =3D \ - set([tag for tag in tags \ - if encs[tag][best_lsb:best_lsb+best_width] =3D=3D bits]) - node['children'].append(child) - for child in node['children']: + bits =3D "".join(reversed("{:0{}b}".format(value, best_width))) + child["leaves"] =3D set( + [tag for tag in tags if encs[tag][best_lsb : best_lsb + best_w= idth] =3D=3D bits] + ) + node["children"].append(child) + for child in node["children"]: auto_separate(child) =20 + auto_separate(dectree_normal) auto_separate(dectree_16bit) if subinsn_groupings: @@ -157,144 +176,173 @@ def auto_separate(node): for tag in faketags: del encs[tag] =20 + def table_name(parents, node): path =3D parents + [node] root =3D path[0] - tag =3D next(iter(node['leaves'])) + tag =3D next(iter(node["leaves"])) if tag in subinsn_groupings: - enc_width =3D len(subinsn_groupings[tag]['enc'].replace(' ', '')) + enc_width =3D len(subinsn_groupings[tag]["enc"].replace(" ", "")) else: - tag =3D next(iter(node['leaves'] - faketags)) + tag =3D next(iter(node["leaves"] - faketags)) enc_width =3D len(encs[tag]) - determining_bits =3D ['_'] * enc_width - for (parent, child) in zip(path[:-1], path[1:]): - lsb =3D parent['separator_lsb'] - width =3D parent['separator_width'] - value =3D parent['children'].index(child) - determining_bits[lsb:lsb+width] =3D \ - list(reversed('{:0{}b}'.format(value, width))) + determining_bits =3D ["_"] * enc_width + for parent, child in zip(path[:-1], path[1:]): + lsb =3D parent["separator_lsb"] + width =3D parent["separator_width"] + value =3D parent["children"].index(child) + determining_bits[lsb : lsb + width] =3D list( + reversed("{:0{}b}".format(value, width)) + ) if tag in subinsn_groupings: - name =3D 'DECODE_ROOT_EE' + name =3D "DECODE_ROOT_EE" else: - enc_class =3D iset.iset[tag]['enc_class'] + enc_class =3D iset.iset[tag]["enc_class"] if enc_class in ext_enc_classes: - name =3D 'DECODE_EXT_{}'.format(enc_class) + name =3D "DECODE_EXT_{}".format(enc_class) elif enc_class in subinsn_enc_classes: - name =3D 'DECODE_SUBINSN_{}'.format(enc_class) + name =3D "DECODE_SUBINSN_{}".format(enc_class) else: - name =3D 'DECODE_ROOT_{}'.format(enc_width) + name =3D "DECODE_ROOT_{}".format(enc_width) if node !=3D root: - name +=3D '_' + ''.join(reversed(determining_bits)) + name +=3D "_" + "".join(reversed(determining_bits)) return name =20 + def print_node(f, node, parents): - if len(node['leaves']) <=3D 1: + if len(node["leaves"]) <=3D 1: return name =3D table_name(parents, node) - lsb =3D node['separator_lsb'] - width =3D node['separator_width'] - print('DECODE_NEW_TABLE({},{},DECODE_SEPARATOR_BITS({},{}))'.\ - format(name, 2 ** width, lsb, width), file=3Df) - for child in node['children']: - if len(child['leaves']) =3D=3D 0: - print('INVALID()', file=3Df) - elif len(child['leaves']) =3D=3D 1: - (tag,) =3D child['leaves'] + lsb =3D node["separator_lsb"] + width =3D node["separator_width"] + print( + "DECODE_NEW_TABLE({},{},DECODE_SEPARATOR_BITS({},{}))".format( + name, 2**width, lsb, width + ), + file=3Df, + ) + for child in node["children"]: + if len(child["leaves"]) =3D=3D 0: + print("INVALID()", file=3Df) + elif len(child["leaves"]) =3D=3D 1: + (tag,) =3D child["leaves"] if tag in subinsn_groupings: - class_a =3D subinsn_groupings[tag]['class_a'] - class_b =3D subinsn_groupings[tag]['class_b'] - enc =3D subinsn_groupings[tag]['enc'].replace(' ', '') - if 'RESERVED' in tag: - print('INVALID()', file=3Df) + class_a =3D subinsn_groupings[tag]["class_a"] + class_b =3D subinsn_groupings[tag]["class_b"] + enc =3D subinsn_groupings[tag]["enc"].replace(" ", "") + if "RESERVED" in tag: + print("INVALID()", file=3Df) else: - print('SUBINSNS({},{},{},"{}")'.\ - format(tag, class_a, class_b, enc), file=3Df) + print( + 'SUBINSNS({},{},{},"{}")'.format(tag, class_a, cla= ss_b, enc), + file=3Df, + ) elif tag in iset.enc_ext_spaces: - enc =3D iset.enc_ext_spaces[tag].replace(' ', '') + enc =3D iset.enc_ext_spaces[tag].replace(" ", "") print('EXTSPACE({},"{}")'.format(tag, enc), file=3Df) else: - enc =3D ''.join(reversed(encs[tag])) + enc =3D "".join(reversed(encs[tag])) print('TERMINAL({},"{}")'.format(tag, enc), file=3Df) else: - print('TABLE_LINK({})'.format(table_name(parents + [node], chi= ld)), - file=3Df) - print('DECODE_END_TABLE({},{},DECODE_SEPARATOR_BITS({},{}))'.\ - format(name, 2 ** width, lsb, width), file=3Df) + print("TABLE_LINK({})".format(table_name(parents + [node], chi= ld)), file=3Df) + print( + "DECODE_END_TABLE({},{},DECODE_SEPARATOR_BITS({},{}))".format( + name, 2**width, lsb, width + ), + file=3Df, + ) print(file=3Df) parents.append(node) - for child in node['children']: + for child in node["children"]: print_node(f, child, parents) parents.pop() =20 + def print_tree(f, tree): print_node(f, tree, []) =20 + def print_match_info(f): for tag in sorted(encs.keys(), key=3Diset.tags.index): - enc =3D ''.join(reversed(encs[tag])) - mask =3D int(re.sub(r'[^1]', r'0', enc.replace('0', '1')), 2) - match =3D int(re.sub(r'[^01]', r'0', enc), 2) - suffix =3D '' - print('DECODE{}_MATCH_INFO({},0x{:x}U,0x{:x}U)'.\ - format(suffix, tag, mask, match), file=3Df) + enc =3D "".join(reversed(encs[tag])) + mask =3D int(re.sub(r"[^1]", r"0", enc.replace("0", "1")), 2) + match =3D int(re.sub(r"[^01]", r"0", enc), 2) + suffix =3D "" + print( + "DECODE{}_MATCH_INFO({},0x{:x}U,0x{:x}U)".format(suffix, tag, = mask, match), + file=3Df, + ) + + +regre =3D re.compile(r"((? 1: - raise Exception('Tag "{}" has split register field!'.\ - format(tag)) + raise Exception('Tag "{}" has split register field!'.forma= t(tag)) reg_enc_field =3D reg_enc_fields[0] if 2 ** len(reg_enc_field) !=3D reg_num_choices: - raise Exception('Tag "{}" has incorrect register field wid= th!'.\ - format(tag)) - print(' DECODE_REG({},{},{})'.\ - format(regno, len(reg_enc_field), enc.index(reg_enc_field)= ), - file=3Df) - if reg_type in num_registers and \ - reg_num_choices !=3D num_registers[reg_type]: - print(' DECODE_MAPPED_REG({},{})'.\ - format(regno, reg_mapping), file=3Df) + raise Exception( + 'Tag "{}" has incorrect register field width!'.format(= tag) + ) + print( + " DECODE_REG({},{},{})".format( + regno, len(reg_enc_field), enc.index(reg_enc_field) + ), + file=3Df, + ) + if reg_type in num_registers and reg_num_choices !=3D num_regi= sters[reg_type]: + print( + " DECODE_MAPPED_REG({},{})".format(regno, reg_m= apping), + file=3Df, + ) regno +=3D 1 + def implicit_register_key(reg): return implicit_registers[reg] + for reg in sorted( - set([r for r in (iset.iset[tag]['rregs'].split(',') + \ - iset.iset[tag]['wregs'].split(',')) \ - if r in implicit_registers]), key=3Dimplicit_register_= key): - print(' DECODE_IMPL_REG({},{})'.\ - format(regno, implicit_registers[reg]), file=3Df) + set( + [ + r + for r in ( + iset.iset[tag]["rregs"].split(",") + + iset.iset[tag]["wregs"].split(",") + ) + if r in implicit_registers + ] + ), + key=3Dimplicit_register_key, + ): + print( + " DECODE_IMPL_REG({},{})".format(regno, implicit_re= gisters[reg]), + file=3Df, + ) regno +=3D 1 if imms and imms[0][0].isupper(): imms =3D reversed(imms) @@ -311,41 +359,45 @@ def implicit_register_key(reg): else: imm_shift =3D 0 if imm_type.islower(): - imm_letter =3D 'i' + imm_letter =3D "i" else: - imm_letter =3D 'I' + imm_letter =3D "I" remainder =3D imm_width - for m in reversed(list(re.finditer(imm_letter + '+', enc))): + for m in reversed(list(re.finditer(imm_letter + "+", enc))): remainder -=3D m.end() - m.start() - print(' DECODE_IMM({},{},{},{})'.\ - format(immno, m.end() - m.start(), m.start(), remainde= r), - file=3Df) + print( + " DECODE_IMM({},{},{},{})".format( + immno, m.end() - m.start(), m.start(), remainder + ), + file=3Df, + ) if remainder !=3D 0: if imm[2]: - imm[2] =3D ':' + imm[2] - raise Exception('Tag "{}" has an incorrect number of ' + \ - 'encoding bits for immediate "{}"'.\ - format(tag, ''.join(imm))) - if imm_type.lower() in 'sr': - print(' DECODE_IMM_SXT({},{})'.\ - format(immno, imm_width), file=3Df) - if imm_type.lower() =3D=3D 'n': - print(' DECODE_IMM_NEG({},{})'.\ - format(immno, imm_width), file=3Df) + imm[2] =3D ":" + imm[2] + raise Exception( + 'Tag "{}" has an incorrect number of ' + + 'encoding bits for immediate "{}"'.format(tag, "".jo= in(imm)) + ) + if imm_type.lower() in "sr": + print(" DECODE_IMM_SXT({},{})".format(immno, imm_wi= dth), file=3Df) + if imm_type.lower() =3D=3D "n": + print(" DECODE_IMM_NEG({},{})".format(immno, imm_wi= dth), file=3Df) if imm_shift: - print(' DECODE_IMM_SHIFT({},{})'.\ - format(immno, imm_shift), file=3Df) - print(')', file=3Df) + print( + " DECODE_IMM_SHIFT({},{})".format(immno, imm_sh= ift), file=3Df + ) + print(")", file=3Df) + =20 -if __name__ =3D=3D '__main__': - with open(sys.argv[1], 'w') as f: +if __name__ =3D=3D "__main__": + with open(sys.argv[1], "w") as f: print_tree(f, dectree_normal) print_tree(f, dectree_16bit) if subinsn_groupings: print_tree(f, dectree_subinsn_groupings) - for (name, dectree_subinsn) in sorted(dectree_subinsns.items()): + for name, dectree_subinsn in sorted(dectree_subinsns.items()): print_tree(f, dectree_subinsn) - for (name, dectree_ext) in sorted(dectree_extensions.items()): + for name, dectree_ext in sorted(dectree_extensions.items()): print_tree(f, dectree_ext) print_match_info(f) print_op_info(f) diff --git a/target/hexagon/gen_analyze_funcs.py b/target/hexagon/gen_analy= ze_funcs.py index 1e246209e8..c74443da78 100755 --- a/target/hexagon/gen_analyze_funcs.py +++ b/target/hexagon/gen_analyze_funcs.py @@ -22,137 +22,141 @@ import string import hex_common =20 + ## ## Helpers for gen_analyze_func ## def is_predicated(tag): - return 'A_CONDEXEC' in hex_common.attribdict[tag] + return "A_CONDEXEC" in hex_common.attribdict[tag] + =20 def analyze_opn_old(f, tag, regtype, regid, regno): regN =3D f"{regtype}{regid}N" predicated =3D "true" if is_predicated(tag) else "false" - if (regtype =3D=3D "R"): - if (regid in {"ss", "tt"}): + if regtype =3D=3D "R": + if regid in {"ss", "tt"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") - elif (regid in {"dd", "ee", "xx", "yy"}): + elif regid in {"dd", "ee", "xx", "yy"}: f.write(f" const int {regN} =3D insn->regno[{regno}];\n") f.write(f" ctx_log_reg_write_pair(ctx, {regN}, {predicated}= );\n") - elif (regid in {"s", "t", "u", "v"}): + elif regid in {"s", "t", "u", "v"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") - elif (regid in {"d", "e", "x", "y"}): + elif regid in {"d", "e", "x", "y"}: f.write(f" const int {regN} =3D insn->regno[{regno}];\n") f.write(f" ctx_log_reg_write(ctx, {regN}, {predicated});\n") else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "P"): - if (regid in {"s", "t", "u", "v"}): + elif regtype =3D=3D "P": + if regid in {"s", "t", "u", "v"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") - elif (regid in {"d", "e", "x"}): + elif regid in {"d", "e", "x"}: f.write(f" const int {regN} =3D insn->regno[{regno}];\n") f.write(f" ctx_log_pred_write(ctx, {regN});\n") else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "C"): - if (regid =3D=3D "ss"): - f.write(f"// const int {regN} =3D insn->regno[{regno}] " - "+ HEX_REG_SA0;\n") - elif (regid =3D=3D "dd"): - f.write(f" const int {regN} =3D insn->regno[{regno}] " - "+ HEX_REG_SA0;\n") + elif regtype =3D=3D "C": + if regid =3D=3D "ss": + f.write( + f"// const int {regN} =3D insn->regno[{regno}] " "+ HEX= _REG_SA0;\n" + ) + elif regid =3D=3D "dd": + f.write(f" const int {regN} =3D insn->regno[{regno}] " "+ H= EX_REG_SA0;\n") f.write(f" ctx_log_reg_write_pair(ctx, {regN}, {predicated}= );\n") - elif (regid =3D=3D "s"): - f.write(f"// const int {regN} =3D insn->regno[{regno}] " - "+ HEX_REG_SA0;\n") - elif (regid =3D=3D "d"): - f.write(f" const int {regN} =3D insn->regno[{regno}] " - "+ HEX_REG_SA0;\n") + elif regid =3D=3D "s": + f.write( + f"// const int {regN} =3D insn->regno[{regno}] " "+ HEX= _REG_SA0;\n" + ) + elif regid =3D=3D "d": + f.write(f" const int {regN} =3D insn->regno[{regno}] " "+ H= EX_REG_SA0;\n") f.write(f" ctx_log_reg_write(ctx, {regN}, {predicated});\n") else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "M"): - if (regid =3D=3D "u"): + elif regtype =3D=3D "M": + if regid =3D=3D "u": f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "V"): + elif regtype =3D=3D "V": newv =3D "EXT_DFL" - if (hex_common.is_new_result(tag)): + if hex_common.is_new_result(tag): newv =3D "EXT_NEW" - elif (hex_common.is_tmp_result(tag)): + elif hex_common.is_tmp_result(tag): newv =3D "EXT_TMP" - if (regid in {"dd", "xx"}): + if regid in {"dd", "xx"}: f.write(f" const int {regN} =3D insn->regno[{regno}];\n") - f.write(f" ctx_log_vreg_write_pair(ctx, {regN}, {newv}, " - f"{predicated});\n") - elif (regid in {"uu", "vv"}): + f.write( + f" ctx_log_vreg_write_pair(ctx, {regN}, {newv}, " f"{pr= edicated});\n" + ) + elif regid in {"uu", "vv"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") - elif (regid in {"s", "u", "v", "w"}): + elif regid in {"s", "u", "v", "w"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") - elif (regid in {"d", "x", "y"}): + elif regid in {"d", "x", "y"}: f.write(f" const int {regN} =3D insn->regno[{regno}];\n") - f.write(f" ctx_log_vreg_write(ctx, {regN}, {newv}, " - f"{predicated});\n") + f.write(f" ctx_log_vreg_write(ctx, {regN}, {newv}, " f"{pre= dicated});\n") else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "Q"): - if (regid in {"d", "e", "x"}): + elif regtype =3D=3D "Q": + if regid in {"d", "e", "x"}: f.write(f" const int {regN} =3D insn->regno[{regno}];\n") f.write(f" ctx_log_qreg_write(ctx, {regN});\n") - elif (regid in {"s", "t", "u", "v"}): + elif regid in {"s", "t", "u", "v"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "G"): - if (regid in {"dd"}): + elif regtype =3D=3D "G": + if regid in {"dd"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") - elif (regid in {"d"}): + elif regid in {"d"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") - elif (regid in {"ss"}): + elif regid in {"ss"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") - elif (regid in {"s"}): + elif regid in {"s"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "S"): - if (regid in {"dd"}): + elif regtype =3D=3D "S": + if regid in {"dd"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") - elif (regid in {"d"}): + elif regid in {"d"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") - elif (regid in {"ss"}): + elif regid in {"ss"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") - elif (regid in {"s"}): + elif regid in {"s"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) else: print("Bad register parse: ", regtype, regid) =20 + def analyze_opn_new(f, tag, regtype, regid, regno): regN =3D f"{regtype}{regid}N" - if (regtype =3D=3D "N"): - if (regid in {"s", "t"}): + if regtype =3D=3D "N": + if regid in {"s", "t"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "P"): - if (regid in {"t", "u", "v"}): + elif regtype =3D=3D "P": + if regid in {"t", "u", "v"}: f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "O"): - if (regid =3D=3D "s"): + elif regtype =3D=3D "O": + if regid =3D=3D "s": f.write(f"// const int {regN} =3D insn->regno[{regno}];\n") else: print("Bad register parse: ", regtype, regid) else: print("Bad register parse: ", regtype, regid) =20 + def analyze_opn(f, tag, regtype, regid, toss, numregs, i): - if (hex_common.is_pair(regid)): + if hex_common.is_pair(regid): analyze_opn_old(f, tag, regtype, regid, i) - elif (hex_common.is_single(regid)): + elif hex_common.is_single(regid): if hex_common.is_old_val(regtype, regid, tag): - analyze_opn_old(f,tag, regtype, regid, i) + analyze_opn_old(f, tag, regtype, regid, i) elif hex_common.is_new_val(regtype, regid, tag): analyze_opn_new(f, tag, regtype, regid, i) else: @@ -160,6 +164,7 @@ def analyze_opn(f, tag, regtype, regid, toss, numregs, = i): else: print("Bad register parse: ", regtype, regid, toss, numregs) =20 + ## ## Generate the code to analyze the instruction ## For A2_add: Rd32=3Dadd(Rs32,Rt32), { RdV=3DRsV+RtV;} @@ -175,24 +180,25 @@ def analyze_opn(f, tag, regtype, regid, toss, numregs= , i): ## def gen_analyze_func(f, tag, regs, imms): f.write(f"static void analyze_{tag}(DisasContext *ctx)\n") - f.write('{\n') + f.write("{\n") =20 f.write(" Insn *insn G_GNUC_UNUSED =3D ctx->insn;\n") =20 - i=3D0 + i =3D 0 ## Analyze all the registers for regtype, regid, toss, numregs in regs: analyze_opn(f, tag, regtype, regid, toss, numregs, i) i +=3D 1 =20 - has_generated_helper =3D (not hex_common.skip_qemu_helper(tag) and - not hex_common.is_idef_parser_enabled(tag)) - if (has_generated_helper and - 'A_SCALAR_LOAD' in hex_common.attribdict[tag]): + has_generated_helper =3D not hex_common.skip_qemu_helper( + tag + ) and not hex_common.is_idef_parser_enabled(tag) + if has_generated_helper and "A_SCALAR_LOAD" in hex_common.attribdict[t= ag]: f.write(" ctx->need_pkt_has_store_s1 =3D true;\n") =20 f.write("}\n\n") =20 + def main(): hex_common.read_semantics_file(sys.argv[1]) hex_common.read_attribs_file(sys.argv[2]) @@ -214,7 +220,7 @@ def main(): tagregs =3D hex_common.get_tagregs() tagimms =3D hex_common.get_tagimms() =20 - with open(sys.argv[-1], 'w') as f: + with open(sys.argv[-1], "w") as f: f.write("#ifndef HEXAGON_TCG_FUNCS_H\n") f.write("#define HEXAGON_TCG_FUNCS_H\n\n") =20 @@ -223,5 +229,6 @@ def main(): =20 f.write("#endif /* HEXAGON_TCG_FUNCS_H */\n") =20 + if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/gen_helper_funcs.py b/target/hexagon/gen_helper= _funcs.py index dc67eaf716..c4e04508f8 100755 --- a/target/hexagon/gen_helper_funcs.py +++ b/target/hexagon/gen_helper_funcs.py @@ -22,131 +22,171 @@ import string import hex_common =20 + ## ## Helpers for gen_helper_function ## def gen_decl_ea(f): f.write(" uint32_t EA;\n") =20 -def gen_helper_return_type(f,regtype,regid,regno): - if regno > 1 : f.write(", ") + +def gen_helper_return_type(f, regtype, regid, regno): + if regno > 1: + f.write(", ") f.write("int32_t") =20 -def gen_helper_return_type_pair(f,regtype,regid,regno): - if regno > 1 : f.write(", ") + +def gen_helper_return_type_pair(f, regtype, regid, regno): + if regno > 1: + f.write(", ") f.write("int64_t") =20 -def gen_helper_arg(f,regtype,regid,regno): - if regno > 0 : f.write(", " ) + +def gen_helper_arg(f, regtype, regid, regno): + if regno > 0: + f.write(", ") f.write(f"int32_t {regtype}{regid}V") =20 -def gen_helper_arg_new(f,regtype,regid,regno): - if regno >=3D 0 : f.write(", " ) + +def gen_helper_arg_new(f, regtype, regid, regno): + if regno >=3D 0: + f.write(", ") f.write(f"int32_t {regtype}{regid}N") =20 -def gen_helper_arg_pair(f,regtype,regid,regno): - if regno >=3D 0 : f.write(", ") + +def gen_helper_arg_pair(f, regtype, regid, regno): + if regno >=3D 0: + f.write(", ") f.write(f"int64_t {regtype}{regid}V") =20 -def gen_helper_arg_ext(f,regtype,regid,regno): - if regno > 0 : f.write(", ") + +def gen_helper_arg_ext(f, regtype, regid, regno): + if regno > 0: + f.write(", ") f.write(f"void *{regtype}{regid}V_void") =20 -def gen_helper_arg_ext_pair(f,regtype,regid,regno): - if regno > 0 : f.write(", ") + +def gen_helper_arg_ext_pair(f, regtype, regid, regno): + if regno > 0: + f.write(", ") f.write(f"void *{regtype}{regid}V_void") =20 -def gen_helper_arg_opn(f,regtype,regid,i,tag): - if (hex_common.is_pair(regid)): - if (hex_common.is_hvx_reg(regtype)): - gen_helper_arg_ext_pair(f,regtype,regid,i) + +def gen_helper_arg_opn(f, regtype, regid, i, tag): + if hex_common.is_pair(regid): + if hex_common.is_hvx_reg(regtype): + gen_helper_arg_ext_pair(f, regtype, regid, i) else: - gen_helper_arg_pair(f,regtype,regid,i) - elif (hex_common.is_single(regid)): + gen_helper_arg_pair(f, regtype, regid, i) + elif hex_common.is_single(regid): if hex_common.is_old_val(regtype, regid, tag): - if (hex_common.is_hvx_reg(regtype)): - gen_helper_arg_ext(f,regtype,regid,i) + if hex_common.is_hvx_reg(regtype): + gen_helper_arg_ext(f, regtype, regid, i) else: - gen_helper_arg(f,regtype,regid,i) + gen_helper_arg(f, regtype, regid, i) elif hex_common.is_new_val(regtype, regid, tag): - gen_helper_arg_new(f,regtype,regid,i) + gen_helper_arg_new(f, regtype, regid, i) else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numregs) else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numregs) =20 -def gen_helper_arg_imm(f,immlett): + +def gen_helper_arg_imm(f, immlett): f.write(f", int32_t {hex_common.imm_name(immlett)}") =20 -def gen_helper_dest_decl(f,regtype,regid,regno,subfield=3D""): + +def gen_helper_dest_decl(f, regtype, regid, regno, subfield=3D""): f.write(f" int32_t {regtype}{regid}V{subfield} =3D 0;\n") =20 -def gen_helper_dest_decl_pair(f,regtype,regid,regno,subfield=3D""): + +def gen_helper_dest_decl_pair(f, regtype, regid, regno, subfield=3D""): f.write(f" int64_t {regtype}{regid}V{subfield} =3D 0;\n") =20 -def gen_helper_dest_decl_ext(f,regtype,regid): - if (regtype =3D=3D "Q"): - f.write(f" /* {regtype}{regid}V is *(MMQReg *)" - f"({regtype}{regid}V_void) */\n") + +def gen_helper_dest_decl_ext(f, regtype, regid): + if regtype =3D=3D "Q": + f.write( + f" /* {regtype}{regid}V is *(MMQReg *)" f"({regtype}{regid}= V_void) */\n" + ) else: - f.write(f" /* {regtype}{regid}V is *(MMVector *)" - f"({regtype}{regid}V_void) */\n") + f.write( + f" /* {regtype}{regid}V is *(MMVector *)" + f"({regtype}{regid}V_void) */\n" + ) + =20 -def gen_helper_dest_decl_ext_pair(f,regtype,regid,regno): - f.write(f" /* {regtype}{regid}V is *(MMVectorPair *))" - f"{regtype}{regid}V_void) */\n") +def gen_helper_dest_decl_ext_pair(f, regtype, regid, regno): + f.write( + f" /* {regtype}{regid}V is *(MMVectorPair *))" + f"{regtype}{regid}V_void) */\n" + ) =20 -def gen_helper_dest_decl_opn(f,regtype,regid,i): - if (hex_common.is_pair(regid)): - if (hex_common.is_hvx_reg(regtype)): - gen_helper_dest_decl_ext_pair(f,regtype,regid, i) + +def gen_helper_dest_decl_opn(f, regtype, regid, i): + if hex_common.is_pair(regid): + if hex_common.is_hvx_reg(regtype): + gen_helper_dest_decl_ext_pair(f, regtype, regid, i) else: - gen_helper_dest_decl_pair(f,regtype,regid,i) - elif (hex_common.is_single(regid)): - if (hex_common.is_hvx_reg(regtype)): - gen_helper_dest_decl_ext(f,regtype,regid) + gen_helper_dest_decl_pair(f, regtype, regid, i) + elif hex_common.is_single(regid): + if hex_common.is_hvx_reg(regtype): + gen_helper_dest_decl_ext(f, regtype, regid) else: - gen_helper_dest_decl(f,regtype,regid,i) + gen_helper_dest_decl(f, regtype, regid, i) else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numregs) + =20 -def gen_helper_src_var_ext(f,regtype,regid): - if (regtype =3D=3D "Q"): - f.write(f" /* {regtype}{regid}V is *(MMQReg *)" - f"({regtype}{regid}V_void) */\n") +def gen_helper_src_var_ext(f, regtype, regid): + if regtype =3D=3D "Q": + f.write( + f" /* {regtype}{regid}V is *(MMQReg *)" f"({regtype}{regid}= V_void) */\n" + ) else: - f.write(f" /* {regtype}{regid}V is *(MMVector *)" - f"({regtype}{regid}V_void) */\n") + f.write( + f" /* {regtype}{regid}V is *(MMVector *)" + f"({regtype}{regid}V_void) */\n" + ) + + +def gen_helper_src_var_ext_pair(f, regtype, regid, regno): + f.write( + f" /* {regtype}{regid}V{regno} is *(MMVectorPair *)" + f"({regtype}{regid}V{regno}_void) */\n" + ) =20 -def gen_helper_src_var_ext_pair(f,regtype,regid,regno): - f.write(f" /* {regtype}{regid}V{regno} is *(MMVectorPair *)" - f"({regtype}{regid}V{regno}_void) */\n") =20 -def gen_helper_return(f,regtype,regid,regno): +def gen_helper_return(f, regtype, regid, regno): f.write(f" return {regtype}{regid}V;\n") =20 -def gen_helper_return_pair(f,regtype,regid,regno): + +def gen_helper_return_pair(f, regtype, regid, regno): f.write(f" return {regtype}{regid}V;\n") =20 -def gen_helper_dst_write_ext(f,regtype,regid): + +def gen_helper_dst_write_ext(f, regtype, regid): return =20 -def gen_helper_dst_write_ext_pair(f,regtype,regid): + +def gen_helper_dst_write_ext_pair(f, regtype, regid): return =20 + def gen_helper_return_opn(f, regtype, regid, i): - if (hex_common.is_pair(regid)): - if (hex_common.is_hvx_reg(regtype)): - gen_helper_dst_write_ext_pair(f,regtype,regid) + if hex_common.is_pair(regid): + if hex_common.is_hvx_reg(regtype): + gen_helper_dst_write_ext_pair(f, regtype, regid) else: - gen_helper_return_pair(f,regtype,regid,i) - elif (hex_common.is_single(regid)): - if (hex_common.is_hvx_reg(regtype)): - gen_helper_dst_write_ext(f,regtype,regid) + gen_helper_return_pair(f, regtype, regid, i) + elif hex_common.is_single(regid): + if hex_common.is_hvx_reg(regtype): + gen_helper_dst_write_ext(f, regtype, regid) else: - gen_helper_return(f,regtype,regid,i) + gen_helper_return(f, regtype, regid, i) else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numregs) + =20 ## ## Generate the TCG code to call the helper @@ -168,138 +208,145 @@ def gen_helper_function(f, tag, tagregs, tagimms): numresults =3D 0 numscalarresults =3D 0 numscalarreadwrite =3D 0 - for regtype,regid,toss,numregs in regs: - if (hex_common.is_written(regid)): + for regtype, regid, toss, numregs in regs: + if hex_common.is_written(regid): numresults +=3D 1 - if (hex_common.is_scalar_reg(regtype)): + if hex_common.is_scalar_reg(regtype): numscalarresults +=3D 1 - if (hex_common.is_readwrite(regid)): - if (hex_common.is_scalar_reg(regtype)): + if hex_common.is_readwrite(regid): + if hex_common.is_scalar_reg(regtype): numscalarreadwrite +=3D 1 =20 - if (numscalarresults > 1): + if numscalarresults > 1: ## The helper is bogus when there is more than one result - f.write(f"void HELPER({tag})(CPUHexagonState *env) " - f"{{ BOGUS_HELPER({tag}); }}\n") + f.write( + f"void HELPER({tag})(CPUHexagonState *env) " f"{{ BOGUS_HELPER= ({tag}); }}\n" + ) else: ## The return type of the function is the type of the destination ## register (if scalar) - i=3D0 - for regtype,regid,toss,numregs in regs: - if (hex_common.is_written(regid)): - if (hex_common.is_pair(regid)): - if (hex_common.is_hvx_reg(regtype)): + i =3D 0 + for regtype, regid, toss, numregs in regs: + if hex_common.is_written(regid): + if hex_common.is_pair(regid): + if hex_common.is_hvx_reg(regtype): continue else: - gen_helper_return_type_pair(f,regtype,regid,i) - elif (hex_common.is_single(regid)): - if (hex_common.is_hvx_reg(regtype)): - continue + gen_helper_return_type_pair(f, regtype, regid, i) + elif hex_common.is_single(regid): + if hex_common.is_hvx_reg(regtype): + continue else: - gen_helper_return_type(f,regtype,regid,i) + gen_helper_return_type(f, regtype, regid, i) else: - print("Bad register parse: ",regtype,regid,toss,numreg= s) + print("Bad register parse: ", regtype, regid, toss, nu= mregs) i +=3D 1 =20 - if (numscalarresults =3D=3D 0): + if numscalarresults =3D=3D 0: f.write("void") f.write(f" HELPER({tag})(CPUHexagonState *env") =20 ## Arguments include the vector destination operands i =3D 1 - for regtype,regid,toss,numregs in regs: - if (hex_common.is_written(regid)): - if (hex_common.is_pair(regid)): - if (hex_common.is_hvx_reg(regtype)): - gen_helper_arg_ext_pair(f,regtype,regid,i) + for regtype, regid, toss, numregs in regs: + if hex_common.is_written(regid): + if hex_common.is_pair(regid): + if hex_common.is_hvx_reg(regtype): + gen_helper_arg_ext_pair(f, regtype, regid, i) else: continue - elif (hex_common.is_single(regid)): - if (hex_common.is_hvx_reg(regtype)): - gen_helper_arg_ext(f,regtype,regid,i) + elif hex_common.is_single(regid): + if hex_common.is_hvx_reg(regtype): + gen_helper_arg_ext(f, regtype, regid, i) else: # This is the return value of the function continue else: - print("Bad register parse: ",regtype,regid,toss,numreg= s) + print("Bad register parse: ", regtype, regid, toss, nu= mregs) i +=3D 1 =20 ## For conditional instructions, we pass in the destination regist= er - if 'A_CONDEXEC' in hex_common.attribdict[tag]: + if "A_CONDEXEC" in hex_common.attribdict[tag]: for regtype, regid, toss, numregs in regs: - if (hex_common.is_writeonly(regid) and - not hex_common.is_hvx_reg(regtype)): + if hex_common.is_writeonly(regid) and not hex_common.is_hv= x_reg( + regtype + ): gen_helper_arg_opn(f, regtype, regid, i, tag) i +=3D 1 =20 ## Arguments to the helper function are the source regs and immedi= ates - for regtype,regid,toss,numregs in regs: - if (hex_common.is_read(regid)): - if (hex_common.is_hvx_reg(regtype) and - hex_common.is_readwrite(regid)): + for regtype, regid, toss, numregs in regs: + if hex_common.is_read(regid): + if hex_common.is_hvx_reg(regtype) and hex_common.is_readwr= ite(regid): continue - gen_helper_arg_opn(f,regtype,regid,i,tag) + gen_helper_arg_opn(f, regtype, regid, i, tag) i +=3D 1 - for immlett,bits,immshift in imms: - gen_helper_arg_imm(f,immlett) + for immlett, bits, immshift in imms: + gen_helper_arg_imm(f, immlett) i +=3D 1 =20 - if (hex_common.need_pkt_has_multi_cof(tag)): + if hex_common.need_pkt_has_multi_cof(tag): f.write(", uint32_t pkt_has_multi_cof") =20 if hex_common.need_PC(tag): - if i > 0: f.write(", ") + if i > 0: + f.write(", ") f.write("target_ulong PC") i +=3D 1 if hex_common.helper_needs_next_PC(tag): - if i > 0: f.write(", ") + if i > 0: + f.write(", ") f.write("target_ulong next_PC") i +=3D 1 if hex_common.need_slot(tag): - if i > 0: f.write(", ") + if i > 0: + f.write(", ") f.write("uint32_t slot") i +=3D 1 if hex_common.need_part1(tag): - if i > 0: f.write(", ") + if i > 0: + f.write(", ") f.write("uint32_t part1") f.write(")\n{\n") - if (not hex_common.need_slot(tag)): - f.write(" uint32_t slot __attribute__((unused)) =3D 4;\n" ) - if hex_common.need_ea(tag): gen_decl_ea(f) + if not hex_common.need_slot(tag): + f.write(" uint32_t slot __attribute__((unused)) =3D 4;\n") + if hex_common.need_ea(tag): + gen_decl_ea(f) ## Declare the return variable - i=3D0 - if 'A_CONDEXEC' not in hex_common.attribdict[tag]: - for regtype,regid,toss,numregs in regs: - if (hex_common.is_writeonly(regid)): - gen_helper_dest_decl_opn(f,regtype,regid,i) + i =3D 0 + if "A_CONDEXEC" not in hex_common.attribdict[tag]: + for regtype, regid, toss, numregs in regs: + if hex_common.is_writeonly(regid): + gen_helper_dest_decl_opn(f, regtype, regid, i) i +=3D 1 =20 - for regtype,regid,toss,numregs in regs: - if (hex_common.is_read(regid)): - if (hex_common.is_pair(regid)): - if (hex_common.is_hvx_reg(regtype)): - gen_helper_src_var_ext_pair(f,regtype,regid,i) - elif (hex_common.is_single(regid)): - if (hex_common.is_hvx_reg(regtype)): - gen_helper_src_var_ext(f,regtype,regid) + for regtype, regid, toss, numregs in regs: + if hex_common.is_read(regid): + if hex_common.is_pair(regid): + if hex_common.is_hvx_reg(regtype): + gen_helper_src_var_ext_pair(f, regtype, regid, i) + elif hex_common.is_single(regid): + if hex_common.is_hvx_reg(regtype): + gen_helper_src_var_ext(f, regtype, regid) else: - print("Bad register parse: ",regtype,regid,toss,numreg= s) + print("Bad register parse: ", regtype, regid, toss, nu= mregs) =20 - if 'A_FPOP' in hex_common.attribdict[tag]: - f.write(' arch_fpop_start(env);\n'); + if "A_FPOP" in hex_common.attribdict[tag]: + f.write(" arch_fpop_start(env);\n") =20 f.write(f" {hex_common.semdict[tag]}\n") =20 - if 'A_FPOP' in hex_common.attribdict[tag]: - f.write(' arch_fpop_end(env);\n'); + if "A_FPOP" in hex_common.attribdict[tag]: + f.write(" arch_fpop_end(env);\n") =20 ## Save/return the return variable - for regtype,regid,toss,numregs in regs: - if (hex_common.is_written(regid)): + for regtype, regid, toss, numregs in regs: + if hex_common.is_written(regid): gen_helper_return_opn(f, regtype, regid, i) f.write("}\n\n") ## End of the helper definition =20 + def main(): hex_common.read_semantics_file(sys.argv[1]) hex_common.read_attribs_file(sys.argv[2]) @@ -322,27 +369,28 @@ def main(): tagimms =3D hex_common.get_tagimms() =20 output_file =3D sys.argv[-1] - with open(output_file, 'w') as f: + with open(output_file, "w") as f: for tag in hex_common.tags: ## Skip the priv instructions - if ( "A_PRIV" in hex_common.attribdict[tag] ) : + if "A_PRIV" in hex_common.attribdict[tag]: continue ## Skip the guest instructions - if ( "A_GUEST" in hex_common.attribdict[tag] ) : + if "A_GUEST" in hex_common.attribdict[tag]: continue ## Skip the diag instructions - if ( tag =3D=3D "Y6_diag" ) : + if tag =3D=3D "Y6_diag": continue - if ( tag =3D=3D "Y6_diag0" ) : + if tag =3D=3D "Y6_diag0": continue - if ( tag =3D=3D "Y6_diag1" ) : + if tag =3D=3D "Y6_diag1": continue - if ( hex_common.skip_qemu_helper(tag) ): + if hex_common.skip_qemu_helper(tag): continue - if ( hex_common.is_idef_parser_enabled(tag) ): + if hex_common.is_idef_parser_enabled(tag): continue =20 gen_helper_function(f, tag, tagregs, tagimms) =20 + if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/gen_helper_protos.py b/target/hexagon/gen_helpe= r_protos.py index d795f32047..187cd6e04e 100755 --- a/target/hexagon/gen_helper_protos.py +++ b/target/hexagon/gen_helper_protos.py @@ -26,32 +26,34 @@ ## Helpers for gen_helper_prototype ## def_helper_types =3D { - 'N' : 's32', - 'O' : 's32', - 'P' : 's32', - 'M' : 's32', - 'C' : 's32', - 'R' : 's32', - 'V' : 'ptr', - 'Q' : 'ptr' + "N": "s32", + "O": "s32", + "P": "s32", + "M": "s32", + "C": "s32", + "R": "s32", + "V": "ptr", + "Q": "ptr", } =20 def_helper_types_pair =3D { - 'R' : 's64', - 'C' : 's64', - 'S' : 's64', - 'G' : 's64', - 'V' : 'ptr', - 'Q' : 'ptr' + "R": "s64", + "C": "s64", + "S": "s64", + "G": "s64", + "V": "ptr", + "Q": "ptr", } =20 + def gen_def_helper_opn(f, tag, regtype, regid, toss, numregs, i): - if (hex_common.is_pair(regid)): + if hex_common.is_pair(regid): f.write(f", {def_helper_types_pair[regtype]}") - elif (hex_common.is_single(regid)): + elif hex_common.is_single(regid): f.write(f", {def_helper_types[regtype]}") else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numregs) + =20 ## ## Generate the DEF_HELPER prototype for an instruction @@ -66,90 +68,108 @@ def gen_helper_prototype(f, tag, tagregs, tagimms): numresults =3D 0 numscalarresults =3D 0 numscalarreadwrite =3D 0 - for regtype,regid,toss,numregs in regs: - if (hex_common.is_written(regid)): + for regtype, regid, toss, numregs in regs: + if hex_common.is_written(regid): numresults +=3D 1 - if (hex_common.is_scalar_reg(regtype)): + if hex_common.is_scalar_reg(regtype): numscalarresults +=3D 1 - if (hex_common.is_readwrite(regid)): - if (hex_common.is_scalar_reg(regtype)): + if hex_common.is_readwrite(regid): + if hex_common.is_scalar_reg(regtype): numscalarreadwrite +=3D 1 =20 - if (numscalarresults > 1): + if numscalarresults > 1: ## The helper is bogus when there is more than one result - f.write(f'DEF_HELPER_1({tag}, void, env)\n') + f.write(f"DEF_HELPER_1({tag}, void, env)\n") else: ## Figure out how many arguments the helper will take - if (numscalarresults =3D=3D 0): - def_helper_size =3D len(regs)+len(imms)+numscalarreadwrite+1 - if hex_common.need_pkt_has_multi_cof(tag): def_helper_size += =3D 1 - if hex_common.need_part1(tag): def_helper_size +=3D 1 - if hex_common.need_slot(tag): def_helper_size +=3D 1 - if hex_common.need_PC(tag): def_helper_size +=3D 1 - if hex_common.helper_needs_next_PC(tag): def_helper_size +=3D 1 - if hex_common.need_condexec_reg(tag, regs): def_helper_size += =3D 1 - f.write(f'DEF_HELPER_{def_helper_size}({tag}') + if numscalarresults =3D=3D 0: + def_helper_size =3D len(regs) + len(imms) + numscalarreadwrite= + 1 + if hex_common.need_pkt_has_multi_cof(tag): + def_helper_size +=3D 1 + if hex_common.need_part1(tag): + def_helper_size +=3D 1 + if hex_common.need_slot(tag): + def_helper_size +=3D 1 + if hex_common.need_PC(tag): + def_helper_size +=3D 1 + if hex_common.helper_needs_next_PC(tag): + def_helper_size +=3D 1 + if hex_common.need_condexec_reg(tag, regs): + def_helper_size +=3D 1 + f.write(f"DEF_HELPER_{def_helper_size}({tag}") ## The return type is void - f.write(', void' ) + f.write(", void") else: - def_helper_size =3D len(regs)+len(imms)+numscalarreadwrite - if hex_common.need_pkt_has_multi_cof(tag): def_helper_size += =3D 1 - if hex_common.need_part1(tag): def_helper_size +=3D 1 - if hex_common.need_slot(tag): def_helper_size +=3D 1 - if hex_common.need_PC(tag): def_helper_size +=3D 1 - if hex_common.need_condexec_reg(tag, regs): def_helper_size += =3D 1 - if hex_common.helper_needs_next_PC(tag): def_helper_size +=3D 1 - f.write(f'DEF_HELPER_{def_helper_size}({tag}') + def_helper_size =3D len(regs) + len(imms) + numscalarreadwrite + if hex_common.need_pkt_has_multi_cof(tag): + def_helper_size +=3D 1 + if hex_common.need_part1(tag): + def_helper_size +=3D 1 + if hex_common.need_slot(tag): + def_helper_size +=3D 1 + if hex_common.need_PC(tag): + def_helper_size +=3D 1 + if hex_common.need_condexec_reg(tag, regs): + def_helper_size +=3D 1 + if hex_common.helper_needs_next_PC(tag): + def_helper_size +=3D 1 + f.write(f"DEF_HELPER_{def_helper_size}({tag}") =20 ## Generate the qemu DEF_HELPER type for each result ## Iterate over this list twice ## - Emit the scalar result ## - Emit the vector result - i=3D0 - for regtype,regid,toss,numregs in regs: - if (hex_common.is_written(regid)): - if (not hex_common.is_hvx_reg(regtype)): + i =3D 0 + for regtype, regid, toss, numregs in regs: + if hex_common.is_written(regid): + if not hex_common.is_hvx_reg(regtype): gen_def_helper_opn(f, tag, regtype, regid, toss, numre= gs, i) i +=3D 1 =20 ## Put the env between the outputs and inputs - f.write(', env' ) + f.write(", env") i +=3D 1 =20 # Second pass - for regtype,regid,toss,numregs in regs: - if (hex_common.is_written(regid)): - if (hex_common.is_hvx_reg(regtype)): + for regtype, regid, toss, numregs in regs: + if hex_common.is_written(regid): + if hex_common.is_hvx_reg(regtype): gen_def_helper_opn(f, tag, regtype, regid, toss, numre= gs, i) i +=3D 1 =20 ## For conditional instructions, we pass in the destination regist= er - if 'A_CONDEXEC' in hex_common.attribdict[tag]: + if "A_CONDEXEC" in hex_common.attribdict[tag]: for regtype, regid, toss, numregs in regs: - if (hex_common.is_writeonly(regid) and - not hex_common.is_hvx_reg(regtype)): + if hex_common.is_writeonly(regid) and not hex_common.is_hv= x_reg( + regtype + ): gen_def_helper_opn(f, tag, regtype, regid, toss, numre= gs, i) i +=3D 1 =20 ## Generate the qemu type for each input operand (regs and immedia= tes) - for regtype,regid,toss,numregs in regs: - if (hex_common.is_read(regid)): - if (hex_common.is_hvx_reg(regtype) and - hex_common.is_readwrite(regid)): + for regtype, regid, toss, numregs in regs: + if hex_common.is_read(regid): + if hex_common.is_hvx_reg(regtype) and hex_common.is_readwr= ite(regid): continue gen_def_helper_opn(f, tag, regtype, regid, toss, numregs, = i) i +=3D 1 - for immlett,bits,immshift in imms: + for immlett, bits, immshift in imms: f.write(", s32") =20 ## Add the arguments for the instruction pkt_has_multi_cof, slot a= nd ## part1 (if needed) - if hex_common.need_pkt_has_multi_cof(tag): f.write(', i32') - if hex_common.need_PC(tag): f.write(', i32') - if hex_common.helper_needs_next_PC(tag): f.write(', i32') - if hex_common.need_slot(tag): f.write(', i32' ) - if hex_common.need_part1(tag): f.write(' , i32' ) - f.write(')\n') + if hex_common.need_pkt_has_multi_cof(tag): + f.write(", i32") + if hex_common.need_PC(tag): + f.write(", i32") + if hex_common.helper_needs_next_PC(tag): + f.write(", i32") + if hex_common.need_slot(tag): + f.write(", i32") + if hex_common.need_part1(tag): + f.write(" , i32") + f.write(")\n") + =20 def main(): hex_common.read_semantics_file(sys.argv[1]) @@ -173,28 +193,29 @@ def main(): tagimms =3D hex_common.get_tagimms() =20 output_file =3D sys.argv[-1] - with open(output_file, 'w') as f: + with open(output_file, "w") as f: for tag in hex_common.tags: ## Skip the priv instructions - if ( "A_PRIV" in hex_common.attribdict[tag] ) : + if "A_PRIV" in hex_common.attribdict[tag]: continue ## Skip the guest instructions - if ( "A_GUEST" in hex_common.attribdict[tag] ) : + if "A_GUEST" in hex_common.attribdict[tag]: continue ## Skip the diag instructions - if ( tag =3D=3D "Y6_diag" ) : + if tag =3D=3D "Y6_diag": continue - if ( tag =3D=3D "Y6_diag0" ) : + if tag =3D=3D "Y6_diag0": continue - if ( tag =3D=3D "Y6_diag1" ) : + if tag =3D=3D "Y6_diag1": continue =20 - if ( hex_common.skip_qemu_helper(tag) ): + if hex_common.skip_qemu_helper(tag): continue - if ( hex_common.is_idef_parser_enabled(tag) ): + if hex_common.is_idef_parser_enabled(tag): continue =20 gen_helper_prototype(f, tag, tagregs, tagimms) =20 + if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/gen_idef_parser_funcs.py b/target/hexagon/gen_i= def_parser_funcs.py index 60be8e37b6..2cc0f58ec5 100644 --- a/target/hexagon/gen_idef_parser_funcs.py +++ b/target/hexagon/gen_idef_parser_funcs.py @@ -24,6 +24,7 @@ =20 import hex_common =20 + ## ## Generate code to be fed to the idef_parser ## @@ -48,83 +49,99 @@ def main(): tagregs =3D hex_common.get_tagregs() tagimms =3D hex_common.get_tagimms() =20 - with open(sys.argv[3], 'w') as f: + with open(sys.argv[3], "w") as f: f.write('#include "macros.inc"\n\n') =20 for tag in hex_common.tags: ## Skip the priv instructions - if ( "A_PRIV" in hex_common.attribdict[tag] ) : + if "A_PRIV" in hex_common.attribdict[tag]: continue ## Skip the guest instructions - if ( "A_GUEST" in hex_common.attribdict[tag] ) : + if "A_GUEST" in hex_common.attribdict[tag]: continue ## Skip instructions that saturate in a ternary expression - if ( tag in {'S2_asr_r_r_sat', 'S2_asl_r_r_sat'} ) : + if tag in {"S2_asr_r_r_sat", "S2_asl_r_r_sat"}: continue ## Skip instructions using switch - if ( tag in {'S4_vrcrotate_acc', 'S4_vrcrotate'} ) : + if tag in {"S4_vrcrotate_acc", "S4_vrcrotate"}: continue ## Skip trap instructions - if ( tag in {'J2_trap0', 'J2_trap1'} ) : + if tag in {"J2_trap0", "J2_trap1"}: continue ## Skip 128-bit instructions - if ( tag in {'A7_croundd_ri', 'A7_croundd_rr'} ) : + if tag in {"A7_croundd_ri", "A7_croundd_rr"}: continue - if ( tag in {'M7_wcmpyrw', 'M7_wcmpyrwc', - 'M7_wcmpyiw', 'M7_wcmpyiwc', - 'M7_wcmpyrw_rnd', 'M7_wcmpyrwc_rnd', - 'M7_wcmpyiw_rnd', 'M7_wcmpyiwc_rnd'} ) : + if tag in { + "M7_wcmpyrw", + "M7_wcmpyrwc", + "M7_wcmpyiw", + "M7_wcmpyiwc", + "M7_wcmpyrw_rnd", + "M7_wcmpyrwc_rnd", + "M7_wcmpyiw_rnd", + "M7_wcmpyiwc_rnd", + }: continue ## Skip interleave/deinterleave instructions - if ( tag in {'S2_interleave', 'S2_deinterleave'} ) : + if tag in {"S2_interleave", "S2_deinterleave"}: continue ## Skip instructions using bit reverse - if ( tag in {'S2_brev', 'S2_brevp', 'S2_ct0', 'S2_ct1', - 'S2_ct0p', 'S2_ct1p', 'A4_tlbmatch'} ) : + if tag in { + "S2_brev", + "S2_brevp", + "S2_ct0", + "S2_ct1", + "S2_ct0p", + "S2_ct1p", + "A4_tlbmatch", + }: continue ## Skip other unsupported instructions - if ( tag =3D=3D 'S2_cabacdecbin' or tag =3D=3D 'A5_ACS' ) : + if tag =3D=3D "S2_cabacdecbin" or tag =3D=3D "A5_ACS": continue - if ( tag.startswith('Y') ) : + if tag.startswith("Y"): continue - if ( tag.startswith('V6_') ) : + if tag.startswith("V6_"): continue - if ( tag.startswith('F') ) : + if tag.startswith("F"): continue - if ( tag.endswith('_locked') ) : + if tag.endswith("_locked"): continue - if ( "A_COF" in hex_common.attribdict[tag] ) : + if "A_COF" in hex_common.attribdict[tag]: continue =20 regs =3D tagregs[tag] imms =3D tagimms[tag] =20 arguments =3D [] - for regtype,regid,toss,numregs in regs: + for regtype, regid, toss, numregs in regs: prefix =3D "in " if hex_common.is_read(regid) else "" =20 is_pair =3D hex_common.is_pair(regid) - is_single_old =3D (hex_common.is_single(regid) - and hex_common.is_old_val(regtype, regid,= tag)) - is_single_new =3D (hex_common.is_single(regid) - and hex_common.is_new_val(regtype, regid,= tag)) + is_single_old =3D hex_common.is_single(regid) and hex_comm= on.is_old_val( + regtype, regid, tag + ) + is_single_new =3D hex_common.is_single(regid) and hex_comm= on.is_new_val( + regtype, regid, tag + ) =20 if is_pair or is_single_old: arguments.append(f"{prefix}{regtype}{regid}V") elif is_single_new: arguments.append(f"{prefix}{regtype}{regid}N") else: - print("Bad register parse: ",regtype,regid,toss,numreg= s) + print("Bad register parse: ", regtype, regid, toss, nu= mregs) =20 - for immlett,bits,immshift in imms: + for immlett, bits, immshift in imms: arguments.append(hex_common.imm_name(immlett)) =20 f.write(f"{tag}({', '.join(arguments)}) {{\n") - f.write(" "); + f.write(" ") if hex_common.need_ea(tag): - f.write("size4u_t EA; "); + f.write("size4u_t EA; ") f.write(f"{hex_common.semdict[tag]}\n") f.write("}\n\n") =20 + if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/gen_op_attribs.py b/target/hexagon/gen_op_attri= bs.py index fc705375d4..1718c325c7 100755 --- a/target/hexagon/gen_op_attribs.py +++ b/target/hexagon/gen_op_attribs.py @@ -22,6 +22,7 @@ import string import hex_common =20 + def main(): hex_common.read_semantics_file(sys.argv[1]) hex_common.read_attribs_file(sys.argv[2]) @@ -30,10 +31,13 @@ def main(): ## ## Generate all the attributes associated with each instruction ## - with open(sys.argv[3], 'w') as f: + with open(sys.argv[3], "w") as f: for tag in hex_common.tags: - f.write(f'OP_ATTRIB({tag},ATTRIBS(' - f'{",".join(sorted(hex_common.attribdict[tag]))}))\n') + f.write( + f"OP_ATTRIB({tag},ATTRIBS(" + f'{",".join(sorted(hex_common.attribdict[tag]))}))\n' + ) + =20 if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/gen_op_regs.py b/target/hexagon/gen_op_regs.py index 5f0ae20722..96fc2bbf94 100755 --- a/target/hexagon/gen_op_regs.py +++ b/target/hexagon/gen_op_regs.py @@ -22,21 +22,25 @@ import string import hex_common =20 + ## ## Generate the register and immediate operands for each instruction ## def calculate_regid_reg(tag): - def letter_inc(x): return chr(ord(x)+1) - ordered_implregs =3D [ 'SP','FP','LR' ] - srcdst_lett =3D 'X' - src_lett =3D 'S' - dst_lett =3D 'D' + def letter_inc(x): + return chr(ord(x) + 1) + + ordered_implregs =3D ["SP", "FP", "LR"] + srcdst_lett =3D "X" + src_lett =3D "S" + dst_lett =3D "D" retstr =3D "" mapdict =3D {} for reg in ordered_implregs: reg_rd =3D 0 reg_wr =3D 0 - if ('A_IMPLICIT_WRITES_'+reg) in hex_common.attribdict[tag]: reg_w= r =3D 1 + if ("A_IMPLICIT_WRITES_" + reg) in hex_common.attribdict[tag]: + reg_wr =3D 1 if reg_rd and reg_wr: retstr +=3D srcdst_lett mapdict[srcdst_lett] =3D reg @@ -49,16 +53,19 @@ def letter_inc(x): return chr(ord(x)+1) retstr +=3D dst_lett mapdict[dst_lett] =3D reg dst_lett =3D letter_inc(dst_lett) - return retstr,mapdict + return retstr, mapdict + =20 def calculate_regid_letters(tag): - retstr,mapdict =3D calculate_regid_reg(tag) + retstr, mapdict =3D calculate_regid_reg(tag) return retstr =20 + def strip_reg_prefix(x): - y=3Dx.replace('UREG.','') - y=3Dy.replace('MREG.','') - return y.replace('GREG.','') + y =3D x.replace("UREG.", "") + y =3D y.replace("MREG.", "") + return y.replace("GREG.", "") + =20 def main(): hex_common.read_semantics_file(sys.argv[1]) @@ -66,45 +73,51 @@ def main(): tagregs =3D hex_common.get_tagregs() tagimms =3D hex_common.get_tagimms() =20 - with open(sys.argv[3], 'w') as f: + with open(sys.argv[3], "w") as f: for tag in hex_common.tags: regs =3D tagregs[tag] rregs =3D [] wregs =3D [] regids =3D "" - for regtype,regid,toss,numregs in regs: + for regtype, regid, toss, numregs in regs: if hex_common.is_read(regid): - if regid[0] not in regids: regids +=3D regid[0] - rregs.append(regtype+regid+numregs) + if regid[0] not in regids: + regids +=3D regid[0] + rregs.append(regtype + regid + numregs) if hex_common.is_written(regid): - wregs.append(regtype+regid+numregs) - if regid[0] not in regids: regids +=3D regid[0] + wregs.append(regtype + regid + numregs) + if regid[0] not in regids: + regids +=3D regid[0] for attrib in hex_common.attribdict[tag]: - if hex_common.attribinfo[attrib]['rreg']: - rregs.append(strip_reg_prefix(attribinfo[attrib]['rreg= '])) - if hex_common.attribinfo[attrib]['wreg']: - wregs.append(strip_reg_prefix(attribinfo[attrib]['wreg= '])) + if hex_common.attribinfo[attrib]["rreg"]: + rregs.append(strip_reg_prefix(attribinfo[attrib]["rreg= "])) + if hex_common.attribinfo[attrib]["wreg"]: + wregs.append(strip_reg_prefix(attribinfo[attrib]["wreg= "])) regids +=3D calculate_regid_letters(tag) - f.write(f'REGINFO({tag},"{regids}",\t/*RD:*/\t"{",".join(rregs= )}",' - f'\t/*WR:*/\t"{",".join(wregs)}")\n') + f.write( + f'REGINFO({tag},"{regids}",\t/*RD:*/\t"{",".join(rregs)}",' + f'\t/*WR:*/\t"{",".join(wregs)}")\n' + ) =20 for tag in hex_common.tags: imms =3D tagimms[tag] - f.write(f'IMMINFO({tag}') + f.write(f"IMMINFO({tag}") if not imms: - f.write(''','u',0,0,'U',0,0''') - for sign,size,shamt in imms: - if sign =3D=3D 'r': sign =3D 's' + f.write(""",'u',0,0,'U',0,0""") + for sign, size, shamt in imms: + if sign =3D=3D "r": + sign =3D "s" if not shamt: shamt =3D "0" - f.write(f''','{sign}',{size},{shamt}''') + f.write(f""",'{sign}',{size},{shamt}""") if len(imms) =3D=3D 1: if sign.isupper(): - myu =3D 'u' + myu =3D "u" else: - myu =3D 'U' - f.write(f''','{myu}',0,0''') - f.write(')\n') + myu =3D "U" + f.write(f""",'{myu}',0,0""") + f.write(")\n") + =20 if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/gen_opcodes_def.py b/target/hexagon/gen_opcodes= _def.py index 550949cbc6..507b0e2aba 100755 --- a/target/hexagon/gen_opcodes_def.py +++ b/target/hexagon/gen_opcodes_def.py @@ -22,15 +22,17 @@ import string import hex_common =20 + def main(): hex_common.read_semantics_file(sys.argv[1]) =20 ## ## Generate a list of all the opcodes ## - with open(sys.argv[3], 'w') as f: + with open(sys.argv[3], "w") as f: for tag in hex_common.tags: f.write(f"OPCODE({tag}),\n") =20 + if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/gen_printinsn.py b/target/hexagon/gen_printinsn= .py index fe02572922..75d3c6b6f8 100755 --- a/target/hexagon/gen_printinsn.py +++ b/target/hexagon/gen_printinsn.py @@ -22,24 +22,26 @@ import string import hex_common =20 + ## ## Generate data for printing each instruction (format string + operan= ds) ## def regprinter(m): str =3D m.group(1) - str +=3D ":".join(["%d"]*len(m.group(2))) + str +=3D ":".join(["%d"] * len(m.group(2))) str +=3D m.group(3) - if ('S' in m.group(1)) and (len(m.group(2)) =3D=3D 1): + if ("S" in m.group(1)) and (len(m.group(2)) =3D=3D 1): str +=3D "/%s" - elif ('C' in m.group(1)) and (len(m.group(2)) =3D=3D 1): + elif ("C" in m.group(1)) and (len(m.group(2)) =3D=3D 1): str +=3D "/%s" return str =20 + def spacify(s): # Regular expression that matches any operator that contains '=3D' cha= racter: - opswithequal_re =3D '[-+^&|!<>=3D]?=3D' + opswithequal_re =3D "[-+^&|!<>=3D]?=3D" # Regular expression that matches any assignment operator. - assignment_re =3D '[-+^&|]?=3D' + assignment_re =3D "[-+^&|]?=3D" =20 # Out of the operators that contain the =3D sign, if the operator is a= lso an # assignment, spaces will be added around it, unless it's enclosed wit= hin @@ -54,9 +56,9 @@ def spacify(s): pc =3D 0 while i < slen: c =3D s[i] - if c =3D=3D '(': + if c =3D=3D "(": pc +=3D 1 - elif c =3D=3D ')': + elif c =3D=3D ")": pc -=3D 1 paren_count[i] =3D pc i +=3D 1 @@ -76,31 +78,33 @@ def spacify(s): if paren_count[ms] =3D=3D 0: # Check if the entire string t is an assignment. am =3D assign.match(t) - if am and len(am.group(0)) =3D=3D me-ms: + if am and len(am.group(0)) =3D=3D me - ms: # Don't add spaces if they are already there. - if ms > 0 and s[ms-1] !=3D ' ': - out.append(' ') + if ms > 0 and s[ms - 1] !=3D " ": + out.append(" ") out +=3D t - if me < slen and s[me] !=3D ' ': - out.append(' ') + if me < slen and s[me] !=3D " ": + out.append(" ") continue # If this is not an assignment, just append it to the output # string. out +=3D t =20 # Append the remaining part of the string. - out +=3D s[pos:len(s)] - return ''.join(out) + out +=3D s[pos : len(s)] + return "".join(out) + =20 def main(): hex_common.read_semantics_file(sys.argv[1]) hex_common.read_attribs_file(sys.argv[2]) =20 - immext_casere =3D re.compile(r'IMMEXT\(([A-Za-z])') + immext_casere =3D re.compile(r"IMMEXT\(([A-Za-z])") =20 - with open(sys.argv[3], 'w') as f: + with open(sys.argv[3], "w") as f: for tag in hex_common.tags: - if not hex_common.behdict[tag]: continue + if not hex_common.behdict[tag]: + continue extendable_upper_imm =3D False extendable_lower_imm =3D False m =3D immext_casere.search(hex_common.semdict[tag]) @@ -110,46 +114,45 @@ def main(): else: extendable_lower_imm =3D True beh =3D hex_common.behdict[tag] - beh =3D hex_common.regre.sub(regprinter,beh) - beh =3D hex_common.absimmre.sub(r"#%s0x%x",beh) - beh =3D hex_common.relimmre.sub(r"PC+%s%d",beh) + beh =3D hex_common.regre.sub(regprinter, beh) + beh =3D hex_common.absimmre.sub(r"#%s0x%x", beh) + beh =3D hex_common.relimmre.sub(r"PC+%s%d", beh) beh =3D spacify(beh) # Print out a literal "%s" at the end, used to match empty str= ing # so C won't complain at us - if ("A_VECX" in hex_common.attribdict[tag]): + if "A_VECX" in hex_common.attribdict[tag]: macname =3D "DEF_VECX_PRINTINFO" - else: macname =3D "DEF_PRINTINFO" + else: + macname =3D "DEF_PRINTINFO" f.write(f'{macname}({tag},"{beh}%s"') - regs_or_imms =3D \ - hex_common.reg_or_immre.findall(hex_common.behdict[tag]) + regs_or_imms =3D hex_common.reg_or_immre.findall(hex_common.be= hdict[tag]) ri =3D 0 seenregs =3D {} - for allregs,a,b,c,d,allimm,immlett,bits,immshift in regs_or_im= ms: + for allregs, a, b, c, d, allimm, immlett, bits, immshift in re= gs_or_imms: if a: - #register + # register if b in seenregs: regno =3D seenregs[b] else: regno =3D ri if len(b) =3D=3D 1: - f.write(f', insn->regno[{regno}]') - if 'S' in a: - f.write(f', sreg2str(insn->regno[{regno}])') - elif 'C' in a: - f.write(f', creg2str(insn->regno[{regno}])') + f.write(f", insn->regno[{regno}]") + if "S" in a: + f.write(f", sreg2str(insn->regno[{regno}])") + elif "C" in a: + f.write(f", creg2str(insn->regno[{regno}])") elif len(b) =3D=3D 2: - f.write(f', insn->regno[{regno}] + 1' - f', insn->regno[{regno}]') + f.write(f", insn->regno[{regno}] + 1" f", insn->re= gno[{regno}]") else: print("Put some stuff to handle quads here") if b not in seenregs: seenregs[b] =3D ri ri +=3D 1 else: - #immediate - if (immlett.isupper()): + # immediate + if immlett.isupper(): if extendable_upper_imm: - if immlett in 'rR': + if immlett in "rR": f.write(',insn->extension_valid?"##":""') else: f.write(',insn->extension_valid?"#":""') @@ -158,16 +161,17 @@ def main(): ii =3D 1 else: if extendable_lower_imm: - if immlett in 'rR': + if immlett in "rR": f.write(',insn->extension_valid?"##":""') else: f.write(',insn->extension_valid?"#":""') else: f.write(',""') ii =3D 0 - f.write(f', insn->immed[{ii}]') + f.write(f", insn->immed[{ii}]") # append empty string so there is at least one more arg f.write(',"")\n') =20 + if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/gen_shortcode.py b/target/hexagon/gen_shortcode= .py index ea0965d306..5481bec641 100755 --- a/target/hexagon/gen_shortcode.py +++ b/target/hexagon/gen_shortcode.py @@ -22,8 +22,10 @@ import string import hex_common =20 + def gen_shortcode(f, tag): - f.write(f'DEF_SHORTCODE({tag}, {hex_common.semdict[tag]})\n') + f.write(f"DEF_SHORTCODE({tag}, {hex_common.semdict[tag]})\n") + =20 def main(): hex_common.read_semantics_file(sys.argv[1]) @@ -32,29 +34,30 @@ def main(): tagregs =3D hex_common.get_tagregs() tagimms =3D hex_common.get_tagimms() =20 - with open(sys.argv[3], 'w') as f: + with open(sys.argv[3], "w") as f: f.write("#ifndef DEF_SHORTCODE\n") f.write("#define DEF_SHORTCODE(TAG,SHORTCODE) /* Nothing */\n") f.write("#endif\n") =20 for tag in hex_common.tags: ## Skip the priv instructions - if ( "A_PRIV" in hex_common.attribdict[tag] ) : + if "A_PRIV" in hex_common.attribdict[tag]: continue ## Skip the guest instructions - if ( "A_GUEST" in hex_common.attribdict[tag] ) : + if "A_GUEST" in hex_common.attribdict[tag]: continue ## Skip the diag instructions - if ( tag =3D=3D "Y6_diag" ) : + if tag =3D=3D "Y6_diag": continue - if ( tag =3D=3D "Y6_diag0" ) : + if tag =3D=3D "Y6_diag0": continue - if ( tag =3D=3D "Y6_diag1" ) : + if tag =3D=3D "Y6_diag1": continue =20 gen_shortcode(f, tag) =20 f.write("#undef DEF_SHORTCODE\n") =20 + if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/gen_tcg_func_table.py b/target/hexagon/gen_tcg_= func_table.py index ec9ca20561..6ee3899717 100755 --- a/target/hexagon/gen_tcg_func_table.py +++ b/target/hexagon/gen_tcg_func_table.py @@ -22,6 +22,7 @@ import string import hex_common =20 + def main(): hex_common.read_semantics_file(sys.argv[1]) hex_common.read_attribs_file(sys.argv[2]) @@ -29,24 +30,24 @@ def main(): tagregs =3D hex_common.get_tagregs() tagimms =3D hex_common.get_tagimms() =20 - with open(sys.argv[3], 'w') as f: + with open(sys.argv[3], "w") as f: f.write("#ifndef HEXAGON_FUNC_TABLE_H\n") f.write("#define HEXAGON_FUNC_TABLE_H\n\n") =20 f.write("const SemanticInsn opcode_genptr[XX_LAST_OPCODE] =3D {\n") for tag in hex_common.tags: ## Skip the priv instructions - if ( "A_PRIV" in hex_common.attribdict[tag] ) : + if "A_PRIV" in hex_common.attribdict[tag]: continue ## Skip the guest instructions - if ( "A_GUEST" in hex_common.attribdict[tag] ) : + if "A_GUEST" in hex_common.attribdict[tag]: continue ## Skip the diag instructions - if ( tag =3D=3D "Y6_diag" ) : + if tag =3D=3D "Y6_diag": continue - if ( tag =3D=3D "Y6_diag0" ) : + if tag =3D=3D "Y6_diag0": continue - if ( tag =3D=3D "Y6_diag1" ) : + if tag =3D=3D "Y6_diag1": continue =20 f.write(f" [{tag}] =3D generate_{tag},\n") @@ -54,5 +55,6 @@ def main(): =20 f.write("#endif /* HEXAGON_FUNC_TABLE_H */\n") =20 + if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/gen_tcg_funcs.py b/target/hexagon/gen_tcg_funcs= .py index 285b3abe3a..fcb3384480 100755 --- a/target/hexagon/gen_tcg_funcs.py +++ b/target/hexagon/gen_tcg_funcs.py @@ -22,249 +22,277 @@ import string import hex_common =20 + ## ## Helpers for gen_tcg_func ## def gen_decl_ea_tcg(f, tag): f.write(" TCGv EA G_GNUC_UNUSED =3D tcg_temp_new();\n") =20 + def genptr_decl_pair_writable(f, tag, regtype, regid, regno): - regN=3Df"{regtype}{regid}N" - if (regtype =3D=3D "R"): + regN =3D f"{regtype}{regid}N" + if regtype =3D=3D "R": f.write(f" const int {regN} =3D insn->regno[{regno}];\n") - elif (regtype =3D=3D "C"): + elif regtype =3D=3D "C": f.write(f" const int {regN} =3D insn->regno[{regno}] + HEX_REG_= SA0;\n") else: print("Bad register parse: ", regtype, regid) - f.write(f" TCGv_i64 {regtype}{regid}V =3D " - f"get_result_gpr_pair(ctx, {regN});\n") + f.write(f" TCGv_i64 {regtype}{regid}V =3D " f"get_result_gpr_pair(c= tx, {regN});\n") + =20 def genptr_decl_writable(f, tag, regtype, regid, regno): - regN=3Df"{regtype}{regid}N" - if (regtype =3D=3D "R"): + regN =3D f"{regtype}{regid}N" + if regtype =3D=3D "R": f.write(f" const int {regN} =3D insn->regno[{regno}];\n") f.write(f" TCGv {regtype}{regid}V =3D get_result_gpr(ctx, {regN= });\n") - elif (regtype =3D=3D "C"): + elif regtype =3D=3D "C": f.write(f" const int {regN} =3D insn->regno[{regno}] + HEX_REG_= SA0;\n") f.write(f" TCGv {regtype}{regid}V =3D get_result_gpr(ctx, {regN= });\n") - elif (regtype =3D=3D "P"): + elif regtype =3D=3D "P": f.write(f" const int {regN} =3D insn->regno[{regno}];\n") f.write(f" TCGv {regtype}{regid}V =3D tcg_temp_new();\n") else: print("Bad register parse: ", regtype, regid) =20 + def genptr_decl(f, tag, regtype, regid, regno): - regN=3Df"{regtype}{regid}N" - if (regtype =3D=3D "R"): - if (regid in {"ss", "tt"}): + regN =3D f"{regtype}{regid}N" + if regtype =3D=3D "R": + if regid in {"ss", "tt"}: f.write(f" TCGv_i64 {regtype}{regid}V =3D tcg_temp_new_i64(= );\n") f.write(f" const int {regN} =3D insn->regno[{regno}];\n") - elif (regid in {"dd", "ee", "xx", "yy"}): + elif regid in {"dd", "ee", "xx", "yy"}: genptr_decl_pair_writable(f, tag, regtype, regid, regno) - elif (regid in {"s", "t", "u", "v"}): - f.write(f" TCGv {regtype}{regid}V =3D " - f"hex_gpr[insn->regno[{regno}]];\n") - elif (regid in {"d", "e", "x", "y"}): + elif regid in {"s", "t", "u", "v"}: + f.write( + f" TCGv {regtype}{regid}V =3D " f"hex_gpr[insn->regno[{= regno}]];\n" + ) + elif regid in {"d", "e", "x", "y"}: genptr_decl_writable(f, tag, regtype, regid, regno) else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "P"): - if (regid in {"s", "t", "u", "v"}): - f.write(f" TCGv {regtype}{regid}V =3D " - f"hex_pred[insn->regno[{regno}]];\n") - elif (regid in {"d", "e", "x"}): + elif regtype =3D=3D "P": + if regid in {"s", "t", "u", "v"}: + f.write( + f" TCGv {regtype}{regid}V =3D " f"hex_pred[insn->regno[= {regno}]];\n" + ) + elif regid in {"d", "e", "x"}: genptr_decl_writable(f, tag, regtype, regid, regno) else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "C"): - if (regid =3D=3D "ss"): - f.write(f" TCGv_i64 {regtype}{regid}V =3D " - f"tcg_temp_new_i64();\n") - f.write(f" const int {regN} =3D insn->regno[{regno}] + " - "HEX_REG_SA0;\n") - elif (regid =3D=3D "dd"): + elif regtype =3D=3D "C": + if regid =3D=3D "ss": + f.write(f" TCGv_i64 {regtype}{regid}V =3D " f"tcg_temp_new_= i64();\n") + f.write(f" const int {regN} =3D insn->regno[{regno}] + " "H= EX_REG_SA0;\n") + elif regid =3D=3D "dd": genptr_decl_pair_writable(f, tag, regtype, regid, regno) - elif (regid =3D=3D "s"): + elif regid =3D=3D "s": f.write(f" TCGv {regtype}{regid}V =3D tcg_temp_new();\n") - f.write(f" const int {regtype}{regid}N =3D insn->regno[{reg= no}] + " - "HEX_REG_SA0;\n") - elif (regid =3D=3D "d"): + f.write( + f" const int {regtype}{regid}N =3D insn->regno[{regno}]= + " + "HEX_REG_SA0;\n" + ) + elif regid =3D=3D "d": genptr_decl_writable(f, tag, regtype, regid, regno) else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "M"): - if (regid =3D=3D "u"): - f.write(f" const int {regtype}{regid}N =3D " - f"insn->regno[{regno}];\n") - f.write(f" TCGv {regtype}{regid}V =3D hex_gpr[{regtype}{reg= id}N + " - "HEX_REG_M0];\n") + elif regtype =3D=3D "M": + if regid =3D=3D "u": + f.write(f" const int {regtype}{regid}N =3D " f"insn->regno[= {regno}];\n") + f.write( + f" TCGv {regtype}{regid}V =3D hex_gpr[{regtype}{regid}N= + " + "HEX_REG_M0];\n" + ) else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "V"): - if (regid in {"dd"}): - f.write(f" const int {regtype}{regid}N =3D " - f"insn->regno[{regno}];\n") + elif regtype =3D=3D "V": + if regid in {"dd"}: + f.write(f" const int {regtype}{regid}N =3D " f"insn->regno[= {regno}];\n") f.write(f" const intptr_t {regtype}{regid}V_off =3D\n") - if (hex_common.is_tmp_result(tag)): - f.write(f" ctx_tmp_vreg_off(ctx, {regtype}{regid}N,= 2, " - "true);\n") + if hex_common.is_tmp_result(tag): + f.write( + f" ctx_tmp_vreg_off(ctx, {regtype}{regid}N, 2, = " "true);\n" + ) else: f.write(f" ctx_future_vreg_off(ctx, {regtype}{regid= }N,") f.write(" 2, true);\n") - if (not hex_common.skip_qemu_helper(tag)): - f.write(f" TCGv_ptr {regtype}{regid}V =3D " - "tcg_temp_new_ptr();\n") - f.write(f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env,= " - f"{regtype}{regid}V_off);\n") - elif (regid in {"uu", "vv", "xx"}): - f.write(f" const int {regtype}{regid}N =3D " - f"insn->regno[{regno}];\n") + if not hex_common.skip_qemu_helper(tag): + f.write(f" TCGv_ptr {regtype}{regid}V =3D " "tcg_temp_n= ew_ptr();\n") + f.write( + f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env, " + f"{regtype}{regid}V_off);\n" + ) + elif regid in {"uu", "vv", "xx"}: + f.write(f" const int {regtype}{regid}N =3D " f"insn->regno[= {regno}];\n") f.write(f" const intptr_t {regtype}{regid}V_off =3D\n") f.write(f" offsetof(CPUHexagonState, {regtype}{regid}V)= ;\n") - if (not hex_common.skip_qemu_helper(tag)): - f.write(f" TCGv_ptr {regtype}{regid}V =3D " - "tcg_temp_new_ptr();\n") - f.write(f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env,= " - f"{regtype}{regid}V_off);\n") - elif (regid in {"s", "u", "v", "w"}): - f.write(f" const int {regtype}{regid}N =3D " - f"insn->regno[{regno}];\n") + if not hex_common.skip_qemu_helper(tag): + f.write(f" TCGv_ptr {regtype}{regid}V =3D " "tcg_temp_n= ew_ptr();\n") + f.write( + f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env, " + f"{regtype}{regid}V_off);\n" + ) + elif regid in {"s", "u", "v", "w"}: + f.write(f" const int {regtype}{regid}N =3D " f"insn->regno[= {regno}];\n") f.write(f" const intptr_t {regtype}{regid}V_off =3D\n") f.write(f" vreg_src_off(ctx, {regtype}{regid}N);\n") - if (not hex_common.skip_qemu_helper(tag)): - f.write(f" TCGv_ptr {regtype}{regid}V =3D " - "tcg_temp_new_ptr();\n") - elif (regid in {"d", "x", "y"}): - f.write(f" const int {regtype}{regid}N =3D " - f"insn->regno[{regno}];\n") + if not hex_common.skip_qemu_helper(tag): + f.write(f" TCGv_ptr {regtype}{regid}V =3D " "tcg_temp_n= ew_ptr();\n") + elif regid in {"d", "x", "y"}: + f.write(f" const int {regtype}{regid}N =3D " f"insn->regno[= {regno}];\n") f.write(f" const intptr_t {regtype}{regid}V_off =3D\n") - if (regid =3D=3D "y"): + if regid =3D=3D "y": f.write(" offsetof(CPUHexagonState, vtmp);\n") - elif (hex_common.is_tmp_result(tag)): - f.write(f" ctx_tmp_vreg_off(ctx, {regtype}{regid}N,= 1, " - "true);\n") + elif hex_common.is_tmp_result(tag): + f.write( + f" ctx_tmp_vreg_off(ctx, {regtype}{regid}N, 1, = " "true);\n" + ) else: f.write(f" ctx_future_vreg_off(ctx, {regtype}{regid= }N,") - f.write(" 1, true);\n"); + f.write(" 1, true);\n") =20 - if (not hex_common.skip_qemu_helper(tag)): - f.write(f" TCGv_ptr {regtype}{regid}V =3D " - "tcg_temp_new_ptr();\n") - f.write(f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env,= " - f"{regtype}{regid}V_off);\n") + if not hex_common.skip_qemu_helper(tag): + f.write(f" TCGv_ptr {regtype}{regid}V =3D " "tcg_temp_n= ew_ptr();\n") + f.write( + f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env, " + f"{regtype}{regid}V_off);\n" + ) else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "Q"): - if (regid in {"d", "e", "x"}): - f.write(f" const int {regtype}{regid}N =3D " - f"insn->regno[{regno}];\n") + elif regtype =3D=3D "Q": + if regid in {"d", "e", "x"}: + f.write(f" const int {regtype}{regid}N =3D " f"insn->regno[= {regno}];\n") f.write(f" const intptr_t {regtype}{regid}V_off =3D\n") f.write(f" get_result_qreg(ctx, {regtype}{regid}N);\n") - if (not hex_common.skip_qemu_helper(tag)): - f.write(f" TCGv_ptr {regtype}{regid}V =3D " - "tcg_temp_new_ptr();\n") - f.write(f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env,= " - f"{regtype}{regid}V_off);\n") - elif (regid in {"s", "t", "u", "v"}): - f.write(f" const int {regtype}{regid}N =3D " - f"insn->regno[{regno}];\n") + if not hex_common.skip_qemu_helper(tag): + f.write(f" TCGv_ptr {regtype}{regid}V =3D " "tcg_temp_n= ew_ptr();\n") + f.write( + f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env, " + f"{regtype}{regid}V_off);\n" + ) + elif regid in {"s", "t", "u", "v"}: + f.write(f" const int {regtype}{regid}N =3D " f"insn->regno[= {regno}];\n") f.write(f" const intptr_t {regtype}{regid}V_off =3D\n") - f.write(f" offsetof(CPUHexagonState, " - f"QRegs[{regtype}{regid}N]);\n") - if (not hex_common.skip_qemu_helper(tag)): - f.write(f" TCGv_ptr {regtype}{regid}V =3D " - "tcg_temp_new_ptr();\n") + f.write( + f" offsetof(CPUHexagonState, " f"QRegs[{regtype}{re= gid}N]);\n" + ) + if not hex_common.skip_qemu_helper(tag): + f.write(f" TCGv_ptr {regtype}{regid}V =3D " "tcg_temp_n= ew_ptr();\n") else: print("Bad register parse: ", regtype, regid) else: print("Bad register parse: ", regtype, regid) =20 + def genptr_decl_new(f, tag, regtype, regid, regno): - if (regtype =3D=3D "N"): - if (regid in {"s", "t"}): - f.write(f" TCGv {regtype}{regid}N =3D " - f"hex_new_value[insn->regno[{regno}]];\n") + if regtype =3D=3D "N": + if regid in {"s", "t"}: + f.write( + f" TCGv {regtype}{regid}N =3D " + f"hex_new_value[insn->regno[{regno}]];\n" + ) else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "P"): - if (regid in {"t", "u", "v"}): - f.write(f" TCGv {regtype}{regid}N =3D " - f"hex_new_pred_value[insn->regno[{regno}]];\n") + elif regtype =3D=3D "P": + if regid in {"t", "u", "v"}: + f.write( + f" TCGv {regtype}{regid}N =3D " + f"hex_new_pred_value[insn->regno[{regno}]];\n" + ) else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "O"): - if (regid =3D=3D "s"): - f.write(f" const intptr_t {regtype}{regid}N_num =3D " - f"insn->regno[{regno}];\n") - if (hex_common.skip_qemu_helper(tag)): + elif regtype =3D=3D "O": + if regid =3D=3D "s": + f.write( + f" const intptr_t {regtype}{regid}N_num =3D " + f"insn->regno[{regno}];\n" + ) + if hex_common.skip_qemu_helper(tag): f.write(f" const intptr_t {regtype}{regid}N_off =3D\n") - f.write(" ctx_future_vreg_off(ctx, " - f"{regtype}{regid}N_num,") + f.write(" ctx_future_vreg_off(ctx, " f"{regtype}{r= egid}N_num,") f.write(" 1, true);\n") else: - f.write(f" TCGv {regtype}{regid}N =3D " - f"tcg_constant_tl({regtype}{regid}N_num);\n") + f.write( + f" TCGv {regtype}{regid}N =3D " + f"tcg_constant_tl({regtype}{regid}N_num);\n" + ) else: print("Bad register parse: ", regtype, regid) else: print("Bad register parse: ", regtype, regid) =20 + def genptr_decl_opn(f, tag, regtype, regid, toss, numregs, i): - if (hex_common.is_pair(regid)): + if hex_common.is_pair(regid): genptr_decl(f, tag, regtype, regid, i) - elif (hex_common.is_single(regid)): + elif hex_common.is_single(regid): if hex_common.is_old_val(regtype, regid, tag): - genptr_decl(f,tag, regtype, regid, i) + genptr_decl(f, tag, regtype, regid, i) elif hex_common.is_new_val(regtype, regid, tag): genptr_decl_new(f, tag, regtype, regid, i) else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numregs) else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numregs) + =20 -def genptr_decl_imm(f,immlett): - if (immlett.isupper()): +def genptr_decl_imm(f, immlett): + if immlett.isupper(): i =3D 1 else: i =3D 0 f.write(f" int {hex_common.imm_name(immlett)} =3D insn->immed[{i}];= \n") =20 + def genptr_src_read(f, tag, regtype, regid): - if (regtype =3D=3D "R"): - if (regid in {"ss", "tt", "xx", "yy"}): - f.write(f" tcg_gen_concat_i32_i64({regtype}{regid}V, " - f"hex_gpr[{regtype}{regid}N],\n") - f.write(f" hex_gpr[{regtype}" - f"{regid}N + 1]);\n") - elif (regid in {"x", "y"}): + if regtype =3D=3D "R": + if regid in {"ss", "tt", "xx", "yy"}: + f.write( + f" tcg_gen_concat_i32_i64({regtype}{regid}V, " + f"hex_gpr[{regtype}{regid}N],\n" + ) + f.write( + f" hex_gpr[{regtype}" + f"{regid}N + 1]);\n" + ) + elif regid in {"x", "y"}: ## For read/write registers, we need to get the original value= into ## the result TCGv. For conditional instructions, this is don= e in ## gen_start_packet. For unconditional instructions, we do it= here. - if ('A_CONDEXEC' not in hex_common.attribdict[tag]): - f.write(f" tcg_gen_mov_tl({regtype}{regid}V, " - f"hex_gpr[{regtype}{regid}N]);\n") - elif (regid not in {"s", "t", "u", "v"}): + if "A_CONDEXEC" not in hex_common.attribdict[tag]: + f.write( + f" tcg_gen_mov_tl({regtype}{regid}V, " + f"hex_gpr[{regtype}{regid}N]);\n" + ) + elif regid not in {"s", "t", "u", "v"}: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "P"): - if (regid =3D=3D "x"): - f.write(f" tcg_gen_mov_tl({regtype}{regid}V, " - f"hex_pred[{regtype}{regid}N]);\n") - elif (regid not in {"s", "t", "u", "v"}): + elif regtype =3D=3D "P": + if regid =3D=3D "x": + f.write( + f" tcg_gen_mov_tl({regtype}{regid}V, " + f"hex_pred[{regtype}{regid}N]);\n" + ) + elif regid not in {"s", "t", "u", "v"}: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "C"): - if (regid =3D=3D "ss"): - f.write(f" gen_read_ctrl_reg_pair(ctx, {regtype}{regid}N, " - f"{regtype}{regid}V);\n") - elif (regid =3D=3D "s"): - f.write(f" gen_read_ctrl_reg(ctx, {regtype}{regid}N, " - f"{regtype}{regid}V);\n") + elif regtype =3D=3D "C": + if regid =3D=3D "ss": + f.write( + f" gen_read_ctrl_reg_pair(ctx, {regtype}{regid}N, " + f"{regtype}{regid}V);\n" + ) + elif regid =3D=3D "s": + f.write( + f" gen_read_ctrl_reg(ctx, {regtype}{regid}N, " + f"{regtype}{regid}V);\n" + ) else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "M"): - if (regid !=3D "u"): + elif regtype =3D=3D "M": + if regid !=3D "u": print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "V"): - if (regid in {"uu", "vv", "xx"}): + elif regtype =3D=3D "V": + if regid in {"uu", "vv", "xx"}: f.write(f" tcg_gen_gvec_mov(MO_64, {regtype}{regid}V_off,\n= ") f.write(f" vreg_src_off(ctx, {regtype}{regid}N),\n") f.write(" sizeof(MMVector), sizeof(MMVector));\n") @@ -272,147 +300,174 @@ def genptr_src_read(f, tag, regtype, regid): f.write(f" {regtype}{regid}V_off + sizeof(MMVector),\n") f.write(f" vreg_src_off(ctx, {regtype}{regid}N ^ 1),\n") f.write(" sizeof(MMVector), sizeof(MMVector));\n") - elif (regid in {"s", "u", "v", "w"}): - if (not hex_common.skip_qemu_helper(tag)): - f.write(f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env,= " - f"{regtype}{regid}V_off);\n") - elif (regid in {"x", "y"}): + elif regid in {"s", "u", "v", "w"}: + if not hex_common.skip_qemu_helper(tag): + f.write( + f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env, " + f"{regtype}{regid}V_off);\n" + ) + elif regid in {"x", "y"}: f.write(f" tcg_gen_gvec_mov(MO_64, {regtype}{regid}V_off,\n= ") f.write(f" vreg_src_off(ctx, {regtype}{regid}N),\n") f.write(" sizeof(MMVector), sizeof(MMVector));\n") else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "Q"): - if (regid in {"s", "t", "u", "v"}): - if (not hex_common.skip_qemu_helper(tag)): - f.write(f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env,= " - f"{regtype}{regid}V_off);\n") - elif (regid in {"x"}): + elif regtype =3D=3D "Q": + if regid in {"s", "t", "u", "v"}: + if not hex_common.skip_qemu_helper(tag): + f.write( + f" tcg_gen_addi_ptr({regtype}{regid}V, cpu_env, " + f"{regtype}{regid}V_off);\n" + ) + elif regid in {"x"}: f.write(f" tcg_gen_gvec_mov(MO_64, {regtype}{regid}V_off,\n= ") - f.write(f" offsetof(CPUHexagonState, " - f"QRegs[{regtype}{regid}N]),\n") + f.write( + f" offsetof(CPUHexagonState, " f"QRegs[{regtype}{re= gid}N]),\n" + ) f.write(" sizeof(MMQReg), sizeof(MMQReg));\n") else: print("Bad register parse: ", regtype, regid) else: print("Bad register parse: ", regtype, regid) =20 -def genptr_src_read_new(f,regtype,regid): - if (regtype =3D=3D "N"): - if (regid not in {"s", "t"}): + +def genptr_src_read_new(f, regtype, regid): + if regtype =3D=3D "N": + if regid not in {"s", "t"}: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "P"): - if (regid not in {"t", "u", "v"}): + elif regtype =3D=3D "P": + if regid not in {"t", "u", "v"}: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "O"): - if (regid !=3D "s"): + elif regtype =3D=3D "O": + if regid !=3D "s": print("Bad register parse: ", regtype, regid) else: print("Bad register parse: ", regtype, regid) =20 -def genptr_src_read_opn(f,regtype,regid,tag): - if (hex_common.is_pair(regid)): + +def genptr_src_read_opn(f, regtype, regid, tag): + if hex_common.is_pair(regid): genptr_src_read(f, tag, regtype, regid) - elif (hex_common.is_single(regid)): + elif hex_common.is_single(regid): if hex_common.is_old_val(regtype, regid, tag): genptr_src_read(f, tag, regtype, regid) elif hex_common.is_new_val(regtype, regid, tag): - genptr_src_read_new(f,regtype,regid) + genptr_src_read_new(f, regtype, regid) else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numregs) else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numregs) + =20 def gen_helper_call_opn(f, tag, regtype, regid, toss, numregs, i): - if (i > 0): f.write(", ") - if (hex_common.is_pair(regid)): + if i > 0: + f.write(", ") + if hex_common.is_pair(regid): f.write(f"{regtype}{regid}V") - elif (hex_common.is_single(regid)): + elif hex_common.is_single(regid): if hex_common.is_old_val(regtype, regid, tag): f.write(f"{regtype}{regid}V") elif hex_common.is_new_val(regtype, regid, tag): f.write(f"{regtype}{regid}N") else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numregs) else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numregs) =20 -def gen_helper_decl_imm(f,immlett): - f.write(f" TCGv tcgv_{hex_common.imm_name(immlett)} =3D " - f"tcg_constant_tl({hex_common.imm_name(immlett)});\n") =20 -def gen_helper_call_imm(f,immlett): +def gen_helper_decl_imm(f, immlett): + f.write( + f" TCGv tcgv_{hex_common.imm_name(immlett)} =3D " + f"tcg_constant_tl({hex_common.imm_name(immlett)});\n" + ) + + +def gen_helper_call_imm(f, immlett): f.write(f", tcgv_{hex_common.imm_name(immlett)}") =20 + def genptr_dst_write_pair(f, tag, regtype, regid): - f.write(f" gen_log_reg_write_pair({regtype}{regid}N, " - f"{regtype}{regid}V);\n") + f.write(f" gen_log_reg_write_pair({regtype}{regid}N, " f"{regtype}{= regid}V);\n") + =20 def genptr_dst_write(f, tag, regtype, regid): - if (regtype =3D=3D "R"): - if (regid in {"dd", "xx", "yy"}): + if regtype =3D=3D "R": + if regid in {"dd", "xx", "yy"}: genptr_dst_write_pair(f, tag, regtype, regid) - elif (regid in {"d", "e", "x", "y"}): - f.write(f" gen_log_reg_write({regtype}{regid}N, " - f"{regtype}{regid}V);\n") + elif regid in {"d", "e", "x", "y"}: + f.write( + f" gen_log_reg_write({regtype}{regid}N, " f"{regtype}{r= egid}V);\n" + ) else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "P"): - if (regid in {"d", "e", "x"}): - f.write(f" gen_log_pred_write(ctx, {regtype}{regid}N, " - f"{regtype}{regid}V);\n") + elif regtype =3D=3D "P": + if regid in {"d", "e", "x"}: + f.write( + f" gen_log_pred_write(ctx, {regtype}{regid}N, " + f"{regtype}{regid}V);\n" + ) else: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "C"): - if (regid =3D=3D "dd"): - f.write(f" gen_write_ctrl_reg_pair(ctx, {regtype}{regid}N, " - f"{regtype}{regid}V);\n") - elif (regid =3D=3D "d"): - f.write(f" gen_write_ctrl_reg(ctx, {regtype}{regid}N, " - f"{regtype}{regid}V);\n") + elif regtype =3D=3D "C": + if regid =3D=3D "dd": + f.write( + f" gen_write_ctrl_reg_pair(ctx, {regtype}{regid}N, " + f"{regtype}{regid}V);\n" + ) + elif regid =3D=3D "d": + f.write( + f" gen_write_ctrl_reg(ctx, {regtype}{regid}N, " + f"{regtype}{regid}V);\n" + ) else: print("Bad register parse: ", regtype, regid) else: print("Bad register parse: ", regtype, regid) =20 + def genptr_dst_write_ext(f, tag, regtype, regid, newv=3D"EXT_DFL"): - if (regtype =3D=3D "V"): - if (regid in {"xx"}): - f.write(f" gen_log_vreg_write_pair(ctx, {regtype}{regid}V_o= ff, " - f"{regtype}{regid}N, {newv});\n") - elif (regid in {"y"}): - f.write(f" gen_log_vreg_write(ctx, {regtype}{regid}V_off, " - f"{regtype}{regid}N, {newv});\n") - elif (regid not in {"dd", "d", "x"}): + if regtype =3D=3D "V": + if regid in {"xx"}: + f.write( + f" gen_log_vreg_write_pair(ctx, {regtype}{regid}V_off, " + f"{regtype}{regid}N, {newv});\n" + ) + elif regid in {"y"}: + f.write( + f" gen_log_vreg_write(ctx, {regtype}{regid}V_off, " + f"{regtype}{regid}N, {newv});\n" + ) + elif regid not in {"dd", "d", "x"}: print("Bad register parse: ", regtype, regid) - elif (regtype =3D=3D "Q"): - if (regid not in {"d", "e", "x"}): - + elif regtype =3D=3D "Q": + if regid not in {"d", "e", "x"}: print("Bad register parse: ", regtype, regid) else: print("Bad register parse: ", regtype, regid) =20 -def genptr_dst_write_opn(f,regtype, regid, tag): - if (hex_common.is_pair(regid)): - if (hex_common.is_hvx_reg(regtype)): - if (hex_common.is_tmp_result(tag)): + +def genptr_dst_write_opn(f, regtype, regid, tag): + if hex_common.is_pair(regid): + if hex_common.is_hvx_reg(regtype): + if hex_common.is_tmp_result(tag): genptr_dst_write_ext(f, tag, regtype, regid, "EXT_TMP") else: genptr_dst_write_ext(f, tag, regtype, regid) else: genptr_dst_write(f, tag, regtype, regid) - elif (hex_common.is_single(regid)): - if (hex_common.is_hvx_reg(regtype)): - if (hex_common.is_new_result(tag)): + elif hex_common.is_single(regid): + if hex_common.is_hvx_reg(regtype): + if hex_common.is_new_result(tag): genptr_dst_write_ext(f, tag, regtype, regid, "EXT_NEW") - elif (hex_common.is_tmp_result(tag)): + elif hex_common.is_tmp_result(tag): genptr_dst_write_ext(f, tag, regtype, regid, "EXT_TMP") else: genptr_dst_write_ext(f, tag, regtype, regid, "EXT_DFL") else: genptr_dst_write(f, tag, regtype, regid) else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numregs) + =20 ## ## Generate the TCG code to call the helper @@ -437,57 +492,59 @@ def genptr_dst_write_opn(f,regtype, regid, tag): ## def gen_tcg_func(f, tag, regs, imms): f.write(f"static void generate_{tag}(DisasContext *ctx)\n") - f.write('{\n') + f.write("{\n") =20 f.write(" Insn *insn __attribute__((unused)) =3D ctx->insn;\n") =20 - if hex_common.need_ea(tag): gen_decl_ea_tcg(f, tag) - i=3D0 + if hex_common.need_ea(tag): + gen_decl_ea_tcg(f, tag) + i =3D 0 ## Declare all the operands (regs and immediates) - for regtype,regid,toss,numregs in regs: + for regtype, regid, toss, numregs in regs: genptr_decl_opn(f, tag, regtype, regid, toss, numregs, i) i +=3D 1 - for immlett,bits,immshift in imms: - genptr_decl_imm(f,immlett) + for immlett, bits, immshift in imms: + genptr_decl_imm(f, immlett) =20 - if 'A_PRIV' in hex_common.attribdict[tag]: - f.write(' fCHECKFORPRIV();\n') - if 'A_GUEST' in hex_common.attribdict[tag]: - f.write(' fCHECKFORGUEST();\n') + if "A_PRIV" in hex_common.attribdict[tag]: + f.write(" fCHECKFORPRIV();\n") + if "A_GUEST" in hex_common.attribdict[tag]: + f.write(" fCHECKFORGUEST();\n") =20 ## Read all the inputs - for regtype,regid,toss,numregs in regs: - if (hex_common.is_read(regid)): - genptr_src_read_opn(f,regtype,regid,tag) + for regtype, regid, toss, numregs in regs: + if hex_common.is_read(regid): + genptr_src_read_opn(f, regtype, regid, tag) =20 if hex_common.is_idef_parser_enabled(tag): declared =3D [] ## Handle registers - for regtype,regid,toss,numregs in regs: - if (hex_common.is_pair(regid) - or (hex_common.is_single(regid) - and hex_common.is_old_val(regtype, regid, tag))): + for regtype, regid, toss, numregs in regs: + if hex_common.is_pair(regid) or ( + hex_common.is_single(regid) + and hex_common.is_old_val(regtype, regid, tag) + ): declared.append(f"{regtype}{regid}V") if regtype =3D=3D "M": declared.append(f"{regtype}{regid}N") elif hex_common.is_new_val(regtype, regid, tag): declared.append(f"{regtype}{regid}N") else: - print("Bad register parse: ",regtype,regid,toss,numregs) + print("Bad register parse: ", regtype, regid, toss, numreg= s) =20 ## Handle immediates - for immlett,bits,immshift in imms: + for immlett, bits, immshift in imms: declared.append(hex_common.imm_name(immlett)) =20 arguments =3D ", ".join(["ctx", "ctx->insn", "ctx->pkt"] + declare= d) f.write(f" emit_{tag}({arguments});\n") =20 - elif ( hex_common.skip_qemu_helper(tag) ): + elif hex_common.skip_qemu_helper(tag): f.write(f" fGEN_TCG_{tag}({hex_common.semdict[tag]});\n") else: ## Generate the call to the helper - for immlett,bits,immshift in imms: - gen_helper_decl_imm(f,immlett) + for immlett, bits, immshift in imms: + gen_helper_decl_imm(f, immlett) if hex_common.need_pkt_has_multi_cof(tag): f.write(" TCGv pkt_has_multi_cof =3D ") f.write("tcg_constant_tl(ctx->pkt->pkt_has_multi_cof);\n") @@ -500,62 +557,68 @@ def gen_tcg_func(f, tag, regs, imms): if hex_common.helper_needs_next_PC(tag): f.write(" TCGv next_PC =3D tcg_constant_tl(ctx->next_PC);\n= ") f.write(f" gen_helper_{tag}(") - i=3D0 + i =3D 0 ## If there is a scalar result, it is the return type - for regtype,regid,toss,numregs in regs: - if (hex_common.is_written(regid)): - if (hex_common.is_hvx_reg(regtype)): + for regtype, regid, toss, numregs in regs: + if hex_common.is_written(regid): + if hex_common.is_hvx_reg(regtype): continue gen_helper_call_opn(f, tag, regtype, regid, toss, numregs,= i) i +=3D 1 - if (i > 0): f.write(", ") + if i > 0: + f.write(", ") f.write("cpu_env") - i=3D1 + i =3D 1 ## For conditional instructions, we pass in the destination regist= er - if 'A_CONDEXEC' in hex_common.attribdict[tag]: + if "A_CONDEXEC" in hex_common.attribdict[tag]: for regtype, regid, toss, numregs in regs: - if (hex_common.is_writeonly(regid) and - not hex_common.is_hvx_reg(regtype)): - gen_helper_call_opn(f, tag, regtype, regid, toss, \ - numregs, i) + if hex_common.is_writeonly(regid) and not hex_common.is_hv= x_reg( + regtype + ): + gen_helper_call_opn(f, tag, regtype, regid, toss, numr= egs, i) i +=3D 1 - for regtype,regid,toss,numregs in regs: - if (hex_common.is_written(regid)): - if (not hex_common.is_hvx_reg(regtype)): + for regtype, regid, toss, numregs in regs: + if hex_common.is_written(regid): + if not hex_common.is_hvx_reg(regtype): continue gen_helper_call_opn(f, tag, regtype, regid, toss, numregs,= i) i +=3D 1 - for regtype,regid,toss,numregs in regs: - if (hex_common.is_read(regid)): - if (hex_common.is_hvx_reg(regtype) and - hex_common.is_readwrite(regid)): + for regtype, regid, toss, numregs in regs: + if hex_common.is_read(regid): + if hex_common.is_hvx_reg(regtype) and hex_common.is_readwr= ite(regid): continue gen_helper_call_opn(f, tag, regtype, regid, toss, numregs,= i) i +=3D 1 - for immlett,bits,immshift in imms: - gen_helper_call_imm(f,immlett) + for immlett, bits, immshift in imms: + gen_helper_call_imm(f, immlett) =20 if hex_common.need_pkt_has_multi_cof(tag): f.write(", pkt_has_multi_cof") - if hex_common.need_PC(tag): f.write(", PC") - if hex_common.helper_needs_next_PC(tag): f.write(", next_PC") - if hex_common.need_slot(tag): f.write(", slot") - if hex_common.need_part1(tag): f.write(", part1" ) + if hex_common.need_PC(tag): + f.write(", PC") + if hex_common.helper_needs_next_PC(tag): + f.write(", next_PC") + if hex_common.need_slot(tag): + f.write(", slot") + if hex_common.need_part1(tag): + f.write(", part1") f.write(");\n") =20 ## Write all the outputs - for regtype,regid,toss,numregs in regs: - if (hex_common.is_written(regid)): - genptr_dst_write_opn(f,regtype, regid, tag) + for regtype, regid, toss, numregs in regs: + if hex_common.is_written(regid): + genptr_dst_write_opn(f, regtype, regid, tag) =20 f.write("}\n\n") =20 + def gen_def_tcg_func(f, tag, tagregs, tagimms): regs =3D tagregs[tag] imms =3D tagimms[tag] =20 gen_tcg_func(f, tag, regs, imms) =20 + def main(): hex_common.read_semantics_file(sys.argv[1]) hex_common.read_attribs_file(sys.argv[2]) @@ -578,30 +641,31 @@ def main(): tagimms =3D hex_common.get_tagimms() =20 output_file =3D sys.argv[-1] - with open(output_file, 'w') as f: + with open(output_file, "w") as f: f.write("#ifndef HEXAGON_TCG_FUNCS_H\n") f.write("#define HEXAGON_TCG_FUNCS_H\n\n") if is_idef_parser_enabled: - f.write("#include \"idef-generated-emitter.h.inc\"\n\n") + f.write('#include "idef-generated-emitter.h.inc"\n\n') =20 for tag in hex_common.tags: ## Skip the priv instructions - if ( "A_PRIV" in hex_common.attribdict[tag] ) : + if "A_PRIV" in hex_common.attribdict[tag]: continue ## Skip the guest instructions - if ( "A_GUEST" in hex_common.attribdict[tag] ) : + if "A_GUEST" in hex_common.attribdict[tag]: continue ## Skip the diag instructions - if ( tag =3D=3D "Y6_diag" ) : + if tag =3D=3D "Y6_diag": continue - if ( tag =3D=3D "Y6_diag0" ) : + if tag =3D=3D "Y6_diag0": continue - if ( tag =3D=3D "Y6_diag1" ) : + if tag =3D=3D "Y6_diag1": continue =20 gen_def_tcg_func(f, tag, tagregs, tagimms) =20 f.write("#endif /* HEXAGON_TCG_FUNCS_H */\n") =20 + if __name__ =3D=3D "__main__": main() diff --git a/target/hexagon/hex_common.py b/target/hexagon/hex_common.py index 9f9da81e20..40f28ca933 100755 --- a/target/hexagon/hex_common.py +++ b/target/hexagon/hex_common.py @@ -21,14 +21,15 @@ import re import string =20 -behdict =3D {} # tag ->behavior -semdict =3D {} # tag -> semantics -attribdict =3D {} # tag -> attributes -macros =3D {} # macro -> macro information... -attribinfo =3D {} # Register information and misc -tags =3D [] # list of all tags -overrides =3D {} # tags with helper overrides -idef_parser_enabled =3D {} # tags enabled for idef-parser +behdict =3D {} # tag ->behavior +semdict =3D {} # tag -> semantics +attribdict =3D {} # tag -> attributes +macros =3D {} # macro -> macro information... +attribinfo =3D {} # Register information and misc +tags =3D [] # list of all tags +overrides =3D {} # tags with helper overrides +idef_parser_enabled =3D {} # tags enabled for idef-parser + =20 # We should do this as a hash for performance, # but to keep order let's keep it as a list. @@ -37,71 +38,77 @@ def uniquify(seq): seen_add =3D seen.add return [x for x in seq if x not in seen and not seen_add(x)] =20 -regre =3D re.compile( - r"((?") - macro.attribs |=3D expand_macro_attribs( - macros[submacro], allmac_re) + macro.attribs |=3D expand_macro_attribs(macros[submacro], allm= ac_re) finished_macros.add(macro.key) return macro.attribs =20 + # When qemu needs an attribute that isn't in the imported files, # we'll add it here. def add_qemu_macro_attrib(name, attrib): macros[name].attribs.add(attrib) =20 -immextre =3D re.compile(r'f(MUST_)?IMMEXT[(]([UuSsRr])') + +immextre =3D re.compile(r"f(MUST_)?IMMEXT[(]([UuSsRr])") + =20 def is_cond_jump(tag): - if tag =3D=3D 'J2_rte': + if tag =3D=3D "J2_rte": return False - if ('A_HWLOOP0_END' in attribdict[tag] or - 'A_HWLOOP1_END' in attribdict[tag]): + if "A_HWLOOP0_END" in attribdict[tag] or "A_HWLOOP1_END" in attribdict= [tag]: return False - return \ - re.compile(r"(if.*fBRANCH)|(if.*fJUMPR)").search(semdict[tag]) != =3D None + return re.compile(r"(if.*fBRANCH)|(if.*fJUMPR)").search(semdict[tag]) = !=3D None + =20 def is_cond_call(tag): return re.compile(r"(if.*fCALL)").search(semdict[tag]) !=3D None =20 + def calculate_attribs(): - add_qemu_macro_attrib('fREAD_PC', 'A_IMPLICIT_READS_PC') - add_qemu_macro_attrib('fTRAP', 'A_IMPLICIT_READS_PC') - add_qemu_macro_attrib('fWRITE_P0', 'A_WRITES_PRED_REG') - add_qemu_macro_attrib('fWRITE_P1', 'A_WRITES_PRED_REG') - add_qemu_macro_attrib('fWRITE_P2', 'A_WRITES_PRED_REG') - add_qemu_macro_attrib('fWRITE_P3', 'A_WRITES_PRED_REG') - add_qemu_macro_attrib('fSET_OVERFLOW', 'A_IMPLICIT_WRITES_USR') - add_qemu_macro_attrib('fSET_LPCFG', 'A_IMPLICIT_WRITES_USR') - add_qemu_macro_attrib('fLOAD', 'A_SCALAR_LOAD') - add_qemu_macro_attrib('fSTORE', 'A_SCALAR_STORE') + add_qemu_macro_attrib("fREAD_PC", "A_IMPLICIT_READS_PC") + add_qemu_macro_attrib("fTRAP", "A_IMPLICIT_READS_PC") + add_qemu_macro_attrib("fWRITE_P0", "A_WRITES_PRED_REG") + add_qemu_macro_attrib("fWRITE_P1", "A_WRITES_PRED_REG") + add_qemu_macro_attrib("fWRITE_P2", "A_WRITES_PRED_REG") + add_qemu_macro_attrib("fWRITE_P3", "A_WRITES_PRED_REG") + add_qemu_macro_attrib("fSET_OVERFLOW", "A_IMPLICIT_WRITES_USR") + add_qemu_macro_attrib("fSET_LPCFG", "A_IMPLICIT_WRITES_USR") + add_qemu_macro_attrib("fLOAD", "A_SCALAR_LOAD") + add_qemu_macro_attrib("fSTORE", "A_SCALAR_STORE") =20 # Recurse down macros, find attributes from sub-macros macroValues =3D list(macros.values()) - allmacros_restr =3D "|".join(set([ m.re.pattern for m in macroValues ]= )) + allmacros_restr =3D "|".join(set([m.re.pattern for m in macroValues])) allmacros_re =3D re.compile(allmacros_restr) for macro in macroValues: - expand_macro_attribs(macro,allmacros_re) + expand_macro_attribs(macro, allmacros_re) # Append attributes to all instructions for tag in tags: for macname in allmacros_re.findall(semdict[tag]): - if not macname: continue + if not macname: + continue macro =3D macros[macname] attribdict[tag] |=3D set(macro.attribs) # Figure out which instructions write predicate registers @@ -110,31 +117,34 @@ def calculate_attribs(): regs =3D tagregs[tag] for regtype, regid, toss, numregs in regs: if regtype =3D=3D "P" and is_written(regid): - attribdict[tag].add('A_WRITES_PRED_REG') + attribdict[tag].add("A_WRITES_PRED_REG") # Mark conditional jumps and calls # Not all instructions are properly marked with A_CONDEXEC for tag in tags: if is_cond_jump(tag) or is_cond_call(tag): - attribdict[tag].add('A_CONDEXEC') + attribdict[tag].add("A_CONDEXEC") + =20 def SEMANTICS(tag, beh, sem): - #print tag,beh,sem + # print tag,beh,sem behdict[tag] =3D beh semdict[tag] =3D sem attribdict[tag] =3D set() - tags.append(tag) # dicts have no order, this is for order + tags.append(tag) # dicts have no order, this is for order + =20 def ATTRIBUTES(tag, attribstring): - attribstring =3D \ - attribstring.replace("ATTRIBS","").replace("(","").replace(")","") + attribstring =3D attribstring.replace("ATTRIBS", "").replace("(", "").= replace(")", "") if not attribstring: return attribs =3D attribstring.split(",") for attrib in attribs: attribdict[tag].add(attrib.strip()) =20 + class Macro(object): - __slots__ =3D ['key','name', 'beh', 'attribs', 're'] + __slots__ =3D ["key", "name", "beh", "attribs", "re"] + def __init__(self, name, beh, attribs): self.key =3D name self.name =3D name @@ -142,20 +152,24 @@ def __init__(self, name, beh, attribs): self.attribs =3D set(attribs) self.re =3D re.compile("\\b" + name + "\\b") =20 -def MACROATTRIB(macname,beh,attribstring): - attribstring =3D attribstring.replace("(","").replace(")","") + +def MACROATTRIB(macname, beh, attribstring): + attribstring =3D attribstring.replace("(", "").replace(")", "") if attribstring: attribs =3D attribstring.split(",") else: attribs =3D [] - macros[macname] =3D Macro(macname,beh,attribs) + macros[macname] =3D Macro(macname, beh, attribs) + =20 def compute_tag_regs(tag): return uniquify(regre.findall(behdict[tag])) =20 + def compute_tag_immediates(tag): return uniquify(immre.findall(behdict[tag])) =20 + ## ## tagregs is the main data structure we'll use ## tagregs[tag] will contain the registers used by an instruction @@ -180,89 +194,113 @@ def compute_tag_immediates(tag): def get_tagregs(): return dict(zip(tags, list(map(compute_tag_regs, tags)))) =20 + def get_tagimms(): return dict(zip(tags, list(map(compute_tag_immediates, tags)))) =20 + def is_pair(regid): return len(regid) =3D=3D 2 =20 + def is_single(regid): return len(regid) =3D=3D 1 =20 + def is_written(regid): return regid[0] in "dexy" =20 + def is_writeonly(regid): return regid[0] in "de" =20 + def is_read(regid): return regid[0] in "stuvwxy" =20 + def is_readwrite(regid): return regid[0] in "xy" =20 + def is_scalar_reg(regtype): return regtype in "RPC" =20 + def is_hvx_reg(regtype): return regtype in "VQ" =20 + def is_old_val(regtype, regid, tag): - return regtype+regid+'V' in semdict[tag] + return regtype + regid + "V" in semdict[tag] + =20 def is_new_val(regtype, regid, tag): - return regtype+regid+'N' in semdict[tag] + return regtype + regid + "N" in semdict[tag] + =20 def need_slot(tag): - if (('A_CONDEXEC' in attribdict[tag] and - 'A_JUMP' not in attribdict[tag]) or - 'A_STORE' in attribdict[tag] or - 'A_LOAD' in attribdict[tag]): + if ( + ("A_CONDEXEC" in attribdict[tag] and "A_JUMP" not in attribdict[ta= g]) + or "A_STORE" in attribdict[tag] + or "A_LOAD" in attribdict[tag] + ): return 1 else: return 0 =20 + def need_part1(tag): return re.compile(r"fPART1").search(semdict[tag]) =20 + def need_ea(tag): return re.compile(r"\bEA\b").search(semdict[tag]) =20 + def need_PC(tag): - return 'A_IMPLICIT_READS_PC' in attribdict[tag] + return "A_IMPLICIT_READS_PC" in attribdict[tag] + =20 def helper_needs_next_PC(tag): - return 'A_CALL' in attribdict[tag] + return "A_CALL" in attribdict[tag] + =20 def need_pkt_has_multi_cof(tag): - return 'A_COF' in attribdict[tag] + return "A_COF" in attribdict[tag] + =20 def need_condexec_reg(tag, regs): - if 'A_CONDEXEC' in attribdict[tag]: + if "A_CONDEXEC" in attribdict[tag]: for regtype, regid, toss, numregs in regs: if is_writeonly(regid) and not is_hvx_reg(regtype): return True return False =20 + def skip_qemu_helper(tag): return tag in overrides.keys() =20 + def is_tmp_result(tag): - return ('A_CVI_TMP' in attribdict[tag] or - 'A_CVI_TMP_DST' in attribdict[tag]) + return "A_CVI_TMP" in attribdict[tag] or "A_CVI_TMP_DST" in attribdict= [tag] + =20 def is_new_result(tag): - return ('A_CVI_NEW' in attribdict[tag]) + return "A_CVI_NEW" in attribdict[tag] + =20 def is_idef_parser_enabled(tag): return tag in idef_parser_enabled =20 + def imm_name(immlett): return f"{immlett}iV" =20 + def read_semantics_file(name): eval_line =3D "" - for line in open(name, 'rt').readlines(): + for line in open(name, "rt").readlines(): if not line.startswith("#"): eval_line +=3D line if line.endswith("\\\n"): @@ -271,24 +309,29 @@ def read_semantics_file(name): eval(eval_line.strip()) eval_line =3D "" =20 + def read_attribs_file(name): - attribre =3D re.compile(r'DEF_ATTRIB\(([A-Za-z0-9_]+), ([^,]*), ' + - r'"([A-Za-z0-9_\.]*)", "([A-Za-z0-9_\.]*)"\)') - for line in open(name, 'rt').readlines(): + attribre =3D re.compile( + r"DEF_ATTRIB\(([A-Za-z0-9_]+), ([^,]*), " + + r'"([A-Za-z0-9_\.]*)", "([A-Za-z0-9_\.]*)"\)' + ) + for line in open(name, "rt").readlines(): if not attribre.match(line): continue - (attrib_base,descr,rreg,wreg) =3D attribre.findall(line)[0] - attrib_base =3D 'A_' + attrib_base - attribinfo[attrib_base] =3D {'rreg':rreg, 'wreg':wreg, 'descr':des= cr} + (attrib_base, descr, rreg, wreg) =3D attribre.findall(line)[0] + attrib_base =3D "A_" + attrib_base + attribinfo[attrib_base] =3D {"rreg": rreg, "wreg": wreg, "descr": = descr} + =20 def read_overrides_file(name): overridere =3D re.compile("#define fGEN_TCG_([A-Za-z0-9_]+)\(.*") - for line in open(name, 'rt').readlines(): + for line in open(name, "rt").readlines(): if not overridere.match(line): continue tag =3D overridere.findall(line)[0] overrides[tag] =3D True =20 + def read_idef_parser_enabled_file(name): global idef_parser_enabled with open(name, "r") as idef_parser_enabled_file: --=20 2.25.1