From nobody Tue Feb 10 00:23:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.44 as permitted sender) client-ip=209.85.218.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1614331937; cv=none; d=zohomail.com; s=zohoarc; b=JPgSCP3+fMcnHrlF6AAwJR/Z6NQJZMEIG49i+JFDqhNrgFH/WtC45GFtkvByOA3bdfA4GbngAkUJ9QqTv+e50+SblgYhs3u5oqw/RQP5KDx6Q5UMNw9SU3q79FQ4b4xHKVJqj95+Su/A8TAUK3viyDStl1OJ/Huv+rHccF6xHUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614331937; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aTBjgsTI4Wp6876fW/WwC5NahK2Whn3Re19zatSnL1c=; b=UMVWus8YXVGEB2lJRQBRpBIe5dy+/TCDYK//9N+Pk7eSRTR7A8+SDeVHZtmZqfDTPPLZn4Hxb0mwbG1U7gFV3OYYMK/30LMd7sB3HZndomkT1UZ30pHfzr+xoRdV4kqtTgjwaTRn2eDjA5cQ2N+Af05TdQATDoMKj6vpulHM/oo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.zohomail.com with SMTPS id 1614331937049255.14963676932427; Fri, 26 Feb 2021 01:32:17 -0800 (PST) Received: by mail-ej1-f44.google.com with SMTP id n20so13670346ejb.5 for ; Fri, 26 Feb 2021 01:32:16 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id c20sm4630759eje.59.2021.02.26.01.32.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 01:32:14 -0800 (PST) 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=aTBjgsTI4Wp6876fW/WwC5NahK2Whn3Re19zatSnL1c=; b=DqaXvv54utNWZsxzWL08cH4+6TQfO+uKbNxGC2cDp+XZh+s/dxJuk+at8bANMmLAeD JpACiTQeTLZHKeJyoBekE8z1JIkLpRyZmlhHjwJDF4tzYaznkGXW9a/KCoMRIUGPY01F +FNdjvVKiveKWeXDm6buIDFR67iMW+MbsBUuXOerwbFR5LaMzjMOA6ppE+/G92A0wTJ6 VakLnjgSB4VaYNC382S7rOf+GFTag3aiMSV85pEnC3u89XWh4cNE7clIHpBC/jJ//lNp hlOXA8a4FJe+KeJcjr+kRbUFC68AF10t94Zc2QD6w/YDC3E3/hR17r9tBBUL+qV1HdMA J99Q== 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=aTBjgsTI4Wp6876fW/WwC5NahK2Whn3Re19zatSnL1c=; b=enBdMqFMwg4S6L4cVksnnUTiK652Nk4b6hVV95HjR6poXpLoi9b/uBCeRU+qV69AO2 QM1/Ps3eFpdakhMwZB6s1AxOuvUNgDybyqQv97aALeTpaTMAg0hMZxkF4gWiFv6G9wiX lX8oy18eGvQ4uoXBxBGNVBaaRKZeQWZknENvpyy0HIvawbqWTY0oxRjxsZgP+5EfHNS8 9RT/m81E/REgK2UF7aAPjTTZmyKKiJbH9APpLP62ReNkonvZA7gfB6KGzWso8jn4LJi/ EXSKAn8wFeX4KaFHC8SuRVci2eMB88XocdpK1pHtu+zAYEYjd+jV6PiZ2YdrBfHDtA37 Oj3Q== X-Gm-Message-State: AOAM532s8EQI2J8g2oxyHbioh9I9RiIEu3e+3paSBQY1H5yQiB3drw4P qaBQ51i9BYSUuani/RJ9ZMA= X-Google-Smtp-Source: ABdhPJx06JN2gGMAoT8jkigY6an5vxccm2/h/QWBcblioNS4CyiKf1RcOeuuKgvZESQjm+JUbElm6g== X-Received: by 2002:a17:906:32d1:: with SMTP id k17mr2337422ejk.141.1614331935299; Fri, 26 Feb 2021 01:32:15 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Richard Henderson Subject: [PATCH v5 12/13] target/mips: Introduce mxu_translate_init() helper Date: Fri, 26 Feb 2021 10:31:09 +0100 Message-Id: <20210226093111.3865906-13-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210226093111.3865906-1-f4bug@amsat.org> References: <20210226093111.3865906-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) Extract the MXU register initialization code from mips_tcg_init() as a new mxu_translate_init() helper. Make it public and replace !TARGET_MIPS64 ifdef'ry by the 'TARGET_LONG_BITS =3D=3D 32' check to elide this code at preprocessing time. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/translate.h | 1 + target/mips/translate.c | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/target/mips/translate.h b/target/mips/translate.h index a5c49f1ee22..a807b3d2566 100644 --- a/target/mips/translate.h +++ b/target/mips/translate.h @@ -179,6 +179,7 @@ extern TCGv bcond; void msa_translate_init(void); =20 /* MXU */ +void mxu_translate_init(void); bool decode_ase_mxu(DisasContext *ctx, uint32_t insn); =20 /* decodetree generated */ diff --git a/target/mips/translate.c b/target/mips/translate.c index 84948ab9ce0..da6825c2fec 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -2045,7 +2045,20 @@ static const char * const mxuregnames[] =3D { "XR1", "XR2", "XR3", "XR4", "XR5", "XR6", "XR7", "XR8", "XR9", "XR10", "XR11", "XR12", "XR13", "XR14", "XR15", "MXU_CR", }; -#endif + +void mxu_translate_init(void) +{ + for (unsigned i =3D 0; i < NUMBER_OF_MXU_REGISTERS - 1; i++) { + mxu_gpr[i] =3D tcg_global_mem_new(cpu_env, + offsetof(CPUMIPSState, active_tc.m= xu_gpr[i]), + mxuregnames[i]); + } + + mxu_CR =3D tcg_global_mem_new(cpu_env, + offsetof(CPUMIPSState, active_tc.mxu_cr), + mxuregnames[NUMBER_OF_MXU_REGISTERS - 1]); +} +#endif /* !TARGET_MIPS64 */ =20 /* General purpose registers moves. */ void gen_load_gpr(TCGv t, int reg) @@ -28047,18 +28060,9 @@ void mips_tcg_init(void) cpu_llval =3D tcg_global_mem_new(cpu_env, offsetof(CPUMIPSState, llval= ), "llval"); =20 -#if !defined(TARGET_MIPS64) - for (i =3D 0; i < NUMBER_OF_MXU_REGISTERS - 1; i++) { - mxu_gpr[i] =3D tcg_global_mem_new(cpu_env, - offsetof(CPUMIPSState, - active_tc.mxu_gpr[i]), - mxuregnames[i]); + if (TARGET_LONG_BITS =3D=3D 32) { + mxu_translate_init(); } - - mxu_CR =3D tcg_global_mem_new(cpu_env, - offsetof(CPUMIPSState, active_tc.mxu_cr), - mxuregnames[NUMBER_OF_MXU_REGISTERS - 1]); -#endif /* !TARGET_MIPS64 */ } =20 void restore_state_to_opc(CPUMIPSState *env, TranslationBlock *tb, --=20 2.26.2