From: David Hildenbrand <david@redhat.com>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org
Subject: Re: [PATCH v4 02/18] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt
Date: Tue, 1 Oct 2019 17:24:29 +0200 [thread overview]
Message-ID: <85f219fa-1f67-f2be-06f7-b03393e06a06@redhat.com> (raw)
In-Reply-To: <20190927193925.23567-3-richard.henderson@linaro.org>
On 27.09.19 21:39, Richard Henderson wrote:
> 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 | 8 ++++----
> target/s390x/interrupt.c | 2 +-
> target/s390x/tcg-stub.c | 4 ++--
> 4 files changed, 9 insertions(+), 9 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..681a9c59e1 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,
> 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();
> }
>
[dhildenb@desktop qemu]$ LANG=C make check-qtest-s390x
make[1]: Entering directory '/home/dhildenb/git/qemu/slirp'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/home/dhildenb/git/qemu/slirp'
CHK version_gen.h
CC s390x-softmmu/target/s390x/excp_helper.o
/home/dhildenb/git/qemu/target/s390x/excp_helper.c: In function 'tcg_s390_vector_exception':
/home/dhildenb/git/qemu/target/s390x/excp_helper.c:78:5: error: too many arguments to function 'tcg_s390_program_interrupt'
78 | tcg_s390_program_interrupt(env, PGM_VECTOR_PROCESSING, ILEN_AUTO, ra);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
/home/dhildenb/git/qemu/target/s390x/excp_helper.c:37:20: note: declared here
37 | void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
make[1]: *** [/home/dhildenb/git/qemu/rules.mak:69: target/s390x/excp_helper.o] Error 1
make: *** [Makefile:482: s390x-softmmu/all] Error 2
Easy to fixup.
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2019-10-01 15:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-27 19:39 [PATCH v4 00/18] target/s390: Use tcg unwinding for ilen Richard Henderson
2019-09-27 19:39 ` [PATCH v4 01/18] target/s390x: Add ilen to unwind data Richard Henderson
2019-09-30 15:43 ` David Hildenbrand
2019-09-27 19:39 ` [PATCH v4 02/18] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt Richard Henderson
2019-10-01 15:24 ` David Hildenbrand [this message]
2019-09-27 19:39 ` [PATCH v4 03/18] target/s390x: Remove ilen parameter from s390_program_interrupt Richard Henderson
2019-09-27 19:39 ` [PATCH v4 04/18] target/s390x: Use tcg_s390_program_interrupt in TCG helpers Richard Henderson
2019-09-27 19:39 ` [PATCH v4 05/18] target/s390x: Push trigger_pgm_exception lower in s390_cpu_tlb_fill Richard Henderson
2019-09-27 19:39 ` [PATCH v4 06/18] target/s390x: Handle tec " Richard Henderson
2019-09-27 19:39 ` [PATCH v4 07/18] target/s390x: Return exception from mmu_translate_real Richard Henderson
2019-09-27 19:39 ` [PATCH v4 08/18] target/s390x: Remove exc argument to mmu_translate_asce Richard Henderson
2019-09-27 19:39 ` [PATCH v4 09/18] target/s390x: Return exception from mmu_translate Richard Henderson
2019-09-30 15:45 ` David Hildenbrand
2019-10-01 15:30 ` David Hildenbrand
2019-10-01 16:21 ` Richard Henderson
2019-09-27 19:39 ` [PATCH v4 10/18] target/s390x: Return exception from translate_pages Richard Henderson
2019-09-27 19:39 ` [PATCH v4 11/18] target/s390x: Remove fail variable from s390_cpu_tlb_fill Richard Henderson
2019-09-27 19:39 ` [PATCH v4 12/18] target/s390x: Simplify helper_lra Richard Henderson
2019-09-27 19:39 ` [PATCH v4 13/18] target/s390x: Rely on unwinding in s390_cpu_tlb_fill Richard Henderson
2019-09-27 19:39 ` [PATCH v4 14/18] target/s390x: Rely on unwinding in s390_cpu_virt_mem_rw Richard Henderson
2019-09-27 19:39 ` [PATCH v4 15/18] target/s390x: Remove ILEN_AUTO Richard Henderson
2019-09-27 19:39 ` [PATCH v4 16/18] target/s390x: Remove ilen argument from trigger_access_exception Richard Henderson
2019-09-27 19:39 ` [PATCH v4 17/18] target/s390x: Remove ilen argument from trigger_pgm_exception Richard Henderson
2019-09-27 19:39 ` [PATCH v4 18/18] target/s390x: Remove ILEN_UNWIND Richard Henderson
2019-09-30 15:45 ` David Hildenbrand
2019-10-01 8:07 ` [PATCH v4 00/18] target/s390: Use tcg unwinding for ilen David Hildenbrand
2019-10-01 15:02 ` Richard Henderson
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=85f219fa-1f67-f2be-06f7-b03393e06a06@redhat.com \
--to=david@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.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).