From patchwork Thu Jun 15 05:53:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9788111 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 7DCA360231 for ; Thu, 15 Jun 2017 05:58:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F95628500 for ; Thu, 15 Jun 2017 05:58:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 635DC28538; Thu, 15 Jun 2017 05:58:36 +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 2EC3828500 for ; Thu, 15 Jun 2017 05:58:34 +0000 (UTC) Received: from localhost ([::1]:52085 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLNne-0003rd-0s for patchwork-qemu-devel@patchwork.kernel.org; Thu, 15 Jun 2017 01:58:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLNjI-0000oJ-Su for qemu-devel@nongnu.org; Thu, 15 Jun 2017 01:54:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLNjI-00018M-6H for qemu-devel@nongnu.org; Thu, 15 Jun 2017 01:54:04 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:34192) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLNjI-00018B-0c for qemu-devel@nongnu.org; Thu, 15 Jun 2017 01:54:04 -0400 Received: by mail-pf0-x243.google.com with SMTP id d5so717368pfe.1 for ; Wed, 14 Jun 2017 22:54:03 -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=NzKFZuEUVH6gELItnIZttecrbkZuD5ApdiM+Iesztfg=; b=TmjUP1t5aEZ20KiZiLjwqZKgq0dNCR5l5Q2uP8YP9vKT6evEwGpm1nIS/kWHZmJluY 6hcdS70YlGRzRKAW7SUaZPqDO0wOTPduyqOuvK9c3BTvLDpqa2repyhvdPcLQGHkdLBT TTxZz09JqekKIU87+Hr+shmPLXXF1MTkmbyAweBw2hmWyEbmSPaXIKxIJf1lb3YMzBmz ahysxDEZhmFOcL0hCcLN05ZsGv22QYifd2eHx1NUZg9DRmo34r5fencxenoqMNu/hNLw zKjWFRvY9aR62C3U8KymKfFRI1dDbav5u9xdiNv6Ncxw52+fzVjV6iKUo/+4pv9UAfAc uw5g== 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=NzKFZuEUVH6gELItnIZttecrbkZuD5ApdiM+Iesztfg=; b=K/RC7a7cqe3TpPwLBCzLthfmhi5zkIDNNtZ0J+aFd2Mkk8A5QhzzeknFeQYqGlBDaW INIHsvTIc4FmpHlzudmhRmk8cEjdcCULb3k+MnxlduCtwf0JNcCcyJ81sggn46CaJ8RQ IXiW6yIQefHzUFhibF6gJTEOAeKBtSf+HV6MVoXIRPYirq6gawAERAEPMFfUPPLUNWiH L3JrHbgTceDSAsjjDA2X5e7mmoFPxrQ6vOLwZFeDAuMERNG4KcpqdJtjMb/6zWrZ21Ae rzVKTKkaod0Vf7cdCdIs+RjRqxLqw6vupuWB3IXIza9fEGAsMsuM4Rx7an7pEyBw3/T7 pO3A== X-Gm-Message-State: AKS2vOxgW7fGqvEop7u73VdY4/f9+7AW4GHhWGlKnpOJzFBHqYxgYoxw s8xY4HMIPY5OF6g4jfA= X-Received: by 10.99.171.12 with SMTP id p12mr3607479pgf.239.1497506042813; Wed, 14 Jun 2017 22:54:02 -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 k73sm310058pge.13.2017.06.14.22.54.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 22:54:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 14 Jun 2017 22:53:54 -0700 Message-Id: <20170615055356.20684-4-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170615055356.20684-1-rth@twiddle.net> References: <20170615055356.20684-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::243 Subject: [Qemu-devel] [PATCH 3/5] 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: aurelien@aurel32.net, david@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 48cee25..4773a10 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3752,7 +3752,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; }