From patchwork Fri Apr 22 16:51:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 564845 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp660977map; Fri, 22 Apr 2022 10:01:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRGARN3dJRu8fOQUUrwGwDTtK8B6EWOMJxSwzxCpXNdBsmULqp+vWBB9BHqzB6EWj1im0F X-Received: by 2002:a05:622a:4c8:b0:2f3:5809:dcd with SMTP id q8-20020a05622a04c800b002f358090dcdmr3076629qtx.222.1650646903601; Fri, 22 Apr 2022 10:01:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650646903; cv=none; d=google.com; s=arc-20160816; b=xnud2fgnhfpEZ9YBtAPJJAx4Zz5Q0PICGUfy4IiBgofDt59Te/PYThcYJFcAW14N5k O9pgEnlTQpeBFLeoX5DX26lBs/hg7lPfakxKKV5SCYFJFar6jDbXAzW81aiYgRr0Dm5c Wr2woF9l2bJgRV+LZhcsgWluxD+rpVamVZ+sLSY3nSQ9vAMY/xOMV/3fzByl3w+1wfPT wVtzJap3d/uAnwQpIhvqjcF3d9znIJda329CsKtYkXRRsh7+IxLPcP5fbF9wHZPPJEoF bnYG8y3hgE5UK0MwypPL0kS8WefvghjVCvJKgvnHqkGZYsfZFdWz1kCmheuflX26Q9F8 +v7g== 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=4LG2ggGa5J5Lu4I1wse39Ww5a8efRD9iZexWoAzkdh0=; b=ShNrA612odUozTepuwyxZWioAtaFI1omOmABqO1x7l9ude8jNw3ezE8FRBJAwcGD7/ Sq6ZL012QKzbk5LNTy9cae3uNNqw5z1w7FYb5SmZvWmnWv2w0MQo5iKBRl3p5um4TSkT Jh8Gl1nRDYmHpy1LWqlzKlcX4NWQZKIjp0phhvBgY5SpeQG3/Kie9VoGV7HzFAod2Ydp stwoG/dEjmenfPQ6FcpAl1J9hcpbXdf6eVkvg2G636K9cj9RmtYNi96le21NHvsA6LrD ssI8DygaH4OMjqfq0BLWB0elfHBFVDyntue9LsC435OjkunlAH1MbuTRNha1LToaWeLu H2qQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F3UQuPkY; 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 a9-20020a0562140c2900b004465172703fsi2346556qvd.141.2022.04.22.10.01.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Apr 2022 10:01:43 -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=F3UQuPkY; 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]:37302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhwf9-0004N1-6L for patch@linaro.org; Fri, 22 Apr 2022 13:01:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhwWr-0000tY-KT for qemu-devel@nongnu.org; Fri, 22 Apr 2022 12:53:09 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:34580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhwWq-0007Fw-0d for qemu-devel@nongnu.org; Fri, 22 Apr 2022 12:53:09 -0400 Received: by mail-pl1-x62c.google.com with SMTP id n8so12125556plh.1 for ; Fri, 22 Apr 2022 09:53:07 -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=4LG2ggGa5J5Lu4I1wse39Ww5a8efRD9iZexWoAzkdh0=; b=F3UQuPkY2JbZ1Ca4oT9tQ20ddOA3oFnx0tiB4QEb0rzE7iRC3+3KW5RKGjdiwmCgJO JX+JrvNsxkLpYKJHphMS5gxTfVmxu/XeDP/Isl4tUMnt+C0XddQTcfiC5xGOcJIVi2HU KCDKUtVGV82s7sWVhQdbYZpIl8JshhsmMTmuAEb1UQzkRM9MYJIxPUcnXZFIWpcLviXX 42c3skR8mn0mEA9kUFibWlrFkaPNhcm9w4st2yLAyBII+blpVLzRcaCOr7XbEa6n91m1 tLvdaV1ffwab7u65jpxWYZ9UEmAaFz7d/34EOfOeEToxPnGlC1xwR45FcI7db850xnEF R73w== 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=4LG2ggGa5J5Lu4I1wse39Ww5a8efRD9iZexWoAzkdh0=; b=agSmjemrnQQZbX5aZfJlm2AEaCcsCkRI34yDsjoe56hrmKg/4f5ojZfcckXEBsclSl xP+rHrZqZ5TIL/9v7Cq2Me6jCH8v1A7f0J6v+HoOtKQpI3V3CxWx+kARxHx4+2CUfSj4 CRBzGM2pisZmLjA7EKIEjMNETBbimKzh6WemhMXCzxrQgLfN1RAWb6oGg5Eljfe301eq VR8cKlbT3DyJwpELWqDyMU0iNYTDuUd39ntrpoEfbKpqxQ6nFTPK4/NZNA9c7JAg9kE0 JIhcJYJDWptjP3OXrqrExut6rFDPOs6XDzAj9rfFq8LDETh6mo+/A2GmvpJvLx+ZmLjk LUWw== X-Gm-Message-State: AOAM532PjtrZwrBK2EOVr0t4yBVkPoyBBJMDbH8snsPnpazEnpDyqC/c J3hHkjWDd5ZbmnKU1qvYnUgkwOp6wgasuMlu X-Received: by 2002:a17:902:ce86:b0:159:90f:c5de with SMTP id f6-20020a170902ce8600b00159090fc5demr5421714plg.52.1650646385854; Fri, 22 Apr 2022 09:53:05 -0700 (PDT) Received: from stoup.. ([2607:fb90:27d0:b0f2:934d:3e2:9f8c:dd1]) by smtp.gmail.com with ESMTPSA id 6-20020a17090a030600b001cd4989ff5fsm6835904pje.38.2022.04.22.09.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 09:53:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v8 14/68] target/nios2: Stop generating code if gen_check_supervisor fails Date: Fri, 22 Apr 2022 09:51:44 -0700 Message-Id: <20220422165238.1971496-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220422165238.1971496-1-richard.henderson@linaro.org> References: <20220422165238.1971496-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.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 Message-Id: <20220421151735.31996-15-richard.henderson@linaro.org> --- 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);