From patchwork Tue Jun 20 00:03:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 778033 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 3ws7Q70LkKz9s3T for ; Tue, 20 Jun 2017 10:05:01 +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="NbfQdnk1"; dkim-atps=neutral Received: from localhost ([::1]:44861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN6fC-0003O7-HX for incoming@patchwork.ozlabs.org; Mon, 19 Jun 2017 20:04:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN6eR-0003MN-Sv for qemu-devel@nongnu.org; Mon, 19 Jun 2017 20:04:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dN6eQ-0001nk-Ki for qemu-devel@nongnu.org; Mon, 19 Jun 2017 20:04:11 -0400 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:33183) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dN6eQ-0001nW-Ek for qemu-devel@nongnu.org; Mon, 19 Jun 2017 20:04:10 -0400 Received: by mail-pg0-x243.google.com with SMTP id u62so12966309pgb.0 for ; Mon, 19 Jun 2017 17:04:10 -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=Lt6ZiUxNfNruoCQy5tzZXyJKl94Bf2KRJdjVloolbpQ=; b=NbfQdnk1PjkXCfCVtY6nLFeNMwV6SrOTakCj4awW6yJRYPGaODlmDwRk28gpC572Gm MmutcUaF4ULDpIg8R3GD09Mh6c3oO3pN07eMqA0GV6VjjC9cU12sF923fJ5Qa+BNtm+a S+FL2crJBnOfTEq9nCjh2igResps6cbONso++nbp3zmU062p6KdJ2JKtw9dupqd9zZld fvre663LyDHpVFuLIQbzszcs2EIQXjRxlmwSBoKNwGRYhHXy4LF9ffatMsTTtIbHa3SA cTgeU9YwSWiOKcHd53cL9QD3CkiuzIQ8k3zSidO/uGu/zmtW+sH2aQj99f6S8WUxtIM8 Y5pQ== 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=Lt6ZiUxNfNruoCQy5tzZXyJKl94Bf2KRJdjVloolbpQ=; b=fv97yS1VPGEhN0JRdkCEBJUS1mqBiNSAQqLUGFvDbg4PTFmHcUtBD9OurXdJ+hPoTY uPd1Xzq9WMgdapw5mFM/V015S/LWywdGHVRPyNVmYFDSW097xfQRxlimBCSazQJZWWHE GhhGfltqkCtst8N5WQYQS1EfettbcLXVeR4Nxz2zxA5kZbcciJi1/H5alk+BKExu+Qjn ciaQjKyuwdv4/saDk56p0+mWL4K+UwxGXhJWQo+aD08udIDiv/6M1zdllA7f10t8smkC XutDccXeO/J9wj/GBKEN2NmDCyx8Cvr3OOn9Xa+gwnqCB0l3XuaQvuKPf2BRh1esqQGG AlfQ== X-Gm-Message-State: AKS2vOzwQqEPRAqDtNoIfUIDf24c5r6Lp8OI+UPOZYp3FqpGM15uD8J9 g03pNGTwpTvSRl/0T6g= X-Received: by 10.84.208.102 with SMTP id f35mr31993710plh.53.1497917049315; Mon, 19 Jun 2017 17:04:09 -0700 (PDT) Received: from bigtime.twiddle.net (97-113-165-157.tukw.qwest.net. [97.113.165.157]) by smtp.gmail.com with ESMTPSA id o8sm23064937pgn.52.2017.06.19.17.04.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jun 2017 17:04:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 19 Jun 2017 17:03:49 -0700 Message-Id: <20170620000405.3391-3-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170620000405.3391-1-rth@twiddle.net> References: <20170620000405.3391-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::243 Subject: [Qemu-devel] [PATCH v3 02/18] target/s390x: change PSW_SHIFT_KEY 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: thuth@redhat.com, aurelien@aurel32.net, David Hildenbrand Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: David Hildenbrand Such shifts are usually used to easily extract the PSW KEY from the PSW mask, so let's avoid the confusing offset of 4. Reviewed-by: Thomas Huth Signed-off-by: David Hildenbrand Message-Id: <20170614133819.18480-2-david@redhat.com> Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- target/s390x/cpu.h | 2 +- target/s390x/translate.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index a4028fb..532a4a0 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -315,7 +315,7 @@ void s390x_cpu_debug_excp_handler(CPUState *cs); #define PSW_MASK_IO 0x0200000000000000ULL #define PSW_MASK_EXT 0x0100000000000000ULL #define PSW_MASK_KEY 0x00F0000000000000ULL -#define PSW_SHIFT_KEY 56 +#define PSW_SHIFT_KEY 52 #define PSW_MASK_MCHECK 0x0004000000000000ULL #define PSW_MASK_WAIT 0x0002000000000000ULL #define PSW_MASK_PSTATE 0x0001000000000000ULL diff --git a/target/s390x/translate.c b/target/s390x/translate.c index af18ffb..204b52a 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3751,7 +3751,7 @@ static ExitStatus op_spka(DisasContext *s, DisasOps *o) { check_privileged(s); tcg_gen_shri_i64(o->in2, o->in2, 4); - tcg_gen_deposit_i64(psw_mask, psw_mask, o->in2, PSW_SHIFT_KEY - 4, 4); + tcg_gen_deposit_i64(psw_mask, psw_mask, o->in2, PSW_SHIFT_KEY, 4); return NO_EXIT; }