From patchwork Mon Apr 7 15:43:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 14041171 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B9C8C36010 for ; Mon, 7 Apr 2025 15:44:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1odH-0004y5-8o; Mon, 07 Apr 2025 11:43:31 -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 1u1odG-0004xO-3H for qemu-devel@nongnu.org; Mon, 07 Apr 2025 11:43:30 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1odA-0002ev-Uq for qemu-devel@nongnu.org; Mon, 07 Apr 2025 11:43:29 -0400 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5378drk3016227 for ; Mon, 7 Apr 2025 15:43:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= VVcI9RwFxKt9dR+fd9xRnjviPSIR5ftsMfI4BW8etrY=; b=obSov3Nm9Dea8JD8 4mZqEbi67tyRnoRMJ/cParW6xG2Ps3Gik4EEoea5/i63XNPmlDXY8cSS77xcQcij j8RcTyqabfoTOwSxdfmslaGccBsbCT+u+M+5OLmUS0LrWiBZm3NLvy11ia/X5ttC w2quNcdoztT87rkY/3zc1TBiuz2IbzgS0oAmidx/TaXTZEByg7/DqZDVE4KZz89j W6Y0LVKf25jLMu3cNMpMMxqahxCRDAPc8K9YxqcDoKwNLqg7LTZdeNQPQDce0RQs dIc+aGZEgrcbguXG3vYhcJJr7W4ic0SLnEWkS0KtaI3nqg76aRq9fnnlXkcfr4L4 j5oCvA== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twdgcrk7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 07 Apr 2025 15:43:23 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-736c7df9b6cso5927613b3a.3 for ; Mon, 07 Apr 2025 08:43:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744040602; x=1744645402; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VVcI9RwFxKt9dR+fd9xRnjviPSIR5ftsMfI4BW8etrY=; b=vvJyQMHM0HlNKQKHEApVJOuqfjh1GcXgggJZ4AQAdF3NC+pq5uTU7yX2thYPJTXciH n2CZ5wlnkODITD+dbEs8MAgzOSy+kqySEQBAWERmk9qkrsaUsX4kvwWR0VbrcYQogcse BAKfCDmVU1JgJWaNpurHvc67rwOX6gXyBSes/5RyqLL18/vvTgOXZOYOvuyOvCllSFdk QI/RJTe4bN/XXSbIsr/T7RFIMUDqviLHV/5I8R5hYmPjqeRpAT0SaNCqDJoPCniF8WL5 OPh5RPnNXGsGJfLSw9jYSCQmGoJsDj86jAF2iz/T0RlLWCbVqB7HGDu+GJuEd7iHqO1W FCVg== X-Gm-Message-State: AOJu0YzYe53hJuZ/wV01VMBWim7vhW+qT+uLfxKCDd93ji4vQGf5L8j3 izeTy4Dxz+3zszNB26roCmy+HmNyq1KasT6bgZCKVwl24AjqarUJyMXBg5tC9OsPi33Z2cj3qa8 mCJVlJMgnGQOFRjvjYxzSCxMhwScK4ZJRI+j99WZXX/6f/dCb7CrKxBpug5tJWQ== X-Gm-Gg: ASbGncs2HHgkC3cBrLhU5/4eF3Fw8ObZ5h6vdzVGrDgGU8u1Wx+y+7nrqGK2xpITvRn O1JKtHNgwJYqQ0s33vGPtO5KwZCKrhIN3cJbpj2DUXY7M/IkoSeXNozVFz7PY/jjZ0BMM6ojF1b AkCszh8YLCLL7roi+b0y3BGzvoymbJsnKSnd10xrGNGWocRPlzRB6DAFaRupYF+F/l7GGogUIc/ Y9Z6sndZAqh+w4zIWB5eMdC7DhcV2Q3nnT4ZghfGIYzFg7i+njNAdjSSM2B9AnGlhjo+7oM2bQt DVK13+ddCqejhDI+00y55AUOgr3LJAvYmmZfQejq5DMygUQ2GFOYQwrWdPvYpDUH X-Received: by 2002:a05:6a00:aca:b0:736:34a2:8a18 with SMTP id d2e1a72fcca58-739e4f7a0a5mr20548493b3a.24.1744040601589; Mon, 07 Apr 2025 08:43:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGnUERt3XR2wUYMi+8ET/Bvg80a0qd6c1gvrYmJWUmEDC3YcoadDOZJJIB3p2bQzM5mBKGdXg== X-Received: by 2002:a05:6a00:aca:b0:736:34a2:8a18 with SMTP id d2e1a72fcca58-739e4f7a0a5mr20548447b3a.24.1744040601115; Mon, 07 Apr 2025 08:43:21 -0700 (PDT) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739d97ee3fesm8681651b3a.37.2025.04.07.08.43.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 08:43:20 -0700 (PDT) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, matheus.bernardino@oss.qualcomm.com, ale@rev.ng, anjo@rev.ng, marco.liebel@oss.qualcomm.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com, Brian Cain Subject: [PATCH v2 1/5] target/hexagon: handle .new values Date: Mon, 7 Apr 2025 08:43:10 -0700 Message-Id: <20250407154314.2512587-2-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407154314.2512587-1-brian.cain@oss.qualcomm.com> References: <20250407154314.2512587-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=PJgP+eqC c=1 sm=1 tr=0 ts=67f3f29b cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=G8g7tdY8SUdx2gpfVe8A:9 a=QEXdDO2ut3YA:10 a=IoOABgeZipijB_acs4fv:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: emQJB2Z6NAAt45KltGEUeJBocNedF9Iu X-Proofpoint-GUID: emQJB2Z6NAAt45KltGEUeJBocNedF9Iu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-07_04,2025-04-03_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 clxscore=1015 adultscore=0 malwarescore=0 spamscore=0 impostorscore=0 suspectscore=0 mlxlogscore=393 bulkscore=0 mlxscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504070109 Received-SPF: pass client-ip=205.220.180.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Brian Cain Signed-off-by: Brian Cain --- target/hexagon/hex_common.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/target/hexagon/hex_common.py b/target/hexagon/hex_common.py index 758e5fd12d..6803908718 100755 --- a/target/hexagon/hex_common.py +++ b/target/hexagon/hex_common.py @@ -350,6 +350,7 @@ def helper_arg(self): f"{self.helper_arg_type()} {self.helper_arg_name()}" ) + # # Every register is either Single or Pair or Hvx # @@ -1070,11 +1071,22 @@ def init_registers(): for reg in new_regs: new_registers[f"{reg.regtype}{reg.regid}"] = reg -def get_register(tag, regtype, regid): - if f"{regtype}{regid}V" in semdict[tag]: - return registers[f"{regtype}{regid}"] - else: - return new_registers[f"{regtype}{regid}"] +def is_new_reg(tag, regid): + if regid[0] in "NO": + return True + return regid[0] == "P" and \ + f"{regid}N" in semdict[tag] and \ + f"{regid}V" not in semdict[tag] + +def get_register(tag, regtype, regid, subtype=""): + regid = f"{regtype}{regid}" + is_new = is_new_reg(tag, regid) + try: + reg = new_registers[regid] if is_new else registers[regid] + except KeyError: + raise Exception(f"Unknown {'new ' if is_new else ''}register {regid}" +\ + f"from '{tag}' with syntax '{semdict[tag]}'") from None + return reg def helper_ret_type(tag, regs): ## If there is a scalar result, it is the return type From patchwork Mon Apr 7 15:43:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 14041172 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E7CE2C3601E for ; Mon, 7 Apr 2025 15:44:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1odH-0004xy-2N; Mon, 07 Apr 2025 11:43:31 -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 1u1odE-0004wO-1q for qemu-devel@nongnu.org; Mon, 07 Apr 2025 11:43:28 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1odC-0002f8-Hp for qemu-devel@nongnu.org; Mon, 07 Apr 2025 11:43:27 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5378doD4017429 for ; Mon, 7 Apr 2025 15:43:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= gVoHJ0OtSSYZsMzuDVY7GZ5ga6wHPMe1mgwZjB5K2qs=; b=e5n3o6TwElw2vbNs rL67EBF17zpyx9nYgFYvZdzzgQc/ccQCfYK5enQ15qJib7NvdCJRej3kNj4VglOu ky8UEcRCeqXECeulJxOItrA45+wp1FKSss0zgDRuCO4FluJxbIEPRtBQIMDM7U1z cEsINmZr2tmQaE1BC92xruY2cdKtk/sZrlItGl4hshviPR9DjOmNW72Z5A3x+P1Z fFXNqk7iY1cJFh7dfpZShDp0dT84vYtuwQSzEaNCzU2rJZNVBVTyw1/TyMRPsNDH uhcU1Q+2FLAclK+8GXwO7l9/qk53HHHR2FMIHVM6xgdLEaZQ+kd4STugwIw9gKCg SphMtA== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twg3cpjt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 07 Apr 2025 15:43:25 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-7395095a505so3454383b3a.1 for ; Mon, 07 Apr 2025 08:43:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744040604; x=1744645404; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gVoHJ0OtSSYZsMzuDVY7GZ5ga6wHPMe1mgwZjB5K2qs=; b=TSJ73tRtxMaCP0yT52DvRK84XnPMgB2l70z9zxV/8diAJOSiRbbmzz8x6f1TIsTk4y XOfsbkS6RlUPnC/P0l45iN/wrzk7kHMLFGyjLlIJ8VAXmQzqIulMxu4l6JdIbB09Qw2x d1QfXgfEtYZZtNr9VP/nUAFfC4xctv+GUCXRhi036M+pKq5Y6wdcHFTkjXNhCmm7qghh qxtJJu/kpVxH87zwzUTEheH3j2SyLueVPwzoyEB7jorgY9MvHzmkZw75oZJlIQjryi0p FoZv90PYoIMOVKvcv2rbScqOzNeZqfaEDkKgrhkzFzcEuu1fOx7eWDQkkamV+wNo7Wpw 1jIw== X-Gm-Message-State: AOJu0Yxv4BVGVCwjyk4FPJ0wCovAdL0cGIsPo9FP79Btc9YD/8b0Vadv 283Lc2HdO5qC61yGRPxgtYnIM0+OWTofQRJ2HZY7t8Zv8MOcyPj1dmBtzNmquxwPDuQ8m321vl2 81dHg5LZ3tu1UM99e4HLUJ9uDL/uDL5UloTtHx8o/0FAj/3ZaGvXfxIQielJWdA== X-Gm-Gg: ASbGncu4N9+wJ8bckLfqtzjgXAdffQco2CGs40GmSJaz1rzj6kv0+chKFpUtode+xAY n3frPmD0b+rWO0JG98ibbhaIorzN/dW/vrp7XTOY5VF5nCvAe9lzVrQ0J+7Hghxmo5ZRLJiOWMv N7xZRBE1ch31g7pszro4RooKRPKVjU2QWnr8XJ/rgk7QB8nO0KANkloi3CJe0BFKkhqxXNcKFnK DSNImoJBhFMV43v4AXRtODXlAGVNWjwf38Rq/l9340MIxmSLy8VV2tYzViTTopIG6aoIbv/zdfz Mn3puyV5O+G0juvD4GYFqm161pTQAnjd0hACNc+DmsNkXgzgMBIKpbvQwgVu9Yq7 X-Received: by 2002:a05:6a00:2e14:b0:736:4bd3:ffab with SMTP id d2e1a72fcca58-739e4be89demr13116329b3a.17.1744040604104; Mon, 07 Apr 2025 08:43:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH8hZNjs2t6W98ctkr+Vfrkt9yTm+oW56r6gZywOA6QnZmqCCr5+k6WlJi/2Rpo993V41B3Lw== X-Received: by 2002:a05:6a00:2e14:b0:736:4bd3:ffab with SMTP id d2e1a72fcca58-739e4be89demr13116305b3a.17.1744040603688; Mon, 07 Apr 2025 08:43:23 -0700 (PDT) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739d97ee3fesm8681651b3a.37.2025.04.07.08.43.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 08:43:22 -0700 (PDT) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, matheus.bernardino@oss.qualcomm.com, ale@rev.ng, anjo@rev.ng, marco.liebel@oss.qualcomm.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com, Brian Cain Subject: [PATCH v2 2/5] target/hexagon: Fix badva reference, delete CAUSE Date: Mon, 7 Apr 2025 08:43:11 -0700 Message-Id: <20250407154314.2512587-3-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407154314.2512587-1-brian.cain@oss.qualcomm.com> References: <20250407154314.2512587-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: u_jpHJtBHk8rkKZqesqsRW4dBdi0h2Uf X-Proofpoint-ORIG-GUID: u_jpHJtBHk8rkKZqesqsRW4dBdi0h2Uf X-Authority-Analysis: v=2.4 cv=I/9lRMgg c=1 sm=1 tr=0 ts=67f3f29d cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=HN0uuiy-se_EESAQhN8A:9 a=QEXdDO2ut3YA:10 a=zc0IvFSfCIW2DFIPzwfm:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-07_04,2025-04-03_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 phishscore=0 suspectscore=0 mlxlogscore=905 lowpriorityscore=0 spamscore=0 clxscore=1015 malwarescore=0 adultscore=0 priorityscore=1501 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504070109 Received-SPF: pass client-ip=205.220.180.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Brian Cain The BADVA reg is referred to with the wrong identifier. The CAUSE reg field of SSR is not yet modeled. Signed-off-by: Brian Cain --- target/hexagon/cpu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index 766b678651..62f1fe15b8 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -216,8 +216,7 @@ static void hexagon_dump(CPUHexagonState *env, FILE *f, int flags) qemu_fprintf(f, " cs0 = 0x00000000\n"); qemu_fprintf(f, " cs1 = 0x00000000\n"); #else - print_reg(f, env, HEX_REG_CAUSE); - print_reg(f, env, HEX_REG_BADVA); + print_reg(f, env, HEX_SREG_BADVA); print_reg(f, env, HEX_REG_CS0); print_reg(f, env, HEX_REG_CS1); #endif From patchwork Mon Apr 7 15:43:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 14041174 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 280CAC36010 for ; Mon, 7 Apr 2025 15:44:57 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1odH-0004yk-PS; Mon, 07 Apr 2025 11:43:31 -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 1u1odG-0004xV-BW for qemu-devel@nongnu.org; Mon, 07 Apr 2025 11:43:30 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1odE-0002fa-M1 for qemu-devel@nongnu.org; Mon, 07 Apr 2025 11:43:30 -0400 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5378dqBF013349 for ; Mon, 7 Apr 2025 15:43:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= x7OQYxWqO/Klv3aLxEoeizMJ+O7vvC2qHk9AaZLiBHw=; b=Kv0h4NeZKGCW5wb6 /P9aueKHl06mazW35XV02kVgFEnDMHgIU97PjjRhVNvqOrP6hkOznJB4WgsARalV hzRiMc5qSk23x8vTd6dC3+9KGsLUjI49fbrBNAbZ9c8/JyDszOwPaUzqVLbOtZ5O 8QnpCS86an7VsiNi9MCjeCUTi2YqsZjdKSsqzCKPOYJjdgm84Vt+cP7mYXXwZssH cOCOnPZsrARQF2MS4JaCP8AuNXVw0bx4GSXIIoio2wbOqIhz5MDFnpm6+WXNhtQW /k9+9Aluq1qhaQA67oClzDDdZDifEJw6kydva8yDKRnXIOa1ny88tPm8/MeXNrIS I8wmdw== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twc1cnma-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 07 Apr 2025 15:43:27 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-736c1ea954fso2373903b3a.3 for ; Mon, 07 Apr 2025 08:43:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744040605; x=1744645405; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x7OQYxWqO/Klv3aLxEoeizMJ+O7vvC2qHk9AaZLiBHw=; b=AuZy/6ucCsAMGM+ubA8WFcV3CVuByBqZqq2tuAi/Aku1qpYBIKf/rSXwu2RkU7BIn8 FLZqYOqI9u76AkGuJu76ENlx7Ae9OzQUl5tIhiaED9B8HjOYU5EwPI/sHGWq+exPkKGT wEPW3UZLdKYJLV44euCd5MN9Oxl93bkH6Ee37hNlNtf+oabCi6weIHmowAInDVs3fTyX 4gUFKZmYceFZ4itfop5ll9DsiJBB+BkjGQGxYR5WAUXG/2M87/L9L8aCzp6nRuLOlVMd n0Fbj/gzwEFhzC4kT1rDf5+RQ+Kql/MSok125cz5eKUw++iGyvXG19g5fJYDFaskkmsh I9Xg== X-Gm-Message-State: AOJu0YxzScDZf7e7cBb3NNJ5PXDI8H5EFmewDjv13XFQFRitwFVaU+rh PGdH3DNtmb+1CaSleswrG54qq36LBDHe0MFgeyTkv4QtlfEHPX3ExMbTOupH04FtVjYW14thWmc lAX3xzQUDds2j/JkKeJO3NmokVJCY7eXg4Yp4DTNBWplfVxyPvxi0BrkqOMpMSA== X-Gm-Gg: ASbGncvudy8OY2OFYWJtYp1CUEdWByFedWso15U2IKkiggBErEkLk1KjESFLdq3RgpZ tWAmZ5WRNjkz2697z+GklW9BLELtDLjG3FizbmxzqoFUHLfnktw5IiPlOCPQ8ZfOVayN9AHCB9W Vji0SdtCJ5teDRmRwSb0qxIJpRqbmrf/4GfrilYZObVvY4d6dbil/k/OdteiliE+XuM1Py2IuuX +APD7nd+l3Gu1YDetdmXp3+1TtpRBiBIxGZvmpkClfbS7EhA2Z4Wq+Ca4AXWgyL6xoxh8JjJ1ru FTla6J1scVBGzoqagM/EffAjNK84DxuNW0XBGMdHJzx/OW041xsVeBjwVFWWiO/V X-Received: by 2002:a05:6a00:23c8:b0:736:3c6a:be02 with SMTP id d2e1a72fcca58-739e4b49c79mr15598939b3a.11.1744040605512; Mon, 07 Apr 2025 08:43:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFuOMI2Xcy/nC6srbF6cfYh71RH09U11NZceBRNhbBZdMS89EUXYWBvu/Q/XgRJimIhyB8FHA== X-Received: by 2002:a05:6a00:23c8:b0:736:3c6a:be02 with SMTP id d2e1a72fcca58-739e4b49c79mr15598897b3a.11.1744040605083; Mon, 07 Apr 2025 08:43:25 -0700 (PDT) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739d97ee3fesm8681651b3a.37.2025.04.07.08.43.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 08:43:24 -0700 (PDT) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, matheus.bernardino@oss.qualcomm.com, ale@rev.ng, anjo@rev.ng, marco.liebel@oss.qualcomm.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com, Brian Cain Subject: [PATCH v2 3/5] target/hexagon: Add missing A_CALL attr, hintjumpr to multi_cof Date: Mon, 7 Apr 2025 08:43:12 -0700 Message-Id: <20250407154314.2512587-4-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407154314.2512587-1-brian.cain@oss.qualcomm.com> References: <20250407154314.2512587-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: doNTtGaEsPGU62-hPjJ-sbc5eccl93gN X-Authority-Analysis: v=2.4 cv=KtdN2XWN c=1 sm=1 tr=0 ts=67f3f29f cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=ExrS_PMGiXDxMcIyg5oA:9 a=QEXdDO2ut3YA:10 a=2VI0MkxyNR6bbpdq8BZq:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: doNTtGaEsPGU62-hPjJ-sbc5eccl93gN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-07_04,2025-04-03_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0 priorityscore=1501 phishscore=0 bulkscore=0 suspectscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=715 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504070109 Received-SPF: pass client-ip=205.220.180.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Brian Cain Signed-off-by: Brian Cain --- target/hexagon/hex_common.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/hexagon/hex_common.py b/target/hexagon/hex_common.py index 6803908718..a2dcb0aa2e 100755 --- a/target/hexagon/hex_common.py +++ b/target/hexagon/hex_common.py @@ -247,8 +247,11 @@ def need_next_PC(tag): def need_pkt_has_multi_cof(tag): - return "A_COF" in attribdict[tag] - + return ( + "A_JUMP" in attribdict[tag] + or "A_CALL" in attribdict[tag] + or "J2_rte" == tag + ) and tag != "J2_hintjumpr" def need_pkt_need_commit(tag): return 'A_IMPLICIT_WRITES_USR' in attribdict[tag] From patchwork Mon Apr 7 15:43:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 14041173 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CC495C369A2 for ; Mon, 7 Apr 2025 15:44:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1odK-0004zW-D3; Mon, 07 Apr 2025 11:43:34 -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 1u1odI-0004zC-Sx for qemu-devel@nongnu.org; Mon, 07 Apr 2025 11:43:32 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1odG-0002fw-QQ for qemu-devel@nongnu.org; Mon, 07 Apr 2025 11:43:32 -0400 Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5378dkBA022388 for ; Mon, 7 Apr 2025 15:43:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= XdOoA6yP8KgHJ0ReAntJTjKigv+wvIvUfO0xtSYIysE=; b=dc3cIMUZGlCFpZLU 4Bf8pwsBVe86r6Vavk/TgvpVJw70mF94JQmSN5T3cY1CzgK5+B5kG+0LLGq8Y+dP cufZnmF62cV74eq4EpdYA94CTAN6OhlLgj5smKVJyXwsGRculdsGUemr+G/A17lM eaATD6FJbMoBV1h0bFi/wGH+e8xxnGioz+o1r1Dg+jxz/Zy4CkLDa17IgkijYSeV aLaNoPldG9kxq/0Ds1kVZiPReYTLEITMyu7V3mzpvIMp6tWepW/C1bZOqu3eC3BR +zwWaqOnfwwJCrQIgX4BJSKE4NIQgMmbAXV0W0ClzJX9IKuGi/gML7Hl9tUzpOnD 2tuKXg== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twcrcr16-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 07 Apr 2025 15:43:29 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-224347aef79so64437795ad.2 for ; Mon, 07 Apr 2025 08:43:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744040608; x=1744645408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XdOoA6yP8KgHJ0ReAntJTjKigv+wvIvUfO0xtSYIysE=; b=cJZo4ALPjFHDs4kQIKziFaYbJGlHHFjSMl2+yPucGT/9Wn442qoSLI/9ICbgDylOxk RNRKzKkaY/qJGBic19kfOa8twCNF/WIDJC72XEEDJCpzWs88TT5gHNZuK2W1pNFSvdx0 CUXYL2lyjD4YF/cqjLTFGYUlGEBmzuD6YjFPomqQPfiWefqt8drtXYZJmkoMdLO0SZZF bKlIy+OflDjLKSqquqeDcPqjHzRUfw2We73wSlGM2u+BV1yaychGBYsr7TV7EsFVHH1a KT7vLIJuB/JHnGAxvILQfqZYxqcHLajBjw8NvCE+bJVJDGw1S8chIrX4lFmFBPEBcDRl j5qg== X-Gm-Message-State: AOJu0YzF1acMgLfdM7oDzIwoJgcqhPynnXfAzCokSyN+dmv66z8kv6xw F3KBUVcx38d6J5SIqmBXxIMKMQOWQbeIGkxrN+6onrhe5CxiJsFytuBCDZtOyeFyMOEdh7cFt6Q 2f6FXqa1XwkQIKtQl6+cFxQyu5Q6uziHngki5B66kElOpejiyCUfmv/gOeXSPBA== X-Gm-Gg: ASbGncud9sX92IhClQaskowWGZYWmX8W3NGTRV+UEXh2e+9R4HdTu1L/QgY3zd57Wvf Aw8FioGIflArfxP9YKfI7BfzVtuDCa0JSyNlFwxjfrfuG84J7UbZhgoYbCyy3E5kRvFLdWSAfic 0RI04DFuDFdgxBMSK/vIw0TdQ6xYKGuNxXFJyDyxvm38kQfOMC+n93Eb96Fctq3AuNm9jrbvOg3 NzTyE4rassJQKpNpAHT12f1DbwMvINQapyPaAzlA4IfEGwmjSJC0U3Meh1f1OTTrwuvyKz8n3yf h3uWfe9eYbhgQ4veSMeZsSOCioyTHY4KATL6Vb3XH/Pc9eE2TKdLanxWfXmsNQa+ X-Received: by 2002:a17:902:d543:b0:21f:35fd:1b6c with SMTP id d9443c01a7336-22a95588061mr139371635ad.45.1744040607834; Mon, 07 Apr 2025 08:43:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGIMRTbHYcvC79wOI0wGukOuJ4fy9caHliKBRmLeBsEpMu9M7/qMDRq05jDGFa71OVEK5W37w== X-Received: by 2002:a17:902:d543:b0:21f:35fd:1b6c with SMTP id d9443c01a7336-22a95588061mr139371275ad.45.1744040607420; Mon, 07 Apr 2025 08:43:27 -0700 (PDT) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739d97ee3fesm8681651b3a.37.2025.04.07.08.43.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 08:43:26 -0700 (PDT) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, matheus.bernardino@oss.qualcomm.com, ale@rev.ng, anjo@rev.ng, marco.liebel@oss.qualcomm.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com, Brian Cain Subject: [PATCH v2 4/5] target/hexagon: s/pkt_has_store/pkt_has_scalar_store Date: Mon, 7 Apr 2025 08:43:13 -0700 Message-Id: <20250407154314.2512587-5-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407154314.2512587-1-brian.cain@oss.qualcomm.com> References: <20250407154314.2512587-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: Gs1zlyD3pUlp5eFeHr91XJuJ1ELcU-bs X-Authority-Analysis: v=2.4 cv=QuVe3Uyd c=1 sm=1 tr=0 ts=67f3f2a1 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=NfTq8dMVL6FJjgmeXnEA:9 a=QEXdDO2ut3YA:10 a=1OuFwYUASf3TG4hYMiVC:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: Gs1zlyD3pUlp5eFeHr91XJuJ1ELcU-bs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-07_04,2025-04-03_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxlogscore=685 bulkscore=0 priorityscore=1501 clxscore=1015 phishscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504070109 Received-SPF: pass client-ip=205.220.180.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Brian Cain To remove any confusion with HVX or other potential store instructions, we'll qualify this context var with "scalar". Signed-off-by: Brian Cain --- target/hexagon/idef-parser/README.rst | 2 +- target/hexagon/insn.h | 4 ++-- target/hexagon/macros.h | 8 ++++---- target/hexagon/decode.c | 4 ++-- target/hexagon/genptr.c | 3 ++- target/hexagon/idef-parser/parser-helpers.c | 4 ++-- target/hexagon/op_helper.c | 4 ++-- target/hexagon/translate.c | 9 +++++---- target/hexagon/gen_helper_funcs.py | 2 +- 9 files changed, 21 insertions(+), 19 deletions(-) diff --git a/target/hexagon/idef-parser/README.rst b/target/hexagon/idef-parser/README.rst index 7199177ee3..235e3debee 100644 --- a/target/hexagon/idef-parser/README.rst +++ b/target/hexagon/idef-parser/README.rst @@ -637,7 +637,7 @@ tinycode for the Hexagon ``add`` instruction :: ---- 00021094 - mov_i32 pkt_has_store_s1,$0x0 + mov_i32 pkt_has_scalar_store_s1,$0x0 add_i32 tmp0,r2,r2 mov_i32 loc2,tmp0 mov_i32 new_r1,loc2 diff --git a/target/hexagon/insn.h b/target/hexagon/insn.h index 24dcf7fe9f..5d59430da9 100644 --- a/target/hexagon/insn.h +++ b/target/hexagon/insn.h @@ -66,8 +66,8 @@ struct Packet { bool pkt_has_dczeroa; - bool pkt_has_store_s0; - bool pkt_has_store_s1; + bool pkt_has_scalar_store_s0; + bool pkt_has_scalar_store_s1; bool pkt_has_hvx; Insn *vhist_insn; diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h index ee3d4c88e7..b6e5c8aae2 100644 --- a/target/hexagon/macros.h +++ b/target/hexagon/macros.h @@ -82,7 +82,7 @@ */ #define CHECK_NOSHUF(VA, SIZE) \ do { \ - if (insn->slot == 0 && ctx->pkt->pkt_has_store_s1) { \ + if (insn->slot == 0 && ctx->pkt->pkt_has_scalar_store_s1) { \ probe_noshuf_load(VA, SIZE, ctx->mem_idx); \ process_store(ctx, 1); \ } \ @@ -93,11 +93,11 @@ TCGLabel *noshuf_label = gen_new_label(); \ tcg_gen_brcondi_tl(TCG_COND_EQ, PRED, 0, noshuf_label); \ GET_EA; \ - if (insn->slot == 0 && ctx->pkt->pkt_has_store_s1) { \ + if (insn->slot == 0 && ctx->pkt->pkt_has_scalar_store_s1) { \ probe_noshuf_load(EA, SIZE, ctx->mem_idx); \ } \ gen_set_label(noshuf_label); \ - if (insn->slot == 0 && ctx->pkt->pkt_has_store_s1) { \ + if (insn->slot == 0 && ctx->pkt->pkt_has_scalar_store_s1) { \ process_store(ctx, 1); \ } \ } while (0) @@ -524,7 +524,7 @@ static inline TCGv gen_read_ireg(TCGv result, TCGv val, int shift) #define fLOAD(NUM, SIZE, SIGN, EA, DST) \ do { \ - check_noshuf(env, pkt_has_store_s1, slot, EA, SIZE, GETPC()); \ + check_noshuf(env, pkt_has_scalar_store_s1, slot, EA, SIZE, GETPC()); \ DST = (size##SIZE##SIGN##_t)MEM_LOAD##SIZE(env, EA, GETPC()); \ } while (0) #endif diff --git a/target/hexagon/decode.c b/target/hexagon/decode.c index 23deba2426..b5ece60450 100644 --- a/target/hexagon/decode.c +++ b/target/hexagon/decode.c @@ -236,9 +236,9 @@ static void decode_set_insn_attr_fields(Packet *pkt) if (GET_ATTRIB(opcode, A_SCALAR_STORE) && !GET_ATTRIB(opcode, A_MEMSIZE_0B)) { if (pkt->insn[i].slot == 0) { - pkt->pkt_has_store_s0 = true; + pkt->pkt_has_scalar_store_s0 = true; } else { - pkt->pkt_has_store_s1 = true; + pkt->pkt_has_scalar_store_s1 = true; } } } diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index 2c5e15cfcf..7c73772e40 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -395,7 +395,8 @@ static inline void gen_store_conditional8(DisasContext *ctx, #ifndef CONFIG_HEXAGON_IDEF_PARSER static TCGv gen_slotval(DisasContext *ctx) { - int slotval = (ctx->pkt->pkt_has_store_s1 & 1) | (ctx->insn->slot << 1); + int slotval = + (ctx->pkt->pkt_has_scalar_store_s1 & 1) | (ctx->insn->slot << 1); return tcg_constant_tl(slotval); } #endif diff --git a/target/hexagon/idef-parser/parser-helpers.c b/target/hexagon/idef-parser/parser-helpers.c index a7dcd85fe4..3316c230f8 100644 --- a/target/hexagon/idef-parser/parser-helpers.c +++ b/target/hexagon/idef-parser/parser-helpers.c @@ -1725,7 +1725,7 @@ void gen_cancel(Context *c, YYLTYPE *locp) void gen_load_cancel(Context *c, YYLTYPE *locp) { - OUT(c, locp, "if (insn->slot == 0 && pkt->pkt_has_store_s1) {\n"); + OUT(c, locp, "if (insn->slot == 0 && pkt->pkt_has_scalar_store_s1) {\n"); OUT(c, locp, "ctx->s1_store_processed = false;\n"); OUT(c, locp, "process_store(ctx, 1);\n"); OUT(c, locp, "}\n"); @@ -1750,7 +1750,7 @@ void gen_load(Context *c, YYLTYPE *locp, HexValue *width, /* Lookup the effective address EA */ find_variable(c, locp, ea, ea); - OUT(c, locp, "if (insn->slot == 0 && pkt->pkt_has_store_s1) {\n"); + OUT(c, locp, "if (insn->slot == 0 && pkt->pkt_has_scalar_store_s1) {\n"); OUT(c, locp, "probe_noshuf_load(", ea, ", ", width, ", ctx->mem_idx);\n"); OUT(c, locp, "process_store(ctx, 1);\n"); OUT(c, locp, "}\n"); diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 6da8db8ea5..6ff37680d9 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -463,11 +463,11 @@ void HELPER(probe_pkt_scalar_hvx_stores)(CPUHexagonState *env, int mask) * If the load is in slot 0 and there is a store in slot1 (that * wasn't cancelled), we have to do the store first. */ -static void check_noshuf(CPUHexagonState *env, bool pkt_has_store_s1, +static void check_noshuf(CPUHexagonState *env, bool pkt_has_scalar_store_s1, uint32_t slot, target_ulong vaddr, int size, uintptr_t ra) { - if (slot == 0 && pkt_has_store_s1 && + if (slot == 0 && pkt_has_scalar_store_s1 && ((env->slot_cancelled & (1 << 1)) == 0)) { probe_read(env, vaddr, size, MMU_USER_IDX, ra); commit_store(env, 1, ra); diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 5271c4e022..aca77dfdb1 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -705,11 +705,11 @@ static void process_store_log(DisasContext *ctx) * the memory accesses overlap. */ Packet *pkt = ctx->pkt; - if (pkt->pkt_has_store_s1) { + if (pkt->pkt_has_scalar_store_s1) { g_assert(!pkt->pkt_has_dczeroa); process_store(ctx, 1); } - if (pkt->pkt_has_store_s0) { + if (pkt->pkt_has_scalar_store_s0) { g_assert(!pkt->pkt_has_dczeroa); process_store(ctx, 0); } @@ -834,8 +834,9 @@ static void gen_commit_packet(DisasContext *ctx) * involved in committing the packet. */ Packet *pkt = ctx->pkt; - bool has_store_s0 = pkt->pkt_has_store_s0; - bool has_store_s1 = (pkt->pkt_has_store_s1 && !ctx->s1_store_processed); + bool has_store_s0 = pkt->pkt_has_scalar_store_s0; + bool has_store_s1 = + (pkt->pkt_has_scalar_store_s1 && !ctx->s1_store_processed); bool has_hvx_store = pkt_has_hvx_store(pkt); if (pkt->pkt_has_dczeroa) { /* diff --git a/target/hexagon/gen_helper_funcs.py b/target/hexagon/gen_helper_funcs.py index c1f806ac4b..a9c0e27a80 100755 --- a/target/hexagon/gen_helper_funcs.py +++ b/target/hexagon/gen_helper_funcs.py @@ -69,7 +69,7 @@ def gen_helper_function(f, tag, tagregs, tagimms): if hex_common.need_slot(tag): if "A_LOAD" in hex_common.attribdict[tag]: f.write(hex_common.code_fmt(f"""\ - bool pkt_has_store_s1 = slotval & 0x1; + bool pkt_has_scalar_store_s1 = slotval & 0x1; """)) f.write(hex_common.code_fmt(f"""\ uint32_t slot = slotval >> 1; From patchwork Mon Apr 7 15:43:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 14041170 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B1AB2C36010 for ; Mon, 7 Apr 2025 15:44:12 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1odM-00050A-27; Mon, 07 Apr 2025 11:43:36 -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 1u1odK-0004zR-6J for qemu-devel@nongnu.org; Mon, 07 Apr 2025 11:43:34 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1odH-0002gJ-M5 for qemu-devel@nongnu.org; Mon, 07 Apr 2025 11:43:33 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5378dpZ4017451 for ; Mon, 7 Apr 2025 15:43:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= X6WsiV3WAnDhq6R8jZFhwXEKmS+scYU94YlEcS5TmFs=; b=klpwq1B7Lt8p1LG4 +6oAE/ZRw380r/B2yzMtLnpTPkrB6B75MJtBpeNxzjbt4kJmnldShWUVJG1zaaoj QzjADyQLXSIl+I4xY44Zd24lGDNLztmDsn9rV0V5LxWfwOoGgD+fTVxHAWPE0dKZ ggmFvhVPUZxGTR90z24BigAwZR4nqpIVfADKijMbRxRSHROcmYb+X7iHdL7s9HVg fcjzLQ1aoIWDAVSLdl9VAWITGpzDDe0jc2pzFjVE9Ol9nYEeShcfjABCqzGMcNKG /kKj/INrIlbB/6ZPjV0CavIP4JR4vwG7ZvF8L5KZPrlIprjleBA7SFN02F97SBQl kEz72g== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twg3cpk8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 07 Apr 2025 15:43:30 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-736c0306242so6161588b3a.1 for ; Mon, 07 Apr 2025 08:43:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744040609; x=1744645409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X6WsiV3WAnDhq6R8jZFhwXEKmS+scYU94YlEcS5TmFs=; b=TuWBNUuwyZBflVbUe6UTRJpfOA691Rk3wKvfQzVRiXvznBws57K3H7gC7sdckBEhFu tGgw44DyjSAjlridESSOS0eT9uxlaGv/KMn3szAZcgRw8J2VVaTGie/ec5uFzro0ewTH PKjMdXj42ZBS1AjDt4wqk3a7XLaCpQGJeaq0YQoeBzpyMelNhKX+tgwDYghoPUuj5+gP zxLpWeJnHBwvfLdSW+yr+XoMgGmwajR/u0irggQKcXQBzUzuEe0eUsbt57CPYl1628g/ dm3OEvDPr3edM8BW6nAjdegjt0Abd/sbwR54R3X9VC/0rkOTygsrbJLLZcxypuzF1xvd WcMw== X-Gm-Message-State: AOJu0YyfAIYAuSS+LAtPSZpOD4Ohiolxkg+nYUhx6KrtR3R6RJo/LifH 0xGf8LOvLyoOtb2ksX6M82clLcwof3QXY69a9YLxCJr8JuQfNcLScTg/vjjav6rBWwFxbzjLmAl 7mUQJvZgvOKVDttHxaCWWOpl2juEFr6nl7bYsVoe0cHy1xju1qkGAT5xXwzqwJQ== X-Gm-Gg: ASbGncuZouQI0xYlzBoI98EAr9YGJKbFW5Tv5jPO3G1a0FRBMM7dm+0L0i4WFRCXp3k tR3zqULa8zUjMdE7XZUgd9sQRFnb6XPFWBEuc5mm5w0q6A+GfxL0VyCxK++DsmknK5jS5C0j7fX amZkyb7f0NpEhtNt5RELMGjkoYeK0QRJPcqn71oDJcWxRlNzqRI1t/YUh8tL1VeX3DNWD3+JuXk QBhbe1pNWzjWo08H92Ts14O6UVmMB9iFpBliP2wvC/hV+k4BS6jt/sn7qwIdIRXgKpKG0k/yW1/ C5U6WU0hPW45LSW5X1AVcRD3yIKWvsevc5AKCjqMXHoI5u6eFNZAbEFHIq7sazJX X-Received: by 2002:a05:6a00:b8b:b0:736:a77d:5412 with SMTP id d2e1a72fcca58-739e4b49c5fmr19988753b3a.12.1744040609139; Mon, 07 Apr 2025 08:43:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFQeAr9ajGrDQKjNop7jHbF4ikCA4GizpaCnuI6zn6rmXOdH/x0wk7LMm+cdDBS4j3G+VLh+w== X-Received: by 2002:a05:6a00:b8b:b0:736:a77d:5412 with SMTP id d2e1a72fcca58-739e4b49c5fmr19988706b3a.12.1744040608741; Mon, 07 Apr 2025 08:43:28 -0700 (PDT) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739d97ee3fesm8681651b3a.37.2025.04.07.08.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 08:43:28 -0700 (PDT) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, matheus.bernardino@oss.qualcomm.com, ale@rev.ng, anjo@rev.ng, marco.liebel@oss.qualcomm.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com, Brian Cain Subject: [PATCH v2 5/5] target/hexagon: Remove unreachable Date: Mon, 7 Apr 2025 08:43:14 -0700 Message-Id: <20250407154314.2512587-6-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407154314.2512587-1-brian.cain@oss.qualcomm.com> References: <20250407154314.2512587-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: yLwZWNWBqq89tzbMczP_ddhT569_2MdF X-Proofpoint-ORIG-GUID: yLwZWNWBqq89tzbMczP_ddhT569_2MdF X-Authority-Analysis: v=2.4 cv=I/9lRMgg c=1 sm=1 tr=0 ts=67f3f2a2 cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=WeWQB0ruK5ITHrmzxTQA:9 a=QEXdDO2ut3YA:10 a=zc0IvFSfCIW2DFIPzwfm:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-07_04,2025-04-03_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 phishscore=0 suspectscore=0 mlxlogscore=706 lowpriorityscore=0 spamscore=0 clxscore=1015 malwarescore=0 adultscore=0 priorityscore=1501 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504070109 Received-SPF: pass client-ip=205.220.180.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Brian Cain We should raise an exception in the event that we encounter a packet that can't be correctly decoded, not fault. Signed-off-by: Brian Cain --- target/hexagon/decode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/hexagon/decode.c b/target/hexagon/decode.c index b5ece60450..1db7f1950f 100644 --- a/target/hexagon/decode.c +++ b/target/hexagon/decode.c @@ -489,7 +489,6 @@ decode_insns(DisasContext *ctx, Insn *insn, uint32_t encoding) insn->iclass = iclass_bits(encoding); return 1; } - g_assert_not_reached(); } else { uint32_t iclass = get_duplex_iclass(encoding); unsigned int slot0_subinsn = get_slot0_subinsn(encoding); @@ -512,6 +511,11 @@ decode_insns(DisasContext *ctx, Insn *insn, uint32_t encoding) } g_assert_not_reached(); } + /* + * invalid/unrecognized opcode; return 1 and let gen_insn() raise an + * exception when it sees this empty insn. + */ + return 1; } static void decode_add_endloop_insn(Insn *insn, int loopnum)