From nobody Wed Nov 5 10:36:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499394370535778.1874937640763; Thu, 6 Jul 2017 19:26:10 -0700 (PDT) Received: from localhost ([::1]:54121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTIy9-0004Id-Ae for importer@patchew.org; Thu, 06 Jul 2017 22:26:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTIu6-0000z6-1S for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:21:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTIu4-0007kU-SG for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:21:57 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:34290) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTIu4-0007k5-Nh for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:21:56 -0400 Received: by mail-qk0-x244.google.com with SMTP id 91so2758598qkq.1 for ; Thu, 06 Jul 2017 19:21:56 -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.21.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 19:21:55 -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=U15tUBzVdM7uJXA0+8ZOa5CzWxUH0IpH7gw63PiNv2c=; b=oqy1Z4H7CJQfZuUt9Fat1Rj7UFWq1GBzaECAopt18jPTrblMmTczehzohSXyaIalnj WW12FcM96Iq6E3wGyfF6HbGoyD0Hmpm5s0YWViMv3627zFoG6IYHoKCG87kpXq+wMP9H 9z6/1HomtM2TpoooDtOfyMaexFeDKkveSwZVpANkdpvNgyJewg5B2kBtLw68xMoL1wmY klOhiuk6hAoJnVF9h8jKJJU4Lzkf0HcTVGl8LbssiaTrDcdj8jxqltebr8HQ1FpsBkGW WHi6asnPQEUpEEFw8GvvjXjhEK+Gy/wjRcX9d1RrLD+RBFX8jIr+YHXy3IPJ47BW7iOD vtqw== 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=U15tUBzVdM7uJXA0+8ZOa5CzWxUH0IpH7gw63PiNv2c=; b=gz5AhREAQnggQkpugD4aicHfmNmZe/0gxMhKeGXcJQ4RmPFU127pkIxAtldZPxstTu UZcCPlqcawSU6QqE5TqmTcOlFp2YU0f38enDIEABdKuWjidlXam/BbTrYmZduzRIkNwE Ea5Ghkva0424Lo9CIJxKLyKhTqcpfxkFeD8dy9yUIXW+yL13bjcCqWg/n+/sXe0Klj7G gkaUc9BrE9EV3pGAv2/Uq0DrMXQJvJGCEYGDD8u5H0eRr8bWF/SrwnPlUjAOfk1DXIjJ ReR5aEAZ84IwRRbQFRvEZ0SmdV423eFgm8HpewdnRALy6X2MNmHP5n9c5Qh0+aRsR0Ok KvQg== X-Gm-Message-State: AKS2vOxvD6s9e4k6OjL+sQwH2GB/9M/OJoPb9AGA04ZIFJf2M+8t9Wdu j+u/RgQDHJ8aBnaRqV4= X-Received: by 10.55.99.85 with SMTP id x82mr66640407qkb.62.1499394115972; Thu, 06 Jul 2017 19:21:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 6 Jul 2017 16:20:47 -1000 Message-Id: <20170707022111.21836-4-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::244 Subject: [Qemu-devel] [PATCH v2 03/27] target/sh4: Introduce TB_FLAG_ENVFLAGS_MASK 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We'll be putting more things into this bitmask soon. Let's have a name that covers all possible uses. Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/sh4/cpu.h | 4 +++- target/sh4/translate.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index b15116e..240ed36 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) =20 +#define TB_FLAG_ENVFLAGS_MASK DELAY_SLOT_MASK + typedef struct tlb_t { uint32_t vpn; /* virtual page number */ uint32_t ppn; /* physical page number */ @@ -389,7 +391,7 @@ static inline void cpu_get_tb_cpu_state(CPUSH4State *en= v, target_ulong *pc, { *pc =3D env->pc; *cs_base =3D 0; - *flags =3D (env->flags & DELAY_SLOT_MASK) /* Bits = 0- 2 */ + *flags =3D (env->flags & TB_FLAG_ENVFLAGS_MASK) /* Bits 0-2 */ | (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 */ diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 663b5c0..cf53cd6 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -225,7 +225,7 @@ static inline void gen_save_cpu_state(DisasContext *ctx= , bool save_pc) if (ctx->delayed_pc !=3D (uint32_t) -1) { tcg_gen_movi_i32(cpu_delayed_pc, ctx->delayed_pc); } - if ((ctx->tbflags & DELAY_SLOT_MASK) !=3D ctx->envflags) { + if ((ctx->tbflags & TB_FLAG_ENVFLAGS_MASK) !=3D ctx->envflags) { tcg_gen_movi_i32(cpu_flags, ctx->envflags); } } @@ -1837,7 +1837,7 @@ void gen_intermediate_code(CPUSH4State * env, struct = TranslationBlock *tb) pc_start =3D tb->pc; ctx.pc =3D pc_start; ctx.tbflags =3D (uint32_t)tb->flags; - ctx.envflags =3D tb->flags & DELAY_SLOT_MASK; + ctx.envflags =3D tb->flags & TB_FLAG_ENVFLAGS_MASK; ctx.bstate =3D BS_NONE; ctx.memidx =3D (ctx.tbflags & (1u << SR_MD)) =3D=3D 0 ? 1 : 0; /* We don't know if the delayed pc came from a dynamic or static branc= h, --=20 2.9.4