From nobody Mon Feb 9 09:43:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1629323726; cv=none; d=zohomail.com; s=zohoarc; b=i3lCPD37ZtDDsKoHk+ds+O3hM9nFGLB/OQWdAah5nDN6Q0rkg0uDSTtX2pj1phHlP8g6GgSGDq/4XqXEhwJypMSBa5qQK1gkCLIFeadGzkEeUzFSbkNBfZNJ5ypOq0lcI3eFyWjHukwIDU3ANkw/ARmpl1T6/lSG9i/x49100F8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629323726; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v88WJY9jWSIDINAld1zfrJMJVvB23xKws1R7Y44jy4I=; b=m3Ot/DN07vimUIffekGqgy8WaamJvNimPN+Kjdc7yzaTX2sym2r6gNMTh1/z1X3DxDDQhFxs7mrAJsz5Zq/UMvg7jC7ZdJwk40XJ4YgrGcBw0UMs3TbZYlVFxeui8ggD4R36a8mjPu7p7xCYvrcJEnsjuoLSUsjsJWDJtnc/whc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1629323726847792.7372388377826; Wed, 18 Aug 2021 14:55:26 -0700 (PDT) Received: by mail-wm1-f48.google.com with SMTP id w21-20020a7bc1150000b02902e69ba66ce6so2720948wmi.1 for ; Wed, 18 Aug 2021 14:55:26 -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 p5sm1118566wrd.25.2021.08.18.14.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 14:55:24 -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=v88WJY9jWSIDINAld1zfrJMJVvB23xKws1R7Y44jy4I=; b=U1teTNutOLhNLP6UNAWZ7PMMxCXOLGO2HQozCJK7+5dBgCRNIoRU8rGHnbLd/ENjmX 5PhWS0CyXpWSx/OQRZ2epIpRTovItfbJ+e+Q6RAF9dErUwGAsh0DW9JIZSAKb4o0AY7S 6wgstHb7tjxIg5Nh6hylb9poWoeofEuR3zLkKkWtfesB2iR7CR3pS0IPrPH2K9G2YDan xFRuZanbXcof86Zo8Hr6kQf1BEYWv+K3h1/EvfzfJKGXKfU3Twjqh/rVdlnl/aE2r4om Mn+/H7O+QLwNCmw9riJXcB80cIv+4a/R8FNEOHDkOgA/TOBYPMx6aDdETVHugvbfi4tg vhWg== 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=v88WJY9jWSIDINAld1zfrJMJVvB23xKws1R7Y44jy4I=; b=ELblWOCcne6y3oktRXYpD0XdWM10sE2394LEL2LeIYc7YRS7JUM6TzDEfPk3eDIjpZ 9h9FHkXXvETWr7VpwKMUsBNQN2bQ0JnwmUYv2emJvQlSYnaCTF63jOd18v15ORKkxre5 rp5MIpOew4C3XJ8je0/4Jc/BwllHTUy56oOD8kpEZ45H/7yc6ukuH9qK15mWxG3VNUhg ddXycdCOLC3fPrf/hysutdIqXLJJA1+mMnoN91T/Ze9KKAaojAfUI40jLkGCgWns5OAx qyw3wot2q3Q5sfz8tixz49qUVqNwlkhFjN+M1IYIn0FLgduoJXHrpDSqaukpfPGMJ/z0 bLXg== X-Gm-Message-State: AOAM530Hbo63VtcagbUd/gbcE+KPGtAvct4AW0ehDTlrTbV3ldKwjPG5 AMBXBO5/XsZ1aszquvbnpLU= X-Google-Smtp-Source: ABdhPJyXLxPKPyz8uADqvXpVheWXaxexpvKV9lYwLuzE82t3riVS5EZs8xWUijE5Mk7Vo2qEw4OZSQ== X-Received: by 2002:a1c:19c1:: with SMTP id 184mr10587416wmz.98.1629323724661; Wed, 18 Aug 2021 14:55:24 -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 1/5] target/mips: Call cpu_is_bigendian & inline GET_OFFSET in ld/st helpers Date: Wed, 18 Aug 2021 23:55:13 +0200 Message-Id: <20210818215517.2560994-2-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: 1629323728349100001 The target endianess information is stored in the BigEndian bit of the Config0 register in CP0. As a first step, inline the GET_OFFSET() macro, calling cpu_is_bigendian() to get the 'direction' of the offset. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/tcg/ldst_helper.c | 55 +++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/target/mips/tcg/ldst_helper.c b/target/mips/tcg/ldst_helper.c index d42812b8a6a..8d1dfea6766 100644 --- a/target/mips/tcg/ldst_helper.c +++ b/target/mips/tcg/ldst_helper.c @@ -52,31 +52,36 @@ HELPER_LD_ATOMIC(lld, ldq, 0x7, (target_ulong)) =20 #endif /* !CONFIG_USER_ONLY */ =20 +static inline bool cpu_is_bigendian(CPUMIPSState *env) +{ + return extract32(env->CP0_Config0, CP0C0_BE, 1); +} + #ifdef TARGET_WORDS_BIGENDIAN #define GET_LMASK(v) ((v) & 3) -#define GET_OFFSET(addr, offset) (addr + (offset)) #else #define GET_LMASK(v) (((v) & 3) ^ 3) -#define GET_OFFSET(addr, offset) (addr - (offset)) #endif =20 void helper_swl(CPUMIPSState *env, target_ulong arg1, target_ulong arg2, int mem_idx) { + int dir =3D cpu_is_bigendian(env) ? 1 : -1; + cpu_stb_mmuidx_ra(env, arg2, (uint8_t)(arg1 >> 24), mem_idx, GETPC()); =20 if (GET_LMASK(arg2) <=3D 2) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 1), (uint8_t)(arg1 >> 16), + cpu_stb_mmuidx_ra(env, arg2 + 1 * dir, (uint8_t)(arg1 >> 16), mem_idx, GETPC()); } =20 if (GET_LMASK(arg2) <=3D 1) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 2), (uint8_t)(arg1 >> 8), + cpu_stb_mmuidx_ra(env, arg2 + 2 * dir, (uint8_t)(arg1 >> 8), mem_idx, GETPC()); } =20 if (GET_LMASK(arg2) =3D=3D 0) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 3), (uint8_t)arg1, + cpu_stb_mmuidx_ra(env, arg2 + 3 * dir, (uint8_t)arg1, mem_idx, GETPC()); } } @@ -84,20 +89,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) { + int dir =3D cpu_is_bigendian(env) ? 1 : -1; + cpu_stb_mmuidx_ra(env, arg2, (uint8_t)arg1, mem_idx, GETPC()); =20 if (GET_LMASK(arg2) >=3D 1) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -1), (uint8_t)(arg1 >> 8), + cpu_stb_mmuidx_ra(env, arg2 - 1 * dir, (uint8_t)(arg1 >> 8), mem_idx, GETPC()); } =20 if (GET_LMASK(arg2) >=3D 2) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -2), (uint8_t)(arg1 >> 16), + cpu_stb_mmuidx_ra(env, arg2 - 2 * dir, (uint8_t)(arg1 >> 16), mem_idx, GETPC()); } =20 if (GET_LMASK(arg2) =3D=3D 3) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -3), (uint8_t)(arg1 >> 24), + cpu_stb_mmuidx_ra(env, arg2 - 3 * dir, (uint8_t)(arg1 >> 24), mem_idx, GETPC()); } } @@ -116,40 +123,42 @@ void helper_swr(CPUMIPSState *env, target_ulong arg1,= target_ulong arg2, void helper_sdl(CPUMIPSState *env, target_ulong arg1, target_ulong arg2, int mem_idx) { + int dir =3D cpu_is_bigendian(env) ? 1 : -1; + cpu_stb_mmuidx_ra(env, arg2, (uint8_t)(arg1 >> 56), mem_idx, GETPC()); =20 if (GET_LMASK64(arg2) <=3D 6) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 1), (uint8_t)(arg1 >> 48), + cpu_stb_mmuidx_ra(env, arg2 + 1 * dir, (uint8_t)(arg1 >> 48), mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) <=3D 5) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 2), (uint8_t)(arg1 >> 40), + cpu_stb_mmuidx_ra(env, arg2 + 2 * dir, (uint8_t)(arg1 >> 40), mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) <=3D 4) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 3), (uint8_t)(arg1 >> 32), + cpu_stb_mmuidx_ra(env, arg2 + 3 * dir, (uint8_t)(arg1 >> 32), mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) <=3D 3) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 4), (uint8_t)(arg1 >> 24), + cpu_stb_mmuidx_ra(env, arg2 + 4 * dir, (uint8_t)(arg1 >> 24), mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) <=3D 2) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 5), (uint8_t)(arg1 >> 16), + cpu_stb_mmuidx_ra(env, arg2 + 5 * dir, (uint8_t)(arg1 >> 16), mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) <=3D 1) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 6), (uint8_t)(arg1 >> 8), + cpu_stb_mmuidx_ra(env, arg2 + 6 * dir, (uint8_t)(arg1 >> 8), mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) <=3D 0) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, 7), (uint8_t)arg1, + cpu_stb_mmuidx_ra(env, arg2 + 7 * dir, (uint8_t)arg1, mem_idx, GETPC()); } } @@ -157,40 +166,42 @@ void helper_sdl(CPUMIPSState *env, target_ulong arg1,= target_ulong arg2, void helper_sdr(CPUMIPSState *env, target_ulong arg1, target_ulong arg2, int mem_idx) { + int dir =3D cpu_is_bigendian(env) ? 1 : -1; + cpu_stb_mmuidx_ra(env, arg2, (uint8_t)arg1, mem_idx, GETPC()); =20 if (GET_LMASK64(arg2) >=3D 1) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -1), (uint8_t)(arg1 >> 8), + cpu_stb_mmuidx_ra(env, arg2 - 1 * dir, (uint8_t)(arg1 >> 8), mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) >=3D 2) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -2), (uint8_t)(arg1 >> 16), + cpu_stb_mmuidx_ra(env, arg2 - 2 * dir, (uint8_t)(arg1 >> 16), mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) >=3D 3) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -3), (uint8_t)(arg1 >> 24), + cpu_stb_mmuidx_ra(env, arg2 - 3 * dir, (uint8_t)(arg1 >> 24), mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) >=3D 4) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -4), (uint8_t)(arg1 >> 32), + cpu_stb_mmuidx_ra(env, arg2 - 4 * dir, (uint8_t)(arg1 >> 32), mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) >=3D 5) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -5), (uint8_t)(arg1 >> 40), + cpu_stb_mmuidx_ra(env, arg2 - 5 * dir, (uint8_t)(arg1 >> 40), mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) >=3D 6) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -6), (uint8_t)(arg1 >> 48), + cpu_stb_mmuidx_ra(env, arg2 - 6 * dir, (uint8_t)(arg1 >> 48), mem_idx, GETPC()); } =20 if (GET_LMASK64(arg2) =3D=3D 7) { - cpu_stb_mmuidx_ra(env, GET_OFFSET(arg2, -7), (uint8_t)(arg1 >> 56), + cpu_stb_mmuidx_ra(env, arg2 - 7 * dir, (uint8_t)(arg1 >> 56), mem_idx, GETPC()); } } --=20 2.31.1 From nobody Mon Feb 9 09:43:39 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 From nobody Mon Feb 9 09:43:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1629323736; cv=none; d=zohomail.com; s=zohoarc; b=fNJ+KFYUNbCP+RfvGItwZL+r60EzoN70t8n8H45+SwO1nHLiMEEqUXYUXoKYWbmu8bzm/sSyZuTbgkkhWI4LaP2ZfTQzyLDAEbkfRg5VGdIMngpMqKEF9hjqC6EyKDkKkW/zXWp8Q2htCtZ78qg1Y9Jjj1Lo9VFmhs1I9aVqEbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629323736; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZmWEqvwx0LhQMZDXdcBKLnuhYde6vFm0XnmKyuDjCoU=; b=kNUz69CS4K/1X8FF9npUMNfwuWop8dS7n4bppVkv0bXzbxddVy8e+ZGz0iPpg9U/2A62xGZ+UMQRLoBeU5Q/2vBiRSGQG+AZCQ22J9++JGsthbWqteTsRxvyPUla8fXxvRgYrRH973nTms+Pufp6a0FsfUztsMV3nzSAH/gefUw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1629323736357882.6040355474623; Wed, 18 Aug 2021 14:55:36 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id a201-20020a1c7fd2000000b002e6d33447f9so4267799wmd.0 for ; Wed, 18 Aug 2021 14:55:35 -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 b10sm1267282wrn.9.2021.08.18.14.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 14:55:34 -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=ZmWEqvwx0LhQMZDXdcBKLnuhYde6vFm0XnmKyuDjCoU=; b=DWMli3VEvnBi6VaFE5hLbw/IiMXgajQrL5+H+8gai2BTnmshKv48paNEusptWHIWMs gbqo5e1p6OCHYKoioYsqMODmoQNScf+chhPUvJgevusjNAHwiavtpDDarGSSuiRX7pAL EyblyVOxkbJwhzV9PP0izbs4Ks2fKSbx6AsLRcjZcqLkKnz089MnSFoOaLHi+JvSb833 KvTGpl9o+PChyvlZcwokIDTkLC9va6RBXBAQx4mImTb/rmOSpu8kp56JgpMhB70sh3TL eVfsv2CmGkkYNNpkU6Zes5FjTVDK6edSFI4wuTVW0IKe8g62LnWdQNS0oibTzHH3UTEw Iufg== 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=ZmWEqvwx0LhQMZDXdcBKLnuhYde6vFm0XnmKyuDjCoU=; b=Gy7sgsZ6OM6eGjr7Rkc45V3/PFyJ6ARJVEr7GHR+cf07CjTwCSwWCKqY1g946Su4gB FclUkmpNP3kZPwQ88TctBtAo/b1KEQhExQsGj+HPFWDwYCEA89JBb5HRZLm4qrJ7WNIc bI0MksO+Q9anX6QlU0a6/9ii+crTwFwcl/X008IJK4wzz64gP+I++qaFF/WDzzP5l53m mv9IFwADD9XFeAwLF+zgHWzjeq2EsDCQ7fdnVU0qOhR/Zgsjn6UTgsyw+73I7ydS8R/O FQlSwhQgSD1C+yi/r4wRqYrQw6yDnsh9t3vwRyo/CUWb2pnhvvJ8fq09xJqj39Y48O9N bYJg== X-Gm-Message-State: AOAM5328i3MLmiDtSgoIRmnvceE8ETUtH0DcxvlSVxWkgm8fQ4ibRjIG ZJtU4aJM1uORBH6wjHKuFrE= X-Google-Smtp-Source: ABdhPJylhRbZ7LLJhvngu3RAVvK4L1CzhRz/fUY3XnazIRfdNR/j4W0LIVE0FAna8xQJRbX3r1LcuQ== X-Received: by 2002:a7b:cdfa:: with SMTP id p26mr10545411wmj.45.1629323734565; Wed, 18 Aug 2021 14:55:34 -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 3/5] target/mips: Replace GET_LMASK64() macro by get_lmask(64) function Date: Wed, 18 Aug 2021 23:55:15 +0200 Message-Id: <20210818215517.2560994-4-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: 1629323736941100001 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 another 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 | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/target/mips/tcg/ldst_helper.c b/target/mips/tcg/ldst_helper.c index c48a2818681..139f4d833bd 100644 --- a/target/mips/tcg/ldst_helper.c +++ b/target/mips/tcg/ldst_helper.c @@ -124,50 +124,46 @@ void helper_swr(CPUMIPSState *env, target_ulong arg1,= target_ulong arg2, * "half" load and stores. We must do the memory access inline, * or fault handling won't work. */ -#ifdef TARGET_WORDS_BIGENDIAN -#define GET_LMASK64(v) ((v) & 7) -#else -#define GET_LMASK64(v) (((v) & 7) ^ 7) -#endif =20 void helper_sdl(CPUMIPSState *env, target_ulong arg1, target_ulong arg2, int mem_idx) { + target_ulong lmask =3D get_lmask(env, arg2, 64); int dir =3D cpu_is_bigendian(env) ? 1 : -1; =20 cpu_stb_mmuidx_ra(env, arg2, (uint8_t)(arg1 >> 56), mem_idx, GETPC()); =20 - if (GET_LMASK64(arg2) <=3D 6) { + if (lmask <=3D 6) { cpu_stb_mmuidx_ra(env, arg2 + 1 * dir, (uint8_t)(arg1 >> 48), mem_idx, GETPC()); } =20 - if (GET_LMASK64(arg2) <=3D 5) { + if (lmask <=3D 5) { cpu_stb_mmuidx_ra(env, arg2 + 2 * dir, (uint8_t)(arg1 >> 40), mem_idx, GETPC()); } =20 - if (GET_LMASK64(arg2) <=3D 4) { + if (lmask <=3D 4) { cpu_stb_mmuidx_ra(env, arg2 + 3 * dir, (uint8_t)(arg1 >> 32), mem_idx, GETPC()); } =20 - if (GET_LMASK64(arg2) <=3D 3) { + if (lmask <=3D 3) { cpu_stb_mmuidx_ra(env, arg2 + 4 * dir, (uint8_t)(arg1 >> 24), mem_idx, GETPC()); } =20 - if (GET_LMASK64(arg2) <=3D 2) { + if (lmask <=3D 2) { cpu_stb_mmuidx_ra(env, arg2 + 5 * dir, (uint8_t)(arg1 >> 16), mem_idx, GETPC()); } =20 - if (GET_LMASK64(arg2) <=3D 1) { + if (lmask <=3D 1) { cpu_stb_mmuidx_ra(env, arg2 + 6 * dir, (uint8_t)(arg1 >> 8), mem_idx, GETPC()); } =20 - if (GET_LMASK64(arg2) <=3D 0) { + if (lmask <=3D 0) { cpu_stb_mmuidx_ra(env, arg2 + 7 * dir, (uint8_t)arg1, mem_idx, GETPC()); } @@ -176,41 +172,42 @@ void helper_sdl(CPUMIPSState *env, target_ulong arg1,= target_ulong arg2, void helper_sdr(CPUMIPSState *env, target_ulong arg1, target_ulong arg2, int mem_idx) { + target_ulong lmask =3D get_lmask(env, arg2, 64); 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_LMASK64(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_LMASK64(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_LMASK64(arg2) >=3D 3) { + if (lmask >=3D 3) { cpu_stb_mmuidx_ra(env, arg2 - 3 * dir, (uint8_t)(arg1 >> 24), mem_idx, GETPC()); } =20 - if (GET_LMASK64(arg2) >=3D 4) { + if (lmask >=3D 4) { cpu_stb_mmuidx_ra(env, arg2 - 4 * dir, (uint8_t)(arg1 >> 32), mem_idx, GETPC()); } =20 - if (GET_LMASK64(arg2) >=3D 5) { + if (lmask >=3D 5) { cpu_stb_mmuidx_ra(env, arg2 - 5 * dir, (uint8_t)(arg1 >> 40), mem_idx, GETPC()); } =20 - if (GET_LMASK64(arg2) >=3D 6) { + if (lmask >=3D 6) { cpu_stb_mmuidx_ra(env, arg2 - 6 * dir, (uint8_t)(arg1 >> 48), mem_idx, GETPC()); } =20 - if (GET_LMASK64(arg2) =3D=3D 7) { + if (lmask =3D=3D 7) { cpu_stb_mmuidx_ra(env, arg2 - 7 * dir, (uint8_t)(arg1 >> 56), mem_idx, GETPC()); } --=20 2.31.1 From nobody Mon Feb 9 09:43:39 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=1629323741; cv=none; d=zohomail.com; s=zohoarc; b=PJEgcNsOVEro4a6rsDqap8MWF8CKu7gbUH2ZM+OIqfVJwTQnjEJEW4xYZSmbHaxNWfHQf3SpYgz4NH5wBc0TXaQwoAHL40bmUNo3dQyCinhqkECmnoodC6uJdYH+HEuEuCOy9dD3+Wb1r1qyrRehwKwqB5uN/JOwbcyV+EQ7lhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629323741; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U7gIJvBW4JKvt2ZTXiAxofETRvBakvpm4JnJyObeScc=; b=llY6H5L/6fnJOwsW2UoPD2idreYDdlsN7g/UaW+is/RN9QHcD047vLjdhEMP/OFc7tIIVXfoL+/VsydNBz0ZmtldEoT0Qmz6QcvsZDQtgvMGdALubQ21JqjcpEB8mXjlFeByXYubt1LaUenqoqoPbwIUXbuqTUeSw6olFX3GECg= 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 1629323741258756.3684536961625; Wed, 18 Aug 2021 14:55:41 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id f5so5694353wrm.13 for ; Wed, 18 Aug 2021 14:55:40 -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 s13sm6153148wmc.47.2021.08.18.14.55.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 14:55:39 -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=U7gIJvBW4JKvt2ZTXiAxofETRvBakvpm4JnJyObeScc=; b=P1kAivs+7ir06Kz/gh/nRf5VDSF+kxIYM1hN6DlCeZZdIb/t+31ZtWn3iDg2I0hXDG NfxA65Knhg50FJvWCHkbo3f+RclzkIsOA1fG8huw3acXDnPjJIKH9G6ja2cK78M36a+X MSa2S0dRx4A/cB/e85QVjC1elss1UPspA5DO9wgR+9s6R3zAapuJkpqRMOPhGzlWZhK9 1rKutbMxj3gUpso+0bfJYyXgEHXcBYZcKG70phVVNjJ+/JHOntgSr0jpTHo6SpUdpfjx AHdD0COcy7lKahjlvzNzD09doyAuUcHFCHJp+pHnIF0iTPiT6M3z8VYPaj5Ps4HLqXv5 eZUw== 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=U7gIJvBW4JKvt2ZTXiAxofETRvBakvpm4JnJyObeScc=; b=d686t83Jm/hwRW/dxtQPjmJ/kHO0tGuFuXrWhxzRoyNVRFSCr4yrrpfTOjfIt+yboo 3vyhk5q4139DxAhRoW9oWTJzQ6BcPfxQtLX9/QgiHBZBVWEB44LxfwpGfb57GDRdv6/r aMgUZKrWOr+KpLNXpzWFI1syYA9RPHoB+b6ppHdl8bq0tb53Iemz/B8JEZOhOYYRTw0K Ip0Zc+PGAauiOu3qymiLVz1h28dhqlJUhKDsg7dmMAqNFmshbhehX1RBR6z1MzB2iiE3 Q03o+QvK2GUAigW/7ARO/HoBMvuE79l5IjvzG4Sh2M0lC/i3tETA5odao6rR8D9WTLeC MLMg== X-Gm-Message-State: AOAM530Nu5KVjAK4BjagWOkz+jiCzvzWqlLZAH2xTQFZwm+90bI3KGTw xTLJhJ0E5HA689wzLVPRle8= X-Google-Smtp-Source: ABdhPJysBoUvLQx7LsiwCay9XbpezvBeCUWBfwDPbdROkMiId90Ckf6M9xeDS58toxAN7flIu9J/gg== X-Received: by 2002:adf:e6cc:: with SMTP id y12mr13669457wrm.200.1629323739485; Wed, 18 Aug 2021 14:55:39 -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 4/5] target/mips: Store CP0_Config0 in DisasContext Date: Wed, 18 Aug 2021 23:55:16 +0200 Message-Id: <20210818215517.2560994-5-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: 1629323743439100001 Most TCG helpers only have access to a DisasContext pointer, not CPUMIPSState. Store a copy of CPUMIPSState::CP0_Config0 in DisasContext so we can access it from TCG helpers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210818164321.2474534-5-f4bug@amsat.org> --- target/mips/tcg/translate.h | 1 + target/mips/tcg/translate.c | 1 + 2 files changed, 2 insertions(+) diff --git a/target/mips/tcg/translate.h b/target/mips/tcg/translate.h index bb0a6b8d74f..9d325c836aa 100644 --- a/target/mips/tcg/translate.h +++ b/target/mips/tcg/translate.h @@ -18,6 +18,7 @@ typedef struct DisasContext { target_ulong page_start; uint32_t opcode; uint64_t insn_flags; + int32_t CP0_Config0; int32_t CP0_Config1; int32_t CP0_Config2; int32_t CP0_Config3; diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index a58d50e40e2..572104e2cc2 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -16034,6 +16034,7 @@ static void mips_tr_init_disas_context(DisasContext= Base *dcbase, CPUState *cs) ctx->page_start =3D ctx->base.pc_first & TARGET_PAGE_MASK; ctx->saved_pc =3D -1; ctx->insn_flags =3D env->insn_flags; + ctx->CP0_Config0 =3D env->CP0_Config0; ctx->CP0_Config1 =3D env->CP0_Config1; ctx->CP0_Config2 =3D env->CP0_Config2; ctx->CP0_Config3 =3D env->CP0_Config3; --=20 2.31.1 From nobody Mon Feb 9 09:43:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1629323746; cv=none; d=zohomail.com; s=zohoarc; b=D0IWQM9Q+MosfGh62WIpIZjzd8YpxX8zZMspH+6w4fAqqIBmOw4NAWUkhNtKgW37HZB6Vai0yVmmzUtT09LaFIQiMDd9bAUwhevHwGjE2JEFFXFjXnICRQpIwXSM4oJ2rCZ/s3Pd4u93LspR+mOOq1uBIZbJu1kgcvQJMpuEFRU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629323746; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=plLQHcycn8l88ybhBeU+6VWeQ95kgaH1lepgJR3+i98=; b=QD0vRi6nRP/ZnFgBZ7SJDCuiOZhoXMMFiHT7qoiUMiSL735ZgSlIBp8GB95petbFB00QYW2CW5RToztnh6sgDUxz59z82EyvB503vzk2PAsrx8C9eOt6JSwBbs/sG9LEFv0BsblYAFIeJe+7v+/m7JDULwlb2/2EGV3DcY4taL8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 162932374623387.87292984167163; Wed, 18 Aug 2021 14:55:46 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id z9so5719177wrh.10 for ; Wed, 18 Aug 2021 14:55:45 -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 r10sm1000599wrp.28.2021.08.18.14.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 14:55:44 -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=plLQHcycn8l88ybhBeU+6VWeQ95kgaH1lepgJR3+i98=; b=rEhhu+YpjyGiXej0YnpGBmBsr1LYM3NubkpuESDE7bvNCuPsc+efNW6tBFiFE61Iq7 TRwMdCm7UkwgNtgc6Cb0jpdLnoXgniH2RjnOMOj5QfMquIvCAlalfiPtGtO4Spv7BlnQ EisMZwD4aDYhHY5/6wVSVhoYVwHQljAvrWVIdjGZNZHW+zHMxodWIvMKmN8Zve1cvh24 15cF2dCIDOQkYcMQjp9G+UrY3o1SR7vB4ZX1BU3X+eCk2vl90CRR5uZVJgvIWzSdprDH Yddj5/wydy/HQlh16WFlMixjzWF3MiW9Jir6aWPpe89OHnKVkRnyet9NqEfqg6/1JxiN yKWg== 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=plLQHcycn8l88ybhBeU+6VWeQ95kgaH1lepgJR3+i98=; b=WVoytPlhYxzz4f0PEjOx61aGajuWpr8adQt2qQbuDJhmN91/vJmTGjzzJwVbIl5o7Q ebm2LI99v1O9gfCtfpHKUjfG4cdcUR67RJ+TkhFLyRNrpHPQ2cabF0Prb3AUm9VwUL85 8hByWGWaMIaqQd3moyUmGkaaapmbuAEXDDKLmEBdbDCVIIou5VvoHW/PfRKuOqpcKS7m 507qMJToWtLvA/z2E+WMGfuntclxOFQoq7rt0X7g1rRniVTDCfu2oaRU2o8mOnLziI0g 1sivnHMnJs/U48p0bDVpkwT46XaPG31W1Y6zHKkifUB9Q9f249bnxWMuwAx+7FdsSh0d nJyg== X-Gm-Message-State: AOAM531NT3sC/wXle/ogDAMZsSK395ToGM12n1cbnQXHlBDo4Q+cpGQZ Pf0/4vDWYx5uAZ03dQZVnMQ= X-Google-Smtp-Source: ABdhPJw++Cp1vH0i1aiIQGFxwiHfBdJFf7R/znNPfq85bE5JnMmE4cjjXqMs7u31/3BgWkXO1Quu0A== X-Received: by 2002:a5d:618f:: with SMTP id j15mr12811613wru.80.1629323744489; Wed, 18 Aug 2021 14:55:44 -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 5/5] target/mips: Replace TARGET_WORDS_BIGENDIAN by cpu_is_bigendian() Date: Wed, 18 Aug 2021 23:55:17 +0200 Message-Id: <20210818215517.2560994-6-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: 1629323747676100001 Add the inlined cpu_is_bigendian() function in "translate.h". Replace the TARGET_WORDS_BIGENDIAN #ifdef'ry by calls to cpu_is_bigendian(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210818164321.2474534-6-f4bug@amsat.org> --- target/mips/tcg/translate.h | 5 ++ target/mips/tcg/translate.c | 70 ++++++++++++------------ target/mips/tcg/nanomips_translate.c.inc | 20 +++---- 3 files changed, 50 insertions(+), 45 deletions(-) diff --git a/target/mips/tcg/translate.h b/target/mips/tcg/translate.h index 9d325c836aa..dfb1552c2fc 100644 --- a/target/mips/tcg/translate.h +++ b/target/mips/tcg/translate.h @@ -212,4 +212,9 @@ bool decode_ext_vr54xx(DisasContext *ctx, uint32_t insn= ); static bool trans_##NAME(DisasContext *ctx, arg_##NAME *a) \ { return FUNC(ctx, a, __VA_ARGS__); } =20 +static inline bool cpu_is_bigendian(DisasContext *ctx) +{ + return extract32(ctx->CP0_Config0, CP0C0_BE, 1); +} + #endif diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 572104e2cc2..f182e64643d 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -2093,9 +2093,9 @@ static void gen_ld(DisasContext *ctx, uint32_t opc, */ tcg_gen_qemu_ld_tl(t1, t0, mem_idx, MO_UB); tcg_gen_andi_tl(t1, t0, 7); -#ifndef TARGET_WORDS_BIGENDIAN - tcg_gen_xori_tl(t1, t1, 7); -#endif + if (!cpu_is_bigendian(ctx)) { + tcg_gen_xori_tl(t1, t1, 7); + } tcg_gen_shli_tl(t1, t1, 3); tcg_gen_andi_tl(t0, t0, ~7); tcg_gen_qemu_ld_tl(t0, t0, mem_idx, MO_TEQ); @@ -2117,9 +2117,9 @@ static void gen_ld(DisasContext *ctx, uint32_t opc, */ tcg_gen_qemu_ld_tl(t1, t0, mem_idx, MO_UB); tcg_gen_andi_tl(t1, t0, 7); -#ifdef TARGET_WORDS_BIGENDIAN - tcg_gen_xori_tl(t1, t1, 7); -#endif + if (cpu_is_bigendian(ctx)) { + tcg_gen_xori_tl(t1, t1, 7); + } tcg_gen_shli_tl(t1, t1, 3); tcg_gen_andi_tl(t0, t0, ~7); tcg_gen_qemu_ld_tl(t0, t0, mem_idx, MO_TEQ); @@ -2198,9 +2198,9 @@ static void gen_ld(DisasContext *ctx, uint32_t opc, */ tcg_gen_qemu_ld_tl(t1, t0, mem_idx, MO_UB); tcg_gen_andi_tl(t1, t0, 3); -#ifndef TARGET_WORDS_BIGENDIAN - tcg_gen_xori_tl(t1, t1, 3); -#endif + if (!cpu_is_bigendian(ctx)) { + tcg_gen_xori_tl(t1, t1, 3); + } tcg_gen_shli_tl(t1, t1, 3); tcg_gen_andi_tl(t0, t0, ~3); tcg_gen_qemu_ld_tl(t0, t0, mem_idx, MO_TEUL); @@ -2226,9 +2226,9 @@ static void gen_ld(DisasContext *ctx, uint32_t opc, */ tcg_gen_qemu_ld_tl(t1, t0, mem_idx, MO_UB); tcg_gen_andi_tl(t1, t0, 3); -#ifdef TARGET_WORDS_BIGENDIAN - tcg_gen_xori_tl(t1, t1, 3); -#endif + if (cpu_is_bigendian(ctx)) { + tcg_gen_xori_tl(t1, t1, 3); + } tcg_gen_shli_tl(t1, t1, 3); tcg_gen_andi_tl(t0, t0, ~3); tcg_gen_qemu_ld_tl(t0, t0, mem_idx, MO_TEUL); @@ -4445,9 +4445,9 @@ static void gen_loongson_lswc2(DisasContext *ctx, int= rt, t1 =3D tcg_temp_new(); tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UB); tcg_gen_andi_tl(t1, t0, 3); -#ifndef TARGET_WORDS_BIGENDIAN - tcg_gen_xori_tl(t1, t1, 3); -#endif + if (!cpu_is_bigendian(ctx)) { + tcg_gen_xori_tl(t1, t1, 3); + } tcg_gen_shli_tl(t1, t1, 3); tcg_gen_andi_tl(t0, t0, ~3); tcg_gen_qemu_ld_tl(t0, t0, ctx->mem_idx, MO_TEUL); @@ -4475,9 +4475,9 @@ static void gen_loongson_lswc2(DisasContext *ctx, int= rt, t1 =3D tcg_temp_new(); tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UB); tcg_gen_andi_tl(t1, t0, 3); -#ifdef TARGET_WORDS_BIGENDIAN - tcg_gen_xori_tl(t1, t1, 3); -#endif + if (cpu_is_bigendian(ctx)) { + tcg_gen_xori_tl(t1, t1, 3); + } tcg_gen_shli_tl(t1, t1, 3); tcg_gen_andi_tl(t0, t0, ~3); tcg_gen_qemu_ld_tl(t0, t0, ctx->mem_idx, MO_TEUL); @@ -4507,9 +4507,9 @@ static void gen_loongson_lswc2(DisasContext *ctx, int= rt, t1 =3D tcg_temp_new(); tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UB); tcg_gen_andi_tl(t1, t0, 7); -#ifndef TARGET_WORDS_BIGENDIAN - tcg_gen_xori_tl(t1, t1, 7); -#endif + if (!cpu_is_bigendian(ctx)) { + tcg_gen_xori_tl(t1, t1, 7); + } tcg_gen_shli_tl(t1, t1, 3); tcg_gen_andi_tl(t0, t0, ~7); tcg_gen_qemu_ld_tl(t0, t0, ctx->mem_idx, MO_TEQ); @@ -4529,9 +4529,9 @@ static void gen_loongson_lswc2(DisasContext *ctx, int= rt, t1 =3D tcg_temp_new(); tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UB); tcg_gen_andi_tl(t1, t0, 7); -#ifdef TARGET_WORDS_BIGENDIAN - tcg_gen_xori_tl(t1, t1, 7); -#endif + if (cpu_is_bigendian(ctx)) { + tcg_gen_xori_tl(t1, t1, 7); + } tcg_gen_shli_tl(t1, t1, 3); tcg_gen_andi_tl(t0, t0, ~7); tcg_gen_qemu_ld_tl(t0, t0, ctx->mem_idx, MO_TEQ); @@ -11464,17 +11464,17 @@ static void gen_flt3_arith(DisasContext *ctx, uin= t32_t opc, gen_set_label(l1); tcg_gen_brcondi_tl(TCG_COND_NE, t0, 4, l2); tcg_temp_free(t0); -#ifdef TARGET_WORDS_BIGENDIAN - gen_load_fpr32(ctx, fp, fs); - gen_load_fpr32h(ctx, fph, ft); - gen_store_fpr32h(ctx, fp, fd); - gen_store_fpr32(ctx, fph, fd); -#else - gen_load_fpr32h(ctx, fph, fs); - gen_load_fpr32(ctx, fp, ft); - gen_store_fpr32(ctx, fph, fd); - gen_store_fpr32h(ctx, fp, fd); -#endif + if (cpu_is_bigendian(ctx)) { + gen_load_fpr32(ctx, fp, fs); + gen_load_fpr32h(ctx, fph, ft); + gen_store_fpr32h(ctx, fp, fd); + gen_store_fpr32(ctx, fph, fd); + } else { + gen_load_fpr32h(ctx, fph, fs); + gen_load_fpr32(ctx, fp, ft); + gen_store_fpr32(ctx, fph, fd); + gen_store_fpr32h(ctx, fp, fd); + } gen_set_label(l2); tcg_temp_free_i32(fp); tcg_temp_free_i32(fph); diff --git a/target/mips/tcg/nanomips_translate.c.inc b/target/mips/tcg/nan= omips_translate.c.inc index 09e64a69480..a66ae267963 100644 --- a/target/mips/tcg/nanomips_translate.c.inc +++ b/target/mips/tcg/nanomips_translate.c.inc @@ -999,11 +999,11 @@ static void gen_llwp(DisasContext *ctx, uint32_t base= , int16_t offset, =20 gen_base_offset_addr(ctx, taddr, base, offset); tcg_gen_qemu_ld64(tval, taddr, ctx->mem_idx); -#ifdef TARGET_WORDS_BIGENDIAN - tcg_gen_extr_i64_tl(tmp2, tmp1, tval); -#else - tcg_gen_extr_i64_tl(tmp1, tmp2, tval); -#endif + if (cpu_is_bigendian(ctx)) { + tcg_gen_extr_i64_tl(tmp2, tmp1, tval); + } else { + tcg_gen_extr_i64_tl(tmp1, tmp2, tval); + } gen_store_gpr(tmp1, reg1); tcg_temp_free(tmp1); gen_store_gpr(tmp2, reg2); @@ -1035,11 +1035,11 @@ static void gen_scwp(DisasContext *ctx, uint32_t ba= se, int16_t offset, gen_load_gpr(tmp1, reg1); gen_load_gpr(tmp2, reg2); =20 -#ifdef TARGET_WORDS_BIGENDIAN - tcg_gen_concat_tl_i64(tval, tmp2, tmp1); -#else - tcg_gen_concat_tl_i64(tval, tmp1, tmp2); -#endif + if (cpu_is_bigendian(ctx)) { + tcg_gen_concat_tl_i64(tval, tmp2, tmp1); + } else { + tcg_gen_concat_tl_i64(tval, tmp1, tmp2); + } =20 tcg_gen_ld_i64(llval, cpu_env, offsetof(CPUMIPSState, llval_wp)); tcg_gen_atomic_cmpxchg_i64(val, taddr, llval, tval, --=20 2.31.1