From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: david@redhat.com
Subject: [PATCH v5 02/18] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt
Date: Tue, 1 Oct 2019 10:15:58 -0700 [thread overview]
Message-ID: <20191001171614.8405-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20191001171614.8405-1-richard.henderson@linaro.org>
Since we begin the operation with an unwind, we have the proper
value of ilen immediately available.
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/s390x/tcg_s390x.h | 4 ++--
target/s390x/excp_helper.c | 10 +++++-----
target/s390x/interrupt.c | 2 +-
target/s390x/tcg-stub.c | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/target/s390x/tcg_s390x.h b/target/s390x/tcg_s390x.h
index 2813f9d48e..2f54ccb027 100644
--- a/target/s390x/tcg_s390x.h
+++ b/target/s390x/tcg_s390x.h
@@ -14,8 +14,8 @@
#define TCG_S390X_H
void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque);
-void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code,
- int ilen, uintptr_t ra);
+void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env,
+ uint32_t code, uintptr_t ra);
void QEMU_NORETURN tcg_s390_data_exception(CPUS390XState *env, uint32_t dxc,
uintptr_t ra);
void QEMU_NORETURN tcg_s390_vector_exception(CPUS390XState *env, uint32_t vxc,
diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
index 892f659d5a..eb55e5ef53 100644
--- a/target/s390x/excp_helper.c
+++ b/target/s390x/excp_helper.c
@@ -34,15 +34,15 @@
#include "hw/boards.h"
#endif
-void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code,
- int ilen, uintptr_t ra)
+void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env,
+ uint32_t code, uintptr_t ra)
{
CPUState *cs = env_cpu(env);
cpu_restore_state(cs, ra, true);
qemu_log_mask(CPU_LOG_INT, "program interrupt at %#" PRIx64 "\n",
env->psw.addr);
- trigger_pgm_exception(env, code, ilen);
+ trigger_pgm_exception(env, code, ILEN_UNWIND);
cpu_loop_exit(cs);
}
@@ -60,7 +60,7 @@ void QEMU_NORETURN tcg_s390_data_exception(CPUS390XState *env, uint32_t dxc,
if (env->cregs[0] & CR0_AFP) {
env->fpc = deposit32(env->fpc, 8, 8, dxc);
}
- tcg_s390_program_interrupt(env, PGM_DATA, ILEN_AUTO, ra);
+ tcg_s390_program_interrupt(env, PGM_DATA, ra);
}
void QEMU_NORETURN tcg_s390_vector_exception(CPUS390XState *env, uint32_t vxc,
@@ -75,7 +75,7 @@ void QEMU_NORETURN tcg_s390_vector_exception(CPUS390XState *env, uint32_t vxc,
/* Always store the VXC into the FPC, without AFP it is undefined */
env->fpc = deposit32(env->fpc, 8, 8, vxc);
- tcg_s390_program_interrupt(env, PGM_VECTOR_PROCESSING, ILEN_AUTO, ra);
+ tcg_s390_program_interrupt(env, PGM_VECTOR_PROCESSING, ra);
}
void HELPER(data_exception)(CPUS390XState *env, uint32_t dxc)
diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c
index 30a9fb8852..b798e2ecbe 100644
--- a/target/s390x/interrupt.c
+++ b/target/s390x/interrupt.c
@@ -40,7 +40,7 @@ void s390_program_interrupt(CPUS390XState *env, uint32_t code, int ilen,
if (kvm_enabled()) {
kvm_s390_program_interrupt(env_archcpu(env), code);
} else if (tcg_enabled()) {
- tcg_s390_program_interrupt(env, code, ilen, ra);
+ tcg_s390_program_interrupt(env, code, ra);
} else {
g_assert_not_reached();
}
diff --git a/target/s390x/tcg-stub.c b/target/s390x/tcg-stub.c
index 32adb7276a..d22c898802 100644
--- a/target/s390x/tcg-stub.c
+++ b/target/s390x/tcg-stub.c
@@ -18,8 +18,8 @@
void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque)
{
}
-void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code,
- int ilen, uintptr_t ra)
+void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env,
+ uint32_t code, uintptr_t ra)
{
g_assert_not_reached();
}
--
2.17.1
next prev parent reply other threads:[~2019-10-01 17:21 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 17:15 [PATCH v5 00/18] target/s390: Use tcg unwinding for ilen Richard Henderson
2019-10-01 17:15 ` [PATCH v5 01/18] target/s390x: Add ilen to unwind data Richard Henderson
2019-10-01 17:15 ` Richard Henderson [this message]
2019-10-01 17:15 ` [PATCH v5 03/18] target/s390x: Remove ilen parameter from s390_program_interrupt Richard Henderson
2019-10-01 17:16 ` [PATCH v5 04/18] target/s390x: Use tcg_s390_program_interrupt in TCG helpers Richard Henderson
2019-10-01 17:16 ` [PATCH v5 05/18] target/s390x: Push trigger_pgm_exception lower in s390_cpu_tlb_fill Richard Henderson
2019-10-01 17:16 ` [PATCH v5 06/18] target/s390x: Handle tec " Richard Henderson
2019-10-01 17:16 ` [PATCH v5 07/18] target/s390x: Return exception from mmu_translate_real Richard Henderson
2019-10-01 17:16 ` [PATCH v5 08/18] target/s390x: Remove exc argument to mmu_translate_asce Richard Henderson
2019-10-01 17:16 ` [PATCH v5 09/18] target/s390x: Return exception from mmu_translate Richard Henderson
2019-10-01 17:16 ` [PATCH v5 10/18] target/s390x: Return exception from translate_pages Richard Henderson
2019-10-01 17:16 ` [PATCH v5 11/18] target/s390x: Remove fail variable from s390_cpu_tlb_fill Richard Henderson
2019-10-01 17:16 ` [PATCH v5 12/18] target/s390x: Simplify helper_lra Richard Henderson
2019-10-01 17:16 ` [PATCH v5 13/18] target/s390x: Rely on unwinding in s390_cpu_tlb_fill Richard Henderson
2019-10-01 17:16 ` [PATCH v5 14/18] target/s390x: Rely on unwinding in s390_cpu_virt_mem_rw Richard Henderson
2019-10-01 17:16 ` [PATCH v5 15/18] target/s390x: Remove ILEN_AUTO Richard Henderson
2019-10-01 17:16 ` [PATCH v5 16/18] target/s390x: Remove ilen argument from trigger_access_exception Richard Henderson
2019-10-01 17:16 ` [PATCH v5 17/18] target/s390x: Remove ilen argument from trigger_pgm_exception Richard Henderson
2019-10-01 17:16 ` [PATCH v5 18/18] target/s390x: Remove ILEN_UNWIND Richard Henderson
2019-10-09 12:46 ` [PATCH v5 00/18] target/s390: Use tcg unwinding for ilen David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191001171614.8405-3-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=david@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).