From patchwork Fri May 26 00:32:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 767185 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 3wYnCf3wQ3z9s2Q for ; Fri, 26 May 2017 10:32:44 +1000 (AEST) Received: from localhost ([::1]:34258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dE3BI-0003Qj-Gf for incoming@patchwork.ozlabs.org; Thu, 25 May 2017 20:32:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dE3Av-0003Hc-Pp for qemu-devel@nongnu.org; Thu, 25 May 2017 20:32:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dE3Au-0007cg-TF for qemu-devel@nongnu.org; Thu, 25 May 2017 20:32:17 -0400 Received: from hall.aurel32.net ([2001:bc8:30d7:100::1]:38692) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dE3Au-0007ca-N2 for qemu-devel@nongnu.org; Thu, 25 May 2017 20:32:16 -0400 Received: from [2001:bc8:30d7:121:cc44:2c6c:4d9c:42c0] (helo=ohm.rr44.fr) by hall.aurel32.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dE3Ar-0007vt-2Z; Fri, 26 May 2017 02:32:13 +0200 Received: from aurel32 by ohm.rr44.fr with local (Exim 4.89) (envelope-from ) id 1dE3Aq-0000oy-BF; Fri, 26 May 2017 02:32:12 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Fri, 26 May 2017 02:32:07 +0200 Message-Id: <20170526003207.3101-1-aurelien@aurel32.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170525210508.4910-1-aurelien@aurel32.net> References: <20170525210508.4910-1-aurelien@aurel32.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:bc8:30d7:100::1 Subject: [Qemu-devel] [PATCH 27/26] target/s390x: fix adj_len_to_page 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: Alexander Graf , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" adj_len_to_page doesn't return the correct result when the address is already page aligned and the length is bigger than a page. Fix that. Signed-off-by: Aurelien Jarno Reviewed-by: Richard Henderson --- target/s390x/mem_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The patch 17 (improve MOVE LONG and MOVE LONG EXTENDED) triggered a bug in adj_len_to_page. This is the fix, I just didn't want to respin the series just for that. diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 6add413531..7841808fa2 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -61,7 +61,7 @@ static inline uint32_t adj_len_to_page(uint32_t len, uint64_t addr) { #ifndef CONFIG_USER_ONLY if ((addr & ~TARGET_PAGE_MASK) + len - 1 >= TARGET_PAGE_SIZE) { - return -addr & ~TARGET_PAGE_MASK; + return (~addr & ~TARGET_PAGE_MASK) + 1; } #endif return len;