From patchwork Sun Jun 4 17:34:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 771024 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 3wgmPW3tHcz9s71 for ; Mon, 5 Jun 2017 04:17:03 +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="KwHutkAC"; dkim-atps=neutral Received: from localhost ([::1]:58015 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHa5E-0004Lm-BR for incoming@patchwork.ozlabs.org; Sun, 04 Jun 2017 14:17:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZS2-0008Aj-6p for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:36:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZS1-0003tz-3i for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:36:30 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:36373) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZS0-0003tY-UT for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:36:29 -0400 Received: by mail-pf0-x241.google.com with SMTP id n23so18101599pfb.3 for ; Sun, 04 Jun 2017 10:36:28 -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=1OnC1qOxmh+UCsNTijRSvBaWRuYi+Hg4akum8TuUY6o=; b=KwHutkACK1cLQEFXmpYfJu0dKBfvinnxo8TddmOrZG1Lx85Z7ocsHrlSV0IkzW212s tJ5kKG+gfHMwUgdJxcTObI/ZZTrxvPDdGA8S+LQxN1VPGq5+pkGqHCCUBL9FApPxVmRk s6/2/ivwyHREBZQ9aQmki4YGrC7zcCTE5XjrQgA4SauqiI28REaZftOBRTaPah+anMRf H5mVv3Csv26HTF93gyQbvbvxgODZYALWpg+8iRFof16vwGCbEcXKFzvV5AYilejXNIS8 Vridq9Y/iGm7jrEhcDORsrqZoss5kaz7whajd/8dAd6dkB9Sc0MjXR6N3h7PBNDsTma9 g4PQ== 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=1OnC1qOxmh+UCsNTijRSvBaWRuYi+Hg4akum8TuUY6o=; b=UIsyZnlVkkE23tWwtjHxmEv1ubX+8v+SPUE7GNGcswFI326ET5Fq6mjzencm6rwgaJ cl7sFS4yeUkSM76DSRsDrADL4ue6jPyalhITjXUvvtCsB8BwhXdws7LsFZUiuQ6DvnGe X0Z/8r+kWQzVXakESe5BnUEE4fE16njHO1dcfYDZkLQ/iK7apA8Gm3GVy/sX+wVZiEng cXBV/Xu374Qy1CTqW0K/KYNPQlAPOIJ3bJDviBTvxU5W/p+qTRUx6kNmQfQM0fF0rrZ2 y/Gpsz9oj9AvWVjPYUj2pwC4tO1YW44vdEHXmQDUv1khUGSNmaAYsD2Lbxs6UuuKR3YO KhyA== X-Gm-Message-State: AODbwcAJse7ZYiNdE6I789Yb1VjOHWlbmpqhVTeVmZ8t1MEl0aQgYRxA +wpa1Gpe8pVrDG1eZFE= X-Received: by 10.99.173.75 with SMTP id y11mr17104752pgo.108.1496597787860; Sun, 04 Jun 2017 10:36:27 -0700 (PDT) Received: from bigtime.ASUS (cpe-98-155-27-246.hawaii.res.rr.com. [98.155.27.246]) by smtp.gmail.com with ESMTPSA id j191sm52854419pgc.53.2017.06.04.10.36.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:36:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:55 -0700 Message-Id: <20170604173509.29684-56-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170604173509.29684-1-rth@twiddle.net> References: <20170604173509.29684-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PULL 55/69] target/s390x: improve 24-bit and 31-bit lengths read/write 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" From: Aurelien Jarno Reviewed-by: Richard Henderson Signed-off-by: Aurelien Jarno Message-Id: <20170531220129.27724-17-aurelien@aurel32.net> Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 2113494..98a7aa2 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -407,6 +407,31 @@ static inline void set_address(CPUS390XState *env, int reg, uint64_t address) } } +static inline uint64_t wrap_length(CPUS390XState *env, uint64_t length) +{ + if (!(env->psw.mask & PSW_MASK_64)) { + /* 24-Bit and 31-Bit mode */ + length &= 0x7fffffff; + } + return length; +} + +static inline uint64_t get_length(CPUS390XState *env, int reg) +{ + return wrap_length(env, env->regs[reg]); +} + +static inline void set_length(CPUS390XState *env, int reg, uint64_t length) +{ + if (env->psw.mask & PSW_MASK_64) { + /* 64-Bit mode */ + env->regs[reg] = length; + } else { + /* 24-Bit and 31-Bit mode */ + env->regs[reg] = deposit64(env->regs[reg], 0, 32, length); + } +} + /* search string (c is byte to search, r2 is string, r1 end of string) */ uint64_t HELPER(srst)(CPUS390XState *env, uint64_t r0, uint64_t end, uint64_t str) @@ -598,19 +623,14 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) { uintptr_t ra = GETPC(); - uint64_t destlen = env->regs[r1 + 1]; + uint64_t destlen = get_length(env, r1 + 1); uint64_t dest = get_address(env, r1); - uint64_t srclen = env->regs[r3 + 1]; + uint64_t srclen = get_length(env, r3 + 1); uint64_t src = get_address(env, r3); uint8_t pad = a2 & 0xff; uint8_t v; uint32_t cc; - if (!(env->psw.mask & PSW_MASK_64)) { - destlen = (uint32_t)destlen; - srclen = (uint32_t)srclen; - } - if (destlen == srclen) { cc = 0; } else if (destlen < srclen) { @@ -632,10 +652,9 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, cpu_stb_data_ra(env, dest, pad, ra); } - env->regs[r1 + 1] = destlen; + set_length(env, r1 + 1 , destlen); /* can't use srclen here, we trunc'ed it */ - /* FIXME: 31-bit mode! */ - env->regs[r3 + 1] -= src - env->regs[r3]; + set_length(env, r3 + 1, env->regs[r3 + 1] - src - env->regs[r3]); set_address(env, r1, dest); set_address(env, r3, src); @@ -647,9 +666,9 @@ uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) { uintptr_t ra = GETPC(); - uint64_t destlen = env->regs[r1 + 1]; + uint64_t destlen = get_length(env, r1 + 1); uint64_t dest = get_address(env, r1); - uint64_t srclen = env->regs[r3 + 1]; + uint64_t srclen = get_length(env, r3 + 1); uint64_t src = get_address(env, r3); uint8_t pad = a2 & 0xff; uint32_t cc = 0; @@ -671,9 +690,9 @@ uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, } } - env->regs[r1 + 1] = destlen; + set_length(env, r1 + 1, destlen); /* can't use srclen here, we trunc'ed it */ - env->regs[r3 + 1] -= src - env->regs[r3]; + set_length(env, r3 + 1, env->regs[r3 + 1] - src - env->regs[r3]); set_address(env, r1, dest); set_address(env, r3, src);