From patchwork Mon Jul 10 20:45:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 786390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x5y4c5MdTz9s3T for ; Tue, 11 Jul 2017 06:49:20 +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="ig7gd3Gc"; dkim-atps=neutral Received: from localhost ([::1]:42993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfcM-0004BI-KH for incoming@patchwork.ozlabs.org; Mon, 10 Jul 2017 16:49:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfZv-0002gn-8j for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUfZs-00059f-47 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:47 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:34827) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUfZr-00059V-Vb for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:44 -0400 Received: by mail-qk0-f193.google.com with SMTP id 16so14399123qkg.2 for ; Mon, 10 Jul 2017 13:46:43 -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=z9odawZG2xFkROpQMBJmT07fSBvpO/HJpQ3u/IYWSXc=; b=ig7gd3Gcmi36T/qvVVkOSXuP3y02CoTozsoK894B/U8QzAtLv3qtJ0yoD2uKEouvS3 2k26F6tNk/b715BYa7rBJh5dQGfs2rr75NIhj1JoK41sAfRKLu70mz+I+xbV85CpEMQ+ edUx3ZkTOTQf1KuLK1qp02ZtVX7P1XYeMLhte+Bb6Zxyqeq66ttd9A2QY6riTyehsbIF +NnY9vDGUeiGFS2+MfL7x3tomni7QX+1WcafYQSWmFiuE933/LgDkDaabyy5WkF5AVsd X7fQrZw8UtJ85pxMBFALjrF/sQwjw8XKut6WHTJGVsohbwVH5/gngU7sv0YhSTZYcsSW hHtw== 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=z9odawZG2xFkROpQMBJmT07fSBvpO/HJpQ3u/IYWSXc=; b=heXsYJgGzWrR3Jm97ZKp8CBHiSmmYgTvnaxPVnI/ZqmAXRc/5A7K5UOuHLVvmuMn6i wrdvKskNXmPpWshMV69MSrcGi0vLnYWs0shsxbsZzdk7CaU7vo8wBTiGpRIG97kXNIZ5 YkKKYgCzOROYwoGA+lOtQehhbDHeeUPjfmVBOoTlSTTSu4Ckq70AgxYxmH6YAnF5PHnS FijqAE7nbp6NJ7Pxo0rjvcQfOVku4ZrxqfN/UvmJfEBTPEvcvUhdTFZ0chALKBml9ofh XEVApEIcwD0qV6qOHslNs8gGLBGPxLN8rK05rpxdv3W7tOIr6kjH9gUdK2yQ6ZQBz+gU 12fw== X-Gm-Message-State: AIVw110hNrjj65KyeJPmpeHC10a4mCZm7pDNsDcvNkLzEtJ83N6EUGPj JcrzjDPH6Hj13ehHcqE= X-Received: by 10.55.217.148 with SMTP id q20mr6175683qkl.76.1499719543153; Mon, 10 Jul 2017 13:45:43 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id v47sm9961143qtb.11.2017.07.10.13.45.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 13:45:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 10 Jul 2017 10:45:18 -1000 Message-Id: <20170710204521.2058-6-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710204521.2058-1-rth@twiddle.net> References: <20170710204521.2058-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.193 Subject: [Qemu-devel] [PATCH v3 5/8] target/s390x: Implement TRTR 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: aurelien@aurel32.net, david@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Drop TRT from the set of insns handled internally by EXECUTE. It's more important to adjust the existing helper to handle both TRT and TRTR. Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/helper.h | 1 + target/s390x/mem_helper.c | 20 +++++++++++++------- target/s390x/translate.c | 9 +++++++++ target/s390x/insn-data.def | 2 ++ 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 32314e0..4b02907 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -97,6 +97,7 @@ DEF_HELPER_FLAGS_3(tp, TCG_CALL_NO_WG, i32, env, i64, i32) DEF_HELPER_FLAGS_4(tr, TCG_CALL_NO_WG, void, env, i32, i64, i64) DEF_HELPER_4(tre, i64, env, i64, i64, i64) DEF_HELPER_4(trt, i32, env, i32, i64, i64) +DEF_HELPER_4(trtr, i32, env, i32, i64, i64) DEF_HELPER_5(trXX, i32, env, i32, i32, i32, i32) DEF_HELPER_4(cksm, i64, env, i64, i64, i64) DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_NO_RWG_SE, i32, env, i32, i64, i64, i64) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index e3db68d..b9d0477 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1277,17 +1277,18 @@ uint64_t HELPER(tre)(CPUS390XState *env, uint64_t array, return array + i; } -static uint32_t do_helper_trt(CPUS390XState *env, uint32_t len, uint64_t array, - uint64_t trans, uintptr_t ra) +static inline uint32_t do_helper_trt(CPUS390XState *env, int len, + uint64_t array, uint64_t trans, + int inc, uintptr_t ra) { - uint32_t i; + int i; for (i = 0; i <= len; i++) { - uint8_t byte = cpu_ldub_data_ra(env, array + i, ra); + uint8_t byte = cpu_ldub_data_ra(env, array + i * inc, ra); uint8_t sbyte = cpu_ldub_data_ra(env, trans + byte, ra); if (sbyte != 0) { - set_address(env, 1, array + i); + set_address(env, 1, array + i * inc); env->regs[2] = deposit64(env->regs[2], 0, 8, sbyte); return (i == len) ? 2 : 1; } @@ -1299,7 +1300,13 @@ static uint32_t do_helper_trt(CPUS390XState *env, uint32_t len, uint64_t array, uint32_t HELPER(trt)(CPUS390XState *env, uint32_t len, uint64_t array, uint64_t trans) { - return do_helper_trt(env, len, array, trans, GETPC()); + return do_helper_trt(env, len, array, trans, 1, GETPC()); +} + +uint32_t HELPER(trtr)(CPUS390XState *env, uint32_t len, uint64_t array, + uint64_t trans) +{ + return do_helper_trt(env, len, array, trans, -1, GETPC()); } /* Translate one/two to one/two */ @@ -2119,7 +2126,6 @@ void HELPER(ex)(CPUS390XState *env, uint32_t ilen, uint64_t r1, uint64_t addr) [0x6] = do_helper_oc, [0x7] = do_helper_xc, [0xc] = do_helper_tr, - [0xd] = do_helper_trt, }; dx_helper helper = dx[opc & 0xf]; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 57e6909..f94ba7c 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4439,6 +4439,15 @@ static ExitStatus op_trt(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_trtr(DisasContext *s, DisasOps *o) +{ + TCGv_i32 l = tcg_const_i32(get_field(s->fields, l1)); + gen_helper_trtr(cc_op, cpu_env, l, o->addr1, o->in2); + tcg_temp_free_i32(l); + set_cc_static(s); + return NO_EXIT; +} + static ExitStatus op_trXX(DisasContext *s, DisasOps *o) { TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 1d34df03..ad84c74 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -916,6 +916,8 @@ C(0xdc00, TR, SS_a, Z, la1, a2, 0, 0, tr, 0) /* TRANSLATE AND TEST */ C(0xdd00, TRT, SS_a, Z, la1, a2, 0, 0, trt, 0) +/* TRANSLATE AND TEST REVERSE */ + C(0xd000, TRTR, SS_a, ETF3, la1, a2, 0, 0, trtr, 0) /* TRANSLATE EXTENDED */ C(0xb2a5, TRE, RRE, Z, 0, r2, r1_P, 0, tre, 0)