From patchwork Sat Mar 1 05:25:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 13997307 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 9E3ADC282D0 for ; Sat, 1 Mar 2025 05:28:26 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1toFNL-0002rV-T9; Sat, 01 Mar 2025 00:26:59 -0500 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 1toFNJ-0002qQ-3I for qemu-devel@nongnu.org; Sat, 01 Mar 2025 00:26:57 -0500 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 1toFNH-000866-Ff for qemu-devel@nongnu.org; Sat, 01 Mar 2025 00:26:56 -0500 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 5214ekFj022292 for ; Sat, 1 Mar 2025 05:26:54 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= yWTZ7VRtzDmAXfV3dJSDJ4TXwiMNm3kRuELPzv2n3L0=; b=AkhRQxMJjE4s2Sdo 5JFL64SgP5yr4vsoN0nvrgzmRqxIY6laO19PixAmDEDgoiQZ+smYsJ/mIFySx0a1 t4i48mOnEZvroqoVBWUB874C0gPzheiRl6zaxuqtZ6mARKN4Hlj9N0TDwW0ZA7bO 8TN1EV+f5F3/u3X4BlKp9pilWXS4LtPOE0YlKRHfwS/SrI4uwcFOfy1H/P6WHp2Z Lj+JjpSeAhy4FqmeYwJ8USMziCPh1qWtTcMYtgVOHurQUC1WLz+4rKMysguYN8ts gIgPZofEMYNG8iYjZYO+aVgjgF8LrbNIzSr2PhuQH9m54Nz/DYFCdjszyO1fG3Cy kxK5Pw== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 453tm5g4sk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 01 Mar 2025 05:26:54 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-22334230880so39434625ad.1 for ; Fri, 28 Feb 2025 21:26:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740806813; x=1741411613; 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=yWTZ7VRtzDmAXfV3dJSDJ4TXwiMNm3kRuELPzv2n3L0=; b=Z6bywpAOx4VtLChIOmpWmxsDMZNTLpzE1wScXPj/FMWvQvTPlAw40ZZyAjJ3YclUZz 8kh72DKh7UKUHKLpiN15j9N6JRc2Z8iJbX7ulKvavz7K9EKGvLsOYCb/emRoy/GVvXGB aV9IWYGkv32NZrrp1OujCfWudaYQFHCSnIMTVLHNNkIHMpB/aWPCGw54lx5Be6K4DGbZ cfqlwlCO4R1SPgdljeCcHvUdISn9ZFxZLPTuMXyhkf09fohS3URmRNT85YUcY2eVDxSC yOQVmV9Dv0VXmKp5UEfTJqFJ/d/KTPfM/2r0musNFE4SFkzgBL2B7y7cXln7YI2ypnrL ADIw== X-Gm-Message-State: AOJu0YybsWiPAtZKz2P55aqu6x47ujIkyzUBsYR7DAIab2UaxI803sAf BMcVLqKGlv9xFRG8dX3JR9fE25UJ6FH3xiutx/srmMBDIbljDk3LwijDIiVuzCww+ViXBjmC1qB CiYr8bFmahVLXesHet8kNaOHm7rQgkc1B56ZPU4o/+we7CM3SOVEOL/j2SHgCJA== X-Gm-Gg: ASbGncsUFdXXUrI18akCteaIOAXDbbXMmQxMixX8U8sIIVM6ks8b18w9xuVEhDMwTFk UaYujJFgBfXTviUeA5+pXB7ZxcGw9mbgDVxuemlrl6RpszylJwSrZFalwKiKTloF0132DYx7iJM oC7Xuj3F39TV5Y8oQIFiVSYIAHOUGvjgAJ9AJ8Wdo7MXqP7UGyWeonGLWcx1n5ye3BM3c3VBaFI q7tKnl7gMG0gYD6k3UrtlPJQGt4fxLAxb9ZuasadgGg/MgkBTufZTS8dozrmmACDd8hGc3Pi0yr oS0Ip1PSIf5DFGKeRkzIp7oPrPyTL+iBl7j/2YaOwgVN4Ykgcyz5oyj5MNcEr16K X-Received: by 2002:a17:903:1987:b0:216:410d:4c53 with SMTP id d9443c01a7336-22369254a72mr99159195ad.41.1740806812999; Fri, 28 Feb 2025 21:26:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IFrg5Q5VXZfCCWBWKg/xDXzMlJzIafsgkYzEFt9ZyMG8WBHkBN0pH8o0tOxv1jRcmUOCovNlQ== X-Received: by 2002:a17:903:1987:b0:216:410d:4c53 with SMTP id d9443c01a7336-22369254a72mr99159015ad.41.1740806812656; Fri, 28 Feb 2025 21:26:52 -0800 (PST) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fe825bb346sm6930596a91.18.2025.02.28.21.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 21:26:52 -0800 (PST) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, quic_mathbern@quicinc.com, ale@rev.ng, anjo@rev.ng, quic_mliebel@quicinc.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com, Brian Cain Subject: [PATCH 04/38] target/hexagon: Make gen_exception_end_tb non-static Date: Fri, 28 Feb 2025 21:25:54 -0800 Message-Id: <20250301052628.1011210-5-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250301052628.1011210-1-brian.cain@oss.qualcomm.com> References: <20250301052628.1011210-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: rTu9tM_O5Bj4pPwqHXh24TCB0sCxWil2 X-Proofpoint-GUID: rTu9tM_O5Bj4pPwqHXh24TCB0sCxWil2 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-01_01,2025-02-28_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 malwarescore=0 mlxlogscore=874 suspectscore=0 priorityscore=1501 adultscore=0 clxscore=1015 bulkscore=0 mlxscore=0 phishscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502100000 definitions=main-2503010038 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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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/translate.h | 2 ++ target/hexagon/translate.c | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/target/hexagon/translate.h b/target/hexagon/translate.h index d251e2233f..2bd125297a 100644 --- a/target/hexagon/translate.h +++ b/target/hexagon/translate.h @@ -281,6 +281,8 @@ extern TCGv hex_vstore_addr[VSTORES_MAX]; extern TCGv hex_vstore_size[VSTORES_MAX]; extern TCGv hex_vstore_pending[VSTORES_MAX]; +void hex_gen_exception_end_tb(DisasContext *ctx, int excp); + void process_store(DisasContext *ctx, int slot_num); FIELD(PROBE_PKT_SCALAR_STORE_S0, MMU_IDX, 0, 2) diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index fe7858703c..2e9a934fc6 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -185,13 +185,12 @@ static void gen_end_tb(DisasContext *ctx) ctx->base.is_jmp = DISAS_NORETURN; } -static void gen_exception_end_tb(DisasContext *ctx, int excp) +void hex_gen_exception_end_tb(DisasContext *ctx, int excp) { gen_exec_counters(ctx); tcg_gen_movi_tl(hex_gpr[HEX_REG_PC], ctx->next_PC); gen_exception_raw(excp); ctx->base.is_jmp = DISAS_NORETURN; - } static int read_packet_words(CPUHexagonState *env, DisasContext *ctx, @@ -558,7 +557,7 @@ static void gen_insn(DisasContext *ctx) ctx->insn->generate(ctx); mark_store_width(ctx); } else { - gen_exception_end_tb(ctx, HEX_CAUSE_INVALID_OPCODE); + hex_gen_exception_end_tb(ctx, HEX_CAUSE_INVALID_OPCODE); } } @@ -912,7 +911,7 @@ static void decode_and_translate_packet(CPUHexagonState *env, DisasContext *ctx) nwords = read_packet_words(env, ctx, words); if (!nwords) { - gen_exception_end_tb(ctx, HEX_CAUSE_INVALID_PACKET); + hex_gen_exception_end_tb(ctx, HEX_CAUSE_INVALID_PACKET); return; } @@ -927,7 +926,7 @@ static void decode_and_translate_packet(CPUHexagonState *env, DisasContext *ctx) gen_commit_packet(ctx); ctx->base.pc_next += pkt.encod_pkt_size_in_bytes; } else { - gen_exception_end_tb(ctx, HEX_CAUSE_INVALID_PACKET); + hex_gen_exception_end_tb(ctx, HEX_CAUSE_INVALID_PACKET); } }