From patchwork Tue May 23 03:03:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 765711 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wX10S5nt7z9sNk for ; Tue, 23 May 2017 13:16:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lYpOxal7"; dkim-atps=neutral Received: from localhost ([::1]:45911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD0Ja-0008FS-87 for incoming@patchwork.ozlabs.org; Mon, 22 May 2017 23:16:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD06w-0005y1-3r for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD06v-0003zG-AO for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:50 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:34209) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD06v-0003zC-6N for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:49 -0400 Received: by mail-qt0-x241.google.com with SMTP id l39so20704308qtb.1 for ; Mon, 22 May 2017 20:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=SfSEkVt6/Ds0QR7cccthrQjk0H9H1DXREaIRrMgI1ho=; b=lYpOxal7fprSa808Bf8Lmy4CsymEUxTdpMFt0KKEBu0AzyUWSdd4RVSwLAZ9uluKxu wpBk6CgwPxZEfo4Wo8TfYQf/LtGRFp0lYeYUwEdFFck8be5YBjXXzTZ5xWw5beGWYHWf oXCwVEo057VuxRI0Tws8ioLvihxvZzzYxkx4yJlKkmuwMnKMTvETaVA50QGnhlQwJGvv Dpjfs6FtRNqPFXrlPTdexsUBR7wccAW328Y1rWIQF30+nsj/mTK+yw5N1+FmcjJsEol4 CyYeYzUWp5ot7/DyA1j5zJrUVRP305Nm4wPnYbRk2TQOG954xTXhQVrgiWEY1wdWKPds 27Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=SfSEkVt6/Ds0QR7cccthrQjk0H9H1DXREaIRrMgI1ho=; b=Fqgrkb+iAMarz5xu/TaF4o/ztSuqcHq1ur58ejeHST+mxU9ara2MyBswvg0jby4v6p s87E3vs4BnVp7udJ/c8GD20OdMG+9zWdBMG24pvIeWme64v/m63br3A8+eYR/yjn3o38 usANPrDPRAzYLN9OOo/ui4pU9BE8Q/8ZCrCl4OWf/zYK72zl6sFrD6ydjZQjEW8nVnT8 c/S/3PHd5sc4prFvUtLG4rPeba8MLLhQdASsEbQ9mojDhPzWhjJs/lbpCiNzP5sVUpmh 7YfxLPES2DxHGWgeXkkWbQMXIvRObH293hOgVplyczC37RAqZVzvD9Dqe709fOmyyW3b 7Sew== X-Gm-Message-State: AODbwcA4+yQXAibqDZ/bFWCO3CJeUTg9DkEGGjeYr7WduSlEVn08WoTV eYr6c6uOwGYtSgm3So4= X-Received: by 10.200.57.57 with SMTP id s54mr26616170qtb.53.1495508628486; Mon, 22 May 2017 20:03:48 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id s190sm12918805qkh.57.2017.05.22.20.03.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:03:07 -0700 Message-Id: <20170523030312.6360-27-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170523030312.6360-1-rth@twiddle.net> References: <20170523030312.6360-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH 26/31] target/s390x: Use unwind data for helper_testblock X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Aurelien Jarno --- target/s390x/mem_helper.c | 3 +++ target/s390x/translate.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 1e31bd3..a874f8a 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -912,6 +912,7 @@ void HELPER(stctl)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) uint32_t HELPER(testblock)(CPUS390XState *env, uint64_t real_addr) { + uintptr_t ra = GETPC(); CPUState *cs = CPU(s390_env_get_cpu(env)); uint64_t abs_addr; int i; @@ -920,12 +921,14 @@ uint32_t HELPER(testblock)(CPUS390XState *env, uint64_t real_addr) abs_addr = mmu_real2abs(env, real_addr) & TARGET_PAGE_MASK; if (!address_space_access_valid(&address_space_memory, abs_addr, TARGET_PAGE_SIZE, true)) { + cpu_restore_state(cs, ra); program_interrupt(env, PGM_ADDRESSING, 4); return 1; } /* Check low-address protection */ if ((env->cregs[0] & CR0_LOWPROT) && real_addr < 0x2000) { + cpu_restore_state(cs, ra); program_interrupt(env, PGM_PROTECTION, 4); return 1; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 3a2151f..694e099 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4047,7 +4047,6 @@ static ExitStatus op_tcxb(DisasContext *s, DisasOps *o) static ExitStatus op_testblock(DisasContext *s, DisasOps *o) { check_privileged(s); - potential_page_fault(s); gen_helper_testblock(cc_op, cpu_env, o->in2); set_cc_static(s); return NO_EXIT;