From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dFLjo-0001r5-VH for qemu-devel@nongnu.org; Mon, 29 May 2017 10:33:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dFLjj-00068p-Uq for qemu-devel@nongnu.org; Mon, 29 May 2017 10:33:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42122) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dFLjj-00068P-O3 for qemu-devel@nongnu.org; Mon, 29 May 2017 10:33:35 -0400 References: <20170529121228.2789-1-david@redhat.com> From: Thomas Huth Message-ID: Date: Mon, 29 May 2017 16:33:29 +0200 MIME-Version: 1.0 In-Reply-To: <20170529121228.2789-1-david@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1] target/s390x: addressing exceptions are suppressing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Hildenbrand , qemu-devel@nongnu.org Cc: agraf@suse.de, Aurelien Jarno , rth@twiddle.net On 29.05.2017 14:12, David Hildenbrand wrote: > We have to make the address in the old PSW point at the next > instruction, as addressing exceptions are suppressing and not > nullifying. According to "Figure 6-1. Interruption Action" in the PoP, they could also be terminating ... but anyway, not nullifying, so the PSW should be increased afterwards. So: Reviewed-by: Thomas Huth > I assume that there are a lot of other broken cases (as most instructions > we care about are suppressing) - all trigger_pgm_exception() specifying > and explicit number or ILEN_LATER look suspicious, however this is another > story that might require bigger changes (and I have to understand when > the address might already have been incremented first). > > This is needed to make an upcoming kvm-unit-test work. > > Signed-off-by: David Hildenbrand > --- > target/s390x/helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/s390x/helper.c b/target/s390x/helper.c > index 9978490..c09e391 100644 > --- a/target/s390x/helper.c > +++ b/target/s390x/helper.c > @@ -204,7 +204,7 @@ int s390_cpu_handle_mmu_fault(CPUState *cs, vaddr orig_vaddr, > if (raddr > ram_size) { > DPRINTF("%s: raddr %" PRIx64 " > ram_size %" PRIx64 "\n", __func__, > (uint64_t)raddr, (uint64_t)ram_size); > - trigger_pgm_exception(env, PGM_ADDRESSING, ILEN_LATER); > + trigger_pgm_exception(env, PGM_ADDRESSING, ILEN_LATER_INC); > return 1; > } > >