From patchwork Tue Nov 2 13:42:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12598919 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00606C433EF for ; Tue, 2 Nov 2021 13:56:50 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id AEF9160EDF for ; Tue, 2 Nov 2021 13:56:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AEF9160EDF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:41686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhuHQ-0001OC-UG for qemu-devel@archiver.kernel.org; Tue, 02 Nov 2021 09:56:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhu4U-0000A2-EG for qemu-devel@nongnu.org; Tue, 02 Nov 2021 09:43:27 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:35490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhu4Q-00060t-Py for qemu-devel@nongnu.org; Tue, 02 Nov 2021 09:43:25 -0400 Received: by mail-wm1-x335.google.com with SMTP id 77-20020a1c0450000000b0033123de3425so2008411wme.0 for ; Tue, 02 Nov 2021 06:43:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vrlE266b7OXg2/V52v1brIFbPFZKEknGt9V0I3M5muc=; b=NO1AUGGw7Md3Y3jN74ibN+c+Zz5HwY+s/ahJRo2a+QNKtshx3l8jbekZcwmX8nmzMA 4JPyjt8nbYvgHlfuq03LS0sVGav8DbAMasFwEoctBOXYNFYf1+lz9E1V19iDXMhoBC4+ yo1vjz6o16sHlHMR98zovtIgoKyQ0uX6sETUSKJM6HSMUrKG9pGQM2Y1GujKyOXvbOSO gm1VoWjorxCWP1rSAgoJCdBuPq8HAA+pZZY//qua/ey8APtJpcS+HRSl5OwztpeXn/yC fI3e/B07PUTLNR5ny/PJBIJs4jaY7mX3CQj4cRDnKyWTdMKi/0QDAeyOlwrN7VzE7Ml4 HKPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vrlE266b7OXg2/V52v1brIFbPFZKEknGt9V0I3M5muc=; b=vWWIv+VTScoQ9m6xnfDOmaVPzsXRpoPq+4hNV9v7LcQBeRD4OygGnM1D/8z4iwfVW+ PDz+ZDfhKOkSfWznfMn15Br8wLWdYClvyL1znjejn2CTqfB6aZq3E+xy46Bc5QQ5Vz// n3rQaoTpNZQg3FUufUV18S3werjIBXbFberwJLYHhcIH3WH6hNWBNs9AZz3iXA9RcTq9 ZaFHTdj9kMEb+ezNNX+ekdzfof3YUMYSdJZaUbyWy8s2HJdg4Pm+yynUxntNLP0o0DqZ cs98FGI516cQov3kglDStq49m9LrAqSl38Deqjvtq3RosSGYBmCubZ9pyjKHBgzScDbo L/jA== X-Gm-Message-State: AOAM532vZcBzbgk6JGD5D2Sm6cIO+XLfkM7MbgSlbewDofmumB4R6sOb Vz6tTzTUBHD0z6fKYHKUBeqtCOhPAbs= X-Google-Smtp-Source: ABdhPJxBYpLiFOjYIfks7nyUBYUI+fo1UwPsKDQ95alpb5e9bNDYn3LjLJDdVkaPUwrsRyfpqQ1ULw== X-Received: by 2002:a05:600c:4fd4:: with SMTP id o20mr6956863wmq.175.1635860601287; Tue, 02 Nov 2021 06:43:21 -0700 (PDT) Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id p12sm5997845wrr.10.2021.11.02.06.43.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 06:43:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 08/41] target/mips: Have check_msa_access() return a boolean Date: Tue, 2 Nov 2021 14:42:07 +0100 Message-Id: <20211102134240.3036524-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211102134240.3036524-1-f4bug@amsat.org> References: <20211102134240.3036524-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x335.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Aleksandar Rikalo , Richard Henderson , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Have check_msa_access() return a boolean value so we can return early if MSA is not enabled (the instruction got decoded properly, but we raised an exception). Reviewed-by: Jiaxun Yang Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20211028210843.2120802-6-f4bug@amsat.org> --- target/mips/tcg/msa_translate.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translate.c index b135c58fd4f..e0ccd8c1cb8 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -295,19 +295,24 @@ void msa_translate_init(void) } } -static inline int check_msa_access(DisasContext *ctx) +/* + * Check if MSA is enabled. + * This function is always called with MSA available. + * If MSA is disabled, raise an exception. + */ +static inline bool check_msa_enabled(DisasContext *ctx) { if (unlikely((ctx->hflags & MIPS_HFLAG_FPU) && !(ctx->hflags & MIPS_HFLAG_F64))) { gen_reserved_instruction(ctx); - return 0; + return false; } if (unlikely(!(ctx->hflags & MIPS_HFLAG_MSA))) { generate_exception_end(ctx, EXCP_MSADIS); - return 0; + return false; } - return 1; + return true; } static void gen_check_zero_element(TCGv tresult, uint8_t df, uint8_t wt, @@ -339,7 +344,9 @@ static bool gen_msa_BxZ_V(DisasContext *ctx, int wt, int s16, TCGCond cond) { TCGv_i64 t0; - check_msa_access(ctx); + if (!check_msa_enabled(ctx)) { + return true; + } if (ctx->hflags & MIPS_HFLAG_BMASK) { gen_reserved_instruction(ctx); @@ -371,7 +378,9 @@ static bool trans_BNZ_V(DisasContext *ctx, arg_msa_bz *a) static bool gen_msa_BxZ(DisasContext *ctx, int df, int wt, int s16, bool if_not) { - check_msa_access(ctx); + if (!check_msa_enabled(ctx)) { + return true; + } if (ctx->hflags & MIPS_HFLAG_BMASK) { gen_reserved_instruction(ctx); @@ -2143,7 +2152,9 @@ static bool trans_MSA(DisasContext *ctx, arg_MSA *a) { uint32_t opcode = ctx->opcode; - check_msa_access(ctx); + if (!check_msa_enabled(ctx)) { + return true; + } switch (MASK_MSA_MINOR(opcode)) { case OPC_MSA_I8_00: