From patchwork Fri Nov 11 17:49:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 125253 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 675E11007D8 for ; Sat, 12 Nov 2011 05:03:50 +1100 (EST) Received: from localhost ([::1]:53105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROvEn-0007Nx-5o for incoming@patchwork.ozlabs.org; Fri, 11 Nov 2011 12:50:01 -0500 Received: from eggs.gnu.org ([140.186.70.92]:55196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROvDz-0004yH-0Q for qemu-devel@nongnu.org; Fri, 11 Nov 2011 12:49:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ROvDt-0002lr-PV for qemu-devel@nongnu.org; Fri, 11 Nov 2011 12:49:10 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45056 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROvDt-0002lC-Dd for qemu-devel@nongnu.org; Fri, 11 Nov 2011 12:49:05 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 1A2FC8CC2B; Fri, 11 Nov 2011 18:49:04 +0100 (CET) From: Alexander Graf To: qemu-devel Developers Date: Fri, 11 Nov 2011 18:49:15 +0100 Message-Id: <1321033763-19881-9-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1321033763-19881-1-git-send-email-agraf@suse.de> References: <1321033763-19881-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH 08/16] s390x: implement rrbe instruction properly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+incoming=patchwork.ozlabs.org@nongnu.org The rrbe instruction resets the reference bit in the given storage key. So far, we merely made it a nop and also returned an invalid CC value, so that the kernel never knew if a page actually got accessed. This patch implements it properly, flushing the R bit and returning the correct CC value. Signed-off-by: Alexander Graf --- target-s390x/op_helper.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/target-s390x/op_helper.c b/target-s390x/op_helper.c index 440e871..364b100 100644 --- a/target-s390x/op_helper.c +++ b/target-s390x/op_helper.c @@ -2779,14 +2779,15 @@ void HELPER(sske)(uint32_t r1, uint64_t r2) /* reset reference bit extended */ uint32_t HELPER(rrbe)(uint32_t r1, uint64_t r2) { + uint8_t re; + uint8_t key; if (r2 > ram_size) { return 0; } - /* XXX implement */ -#if 0 - env->storage_keys[r2 / TARGET_PAGE_SIZE] &= ~SK_REFERENCED; -#endif + key = env->storage_keys[r2 / TARGET_PAGE_SIZE]; + re = key & (SK_R | SK_C); + env->storage_keys[r2 / TARGET_PAGE_SIZE] = (key & ~SK_R); /* * cc @@ -2796,7 +2797,8 @@ uint32_t HELPER(rrbe)(uint32_t r1, uint64_t r2) * 2 Reference bit one; change bit zero * 3 Reference bit one; change bit one */ - return 0; + + return re >> 1; } /* compare and swap and purge */