Message ID | 20181025144644.15464-43-cota@braap.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [RFC,v4,01/71] cpu: convert queued work to a QSIMPLEQ | expand |
Emilio G. Cota <cota@braap.org> writes: > Cc: Aurelien Jarno <aurelien@aurel32.net> > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Emilio G. Cota <cota@braap.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > target/sh4/cpu.c | 2 +- > target/sh4/helper.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c > index b9f393b7c7..58ea212f53 100644 > --- a/target/sh4/cpu.c > +++ b/target/sh4/cpu.c > @@ -45,7 +45,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb) > > static bool superh_cpu_has_work(CPUState *cs) > { > - return cs->interrupt_request & CPU_INTERRUPT_HARD; > + return cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD; > } > > /* CPUClass::reset() */ > diff --git a/target/sh4/helper.c b/target/sh4/helper.c > index 2ff0cf4060..8463da5bc8 100644 > --- a/target/sh4/helper.c > +++ b/target/sh4/helper.c > @@ -83,7 +83,7 @@ void superh_cpu_do_interrupt(CPUState *cs) > { > SuperHCPU *cpu = SUPERH_CPU(cs); > CPUSH4State *env = &cpu->env; > - int do_irq = cs->interrupt_request & CPU_INTERRUPT_HARD; > + int do_irq = cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD; > int do_exp, irq_vector = cs->exception_index; > > /* prioritize exceptions over interrupts */ -- Alex Bennée
diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index b9f393b7c7..58ea212f53 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -45,7 +45,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb) static bool superh_cpu_has_work(CPUState *cs) { - return cs->interrupt_request & CPU_INTERRUPT_HARD; + return cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD; } /* CPUClass::reset() */ diff --git a/target/sh4/helper.c b/target/sh4/helper.c index 2ff0cf4060..8463da5bc8 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -83,7 +83,7 @@ void superh_cpu_do_interrupt(CPUState *cs) { SuperHCPU *cpu = SUPERH_CPU(cs); CPUSH4State *env = &cpu->env; - int do_irq = cs->interrupt_request & CPU_INTERRUPT_HARD; + int do_irq = cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD; int do_exp, irq_vector = cs->exception_index; /* prioritize exceptions over interrupts */