From patchwork Sat Jul 15 17:30:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9842449 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BF73A60392 for ; Sat, 15 Jul 2017 17:35:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A81A228645 for ; Sat, 15 Jul 2017 17:35:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9BAAE28647; Sat, 15 Jul 2017 17:35:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 27BAD28655 for ; Sat, 15 Jul 2017 17:35:22 +0000 (UTC) Received: from localhost ([::1]:42803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWQyP-0000FQ-BO for patchwork-qemu-devel@patchwork.kernel.org; Sat, 15 Jul 2017 13:35:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWQuP-0006WL-Ev for qemu-devel@nongnu.org; Sat, 15 Jul 2017 13:31:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dWQuN-0000v9-L0 for qemu-devel@nongnu.org; Sat, 15 Jul 2017 13:31:13 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:36582) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dWQuN-0000uy-F4 for qemu-devel@nongnu.org; Sat, 15 Jul 2017 13:31:11 -0400 Received: by mail-pf0-x244.google.com with SMTP id k24so866159pfj.3 for ; Sat, 15 Jul 2017 10:31:11 -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=cm6qv+J5qtUAtr/6e9moYaYNL4ayYT2KD4kLx+i2oWk=; b=ZR+K8jdenRA4T0vil6cDJnkX2pclwXLYKK3KNjCbODximcGRTc8A8cUXUs8uyonQ5K lHSK2UgtXRXDu4hDDFNfsfk1P5yKwDmKfzyGeO8J6CyQduoMwmQ/aw/ajeB9GfXS0f7u ZsnXT2ktmHK2IVK7poijb+kTCeAe8tbAptlS53cDEeiRFgYnvNidaZy4jW54XmnuQ0VL 9Zry/D/ErU2C+2zUdt83/Fio7wGDpTI1u0Oi9CNw8VsDbGhCrZjQZZm5QBYRmZY/hJNr rK3gq2qD/yCw1x3k1OYU7Vl/TMs3OlTPSUpk01pzblTC1UCbzNCsuC3FVEfCDNA77WnZ R2fQ== 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=cm6qv+J5qtUAtr/6e9moYaYNL4ayYT2KD4kLx+i2oWk=; b=IJQgH6HYKcWZno3M36bnIS727nnJbIqierYUOhNn3fphh45gNY6hPfErGUmIA7XwNR GucjhG2NTayWzc4rBV1qh47V2D6a8nPi61E2PEUSTIVac1IE9vIKnueOBxqy5w5iYfXq XH+GEMfquuVsuo9L3QYyp1ZNw2ovLrVH6P99Mgv2aqan6H3SVftnv2tF6DlhOUkrUYul qippj7eZ3oMWXedwvv5/DBWqAfSvCESwpd9NSfSiOG/QOwz4nJBJpW++7PZkPIG/74Lg oerIYnCnEK0KQ7Ct6B1ey1HyjdAVFCs1Tvdmwt0isKNxRrkfc81Ya8GwFIwnO50V1jEA z/4g== X-Gm-Message-State: AIVw1100QYOdUWBQ093jry+vSYSZur4VeMyxvOJ/Bj8SlUbgcgf/JCSi yVGS2r9JjtXDtLybN6M= X-Received: by 10.99.163.26 with SMTP id s26mr20991129pge.232.1500139870403; Sat, 15 Jul 2017 10:31:10 -0700 (PDT) Received: from bigtime.twiddle.net (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id w66sm27366075pfi.63.2017.07.15.10.31.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Jul 2017 10:31:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 15 Jul 2017 07:30:50 -1000 Message-Id: <20170715173050.31018-9-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170715173050.31018-1-rth@twiddle.net> References: <20170715173050.31018-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::244 Subject: [Qemu-devel] [PULL 8/8] target/s390x: Fix risbg handling 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 Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The rotation is to the left, but extract shifts to the right. The computation of the extract parameters needs adjusting. For the entry condition, simplify 64 - rot + len <= 64 -rot + len <= 0 len <= rot Reviewed-by: Aurelien Jarno Reported-by: David Hildenbrand Suggested-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index b46f4c8..1dffcee 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3479,8 +3479,8 @@ static ExitStatus op_risbg(DisasContext *s, DisasOps *o) } /* In some cases we can implement this with extract. */ - if (imask == 0 && pos == 0 && len > 0 && rot + len <= 64) { - tcg_gen_extract_i64(o->out, o->in2, rot, len); + if (imask == 0 && pos == 0 && len > 0 && len <= rot) { + tcg_gen_extract_i64(o->out, o->in2, 64 - rot, len); return NO_EXIT; }