From patchwork Tue May 23 03:02:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 765696 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 3wX0p13nY2z9sNf for ; Tue, 23 May 2017 13:07:53 +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="oiPW0Btd"; dkim-atps=neutral Received: from localhost ([::1]:45868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD0Ao-00006I-UF for incoming@patchwork.ozlabs.org; Mon, 22 May 2017 23:07:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD06Z-0005cc-VL for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD06Z-0003ka-57 for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:27 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:35317) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD06Z-0003kF-0g for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:27 -0400 Received: by mail-qt0-x241.google.com with SMTP id r58so20674772qtb.2 for ; Mon, 22 May 2017 20:03:26 -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=53IkC8R8QZpe/Km/je0ip5WE0O/8WJ06yPBsYaUcxZ0=; b=oiPW0BtdeQj/wjTWm+mjOlShp50oqTeyr1I5fQGhBXaTi5ZLUwJpkpAOGIgnkRFEHF yyEN7x6Na5ufiPD7nsWDWiTwVBRHakpMs74outkuYgTjkPks4tJs6+cK/Vn8GxuncHs9 ujesvCEQRUfntVWCwMIFcwlWV+AkWK/DVgv3D4wDUsbWOy9WyI2+oiCk4lBaXWvLsBqU OaFowp06mzha8+/dXVW5tPpDpw6J6/vxMMfHMwVszIWBXC4GS0fqNSS7CtsSI4kYDBKj BeFJia+b2SaiUcqWPvGWzXOQh+iW0Kf0B/E2VyUFjCqSigkutX2WRh3K81XVasNEnW1B axCQ== 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=53IkC8R8QZpe/Km/je0ip5WE0O/8WJ06yPBsYaUcxZ0=; b=htO4VOkMjZdwgJFU84/cBbF1gnmX5kE5K2znj5yAGQkQBJQmJKnU1EA/Ckbk39tj2t OC0YMLav7pcJv7S5N6vt7xDeKcjPcR6kLnFbr0kyWqYwfTObBnJPEAK6SS/nj6/OsC8a d8B6ei6L9QAs/44mVR3DN6dKUvSTqOcPnv5JMeAHbjRrD/+VvgOE/VR2HHK45i85cfe2 m0KGAwgnppb9DWQo94yxZj6WzcOsC+NcVrZSOaPAkEp2OaxhLOEBuubLogqEQs01AHDB hkb2pADlS2ePI+PsjP5haYAwEirtB6uUygddTVn3eG105TaQfYQDfZqXWTS3sQ/22Alu zQ+w== X-Gm-Message-State: AODbwcDH4R12/NXWT0YdkW6MHFODCjZi5ODtaan9pYk5GyoQf6lFtNxQ xj/+pe78c+y31xYNtFg= X-Received: by 10.200.46.217 with SMTP id i25mr23667619qta.188.1495508606301; Mon, 22 May 2017 20:03:26 -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.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:02:48 -0700 Message-Id: <20170523030312.6360-8-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 07/31] target/s390x: Use unwind data for helper_clc 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 | 18 +++++++++--------- target/s390x/translate.c | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 0295485..d04850b 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -215,26 +215,26 @@ void HELPER(mvc)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src) /* compare unsigned byte arrays */ uint32_t HELPER(clc)(CPUS390XState *env, uint32_t l, uint64_t s1, uint64_t s2) { - int i; - unsigned char x, y; - uint32_t cc; + uintptr_t ra = GETPC(); + uint32_t cc = 0; + uint32_t i; HELPER_LOG("%s l %d s1 %" PRIx64 " s2 %" PRIx64 "\n", __func__, l, s1, s2); + for (i = 0; i <= l; i++) { - x = cpu_ldub_data(env, s1 + i); - y = cpu_ldub_data(env, s2 + i); + uint8_t x = cpu_ldub_data_ra(env, s1 + i, ra); + uint8_t y = cpu_ldub_data_ra(env, s2 + i, ra); HELPER_LOG("%02x (%c)/%02x (%c) ", x, x, y, y); if (x < y) { cc = 1; - goto done; + break; } else if (x > y) { cc = 2; - goto done; + break; } } - cc = 0; - done: + HELPER_LOG("\n"); return cc; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 66f3cd6..aefbc90 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1903,7 +1903,6 @@ static ExitStatus op_clc(DisasContext *s, DisasOps *o) tcg_gen_qemu_ld64(cc_dst, o->in2, get_mem_index(s)); break; default: - potential_page_fault(s); vl = tcg_const_i32(l); gen_helper_clc(cc_op, cpu_env, vl, o->addr1, o->in2); tcg_temp_free_i32(vl);