From patchwork Sat Mar 1 05:28:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 13997332 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 973ADC021B8 for ; Sat, 1 Mar 2025 05:31:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1toFQF-00044b-1W; Sat, 01 Mar 2025 00:29: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 1toFQA-0003VI-PD for qemu-devel@nongnu.org; Sat, 01 Mar 2025 00:29:54 -0500 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 1toFQ8-0008Vn-7s for qemu-devel@nongnu.org; Sat, 01 Mar 2025 00:29:54 -0500 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5214eiN1031822 for ; Sat, 1 Mar 2025 05:29:41 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= +2Uu93RgWR6oL6wb6Fda56k1MooPgz2Lg2tWOd7viHI=; b=Q2uIPxKMOBGjTnkS vKxs3lzXX6DTVgjTeYnz8xUieSG/C8B/86TdJkJwqnOvCRcNzs+oUbgBQ5auE9IA ihugb3PxKBau3r2MPzxy5D5YI/FlsD7g1ySV85F1sQl7IuyV7kNlhepXgQuTShL9 7o2NKxPp4qq+Ex8pQnmOb/G+/yW2Ljrn09i9/rpuU7ebJcnssJZ8Ln1P+kwZuSg8 +vBRg4Tl/ZcuFO745IsZWQMhCdVWPMLUwMH05cKNCF2u64XxFhau6e/fJc+9DjGR 3iMOJmdL3/rKz/bBEDB8xt7NbJUXTJoJHLv+sSBRLis70/Ld8ub11SdYFy901JoG BiOkhw== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 453udgr2ay-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 01 Mar 2025 05:29:40 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-223725a1e76so20314255ad.0 for ; Fri, 28 Feb 2025 21:29:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740806980; x=1741411780; 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=+2Uu93RgWR6oL6wb6Fda56k1MooPgz2Lg2tWOd7viHI=; b=Ju7aZd5Vt+vxEClJp2miLZ/KFNYS8n/6G2YKyVe/bIB29gdo8HD9G4yWAa9Zi8i0xh lx16z3CQ+fI6e5U7FfXW4kmisDgHh64blXDiGdPVGa9FBPj0CV7ItoNTeW9S05oNNuQK EHcpQL/S5A8hXXQr/rBBJCl5K9y147bQLcucucCkz/str2nojWmtqpzikafMEWWLZZ5q 1K+0ioB4GLZjoGKyZXgpPf2vwlfxfGylDYRWIQCKD8c6Itgdr5uuv5gsWZUUip/20hBY 8uCWjBiWE9tnMBrkyMv3wkwoVbpANkgqvQ/u9D1tJaonD/95+PnMYMF8QZ5l2YnPOou6 9cPQ== X-Gm-Message-State: AOJu0YxebEcng0duarUFCTSgqAU90aoYbMvE/XoCOFQMzfmX9GKe0+eu xFVtNTn/f+XCc23YNPfCg7Gl13nFqd2pySh6JyT7I/13nKTGpJkSaqOoorj3/McSD7sjUevMjjj 1XEwvzQc185r3SRfb6Nc7s5jhCHQ0YWDgo4X3iaJo6xktGnMAiFMzbz8VHPzvgw== X-Gm-Gg: ASbGnctSgkCIZw4/2XWwcTtLdkqYOWZawzG6tM8K7briI12gdOeJYTk/61uM8qR6+gs q0uxrbL+e2YYxzKL+xuEZDdAZqw1UWlxuMxFp3H5iT5Uo11vERyp7z0VQA/FYWlWlAoEx7zecXX +vamjopJsKwHbHW7E1dns2AhSwwdpcSqYdWYLOnmnFfsMCdWAMUBQaLuYW3trP4I4QgOj7yvSQb dkX9lOBdDWmAtL/joxAFSGn1tjXw+yoS3a7rQX106Y/Y53b/SCHtq4z1RyAg6aKMwzNz4XR0zYQ IGdsanfaFHDv1obcZY8hcRem6sSjf/ru6tXVKv+MDZ1cm5+DgoLXBsS7rBFCeWAP X-Received: by 2002:a17:902:ef45:b0:223:653e:eb06 with SMTP id d9443c01a7336-223690e1497mr114207635ad.26.1740806979839; Fri, 28 Feb 2025 21:29:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IFPa/IsZnnGAKvKU5ODffoAPuI3rOMGxJeW/K21ii4Y7w+TdZsQSl9/E+IBCdfBuOYFhCzFpw== X-Received: by 2002:a17:902:ef45:b0:223:653e:eb06 with SMTP id d9443c01a7336-223690e1497mr114207225ad.26.1740806979376; Fri, 28 Feb 2025 21:29:39 -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-2fea67a5dc8sm4732955a91.23.2025.02.28.21.29.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 21:29:38 -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 Subject: [PATCH 38/39] target/hexagon: Add guest reg reading functionality Date: Fri, 28 Feb 2025 21:28:44 -0800 Message-Id: <20250301052845.1012069-39-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250301052845.1012069-1-brian.cain@oss.qualcomm.com> References: <20250301052845.1012069-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: b_0N1umVmUVA-nfgdsqczqDNpl3KdS4f X-Proofpoint-ORIG-GUID: b_0N1umVmUVA-nfgdsqczqDNpl3KdS4f 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 adultscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 mlxscore=0 suspectscore=0 bulkscore=0 impostorscore=0 mlxlogscore=999 priorityscore=1501 phishscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502100000 definitions=main-2503010040 Received-SPF: pass client-ip=205.220.168.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0a-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: Matheus Tavares Bernardino Signed-off-by: Matheus Tavares Bernardino --- target/hexagon/cpu.c | 19 ++++++++++++++++++- target/hexagon/op_helper.c | 19 +++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index 3c4776232e..80f5e23794 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -739,7 +739,24 @@ static void hexagon_cpu_class_init(ObjectClass *c, void *data) #ifndef CONFIG_USER_ONLY uint32_t hexagon_greg_read(CPUHexagonState *env, uint32_t reg) { - g_assert_not_reached(); + target_ulong ssr = arch_get_system_reg(env, HEX_SREG_SSR); + int ssr_ce = GET_SSR_FIELD(SSR_CE, ssr); + + if (reg <= HEX_GREG_G3) { + return env->greg[reg]; + } + switch (reg) { + case HEX_GREG_GPCYCLELO: + return ssr_ce ? hexagon_get_sys_pcycle_count_low(env) : 0; + + case HEX_GREG_GPCYCLEHI: + return ssr_ce ? hexagon_get_sys_pcycle_count_high(env) : 0; + + default: + qemu_log_mask(LOG_UNIMP, "reading greg %" PRId32 + " not yet supported.\n", reg); + return 0; + } } #endif diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 3bd4e2a872..28b555e873 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -1877,13 +1877,28 @@ uint64_t HELPER(sreg_read_pair)(CPUHexagonState *env, uint32_t reg) } uint32_t HELPER(greg_read)(CPUHexagonState *env, uint32_t reg) + { - g_assert_not_reached(); + return hexagon_greg_read(env, reg); } uint64_t HELPER(greg_read_pair)(CPUHexagonState *env, uint32_t reg) + { - g_assert_not_reached(); + if (reg == HEX_GREG_G0 || reg == HEX_GREG_G2) { + return (uint64_t)(env->greg[reg]) | + (((uint64_t)(env->greg[reg + 1])) << 32); + } + switch (reg) { + case HEX_GREG_GPCYCLELO: { + target_ulong ssr = arch_get_system_reg(env, HEX_SREG_SSR); + int ssr_ce = GET_SSR_FIELD(SSR_CE, ssr); + return ssr_ce ? hexagon_get_sys_pcycle_count(env) : 0; + } + default: + return (uint64_t)hexagon_greg_read(env, reg) | + ((uint64_t)(hexagon_greg_read(env, reg + 1)) << 32); + } } void HELPER(setprio)(CPUHexagonState *env, uint32_t thread, uint32_t prio)