From nobody Mon Feb 9 19:08:24 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1606671782; cv=none; d=zohomail.com; s=zohoarc; b=BU+RoHgJWiDJjfo5N9MTnRnQFhPhoOAtt1RAX72XWL0bQAbZ5dUvElCgqQzw7ry4fubdg7w7IgQ8jgzf1j/cIddyM9vKUXjT/5PPxh8RIIg8evRNgz2MiGfYqx2PJJ5CKn4BEwH5DfVqigbC4smW2THZS5vE1wMgckITTL1q1/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606671782; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3cR/9hnxyL0olc4DR8P2jZGcuc13fxHDf3Td00Nph8M=; b=TzhlwCPxZrvo0T7sZAmbVFZzbe70vDeMjad5hiiDKmRqaxROod7pFT6bk7XIB5HPVsXBR+xZYOPtf2qDqjafKAuFBLSrHK3YQdIJGpZn13P7ltNal961lWUoVaGIvaYeOW6DF5TDYqjFOidcdr+qmSDm8ICq/4vZ+xfUq0z2v1U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160667178235847.02075502664627; Sun, 29 Nov 2020 09:43:02 -0800 (PST) Received: from localhost ([::1]:52344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjQiz-0006lf-3u for importer@patchew.org; Sun, 29 Nov 2020 12:43:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjQga-0004yW-41 for qemu-devel@nongnu.org; Sun, 29 Nov 2020 12:40:32 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:46808) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjQgY-0000ZM-DV for qemu-devel@nongnu.org; Sun, 29 Nov 2020 12:40:31 -0500 Received: by mail-wr1-x441.google.com with SMTP id g14so11992229wrm.13 for ; Sun, 29 Nov 2020 09:40:30 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b4sm23379940wmc.1.2020.11.29.09.40.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Nov 2020 09:40:28 -0800 (PST) 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=3cR/9hnxyL0olc4DR8P2jZGcuc13fxHDf3Td00Nph8M=; b=n8qgxgDYS8npa+jgyDqtQdGav4jgon7h5+kQWL6d0OdHkLM/T8r42Yh7CGi+7ce2hK Gwc8M2J6C+EK9o9JqW3Q4mJOOO0cQ3uSK8DN+XT4grb1/z7v+aa2H+n0LkYiVPoc0tGM tQhD/8reb8TyUkI7cbLqulRS1ycZ2xlEhr+DQI49nvTvbXC0YWSbUiuuqIJdC2+xcwsP e/Be2SN3kTJO2Vv/DP8oQdvHKnGYyODl07NrP2+6IE+zyzec9XTic2pWBCxogL2fOa+y Ys2ozsZxgr3jVMu7MgyXAr7ju1Iw8x0DvbHgKMBZtdERMJ7YNIGqoaV0OBDZw3JAI0lk Oawg== 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=3cR/9hnxyL0olc4DR8P2jZGcuc13fxHDf3Td00Nph8M=; b=o8sAFjmr8H9fQWq6ucFvssJ6DB5LxBS7RPGW67xk9p23eXQtvWwrMWN1UXvQCUXOf1 GmEheI3T9T9jb9zoMP5wGksDZ1IpWldYiZWvO99UzB1BQer/StHz5i06Y7Uqn7uD1syT UI1ORd4B2Od1ibhO5suglJeJRAG1xHyQjlL/OP7htkOLPqRfkoO7QYo85qL0RIz8EuQV vZS9mcCJEb2ZQX8lZDUf0Eqq2j4svqMogk6xKUu2iqFiHzBppLwgIorKAtAjMIrb+kVN kzCUPG2p0/w/gvOKdqe/nWnHsLCwLvtXoVgV+p/adb5Mtvbvalof1OVO6KbbtZgLZ9bP boJA== X-Gm-Message-State: AOAM533yzfwS55EUCqzWvzkXSem75aVJbj58Qyt0J+CeC5evBGoSuht6 JuDymaU5pSS79MW4u3tYA0pAcUhnvJPgRA== X-Google-Smtp-Source: ABdhPJxpi0l0wu+Hmo0szV7aPaJLAtZwylK9cAaVoDHqx4Ls8p1OQe3t7iHik7oKF+PX+t/VS2ykTQ== X-Received: by 2002:adf:f3cf:: with SMTP id g15mr23493326wrp.71.1606671628836; Sun, 29 Nov 2020 09:40:28 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH v2 3/3] target/nios2: Use deposit32() to update ipending register Date: Sun, 29 Nov 2020 17:40:22 +0000 Message-Id: <20201129174022.26530-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201129174022.26530-1-peter.maydell@linaro.org> References: <20201129174022.26530-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x441.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=ham 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: Marek Vasut , Sandra Loosemore , Chris Wulff , Wentong Wu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" In nios2_cpu_set_irq(), use deposit32() rather than raw shift-and-mask operations to set the appropriate bit in the ipending register. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- In patch 1 I left the code for this identical to the old code from nios2_iic.c for clarity of that refactoring, but deposit32() is a clearer way to write it. --- target/nios2/cpu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index 52ebda89ca7..58688e1623a 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -71,8 +71,7 @@ static void nios2_cpu_set_irq(void *opaque, int irq, int = level) CPUNios2State *env =3D &cpu->env; CPUState *cs =3D CPU(cpu); =20 - env->regs[CR_IPENDING] &=3D ~(1 << irq); - env->regs[CR_IPENDING] |=3D !!level << irq; + env->regs[CR_IPENDING] =3D deposit32(env->regs[CR_IPENDING], irq, 1, != !level); =20 env->irq_pending =3D env->regs[CR_IPENDING] & env->regs[CR_IENABLE]; =20 --=20 2.20.1