[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 46/73] cris: convert to cpu_interrupt_request
From: |
Robert Foley |
Subject: |
[PATCH v10 46/73] cris: convert to cpu_interrupt_request |
Date: |
Wed, 17 Jun 2020 17:02:04 -0400 |
From: "Emilio G. Cota" <cota@braap.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Robert Foley <robert.foley@linaro.org>
---
target/cris/cpu.c | 2 +-
target/cris/helper.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/target/cris/cpu.c b/target/cris/cpu.c
index cff6b9eabf..6d7e266042 100644
--- a/target/cris/cpu.c
+++ b/target/cris/cpu.c
@@ -37,7 +37,7 @@ static void cris_cpu_set_pc(CPUState *cs, vaddr value)
static bool cris_cpu_has_work(CPUState *cs)
{
- return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
+ return cpu_interrupt_request(cs) & (CPU_INTERRUPT_HARD |
CPU_INTERRUPT_NMI);
}
static void cris_cpu_reset(DeviceState *dev)
diff --git a/target/cris/helper.c b/target/cris/helper.c
index b5159b8357..67946d9246 100644
--- a/target/cris/helper.c
+++ b/target/cris/helper.c
@@ -131,7 +131,7 @@ void crisv10_cpu_do_interrupt(CPUState *cs)
D_LOG("exception index=%d interrupt_req=%d\n",
cs->exception_index,
- cs->interrupt_request);
+ cpu_interrupt_request(cs));
if (env->dslot) {
/* CRISv10 never takes interrupts while in a delay-slot. */
@@ -193,7 +193,7 @@ void cris_cpu_do_interrupt(CPUState *cs)
D_LOG("exception index=%d interrupt_req=%d\n",
cs->exception_index,
- cs->interrupt_request);
+ cpu_interrupt_request(cs));
switch (cs->exception_index) {
case EXCP_BREAK:
--
2.17.1
- [PATCH v10 39/73] i386: convert to cpu_interrupt_request, (continued)
- [PATCH v10 39/73] i386: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 24/73] riscv: convert to cpu_halted, Robert Foley, 2020/06/17
- [PATCH v10 38/73] arm: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 36/73] s390x: use cpu_reset_interrupt, Robert Foley, 2020/06/17
- [PATCH v10 41/73] i386/hax-all: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 42/73] i386/whpx-all: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 40/73] i386/kvm: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 43/73] i386/hvf: convert to cpu_request_interrupt, Robert Foley, 2020/06/17
- [PATCH v10 45/73] sh4: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 44/73] ppc: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 46/73] cris: convert to cpu_interrupt_request,
Robert Foley <=
- [PATCH v10 47/73] hppa: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 48/73] lm32: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 49/73] m68k: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 50/73] mips: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 51/73] nios: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 52/73] s390x: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 53/73] alpha: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 57/73] unicore32: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 54/73] moxie: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 55/73] sparc: convert to cpu_interrupt_request, Robert Foley, 2020/06/17