From patchwork Fri Jul 7 02:20:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9829381 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 364E9602CA for ; Fri, 7 Jul 2017 02:25:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21D9A27F95 for ; Fri, 7 Jul 2017 02:25:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1505628403; Fri, 7 Jul 2017 02:25:47 +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 BE03427F95 for ; Fri, 7 Jul 2017 02:25:46 +0000 (UTC) Received: from localhost ([::1]:54113 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTIxm-0003AT-1W for patchwork-qemu-devel@patchwork.kernel.org; Thu, 06 Jul 2017 22:25:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTIuH-00016Q-BU for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:22:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTIuG-0007vp-En for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:22:09 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:34298) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTIuG-0007us-AY for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:22:08 -0400 Received: by mail-qk0-x243.google.com with SMTP id 91so2758996qkq.1 for ; Thu, 06 Jul 2017 19:22:08 -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=/2RQA2pCfASvSZgBCJwGToTSJoE3Uf0w/4ExDZuZHQc=; b=mAc9YolP+J55mNE0SD3lWPsrxDgAB6qNpBGhUdBE857qmywenE2BCyWeEqNQO9BOys T8szFTuGwxU09jnt1m/wXeQvoT5jvrmNDsfEOPamcEo7mrC4WqUzdKPtoKWxWRUnwVSH jvxoMbCvVl75z/+o+cH7/uQ78IxrcG66M2TUvpLdNOL4AXVh4FmxEeSthw5Ipj1LbOvU 1p1vpHa0rzZhJd8mo/mIcvjD2NYIjBoI3HitGc87MuGKLsXZaWXoP9sNNqhyZmZI6/wP O/v63sObH8WPrxCgMu6IOwJK/u8q7Zns6OKB4nJYaCeoH3fuY94HIYs+4t81mznuPI1+ BTsA== 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=/2RQA2pCfASvSZgBCJwGToTSJoE3Uf0w/4ExDZuZHQc=; b=cbMPgC7eRm8YljdGxzbDJ+BBH5W20XjV7AsIM3DCP6xYwgYEHlXIcaRCMGyJY5mflx ZPNK1/b4tXnLw1xmAhcvCjMvGlWfuPjzZaPzDARIajITXvYbJusKkdKgd4HcN0R6WJHn AQiofBEhMlyl2hJP0vEgWmLQTNzaDs0Ba6+3goBrKuySRCgziuqaxK7S55zMTiTB/vlE dOLBUUb6R5/G3LWLkAYF3DpfnTHzjSXZf3NseXctZjNsHtmgX5jv9lldFrX0Jpej8I9B MVry5l9p1F7ylZiE7qTLN7EghqFTVyjY5GpWpjATrMy1xVFgmAYb0eVgsPxj6d0NSosf PJUw== X-Gm-Message-State: AKS2vOxz+DeZUQX1JH8mMAjxCXO4s9I8OJchjFmlESf0uFFOlXD/KSbp v/ZTh3sGVbkOJLQFdnc= X-Received: by 10.233.221.70 with SMTP id r67mr60888525qkf.81.1499394127596; Thu, 06 Jul 2017 19:22:07 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-66-91-136-156.west.biz.rr.com. [66.91.136.156]) by smtp.gmail.com with ESMTPSA id i85sm1407176qke.66.2017.07.06.19.22.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 19:22:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 6 Jul 2017 16:20:49 -1000 Message-Id: <20170707022111.21836-6-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170707022111.21836-1-rth@twiddle.net> References: <20170707022111.21836-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v2 05/27] target/sh4: Adjust TB_FLAG_PENDING_MOVCA 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: bruno@clisp.org, laurent@vivier.eu, aurelien@aurel32.net, glaubitz@debian.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Don't leave an unused bit after DELAY_SLOT_MASK. Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno Reviewed-by: Philippe Mathieu-Daudé --- target/sh4/cpu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index 6d179a7..da31805 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -96,6 +96,8 @@ #define DELAY_SLOT_CONDITIONAL (1 << 1) #define DELAY_SLOT_RTE (1 << 2) +#define TB_FLAG_PENDING_MOVCA (1 << 3) + #define TB_FLAG_ENVFLAGS_MASK DELAY_SLOT_MASK typedef struct tlb_t { @@ -369,8 +371,6 @@ static inline int cpu_ptel_pr (uint32_t ptel) #define PTEA_TC (1 << 3) #define cpu_ptea_tc(ptea) (((ptea) & PTEA_TC) >> 3) -#define TB_FLAG_PENDING_MOVCA (1 << 4) - static inline target_ulong cpu_read_sr(CPUSH4State *env) { return env->sr | (env->sr_m << SR_M) | @@ -395,7 +395,7 @@ static inline void cpu_get_tb_cpu_state(CPUSH4State *env, target_ulong *pc, | (env->fpscr & (FPSCR_FR | FPSCR_SZ | FPSCR_PR)) /* Bits 19-21 */ | (env->sr & ((1u << SR_MD) | (1u << SR_RB))) /* Bits 29-30 */ | (env->sr & (1u << SR_FD)) /* Bit 15 */ - | (env->movcal_backup ? TB_FLAG_PENDING_MOVCA : 0); /* Bit 4 */ + | (env->movcal_backup ? TB_FLAG_PENDING_MOVCA : 0); /* Bit 3 */ } #endif /* SH4_CPU_H */