[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 for-2.12 13/15] s390x/tcg: use program_interrupt_
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v1 for-2.12 13/15] s390x/tcg: use program_interrupt_ra() in STSI |
Date: |
Tue, 28 Nov 2017 21:33:23 +0100 |
STSI needs some more love, but let's do one step at a time.
We can now drop potential_page_fault().
Signed-off-by: David Hildenbrand <address@hidden>
---
target/s390x/misc_helper.c | 2 +-
target/s390x/translate.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
index 6ae8e8a220..aa0430dcac 100644
--- a/target/s390x/misc_helper.c
+++ b/target/s390x/misc_helper.c
@@ -184,7 +184,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0,
if ((r0 & STSI_LEVEL_MASK) <= STSI_LEVEL_3 &&
((r0 & STSI_R0_RESERVED_MASK) || (r1 & STSI_R1_RESERVED_MASK))) {
/* valid function code, invalid reserved bits */
- program_interrupt(env, PGM_SPECIFICATION, 4);
+ program_interrupt_ra(env, PGM_SPECIFICATION, 4, GETPC());
}
sel1 = r0 & STSI_R0_SEL1_MASK;
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index f26fa64a78..1ce1390699 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -3988,7 +3988,6 @@ static ExitStatus op_stpt(DisasContext *s, DisasOps *o)
static ExitStatus op_stsi(DisasContext *s, DisasOps *o)
{
check_privileged(s);
- potential_page_fault(s);
gen_helper_stsi(cc_op, cpu_env, o->in2, regs[0], regs[1]);
set_cc_static(s);
return NO_EXIT;
--
2.14.3
- [Qemu-devel] [PATCH v1 for-2.12 10/15] s390x/tcg: use program_interrupt_ra() in DIAG, (continued)
- [Qemu-devel] [PATCH v1 for-2.12 10/15] s390x/tcg: use program_interrupt_ra() in DIAG, David Hildenbrand, 2017/11/28
- [Qemu-devel] [PATCH v1 for-2.12 11/15] s390x/tcg: use program_interrupt_ra() in per_check_exception(), David Hildenbrand, 2017/11/28
- [Qemu-devel] [PATCH v1 for-2.12 12/15] s390x/tcg: use program_interrupt_ra() in SACF, David Hildenbrand, 2017/11/28
- [Qemu-devel] [PATCH v1 for-2.12 14/15] s390x/tcg: drop program_interrupt(), David Hildenbrand, 2017/11/28
- [Qemu-devel] [PATCH v1 for-2.12 13/15] s390x/tcg: use program_interrupt_ra() in STSI,
David Hildenbrand <=
- [Qemu-devel] [PATCH v1 for-2.12 15/15] s390x/tcg: drop potential_page_fault(), David Hildenbrand, 2017/11/28
- Re: [Qemu-devel] [qemu-s390x] [PATCH v1 for-2.12 00/15] s390x/tcg: cleanup and fix program interrupts, Thomas Huth, 2017/11/29