From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:56156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPzyP-0000Jk-Ax for qemu-devel@nongnu.org; Mon, 14 Nov 2011 12:05:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPzyJ-0003n7-Nn for qemu-devel@nongnu.org; Mon, 14 Nov 2011 12:05:33 -0500 Received: from cantor2.suse.de ([195.135.220.15]:49726 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPzyJ-0003l4-Hw for qemu-devel@nongnu.org; Mon, 14 Nov 2011 12:05:27 -0500 From: Alexander Graf Date: Mon, 14 Nov 2011 18:06:32 +0100 Message-Id: <1321290400-32717-5-git-send-email-agraf@suse.de> In-Reply-To: <1321290400-32717-1-git-send-email-agraf@suse.de> References: <1321290400-32717-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 04/12] s390x: implement rrbe instruction properly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Developers Cc: blauwirbel@gmail.com 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 */ -- 1.6.0.2