From: Peter Maydell <peter.maydell@linaro.org>
Date: Sun, 29 Nov 2020 17:40:22 +0000 (+0000)
Subject: target/nios2: Use deposit32() to update ipending register
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=05bcbcf27954e664d85627f026970f62556fefa5;p=qemu.git

target/nios2: Use deposit32() to update ipending register

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 <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20201129174022.26530-4-peter.maydell@linaro.org
---

diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c
index 52ebda89ca..58688e1623 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 = &cpu->env;
     CPUState *cs = CPU(cpu);
 
-    env->regs[CR_IPENDING] &= ~(1 << irq);
-    env->regs[CR_IPENDING] |= !!level << irq;
+    env->regs[CR_IPENDING] = deposit32(env->regs[CR_IPENDING], irq, 1, !!level);
 
     env->irq_pending = env->regs[CR_IPENDING] & env->regs[CR_IENABLE];