From patchwork Thu Apr 21 15:16:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 564361 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp552469map; Thu, 21 Apr 2022 08:44:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytZOiKDwVGo9XmGSKUlT+KF6cLGZHndjUmBxf5Nat/85o5v3nxidgzK+4E7Jwwsh1KAFJf X-Received: by 2002:a05:690c:d:b0:2d0:e02a:6cda with SMTP id bc13-20020a05690c000d00b002d0e02a6cdamr334031ywb.192.1650555899695; Thu, 21 Apr 2022 08:44:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650555899; cv=none; d=google.com; s=arc-20160816; b=f4eOwBv7eNwRQsj/XlyQbzPlyd/ZQ7CqOhkUVjhXIO9C3gpE8sWI9s6/IWVuHkzalj P/vLEZLILtXPT20RNTiI5T2cXx9DFL/o/b0ajkz00CCIi1qRXeDFyH+Rz43ESkOdE0lc 5ISHraac3mzzoBg3MJoNOPAfRxaV1PdyLHzk9m89y5/Q6tZ6UrkxT2I+LSnYGeZOUW+w KAF02091Hu3+0bJQrKw/3zB89hnqcBdne3Nf8kCT4wHlfUvmbWpJWj+AGnbAEpYAERh8 9k9vbB6vVgMAUYM7y6XM0H8MKK0N8yoQCO14HIEP3mUD7m3XUK+ix0BNcHITPrO71s3U S89w== 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=pJcfgBv/PjlYWoRNQ2pxyLVSHhOLb8Gq0Wnr1KLfa4I=; b=dBhzo44QDVdi2RA6lvd07BApwCeGswQj2CrcCpw6vGqdrcsLSfiF9xiIkf8z+bAcTd 3T/zolEL9UUX/Th2SNY2T8tRA1TxaWZ0RA3arsBSXyLcvK5D/UOaQYhQlT2gGxpZ5aRi KXaG8HxNrR8hfo6Y66l0H7YqjnzbUq+QiN4t8l/0Y3A3bZFoOGBKcl9ZDj8Antk+kocj IQnsGU5TnKFCL4KUhnZ3AWzH60ydj5QmfjjVZ4dWvQGDKQ27LzJU+b9L8HGQgvMuIsYi /bxUi7W16/PnI0hBa3UDwBmqb80uWeLVkkKn6DKgZB6XpySiaGtMOQLY3N2CHp+QRGj4 CICg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QCDofGzd; 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 w189-20020a8162c6000000b002ef2c1784cfsi2836663ywb.332.2022.04.21.08.44.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Apr 2022 08:44:59 -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=pass header.i=@linaro.org header.s=google header.b=QCDofGzd; 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]:56428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhYzJ-0000Az-6Z for patch@linaro.org; Thu, 21 Apr 2022 11:44:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhYZH-0007Fo-4c for qemu-devel@nongnu.org; Thu, 21 Apr 2022 11:18:03 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:40546) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhYZF-0006Fv-8i for qemu-devel@nongnu.org; Thu, 21 Apr 2022 11:18:02 -0400 Received: by mail-pf1-x435.google.com with SMTP id i24so5287820pfa.7 for ; Thu, 21 Apr 2022 08:18:00 -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=pJcfgBv/PjlYWoRNQ2pxyLVSHhOLb8Gq0Wnr1KLfa4I=; b=QCDofGzd9oJTpdsx/7yuoXMGHjI61CcHmh9Nl8ayldtNyobVeFVOUhN5tbeXxzrDn6 cxejSdVF79EWDc83GtMlS2LXe579stevfjDgg9m1TeqoF+mQuTj1Q0SizaFtlpQAkVOP ygPzng24/pjdRCvW6Fuar6Ub2zELHt9y5AdV83uMAMLS7TXSzbkt9WpL1sd6LSzgkcwU OnrxJqJmB26hUS4PQt0V11L2vnCXuriDdb/AaCper5EhK7aNE/v2Gxwn4iZ5tYvxd0q/ iT1x74b73jrGaMs4w2y8RIwiMzz63KzbIYlPuy5HULu4RcNODt7E/GQB4IENSchd5bex LrAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pJcfgBv/PjlYWoRNQ2pxyLVSHhOLb8Gq0Wnr1KLfa4I=; b=63EqRDf5pD4xlrVbRylphyfDfhC3wGdNPlrxNLU5iU3dRcHEEulCRGLfGeqTxrfUDo u9auaCWpfpXein4iPnDvtwhgvlPGlSWzXg+DvGvUggBvKV6lq7w9qnslt0aEBpRUYAvh 7CVYhkSxI3VuDxpFhnvZQFydq/LaEaJ5WbBmRsGF+h+ZhA7r+7oIUi4GWE1jP0mG6oV4 mgqXaJJEP6gjWmZsrb2mpFauGZc+vb+uVGj6N6/XwyHrorf4jdpkxTaUrpJ+aw8cJyxp ezeEDQxDQLfxHoVNwcoO00u1JjLRciXk9M/+qLL39XnrBDriQFTjPO3SI+BgJwlLQuHK ZMvg== X-Gm-Message-State: AOAM532LJwuwwFlEhtUfUYJKbRal+6NTf+IFKs/h66ycL3X4gWExWDbU nsM7ycRYKmUjpR716MZQfDYk5CpuRATUXw== X-Received: by 2002:a63:d758:0:b0:380:fba9:f6e5 with SMTP id w24-20020a63d758000000b00380fba9f6e5mr24288359pgi.330.1650554279945; Thu, 21 Apr 2022 08:17:59 -0700 (PDT) Received: from stoup.. ([2607:fb90:80c8:6cf3:a91a:4957:ba18:ac18]) by smtp.gmail.com with ESMTPSA id z16-20020a056a00241000b004f3a647ae89sm24616248pfh.174.2022.04.21.08.17.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Apr 2022 08:17:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v7 14/64] target/nios2: Stop generating code if gen_check_supervisor fails Date: Thu, 21 Apr 2022 08:16:45 -0700 Message-Id: <20220421151735.31996-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220421151735.31996-1-richard.henderson@linaro.org> References: <20220421151735.31996-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.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, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Whether the cpu is in user-mode or not is something that we know at translation-time. We do not need to generate code after having raised an exception. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/nios2/translate.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/target/nios2/translate.c b/target/nios2/translate.c index eb97e13feb..d61e349207 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -169,12 +169,14 @@ static void gen_excp(DisasContext *dc, uint32_t code, uint32_t flags) t_gen_helper_raise_exception(dc, flags); } -static void gen_check_supervisor(DisasContext *dc) +static bool gen_check_supervisor(DisasContext *dc) { if (dc->base.tb->flags & CR_STATUS_U) { /* CPU in user mode, privileged instruction called, stop. */ t_gen_helper_raise_exception(dc, EXCP_SUPERI); + return false; } + return true; } /* @@ -384,7 +386,9 @@ static const Nios2Instruction i_type_instructions[] = { */ static void eret(DisasContext *dc, uint32_t code, uint32_t flags) { - gen_check_supervisor(dc); + if (!gen_check_supervisor(dc)) { + return; + } tcg_gen_mov_tl(cpu_R[CR_STATUS], cpu_R[CR_ESTATUS]); tcg_gen_mov_tl(cpu_R[R_PC], cpu_R[R_EA]); @@ -447,7 +451,9 @@ static void rdctl(DisasContext *dc, uint32_t code, uint32_t flags) { R_TYPE(instr, code); - gen_check_supervisor(dc); + if (!gen_check_supervisor(dc)) { + return; + } if (unlikely(instr.c == R_ZERO)) { return; @@ -474,9 +480,13 @@ static void rdctl(DisasContext *dc, uint32_t code, uint32_t flags) /* ctlN <- rA */ static void wrctl(DisasContext *dc, uint32_t code, uint32_t flags) { - gen_check_supervisor(dc); + if (!gen_check_supervisor(dc)) { + return; + } -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY + g_assert_not_reached(); +#else R_TYPE(instr, code); TCGv v = load_gpr(dc, instr.a);