From patchwork Tue Jun 29 18:53:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 468324 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5249153jao; Tue, 29 Jun 2021 12:22:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1j7KY1gZudWtbSDP6TNtiDc8L15CduOh57tl16IV/nO4/Qt7oEd/hNfMNZ+C9BldwEWYL X-Received: by 2002:a05:6102:212a:: with SMTP id f10mr18629449vsg.56.1624994574517; Tue, 29 Jun 2021 12:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624994574; cv=none; d=google.com; s=arc-20160816; b=oU+i1wquV7JhS8Sk8CX7+LJukqIvr7po29cJ/hUuDNEDCycor7jubq9hsupDwhBGxu q9VcLLL924fchML/8IRGPFmfKnbLZTHiaCDmakuH8lYkSr0WKoAe1fZBRxejDYofSfUn uwUpMS4yRmSQGHo8NpZsblEhRFk+m/dDz+HYds8xNniellaK4cmSU7AzejRaJuR/JLNB Y7q6tdNU5klUeHt+tsG0H6BuxPJ420lmWGi7qh8zdKv4ICC6YwX0Bhf6Z3QIp0XDxdpg 1w8qxhmZGb1ihLpU6WAm1AeMGWDqNYAfK0Q/TtzkDhlFsZe37Bc2dat7D3uxRcmCTJcx 8EIA== 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=xTwMJU3bsMsUDKAuT4u9lBehIy/XuCs4LFcFtzDowXM=; b=MquF1W3qwq7c5doKy1mKSopyWgY+D01JnPW/8L1HCU8oXL9NYIqEQZVGHZ9j5ZX44p j8TLTfcR3LrFq5UswRKcSSY5Fy1TIzzbsoDMo8bGEzez0NJM9v7WARythjyR9lQFlVsG BltA7bd0ZGOJzWNUYr2ic9hM/pFyRWnDy7XJHY9N9iF3s73CcrnN9hb/Sz+IgsLw9Rop oxsTrfau5IuKrMCzIT+bk1PngsJ95wKy+jXCpQjyTEtLCG7BdOIjsBeZcGIi5EDXCeSB TLvmTy0nXh7AFPqQgeg3L30eYZamhJIIo8+ghueOH/GZlxqVvez47F0vnqsIXTJ8LRe8 yRzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PzZJcqo8; 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 w11si11918508vsa.205.2021.06.29.12.22.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Jun 2021 12:22:54 -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=PzZJcqo8; 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]:51004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyJJt-0007bw-V4 for patch@linaro.org; Tue, 29 Jun 2021 15:22:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyItA-0007z5-9D for qemu-devel@nongnu.org; Tue, 29 Jun 2021 14:55:16 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:45628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyIsu-0000rg-Qa for qemu-devel@nongnu.org; Tue, 29 Jun 2021 14:55:10 -0400 Received: by mail-pj1-x1033.google.com with SMTP id z3-20020a17090a3983b029016bc232e40bso3078525pjb.4 for ; Tue, 29 Jun 2021 11:55: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=xTwMJU3bsMsUDKAuT4u9lBehIy/XuCs4LFcFtzDowXM=; b=PzZJcqo8Wkz008DtPhOldpFKhSJk7j5GP27thyDGmacx5ATG2SBfZ9NeQuLCs1iEiP 6XYG4a4CdAeG0FPWmcjQn4kAInUTenGrQ6+pO97R4TsCtTvNXA8R3RxYouMwdbduvmom u+aQWWw9WNYwsc0Enk2DDS8qplNe+RYZey3LAuVHRB4bo9RkkpJuvgw48NLJn+4EhimP PMxNaeg0jlSubcj2DSTkvKxM5zIMbb03ueYV+T3hFnHZiuAvaNodlA2A8a4aMGgIQ3N1 IFK9SEKkdlSr1reSZfCXu6RYQuV0q6Wtovicchc8brQbtne/KZo/KQgyZZA3SLOi2JXT qp9A== 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=xTwMJU3bsMsUDKAuT4u9lBehIy/XuCs4LFcFtzDowXM=; b=kBAa39kSlxZx2VAjqqBadxdvL2N2s/hqgYBnLHefcjtO5YpFMVrCx8KTZHR/R/P2vW IGGwxUF3FYahzX5lrYMNCNmoQ5mDoivWOw/UJgaoW0byqbBfU1moKOqghcz3HVACUgEb 1krR4hduo8enboH6QMFnEvG1ftu27Q4Y3Fb6Va0S8hoHW2yqZx2CiU5D7+O2+hD4Bqmz FEZ0fRoFhHN9R4nepUZLiO9jO12fC/PnCsYeqJ37Kk6TCRxU5yBCYBe7mMoUb142WLCQ AB+DtjJO/Kp+s2Lb8w1c2BZ4YGS3jgf28g23boACGr7MlB2cQqhNocttPTKTmh8LGbDZ iiSg== X-Gm-Message-State: AOAM532xiwYAe2u513mJyv/lOl/oMfPkBPcVl3abVdQNp37roSL9cDtf xbXi5vLGHEYHXCtSNMzDOyBi7xrUIKrsSA== X-Received: by 2002:a17:90b:4f44:: with SMTP id pj4mr18851189pjb.100.1624992899566; Tue, 29 Jun 2021 11:54:59 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id j2sm18811253pfb.53.2021.06.29.11.54.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 11:54:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 06/63] target/nios2: Remove assignment to env in handle_instruction Date: Tue, 29 Jun 2021 11:53:58 -0700 Message-Id: <20210629185455.3131172-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629185455.3131172-1-richard.henderson@linaro.org> References: <20210629185455.3131172-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.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: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Direct assignments to env during translation do not work. As it happens, the only way we can get here is if env->pc is already set to dc->pc. We will trap on the first insn we execute anywhere on the page. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/nios2/translate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 66f4c25b06..6fd4330b31 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -740,14 +740,15 @@ static void handle_instruction(DisasContext *dc, CPUNios2State *env) uint32_t code; uint8_t op; const Nios2Instruction *instr; + #if defined(CONFIG_USER_ONLY) /* FIXME: Is this needed ? */ if (dc->pc >= 0x1000 && dc->pc < 0x2000) { - env->regs[R_PC] = dc->pc; t_gen_helper_raise_exception(dc, 0xaa); return; } #endif + code = cpu_ldl_code(env, dc->pc); op = get_opcode(code);