From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E50AECE587 for ; Tue, 1 Oct 2019 15:49:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 742302070B for ; Tue, 1 Oct 2019 15:49:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 742302070B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFKOc-0002Jb-6U for qemu-devel@archiver.kernel.org; Tue, 01 Oct 2019 11:49:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46256) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFK0y-0003T0-64 for qemu-devel@nongnu.org; Tue, 01 Oct 2019 11:24:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFK0u-00088S-5p for qemu-devel@nongnu.org; Tue, 01 Oct 2019 11:24:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40570) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFK0t-00087r-Sc; Tue, 01 Oct 2019 11:24:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 180E010C0946; Tue, 1 Oct 2019 15:24:31 +0000 (UTC) Received: from [10.36.116.54] (ovpn-116-54.ams2.redhat.com [10.36.116.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39C165D713; Tue, 1 Oct 2019 15:24:30 +0000 (UTC) Subject: Re: [PATCH v4 02/18] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt To: Richard Henderson , qemu-devel@nongnu.org References: <20190927193925.23567-1-richard.henderson@linaro.org> <20190927193925.23567-3-richard.henderson@linaro.org> From: David Hildenbrand Openpgp: preference=signencrypt Autocrypt: addr=david@redhat.com; prefer-encrypt=mutual; keydata= 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 SE+xAvmumFBY Organization: Red Hat GmbH Message-ID: <85f219fa-1f67-f2be-06f7-b03393e06a06@redhat.com> Date: Tue, 1 Oct 2019 17:24:29 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190927193925.23567-3-richard.henderson@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Tue, 01 Oct 2019 15:24:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 > Signed-off-by: Richard Henderson > --- > 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