From nobody Tue Feb 10 06:07:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1629323731; cv=none; d=zohomail.com; s=zohoarc; b=RnJ80qMZ0VE52l/cnYBCMJ9uw3uqfevTS01WGlAsNKqXwUdliYoUC+7+aCfGVSmNaL8rJti8QPyFT1mJd+4Vlm3eS6vzMLG/7XzFj7HsPQGhQ9hecZ9eIB9h0hiLXqxnFm4991TJ8yHp6LEJk2ymqE3+yPBLx8OjsxbY623M+c0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629323731; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W6S/3CJZSP/BlDLbxQ5gLlsNt2yHDOQ34zQ37MfEbrQ=; b=Ef+uwKDuM4rsEvi/Kr1+menHE+WQxwcugwx9LJ+NKT1yFBWMTmexmdg9FQYa7v4Q3nOL/NbvbFNPznHKKjygwhYsHI3nBPvVwxqHHoKJdHfen1NERelegvF23cXt9wzO3EulKvWCU8UWGmcW7Ma5+UodjMIPul7RIEBNWAWdMqo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1629323731411227.04076375566126; Wed, 18 Aug 2021 14:55:31 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id r7so5841447wrs.0 for ; Wed, 18 Aug 2021 14:55:30 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id z137sm6442070wmc.14.2021.08.18.14.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 14:55:29 -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 :mime-version:content-transfer-encoding; bh=W6S/3CJZSP/BlDLbxQ5gLlsNt2yHDOQ34zQ37MfEbrQ=; b=b6+3/2xNjkLSWfWiNMIDQ5/MX5/lojlQCmiydwKqvLNPuFLT8t3PfGCHScGVflCDfq 6QxtFK2WsvOiHxYrf/VCKhQ1yzwtOfLu6y07HNIhh3ufi8uwGBcJElqgucTIyOzcco7W +D929j9WtrDm2Gs/ySvNY6LwyfMXWrcWHTLVzz0p8WqUXMu7Yu/l0Ugshvbo5Wc5hVIx OsKjWO1UXGOlpQ03eU0JHCILnEFcAK7jmL9iO2wKOfzXqEW09d/sx4wt2v8S3E2bo5N2 Crwf7kbLGxhKetyRJCjG86Y3w6IBNlc7bbjwv+JE1RZokFYMODJQ91ogM3F4E2n246x/ cCVw== 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:mime-version:content-transfer-encoding; bh=W6S/3CJZSP/BlDLbxQ5gLlsNt2yHDOQ34zQ37MfEbrQ=; b=jZg0m+uZ6JKX/5WpN5DQw5TsFa6R5+delce4BxL5wtVEb63/saVqr1SFlqS52OEoo1 rCefQPqR47zpvHDSTpoEKZRv7SXZbYMaG7klRDPreEHQfiZ10FkhEvlu+Q/mr6GQEW/Q 6Y4wKoo0Nl7fi2NtujKbkrhlIN1izSn53kh4IIFkfIoo3rOhz/PmNieWD8TQ+GU5TSqh YvqOcoWWXYnA4jdzBottklyzuRcivRK6siI69fkFKl8dhQi4+9qUCAuj/CDOOC8DwH8N tzPTAyYuwuneWTFfygBnZSJWYJriM7O+oHEBXZWgarDnMsv1zzSwns9q6yObKA75PZs7 HTMg== X-Gm-Message-State: AOAM533o5+3lZt1Gn+KCizFMNJEuA4g32u/OLAY/dQP91mot3kJJaaWj /xg4bOpi794uAlGQsJwrd/o= X-Google-Smtp-Source: ABdhPJzX1/txMrBVqeT2HlkG7xlPsgMSc+3tUGTInbD7KZLEvEsRmh4C8yC8etYf6lkl0lT1CwZlDg== X-Received: by 2002:adf:c549:: with SMTP id s9mr13292557wrf.344.1629323729665; Wed, 18 Aug 2021 14:55:29 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Aurelien Jarno , Richard Henderson , Aleksandar Rikalo , Jiaxun Yang Subject: [PATCH v2 2/5] target/mips: Replace GET_LMASK() macro by get_lmask(32) function Date: Wed, 18 Aug 2021 23:55:14 +0200 Message-Id: <20210818215517.2560994-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210818215517.2560994-1-f4bug@amsat.org> References: <20210818215517.2560994-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1629323732673100001 The target endianess information is stored in the BigEndian bit of the Config0 register in CP0. Replace the GET_LMASK() macro by an inlined get_lmask() function, passing CPUMIPSState and the word size as argument. We can remove one use of the TARGET_WORDS_BIGENDIAN definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/tcg/ldst_helper.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/target/mips/tcg/ldst_helper.c b/target/mips/tcg/ldst_helper.c index 8d1dfea6766..c48a2818681 100644 --- a/target/mips/tcg/ldst_helper.c +++ b/target/mips/tcg/ldst_helper.c @@ -57,30 +57,39 @@ static inline bool cpu_is_bigendian(CPUMIPSState *env) return extract32(env->CP0_Config0, CP0C0_BE, 1); } =20 -#ifdef TARGET_WORDS_BIGENDIAN -#define GET_LMASK(v) ((v) & 3) -#else -#define GET_LMASK(v) (((v) & 3) ^ 3) -#endif +static inline target_ulong get_lmask(CPUMIPSState *env, + target_ulong value, unsigned bits) +{ + unsigned mask =3D (bits / BITS_PER_BYTE) - 1; + + value &=3D mask; + + if (cpu_is_bigendian(env)) { + value ^=3D mask; + } + + return value; +} =20 void helper_swl(CPUMIPSState *env, target_ulong arg1, target_ulong arg2, int mem_idx) { + target_ulong lmask =3D get_lmask(env, arg2, 32); int dir =3D cpu_is_bigendian(env) ? 1 : -1; =20 cpu_stb_mmuidx_ra(env, arg2, (uint8_t)(arg1 >> 24), mem_idx, GETPC()); =20 - if (GET_LMASK(arg2) <=3D 2) { + if (lmask <=3D 2) { cpu_stb_mmuidx_ra(env, arg2 + 1 * dir, (uint8_t)(arg1 >> 16), mem_idx, GETPC()); } =20 - if (GET_LMASK(arg2) <=3D 1) { + if (lmask <=3D 1) { cpu_stb_mmuidx_ra(env, arg2 + 2 * dir, (uint8_t)(arg1 >> 8), mem_idx, GETPC()); } =20 - if (GET_LMASK(arg2) =3D=3D 0) { + if (lmask =3D=3D 0) { cpu_stb_mmuidx_ra(env, arg2 + 3 * dir, (uint8_t)arg1, mem_idx, GETPC()); } @@ -89,21 +98,22 @@ void helper_swl(CPUMIPSState *env, target_ulong arg1, t= arget_ulong arg2, void helper_swr(CPUMIPSState *env, target_ulong arg1, target_ulong arg2, int mem_idx) { + target_ulong lmask =3D get_lmask(env, arg2, 32); int dir =3D cpu_is_bigendian(env) ? 1 : -1; =20 cpu_stb_mmuidx_ra(env, arg2, (uint8_t)arg1, mem_idx, GETPC()); =20 - if (GET_LMASK(arg2) >=3D 1) { + if (lmask >=3D 1) { cpu_stb_mmuidx_ra(env, arg2 - 1 * dir, (uint8_t)(arg1 >> 8), mem_idx, GETPC()); } =20 - if (GET_LMASK(arg2) >=3D 2) { + if (lmask >=3D 2) { cpu_stb_mmuidx_ra(env, arg2 - 2 * dir, (uint8_t)(arg1 >> 16), mem_idx, GETPC()); } =20 - if (GET_LMASK(arg2) =3D=3D 3) { + if (lmask =3D=3D 3) { cpu_stb_mmuidx_ra(env, arg2 - 3 * dir, (uint8_t)(arg1 >> 24), mem_idx, GETPC()); } --=20 2.31.1