From patchwork Wed Jun 7 00:30:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 772097 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 3wj8pn2K8Dz9s7m for ; Wed, 7 Jun 2017 10:40:17 +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="k1X7H2ow"; dkim-atps=neutral Received: from localhost ([::1]:40587 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIP1C-0001ci-UT for incoming@patchwork.ozlabs.org; Tue, 06 Jun 2017 20:40:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOt1-0002Yq-3d for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOsz-0001vU-HF for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:47 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:35096) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOsz-0001vQ-DT for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:45 -0400 Received: by mail-qt0-x244.google.com with SMTP id x58so19242283qtc.2 for ; Tue, 06 Jun 2017 17:31:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=7YHhs8SRU+kHelVyk0DzdUWpp9e1+Bo2BuPlZ1NXW24=; b=k1X7H2owNqa8hCovC2+KCWoZ8FTtGc7wdVROICgu8nKBCvaeskoIMfZawx7P5NFOwk xj71hUvZxjnx+zJbxSBWPdnRRBILW1i79TyKdMbVktL37f4DfltqhWwqZl64oiNmpuRK Ih7THOtL80PPGS+SvC52MgDbemFepOdGn7tTNMnS9tkGiHw3TgXR7Ne+ApLAqHuxA8v9 XVtxaiU7JK7mF0nnBkvMbmEWETfYM25s6Iin8zK9p45ulDlt+ss3TJ0N1dZoERPk8+qR gesmACixUvVdpILdwLuEbcOdj/ohUD7cHasm1D8y91wfrHUIiF6ZuYKq3IrgHtANlG+o 0TLw== 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:cc:subject:date:message-id :in-reply-to:references; bh=7YHhs8SRU+kHelVyk0DzdUWpp9e1+Bo2BuPlZ1NXW24=; b=lhcdYApDqAoYa+pzNiPr7eK87mf6v1+Ewp8SBntDiVW/M/A0CUeOBMXIl1FlMERYaQ 0Gl9WdDzYyaDqNY3Wau+rqPagLEQbLOFScawmP8HWfujgQLGeOnJlS72twQ6pCC3ivvR 1XIDyqj+ZG3ONruc8iUWpYjUc8OtsKg8T7h7ywRMrg5xDMYyVrfaH0hb3dQTPHl3TsRs hHBSRLVi7shNMHR7anfKCgoWwvB0Eaf6JX5pRamBNSSbmAEmxxrcvfuM+pIjHZgi20Gj TXQ53HLuFT+CN4yqtX590Jf7nfTtX6oAIzKUW7cfEfBJDwOrCgCTn9u0ipqFSAnFi18N 7FPg== X-Gm-Message-State: AODbwcDIDu9X9rnz0E7IePhfkWdD8LMaJ+7dO66CdWFHZvxSwmjqtZjk LBsfQ+m56IEWItx8Vas= X-Received: by 10.200.11.193 with SMTP id p1mr33115701qti.221.1496795504746; Tue, 06 Jun 2017 17:31:44 -0700 (PDT) Received: from bigtime.twiddle.net.com (71-217-91-69.tukw.qwest.net. [71.217.91.69]) by smtp.gmail.com with ESMTPSA id m47sm29286qtc.36.2017.06.06.17.31.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:24 -0700 Message-Id: <20170607003119.14778-16-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170607003119.14778-1-rth@twiddle.net> References: <20170607003119.14778-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::244 Subject: [Qemu-devel] [PULL v2 15/70] target/s390x: Use unwind data for helper_stam 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: , Cc: peter.maydell@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Thomas Huth Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 3 ++- target/s390x/translate.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 88e817a..2acc984 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -485,10 +485,11 @@ void HELPER(lam)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) /* store access registers r1 to r3 in memory at a2 */ void HELPER(stam)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) { + uintptr_t ra = GETPC(); int i; for (i = r1;; i = (i + 1) % 16) { - cpu_stl_data(env, a2, env->aregs[i]); + cpu_stl_data_ra(env, a2, env->aregs[i], ra); a2 += 4; if (i == r3) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 16477fc..4ae949a 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3867,7 +3867,6 @@ static ExitStatus op_stam(DisasContext *s, DisasOps *o) { TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3)); - potential_page_fault(s); gen_helper_stam(cpu_env, r1, o->in2, r3); tcg_temp_free_i32(r1); tcg_temp_free_i32(r3);