From nobody Tue Feb 10 01:50:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1610485327; cv=none; d=zohomail.com; s=zohoarc; b=VvZi7l5WwvlXnBZThZ5bDV3/U6JZzMYBl6K9/mehj0xL+7OqOvluy0ZnMdYshFjCXveWJiJ2NM35My1HoyfPQGm8FI75JOAZY2HEguyAhaXgjsAtp9diUlybJ8D3FmNN0mkbf3bBSxJ9XkFcT2qJrmuveKaQNZXRj2QUqHgwXyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610485327; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PdHJTEEbbmsSqQjGmdaxW05TMT4n/VzB78ADEP9BxSI=; b=O/X1jJ7CGSW0OxxjZDuVH7n6g5TrYOKPxtQ8IxzpMH/bOAKMr1Ua6/X7aZEZk3z4Y0n/dtxXS1Fkjj/FEEwYXzW1FkgiaO4wrowJAsoHFf3Ufiw6tm6fCFIS/D6NLRTKBwAe6N3+HBuWF7eGwOmmL9PkEf1VCWozdf5b0WTGsIo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1610485327689754.2151214088008; Tue, 12 Jan 2021 13:02:07 -0800 (PST) Received: by mail-wr1-f52.google.com with SMTP id y17so3911193wrr.10 for ; Tue, 12 Jan 2021 13:02:07 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (190.red-83-57-173.dynamicip.rima-tde.net. [83.57.173.190]) by smtp.gmail.com with ESMTPSA id k10sm6186264wrq.38.2021.01.12.13.02.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 13:02:04 -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=PdHJTEEbbmsSqQjGmdaxW05TMT4n/VzB78ADEP9BxSI=; b=HHkrvNi37tRM+bDwN84SyUTmj58XMYavtBM6SV80uYRmCUR3TJJbXJ5huBJPcDJqr4 fY2ATurrLhClEdgAF3UC15h5GGErU0zY9hcJdQM6pgEWALjdSahXd13HX4sETSjZAnZM 7nVVBU48mV1bh9twi2GBmH2fqTvT6+jR8w4hLGKYcwjWa89Gvv14S+spKxiiSnrpGuKj vdB1iMSM6eFMjNRmP0Rg+qpfYXzvnblQpNEfRHcN6/CrCj0s1Tp+8fNd73suIyvEsfWi 3b58f4X22bV723ABRji26WzVQv0iIvhW9tgkrCg+0//MJt08ZRgQINoU+i+ZNkoCqNp3 zrYw== 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=PdHJTEEbbmsSqQjGmdaxW05TMT4n/VzB78ADEP9BxSI=; b=M5Sk9GkAMHebbMZ0azP1u+KENd05yPbslGSwFilIpSgq3DpXqzb20IEbLmCP3pNzT7 VknbxsurpM+LiUJvaaPjhgQN43YJLGTjFJB8RPtB0Yuq7REEmWRjJIpG3/lkBmn320zD 9R9hPjN7ObTGLpdS0TVVzVBzm/JClqVOoZhiH9Cy9ZHbuN5HfmTQbFEXMma4L2EWuf3V oWibyekkp6zITjPKFfHfLQ+8voukr7S0bE4hMrJPyHFkUptWwTuHJfTzv7izYKglqaCV H1riZB8JgjICrjcVS5cb3SdRWM48rgErMzF12gN2tGseopttiVt3gRGHIbC3Hs56oyw5 1wVA== X-Gm-Message-State: AOAM532D5iSfpwhfUlKfZmKO7WmZBIs+U7Mmhxk+u8x/6H/WryKpKNjI QSHqyrh11JyP1sL55PnB5as= X-Google-Smtp-Source: ABdhPJzijBI7510FL4nmHUVRHbsdYZcsx+sfvCvc8w2+YTDVJAI+eqadetvLFjlx2UW0G5+VzSCZjw== X-Received: by 2002:a5d:5704:: with SMTP id a4mr659267wrv.37.1610485325875; Tue, 12 Jan 2021 13:02:05 -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: Aurelien Jarno , Richard Henderson , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Aleksandar Rikalo Subject: [PATCH 2/3] target/mips: Remove CPU_NANOMIPS32 definition Date: Tue, 12 Jan 2021 22:01:51 +0100 Message-Id: <20210112210152.2072996-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210112210152.2072996-1-f4bug@amsat.org> References: <20210112210152.2072996-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) nanoMIPS not a CPU, but an ISA. The nanoMIPS ISA is already defined as ISA_NANOMIPS32. Remove this incorrect definition and update the single CPU implementing it, the I7200. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/mips-defs.h | 3 --- target/mips/cpu-defs.c.inc | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h index b7879be9e90..3704db85532 100644 --- a/target/mips/mips-defs.h +++ b/target/mips/mips-defs.h @@ -86,9 +86,6 @@ #define CPU_MIPS32R6 (CPU_MIPS32R5 | ISA_MIPS_R6) #define CPU_MIPS64R6 (CPU_MIPS64R5 | CPU_MIPS32R6) =20 -/* Wave Computing: "nanoMIPS" */ -#define CPU_NANOMIPS32 (CPU_MIPS32R6 | ISA_NANOMIPS32) - #define CPU_LOONGSON3A (CPU_MIPS64R2 | INSN_LOONGSON3A | ASE_LMMI | ASE_L= EXT) =20 /* diff --git a/target/mips/cpu-defs.c.inc b/target/mips/cpu-defs.c.inc index ba22ff4bcd1..9f7bac87932 100644 --- a/target/mips/cpu-defs.c.inc +++ b/target/mips/cpu-defs.c.inc @@ -486,8 +486,8 @@ const mips_def_t mips_defs[] =3D .CP1_fcr31 =3D (1 << FCR31_ABS2008) | (1 << FCR31_NAN2008), .SEGBITS =3D 32, .PABITS =3D 32, - .insn_flags =3D CPU_NANOMIPS32 | ASE_DSP | ASE_DSP_R2 | ASE_DSP_R3= | - ASE_MT, + .insn_flags =3D CPU_MIPS32R6 | ISA_NANOMIPS32 | + ASE_DSP | ASE_DSP_R2 | ASE_DSP_R3 | ASE_MT, .mmu_type =3D MMU_TYPE_R4000, }, #if defined(TARGET_MIPS64) --=20 2.26.2