From nobody Tue Feb 10 13:17:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619972168; cv=none; d=zohomail.com; s=zohoarc; b=j/7TRhMxALb5QqgtpWdIV33JfuUXKUFE7lBTtXMb6zZTt49mlCI6sQ3c8vQYXFkiO/3SafgITWTiTyjp3HEm0sjGcChSMw2o9bEqqeCQhJSciUnEQiMSmn6LiCruOg/3ABBCWd/t02SjISLaJq/FZz9EieF1uk6Vn/0RI81cx+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619972168; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0RPwNXgnYoOFEB/Syw7iOsyR0ocLEZVRgNHH2ttrTpk=; b=deYIRGFr6IwwErvBbs0wpnRnEoTB/U1ZPhAfgwStLRjB6ezzZ+bMymOKunOSiviuPbTgES5ZBuoGPxi5ErCzf3lO6DqLxR32Vt5/2UFKQc1Pwgup28oMGE9uyR1DkqiU0Gnk0YETBR9AQJiPnFEG7wrkih1LeT6j9iWsziphegk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1619972168278418.0362498275672; Sun, 2 May 2021 09:16:08 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id k128so1915720wmk.4 for ; Sun, 02 May 2021 09:16:07 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id v18sm10898604wro.18.2021.05.02.09.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 09:16:06 -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=0RPwNXgnYoOFEB/Syw7iOsyR0ocLEZVRgNHH2ttrTpk=; b=NEinPNeqgvyvdCVcS0of2RnYaQeOxPBrUYQW796BCL4diI+aWNWjltWc/AzIZkJjkx 9tI6T+VheF5A1vXyuOqPKr/8HtgRR0fhjl+IybLYW8tJsBq7KxJL18pLf6ao6DWQN34/ HloPtp9R1m5ODqwGWGjEimXileUgff+a9blZXsVY0heiyM6ziDFY5CEb6SONtL0V9zAa Qv1RO1+Xfn9HB7jXLP6S4bG80ZxkMvAozG3IqViVtDF/8Mb4QL/6lnZPr1Cv+GP44GiR z6eEjsA+sNs08e97A5kTTubCLrPEH74yKRIZrBcXYmOdLhdQM/3FjVVppaUkhur1W4Ej ta5g== 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=0RPwNXgnYoOFEB/Syw7iOsyR0ocLEZVRgNHH2ttrTpk=; b=hhABMdK/pX3snUxfXSLlSkYDj/l1vqwULQup/ZE6IVTG0ruCwKF49yHmY8fup79W8S C8JV60pw5gxQJrpocBPxyyR/EzJuslASTYPtjoG9p+ZASYDAxVl10MzVWXhFISl22jAm PWrhENq93lxaD5jZFUm8qg8YZOb+aji8X0lAWIuLZ3xTytu4Dok6Vgyf5mOzOd8dbDH8 ctrLemNcDaXiS9qdPSvoWLl1dZgCChhuw5miO9rYwC2AwK/gdY6I+QOTLzkX+qi66wzk 3FZuCkvRfhlMD57gMsAXLzLA8yWN8vGMY7zPPlXLoWTkW79MdxaN4M6G+ajyClstxTAC 9zlQ== X-Gm-Message-State: AOAM533DJ3GKLyrXTIHyDxCS3cTq43LHFLTqUlxPuxjDyBRfR+pygWcb QnJx7PZr9FAT+dhzS6VbMG4= X-Google-Smtp-Source: ABdhPJytgoSdM47nI4MO9m9nIqmPLznZyPLFBwW6iRg+X8RytBK9alAb/EmSUj+POML1x9bCKAHmsw== X-Received: by 2002:a1c:9897:: with SMTP id a145mr19387038wme.9.1619972166576; Sun, 02 May 2021 09:16:06 -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: Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 05/36] target/mips: Migrate missing CPU fields Date: Sun, 2 May 2021 18:15:07 +0200 Message-Id: <20210502161538.534038-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210502161538.534038-1-f4bug@amsat.org> References: <20210502161538.534038-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) Add various missing fields to the CPU migration vmstate: - CP0_VPControl & CP0_GlobalNumber (01bc435b44b 2016-02-03) - CMGCRBase (c870e3f52ca 2016-03-15) - CP0_ErrCtl (0d74a222c27 2016-03-25) - MXU GPR[] & CR (eb5559f67dc 2018-10-18) - R5900 128-bit upper half (a168a796e1c 2019-01-17) This is a migration break. Fixes: 01bc435b44b ("target-mips: implement R6 multi-threading") Fixes: c870e3f52ca ("target-mips: add CMGCRBase register") Fixes: 0d74a222c27 ("target-mips: make ITC Configuration Tags accessible to= the CPU") Fixes: eb5559f67dc ("target/mips: Introduce MXU registers") Fixes: a168a796e1c ("target/mips: Introduce 32 R5900 multimedia registers") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Richard Henderson Message-Id: <20210423220044.3004195-1-f4bug@amsat.org> --- target/mips/machine.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/target/mips/machine.c b/target/mips/machine.c index b5fda6a2786..80d37f9c2fc 100644 --- a/target/mips/machine.c +++ b/target/mips/machine.c @@ -81,6 +81,9 @@ const VMStateDescription vmstate_inactive_fpu =3D { =20 static VMStateField vmstate_tc_fields[] =3D { VMSTATE_UINTTL_ARRAY(gpr, TCState, 32), +#if defined(TARGET_MIPS64) + VMSTATE_UINT64_ARRAY(gpr_hi, TCState, 32), +#endif /* TARGET_MIPS64 */ VMSTATE_UINTTL(PC, TCState), VMSTATE_UINTTL_ARRAY(HI, TCState, MIPS_DSP_ACC), VMSTATE_UINTTL_ARRAY(LO, TCState, MIPS_DSP_ACC), @@ -95,20 +98,22 @@ static VMStateField vmstate_tc_fields[] =3D { VMSTATE_INT32(CP0_Debug_tcstatus, TCState), VMSTATE_UINTTL(CP0_UserLocal, TCState), VMSTATE_INT32(msacsr, TCState), + VMSTATE_UINTTL_ARRAY(mxu_gpr, TCState, NUMBER_OF_MXU_REGISTERS - 1), + VMSTATE_UINTTL(mxu_cr, TCState), VMSTATE_END_OF_LIST() }; =20 const VMStateDescription vmstate_tc =3D { .name =3D "cpu/tc", - .version_id =3D 1, - .minimum_version_id =3D 1, + .version_id =3D 2, + .minimum_version_id =3D 2, .fields =3D vmstate_tc_fields }; =20 const VMStateDescription vmstate_inactive_tc =3D { .name =3D "cpu/inactive_tc", - .version_id =3D 1, - .minimum_version_id =3D 1, + .version_id =3D 2, + .minimum_version_id =3D 2, .fields =3D vmstate_tc_fields }; =20 @@ -213,8 +218,8 @@ const VMStateDescription vmstate_tlb =3D { =20 const VMStateDescription vmstate_mips_cpu =3D { .name =3D "cpu", - .version_id =3D 20, - .minimum_version_id =3D 20, + .version_id =3D 21, + .minimum_version_id =3D 21, .post_load =3D cpu_post_load, .fields =3D (VMStateField[]) { /* Active TC */ @@ -241,6 +246,7 @@ const VMStateDescription vmstate_mips_cpu =3D { =20 /* Remaining CP0 registers */ VMSTATE_INT32(env.CP0_Index, MIPSCPU), + VMSTATE_INT32(env.CP0_VPControl, MIPSCPU), VMSTATE_INT32(env.CP0_Random, MIPSCPU), VMSTATE_INT32(env.CP0_VPEControl, MIPSCPU), VMSTATE_INT32(env.CP0_VPEConf0, MIPSCPU), @@ -251,6 +257,7 @@ const VMStateDescription vmstate_mips_cpu =3D { VMSTATE_INT32(env.CP0_VPEOpt, MIPSCPU), VMSTATE_UINT64(env.CP0_EntryLo0, MIPSCPU), VMSTATE_UINT64(env.CP0_EntryLo1, MIPSCPU), + VMSTATE_INT32(env.CP0_GlobalNumber, MIPSCPU), VMSTATE_UINTTL(env.CP0_Context, MIPSCPU), VMSTATE_INT32(env.CP0_MemoryMapID, MIPSCPU), VMSTATE_INT32(env.CP0_PageMask, MIPSCPU), @@ -286,6 +293,7 @@ const VMStateDescription vmstate_mips_cpu =3D { VMSTATE_UINTTL(env.CP0_EPC, MIPSCPU), VMSTATE_INT32(env.CP0_PRid, MIPSCPU), VMSTATE_UINTTL(env.CP0_EBase, MIPSCPU), + VMSTATE_UINTTL(env.CP0_CMGCRBase, MIPSCPU), VMSTATE_INT32(env.CP0_Config0, MIPSCPU), VMSTATE_INT32(env.CP0_Config1, MIPSCPU), VMSTATE_INT32(env.CP0_Config2, MIPSCPU), @@ -305,6 +313,7 @@ const VMStateDescription vmstate_mips_cpu =3D { VMSTATE_INT32(env.CP0_Debug, MIPSCPU), VMSTATE_UINTTL(env.CP0_DEPC, MIPSCPU), VMSTATE_INT32(env.CP0_Performance0, MIPSCPU), + VMSTATE_INT32(env.CP0_ErrCtl, MIPSCPU), VMSTATE_UINT64(env.CP0_TagLo, MIPSCPU), VMSTATE_INT32(env.CP0_DataLo, MIPSCPU), VMSTATE_INT32(env.CP0_TagHi, MIPSCPU), --=20 2.26.3