From patchwork Mon Mar 6 15:34:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 659243 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1899324wrb; Mon, 6 Mar 2023 08:14:31 -0800 (PST) X-Google-Smtp-Source: AK7set9jl/wcCu71DuY8cMbFJWTprSygEP4pjmSKIp7WvbQza5vBvwhxDokFvGOWOYx1Chgf+Rwg X-Received: by 2002:a05:622a:1b9e:b0:3bc:fa79:c20c with SMTP id bp30-20020a05622a1b9e00b003bcfa79c20cmr26097190qtb.16.1678119270817; Mon, 06 Mar 2023 08:14:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678119270; cv=none; d=google.com; s=arc-20160816; b=BqG5ZBsMaHc3KNDOboT3+k51os60PQ1VoIi2it+UcZHT/kT8Bm4B97HH5+Iv9IANNl KpA3h+FJZX7TBV/MqQ7H5Bs2WuQiv4wVHzstaD2hfdHgiuASSarhTgmwD6A2L2LeGxyw Spx/sJcjEl/ZIfds5AX91+N1oNJ2+k7b4cF6eC5Jhy3N67HXd6ZCqab+f1qW9soIQX4b VAn6FCUtYP7XNKUuYaCAA5bNUQjWG4Vi7y1Kj9+iAtjrJtHr2mL3q65xNYIw1ubvqHjz wQQfch3tOBfY6IMjxldd6IEsfpXGJgsxHCA6O+NfrZc4d+n9ObA/BMaZDUMuadw2umw+ dYjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=7zDGynslJU4b+FRAwgcAI/YIPi0m+DP8+CtCFF4RjQo=; b=t5n092qCiZbYwkG90VsXL5nGdv3y6JjS6GhXOIlopqcZEP7z88bz4bcpkYi2Igua8N /pbxYKSFSjuHNPGbTfIzjpUAfFoIHiFxhIAdK52uNSuudIUQKFooqMsnkKkS7gKL5jnS LBrZPbWJ99+zPB8VcYbjLBWiSlXvLRNB/voSZJlEB6Ild3yYEfStu2AYixHDHyob0XTm PL++OBgLxRKWS9a9leoI4/JdNwUNnnOBdagDUwnvJYyMdR4FyUyhqB1aKDkUkMiyAUbm fEykgLrs8gH0cGYoSDjpDhTUVNp0HoX8hatRYGO3qQVDjfBJ4xXSkroSwqG3nuaA7Lra YQPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RPPRzob5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v3-20020a05622a014300b003b63fc5da68si7734439qtw.539.2023.03.06.08.14.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Mar 2023 08:14:30 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RPPRzob5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZCrT-00045V-Lf; Mon, 06 Mar 2023 10:34:51 -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 1pZCrS-000448-04 for qemu-devel@nongnu.org; Mon, 06 Mar 2023 10:34:50 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZCrQ-0002At-9N for qemu-devel@nongnu.org; Mon, 06 Mar 2023 10:34:49 -0500 Received: by mail-wm1-x32e.google.com with SMTP id m25-20020a7bcb99000000b003e7842b75f2so5441626wmi.3 for ; Mon, 06 Mar 2023 07:34:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678116887; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7zDGynslJU4b+FRAwgcAI/YIPi0m+DP8+CtCFF4RjQo=; b=RPPRzob5zs5tkt/8nf/YsDMV/82t16+udjpVuEU0lfsa2bjIl/UbH7+UpwGDlcVWuE r86NOEZcHwqJ9Eps0hOBZKUb8o0uSc7I/8BI6pGhnhjLt3lR3d2J9cxk4c1pDgFKPcIi JbhUP/j6kZXhOW7t3Jqevz4fNbS4BNmXS5BV2L9MxYGb95YIdwnhDcjaRzVu682HeLmg gJ5gWG9GbV+n1nd+aofMGCjKS9ejgq+0m3SCLuMc0fXmte/JQc5c9AaCSorEQaBNt1NX i0bhrciFCzOzcCUz+EF5zKEyQvYnn8jn43u0oyetXK9TiZavplLdbxsilDz/5PgF3/Fs i0Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678116887; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7zDGynslJU4b+FRAwgcAI/YIPi0m+DP8+CtCFF4RjQo=; b=TwLocXsK30CSPqtfcPEhm9rHhWhb8Gel73smXy4NK8DEoNer46OHOkzV/VHL8YqRmL JWTcZ+kYj3Xd5ZyfUmgbLqN73Qycse6jd429WsoDfvfu9ON2kRBINxukNBWafm+NnQI+ EX3mrgwPA7w2yeoRDMdPMZH7oLwoKHwlreSWzSFE4sDP8A6x1Pw3N1EpQMID77YPkQKH 9ZpMW1isKUfbHOq8LlsBH1HgeWtjyXP87L5CGiBHLUBdenSKd32+gopzMn35OGZjJnFN nqpz+R07JBDG2JSKs7kRJc8dTsXFwoKkhBY8K5+ByVyS1kL7IGLZEZG1MeUXn1aMt8X1 TU8A== X-Gm-Message-State: AO0yUKUGEyRgeV+fqWejajsn8vWBTndJLjbYJPlJAWh7i9k68DHe+uUC w+zOV6TVMybArQuf7LtJRtzxC9Riqbun7elEPkA= X-Received: by 2002:a7b:cb01:0:b0:3ea:d611:f8 with SMTP id u1-20020a7bcb01000000b003ead61100f8mr10229648wmj.38.1678116886909; Mon, 06 Mar 2023 07:34:46 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v7-20020a05600c444700b003eb0d6f48f3sm15287432wmn.27.2023.03.06.07.34.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 07:34:46 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 12/21] target/arm: Export arm_v7m_mrs_control Date: Mon, 6 Mar 2023 15:34:26 +0000 Message-Id: <20230306153435.490894-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306153435.490894-1-peter.maydell@linaro.org> References: <20230306153435.490894-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: David Reiss Allow the function to be used outside of m_helper.c. Rename with an "arm_" prefix. Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: David Reiss Signed-off-by: Richard Henderson Message-id: 20230227213329.793795-13-richard.henderson@linaro.org [rth: Split out of a larger patch] Signed-off-by: Richard Henderson Signed-off-by: Peter Maydell --- target/arm/internals.h | 3 +++ target/arm/tcg/m_helper.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index dda89aa5dff..086e88e2377 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1357,6 +1357,9 @@ void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp); void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp); #endif +/* Read the CONTROL register as the MRS instruction would. */ +uint32_t arm_v7m_mrs_control(CPUARMState *env, uint32_t secure); + #ifdef CONFIG_USER_ONLY static inline void define_cortex_a72_a57_a53_cp_reginfo(ARMCPU *cpu) { } #else diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index f94e87e7289..03be79e7bfa 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -56,7 +56,7 @@ static uint32_t v7m_mrs_xpsr(CPUARMState *env, uint32_t reg, unsigned el) return xpsr_read(env) & mask; } -static uint32_t v7m_mrs_control(CPUARMState *env, uint32_t secure) +uint32_t arm_v7m_mrs_control(CPUARMState *env, uint32_t secure) { uint32_t value = env->v7m.control[secure]; @@ -93,7 +93,7 @@ uint32_t HELPER(v7m_mrs)(CPUARMState *env, uint32_t reg) case 0 ... 7: /* xPSR sub-fields */ return v7m_mrs_xpsr(env, reg, 0); case 20: /* CONTROL */ - return v7m_mrs_control(env, 0); + return arm_v7m_mrs_control(env, 0); default: /* Unprivileged reads others as zero. */ return 0; @@ -2465,7 +2465,7 @@ uint32_t HELPER(v7m_mrs)(CPUARMState *env, uint32_t reg) case 0 ... 7: /* xPSR sub-fields */ return v7m_mrs_xpsr(env, reg, el); case 20: /* CONTROL */ - return v7m_mrs_control(env, env->v7m.secure); + return arm_v7m_mrs_control(env, env->v7m.secure); case 0x94: /* CONTROL_NS */ /* * We have to handle this here because unprivileged Secure code