[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PATCH v3 for-2.12 15/16] s390x/tcg: drop program_interrupt
From: |
David Hildenbrand |
Subject: |
[qemu-s390x] [PATCH v3 for-2.12 15/16] s390x/tcg: drop program_interrupt() |
Date: |
Thu, 30 Nov 2017 17:27:43 +0100 |
All users are gone, we can finally drop it and make sure that all new
program interrupt injections are reminded of the retaddr - as they have to
use s390_program_interrupt() now.
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
target/s390x/cpu.h | 1 -
target/s390x/interrupt.c | 22 +++++-----------------
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index ae61d18c0a..9cfbbbac04 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -719,7 +719,6 @@ void s390_io_interrupt(uint16_t subchannel_id, uint16_t
subchannel_nr,
uint32_t io_int_parm, uint32_t io_int_word);
/* automatically detect the instruction length */
#define ILEN_AUTO 0xff
-void program_interrupt(CPUS390XState *env, uint32_t code, int ilen);
#define RA_IGNORED 0
void s390_program_interrupt(CPUS390XState *env, uint32_t code, int ilen,
uintptr_t ra);
diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c
index b07e75daed..39c026b8b5 100644
--- a/target/s390x/interrupt.c
+++ b/target/s390x/interrupt.c
@@ -27,17 +27,18 @@ void trigger_pgm_exception(CPUS390XState *env, uint32_t
code, uint32_t ilen)
}
static void tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code,
- int ilen)
+ int ilen, uintptr_t ra)
{
#ifdef CONFIG_TCG
trigger_pgm_exception(env, code, ilen);
- cpu_loop_exit(CPU(s390_env_get_cpu(env)));
+ cpu_loop_exit_restore(CPU(s390_env_get_cpu(env)), ra);
#else
g_assert_not_reached();
#endif
}
-void program_interrupt(CPUS390XState *env, uint32_t code, int ilen)
+void s390_program_interrupt(CPUS390XState *env, uint32_t code, int ilen,
+ uintptr_t ra)
{
S390CPU *cpu = s390_env_get_cpu(env);
@@ -47,25 +48,12 @@ void program_interrupt(CPUS390XState *env, uint32_t code,
int ilen)
if (kvm_enabled()) {
kvm_s390_program_interrupt(cpu, code);
} else if (tcg_enabled()) {
- tcg_s390_program_interrupt(env, code, ilen);
+ tcg_s390_program_interrupt(env, code, ilen, ra);
} else {
g_assert_not_reached();
}
}
-void s390_program_interrupt(CPUS390XState *env, uint32_t code, int ilen,
- uintptr_t ra)
-{
-#ifdef CONFIG_TCG
- S390CPU *cpu = s390_env_get_cpu(env);
-
- if (tcg_enabled()) {
- cpu_restore_state(CPU(cpu), ra);
- }
-#endif
- program_interrupt(env, code, ilen);
-}
-
#if !defined(CONFIG_USER_ONLY)
static void cpu_inject_service(S390CPU *cpu, uint32_t param)
{
--
2.14.3
- [qemu-s390x] [PATCH v3 for-2.12 06/16] s390x/diag: pass the retaddr into handle_diag_308(), (continued)
- [qemu-s390x] [PATCH v3 for-2.12 06/16] s390x/diag: pass the retaddr into handle_diag_308(), David Hildenbrand, 2017/11/30
- [qemu-s390x] [PATCH v3 for-2.12 07/16] s390x: handle exceptions during s390_cpu_virt_mem_rw() correctly (TCG), David Hildenbrand, 2017/11/30
- [qemu-s390x] [PATCH v3 for-2.12 05/16] s390x/pci: pass the retaddr to all PCI instructions, David Hildenbrand, 2017/11/30
- [qemu-s390x] [PATCH v3 for-2.12 08/16] s390x/tcg: don't exit the cpu loop in s390_cpu_virt_mem_rw(), David Hildenbrand, 2017/11/30
- [qemu-s390x] [PATCH v3 for-2.12 09/16] s390x/tcg: io instructions don't need potential_page_fault(), David Hildenbrand, 2017/11/30
- [qemu-s390x] [PATCH v3 for-2.12 10/16] s390x/tcg: use s390_program_interrupt() in SCLP Service Call, David Hildenbrand, 2017/11/30
- [qemu-s390x] [PATCH v3 for-2.12 11/16] s390x/tcg: use s390_program_interrupt() in DIAG, David Hildenbrand, 2017/11/30
- [qemu-s390x] [PATCH v3 for-2.12 12/16] s390x/tcg: use s390_program_interrupt() in per_check_exception(), David Hildenbrand, 2017/11/30
- [qemu-s390x] [PATCH v3 for-2.12 13/16] s390x/tcg: use s390_program_interrupt() in SACF, David Hildenbrand, 2017/11/30
- [qemu-s390x] [PATCH v3 for-2.12 14/16] s390x/tcg: use s390_program_interrupt() in STSI, David Hildenbrand, 2017/11/30
- [qemu-s390x] [PATCH v3 for-2.12 15/16] s390x/tcg: drop program_interrupt(),
David Hildenbrand <=
- [qemu-s390x] [PATCH v3 for-2.12 16/16] s390x/tcg: drop potential_page_fault(), David Hildenbrand, 2017/11/30
- Re: [qemu-s390x] [PATCH v3 for-2.12 00/16] s390x/tcg: cleanup and fix program interrupts, Cornelia Huck, 2017/11/30