From patchwork Tue Mar 23 18:43:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 406948 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp4726968jai; Tue, 23 Mar 2021 12:23:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqbOlERIaDC2zkRAc/6tistZMcQ/Ei9grJmQVGXyJt1x9dewBZe1ZXtG2dZvLhoG3c3q+B X-Received: by 2002:a05:6638:2a3:: with SMTP id d3mr6224032jaq.42.1616527418225; Tue, 23 Mar 2021 12:23:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616527418; cv=none; d=google.com; s=arc-20160816; b=txeu9zhuq7DlyN9MkY24p5g+YJ8KpY8VYWc6VjjeNFjw5z4wEZtXsn7kJ3tbeg3BVf MDtGAyTKM1bjxSjaYjO4EnjFY7n7OjqkIkCDHPAhZU1g73BxSKzS3Xa8oTTp2TB25eTZ 0sxzgXy4S5Z3h9EHgY2XHB1m5CMoR992YXOsAo2daX4LEzN7Xzf5/yC5vW3KZHZ5uRDa UmkmNTAb16wvIZ9s0Y08Dy15eE0TQkkleafX+1h4UUFWhimhMXVvUidV1kitj/Cna1rP wobNdl1H6PqUGLcZTwCpJ61WAaC4lvkybN2gA9pTcBRsyny90wra83xl2f18eOBmY1Mh xTUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=nDEzeJHZqdUXe/dXYq7qR5PEy35VBqTIPDXHrdEdgcc=; b=Wu2elSxcYHIqFcJiZvMgfiOWzDmbsI42uR+qpGJjnU5b6GkeFvIGjpoh1ssm6r0E+h I5U/qMEeUp61D9C/nbRuTUTspeEy/uIbcKzDBijSFEIGWi5WM1sug0dAHyBEdQPMhFAW CrU5NuUydWlOz1BiI0f/EO8/q7hEV5oLW3yFv6bRgQEFAMD3ORZNK8R/s3dJL5j9oq9v +9OjBSwXHdwcAXBKO65NWsAVuQ4wPSilNkSZX/q0VMx+hjbioRILZHQ0CUA73U0Eip63 oXa7wVRH1LQ6qG9sBrSmSxZlk8i//cWaSHkz0RVrWwPjLOheDtggrVpkrnGOobmqLI/b 9YQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="s/lmuF8T"; 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=fail (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 m3si12587535iol.17.2021.03.23.12.23.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Mar 2021 12:23:38 -0700 (PDT) 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=fail header.i=@linaro.org header.s=google header.b="s/lmuF8T"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOmcr-0001ct-LH for patch@linaro.org; Tue, 23 Mar 2021 15:23:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOm0y-0008O0-5j for qemu-devel@nongnu.org; Tue, 23 Mar 2021 14:44:28 -0400 Received: from mail-ot1-x334.google.com ([2607:f8b0:4864:20::334]:35502) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOm0P-0003hr-1v for qemu-devel@nongnu.org; Tue, 23 Mar 2021 14:44:27 -0400 Received: by mail-ot1-x334.google.com with SMTP id v24-20020a9d69d80000b02901b9aec33371so20481260oto.2 for ; Tue, 23 Mar 2021 11:43:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nDEzeJHZqdUXe/dXYq7qR5PEy35VBqTIPDXHrdEdgcc=; b=s/lmuF8TUfFrYmchVU+a8BF+Df99LWU72xmH0sNvilnp9hMxTpPQTwrnof1rgrCh1M pX2fRGwsXindS7yvVjuD6kn35a27UjT9Xg4JxaJACfhZI6GIBPLuA0VtKOVuSAIAKxZI 1ATGsnalhNW2MIcmtAPq72WjBn9AcsSb7OM8ZU4o8rN2uCP6N7128yFCqFp8o7sQ4bdQ n/zV/M7DaeWHNRr2Co4KoGqV7j2wPse9S8kCGBfaX5ESORyFm6TTFe9d/1vFHS7wQYrJ 52+a9O0/dmXqkaXTXLWMYukt8OFuigkrd8+dCW0v4T82HM31fAWCVQ/3jF2PFSxUJQ/a 8eLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nDEzeJHZqdUXe/dXYq7qR5PEy35VBqTIPDXHrdEdgcc=; b=D1cW7T3F1w+fkxYm/Ve0SD2/QDOj35qJ127DKvtAWaw+s+g7DtJCicsQuBAHchQdwv By4o2Y9krOmT0meqbbElsmJqcxxAzDUWVCbm4XbwS0UWsX+Vn3HBf3oLJj9Qtw+sIP5V +R27sAR4RtOHbiYsWeMWGqsOkGCRy+bbH5YKPZDLljhadBGfZ8vkIzWxV25+l7EDUlE1 dKetqqUK91VdPeX/wPsZMHPqR+57BTAfJsabZMkbRAcAeVplDqTgwCIbRKJeUlp+7lgv ljBNf4qGKz3igt0dT0g8ZvmYrwSY7kXExgZAra6s+EH/0Sf/iZ4NgemPb+YLnY3eK7mm aGvA== X-Gm-Message-State: AOAM532IFbzDiE1XP13cf4bU9LqemzbJfc/sh8u2fjaLPGlS7P5TQ5Rz x6HHiqr/FfEWUh1oifZMu8GBWkU+FD5v7coW X-Received: by 2002:a05:6830:158d:: with SMTP id i13mr5721403otr.8.1616525029547; Tue, 23 Mar 2021 11:43:49 -0700 (PDT) Received: from localhost.localdomain (171.189-204-159.bestelclientes.com.mx. [189.204.159.171]) by smtp.gmail.com with ESMTPSA id x23sm3902825ood.28.2021.03.23.11.43.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 11:43:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 05/10] target/ppc: Create helper_scv Date: Tue, 23 Mar 2021 12:43:35 -0600 Message-Id: <20210323184340.619757-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210323184340.619757-1-richard.henderson@linaro.org> References: <20210323184340.619757-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::334; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x334.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Perform the test against FSCR_SCV at runtime, in the helper. This means we can remove the incorrect set against SCV in ppc_tr_init_disas_context and do not need to add an HFLAGS bit. Signed-off-by: Richard Henderson --- target/ppc/helper.h | 1 + target/ppc/excp_helper.c | 9 +++++++++ target/ppc/translate.c | 20 +++++++------------- 3 files changed, 17 insertions(+), 13 deletions(-) -- 2.25.1 diff --git a/target/ppc/helper.h b/target/ppc/helper.h index 6a4dccf70c..513066d54d 100644 --- a/target/ppc/helper.h +++ b/target/ppc/helper.h @@ -13,6 +13,7 @@ DEF_HELPER_1(rfci, void, env) DEF_HELPER_1(rfdi, void, env) DEF_HELPER_1(rfmci, void, env) #if defined(TARGET_PPC64) +DEF_HELPER_2(scv, noreturn, env, i32) DEF_HELPER_2(pminsn, void, env, i32) DEF_HELPER_1(rfid, void, env) DEF_HELPER_1(rfscv, void, env) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 85de7e6c90..5c95e0c103 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -1130,6 +1130,15 @@ void helper_store_msr(CPUPPCState *env, target_ulong val) } #if defined(TARGET_PPC64) +void helper_scv(CPUPPCState *env, uint32_t lev) +{ + if (env->spr[SPR_FSCR] & (1ull << FSCR_SCV)) { + raise_exception_err(env, POWERPC_EXCP_SYSCALL_VECTORED, lev); + } else { + raise_exception_err(env, POWERPC_EXCP_FU, FSCR_IC_SCV); + } +} + void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) { CPUState *cs; diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 7912495f28..d48c554290 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -173,7 +173,6 @@ struct DisasContext { bool vsx_enabled; bool spe_enabled; bool tm_enabled; - bool scv_enabled; bool gtse; ppc_spr_t *spr_cb; /* Needed to check rights for mfspr/mtspr */ int singlestep_enabled; @@ -4081,15 +4080,16 @@ static void gen_sc(DisasContext *ctx) #if !defined(CONFIG_USER_ONLY) static void gen_scv(DisasContext *ctx) { - uint32_t lev; + uint32_t lev = (ctx->opcode >> 5) & 0x7F; - if (unlikely(!ctx->scv_enabled)) { - gen_exception_err(ctx, POWERPC_EXCP_FU, FSCR_IC_SCV); - return; + /* Set the PC back to the faulting instruction. */ + if (ctx->exception == POWERPC_EXCP_NONE) { + gen_update_nip(ctx, ctx->base.pc_next - 4); } + gen_helper_scv(cpu_env, tcg_constant_i32(lev)); - lev = (ctx->opcode >> 5) & 0x7F; - gen_exception_err(ctx, POWERPC_SYSCALL_VECTORED, lev); + /* This need not be exact, just not POWERPC_EXCP_NONE */ + ctx->exception = POWERPC_SYSCALL_VECTORED; } #endif #endif @@ -7907,12 +7907,6 @@ static void ppc_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) ctx->spe_enabled = (hflags >> HFLAGS_SPE) & 1; ctx->altivec_enabled = (hflags >> HFLAGS_VR) & 1; ctx->vsx_enabled = (hflags >> HFLAGS_VSX) & 1; - if ((env->flags & POWERPC_FLAG_SCV) - && (env->spr[SPR_FSCR] & (1ull << FSCR_SCV))) { - ctx->scv_enabled = true; - } else { - ctx->scv_enabled = false; - } ctx->tm_enabled = (hflags >> HFLAGS_TM) & 1; ctx->gtse = !!(env->spr[SPR_LPCR] & LPCR_GTSE);