From nobody Fri Apr 26 15:19:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1610485322; cv=none; d=zohomail.com; s=zohoarc; b=aSrRfXVTQpmByBi9mi7r5q0oSIAhqMgUcjvowU3Ko5j4C16FhsfMLoh7ZCJk2MtS2BKszqeXQFRG0axhjrCozJdvDQbXe/Ohw2a+Qci/YtaiFxKzSbYXGTPbrtHLObfAYlq5uDsGFSzRTQg/f3Bkh4iYgIhQgpg4Da3C45VmpMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610485322; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RJJLxkpXkJjGXmCJae7fsV6ghakSrAYFr/SC+ZdN6PI=; b=ccoplWk+GfM5oRkYkYpJMpnDBicIXIE8ZIsDcZssFYZHT2ZpyhbYXleTYNvgdQmjkui41uvAS897t8kildw5KIjaKgsnv3hMGelyNQb0NaO8F8e5QzarKPk8G1VDt1GHURhVxwljlBDr0HjHVspjNU/zXb3cfYTA4pbZpgc3/9g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1610485322148539.4043017285468; Tue, 12 Jan 2021 13:02:02 -0800 (PST) Received: by mail-wr1-f44.google.com with SMTP id m4so2577964wrx.9 for ; Tue, 12 Jan 2021 13:02:01 -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 x66sm5562386wmg.26.2021.01.12.13.01.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 13:01:59 -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=RJJLxkpXkJjGXmCJae7fsV6ghakSrAYFr/SC+ZdN6PI=; b=HtLUznLTTLiLDXFfEOTjYaHWSVL6eocrdSABAxZ/ifN/OO131FIZ9gzoE5tRjTMs8p 2xqBlvP3P62IHnHFxZWVnlfeumtyNYNPbDTDwg4DIgh10kNK63AJ3zaFJwwSwOjYvyMY zEvzYUJXGJm4Qzt08IirMMRySaWT+VMHNxSClrbJFn3VUjAYWtd2i9RmYO62+CG3BYra h3rb+3OnSuRSuxY+MLk6Ipy1af2d2pzbA58eyqMFHgQVe2jQYhgm/S9mOW6KdUB6Z5Xh /KiJxnAjDfzmToHVEB5z4qByq6G+ELhzEOD0uozebeeZVWTFq6n/RuZXNKJQkgDRWbQK xI9g== 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=RJJLxkpXkJjGXmCJae7fsV6ghakSrAYFr/SC+ZdN6PI=; b=V+WZGhFMduGn8HNu3FiJo4/iGATLyIQzRoJ5jr27BoyPsgVEom8tFSVFHZP0j2T27r oykAxk1y1VkPCJ6Cc8sFf6iNd/q1Y4lXsQc6K4ZB6iEiZzW7tyxLMx1Vfcr96hqFTzo4 +5+kAqNZ2wCgx7H/ZVelmS2bU4PQ8a5AF0WCMzBBIpQ6bogoqxqdEMvyW0RyK5x25h5y MmnoSR41u9tK9f9hSQje3+P2BaSDeXZV9DurZ/9HgxDr7g29k17Fx68K2tYMTgAxacP/ zV09CrqfY6YB+4LmmQOUFlG4CtUpsccEdror8wCTvR03/7a74CoeUi97Ajesfn6OJNu4 qyUA== X-Gm-Message-State: AOAM530u0oliNb/qP1izLOWlGYNW301xaJcwiP8ANEXd+kfOP3yUy+Yo fErup+xA5LbZIY5n23OMiVo= X-Google-Smtp-Source: ABdhPJy094wQL2D6fc5UtS9U/7Lx2XiuPsWPVaMCbEePd1MMtZSEM+W5FrRNjh/LoMD5XEidYdIF3Q== X-Received: by 2002:adf:dc87:: with SMTP id r7mr640530wrj.305.1610485320328; Tue, 12 Jan 2021 13:02:00 -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 1/3] target/mips: Remove CPU_R5900 definition Date: Tue, 12 Jan 2021 22:01:50 +0100 Message-Id: <20210112210152.2072996-2-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) Commit 823f2897bdd ("target/mips: Disable R5900 support") removed the single CPU using the CPU_R5900 definition. As it is unused, remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/mips-defs.h | 1 - 1 file changed, 1 deletion(-) diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h index 6b8e6800115..b7879be9e90 100644 --- a/target/mips/mips-defs.h +++ b/target/mips/mips-defs.h @@ -61,7 +61,6 @@ #define CPU_MIPS4 (CPU_MIPS3 | ISA_MIPS4) #define CPU_MIPS5 (CPU_MIPS4 | ISA_MIPS5) #define CPU_VR54XX (CPU_MIPS4 | INSN_VR54XX) -#define CPU_R5900 (CPU_MIPS3 | INSN_R5900) #define CPU_LOONGSON2E (CPU_MIPS3 | INSN_LOONGSON2E) #define CPU_LOONGSON2F (CPU_MIPS3 | INSN_LOONGSON2F | ASE_LMMI) =20 --=20 2.26.2 From nobody Fri Apr 26 15:19:28 2024 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 Reviewed-by: Richard Henderson --- 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 From nobody Fri Apr 26 15:19:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1610485333; cv=none; d=zohomail.com; s=zohoarc; b=i+LtJrE5XQkiw1odLGDiZ13uqh6JPc4YSb1mYIHefbE5wWeEZR2o9GbbdiOWeeRvvX9pt+OFBHdoR1xi5RdeYGiycehT4Z6Gs3oKmgaQMV7J6L6dJGHRrgtU9v40W2WkhN5UornmCvtCUIRMsMsfOfZhRx1GDd9kxsI/sIiPKbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610485333; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+QdnWeeWowM8n1JNeLbHcjqIuTxoeMtPbLfQb8+zPm8=; b=efqntgVUzXojvzCRn/T8OrsRd5KWPygwmKr6ZscdssOhdvroWo8hpegWKCypCG0SuYk4/FaEQVphOmPpqvrp9j5ujGJhP5C65AIH5R3pU7d0ZXZ2KXlpKMpHDruukgiCmwDNl/XkxxLS/YKcrGGCORFuz+Wf6tcnKBJIypso5cg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1610485333017284.00071798646866; Tue, 12 Jan 2021 13:02:13 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id a12so3930157wrv.8 for ; Tue, 12 Jan 2021 13:02:12 -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 m82sm5648226wmf.29.2021.01.12.13.02.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 13:02:10 -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=+QdnWeeWowM8n1JNeLbHcjqIuTxoeMtPbLfQb8+zPm8=; b=TLQ1/h3rE8KxzNHZBPmQ/fnOOISfg8okPY4C1+X+ah17vHkdW2A4LeqEcZhNSbAI+G yHN7G+MbJDgjSTBLd4D0bcMsIQr3+fWHGskSYJWwjfhJmckgTtCTwcGEqNfma0R+FoHF ZPQjT3+dXDglfYkivVCGvtpX6vTyFlhLD7UnjZLsZPVMdVebnMzKnfxnYRmn5UgfrWF1 1BiQ9CoVHIx2KuD29Jx8YU5WkPoluzk1f84p6HsZFRIs7oCkWKAfGcaEr9YIOgCbGUe6 uR1bYzRLSnMqjZqmlSCqrbqW9k2SitXWvdHjj70hV8HxzWs8AH/ojTbksB9vaU7H1rnO UoFA== 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=+QdnWeeWowM8n1JNeLbHcjqIuTxoeMtPbLfQb8+zPm8=; b=M6xOnC0otfy6mWvUj6Ptok2oryIJa6oJHOU22Id3CJcmMuGZjjhOdr1abunm7AEeUR juZ/4MC8x6u+r0tbzkhTVfGP62W2+2r4IaCaW1mcHIJqF1zJ34U5NDVqqGfXJwESjhu4 A+ewhXZ3QA9tW70Ubel0rNGTiT0qctH/IZP2MEtN5lbt3tKZmF8ibGiOOe1Yxrr/Rq8y qvA3p974m5HsKcBfzcLK9LwX8rCuEs3DyH4T5JFaVJmMXTt7qTT8PMz2S/vpxyhBB7W4 1HYu2M973ClC5yyrWhy8GhwJB7WWMAc1UM8/TAnfEGyYFEnQRHpCVs67iIOhOSHkV2u7 ofgg== X-Gm-Message-State: AOAM532qs7O/iP3wHUCkaSjFfN6OExaPtvy3j7sB56CC/uHrviguLUJ9 r5rOEp7feSrwrWYRNeY6aSU= X-Google-Smtp-Source: ABdhPJzBCBdhNkxg15ZYGTmNJD9EM95DNfukzwBx9e/11Ij+KNE0H71hqG/AzpuT04ZQ7cUwY/JwFQ== X-Received: by 2002:a5d:60ca:: with SMTP id x10mr693195wrt.242.1610485331204; Tue, 12 Jan 2021 13:02:11 -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 3/3] target/mips: Remove vendor specific CPU definitions Date: Tue, 12 Jan 2021 22:01:52 +0100 Message-Id: <20210112210152.2072996-4-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) Vendor specific CPU definitions are not very useful. Use the ISA definitions instead, which are more helpful when looking at the various CPU definitions. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/mips-defs.h | 5 ----- target/mips/cpu-defs.c.inc | 12 +++++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h index 3704db85532..0a12d982a72 100644 --- a/target/mips/mips-defs.h +++ b/target/mips/mips-defs.h @@ -60,9 +60,6 @@ #define CPU_MIPS3 (CPU_MIPS2 | ISA_MIPS3) #define CPU_MIPS4 (CPU_MIPS3 | ISA_MIPS4) #define CPU_MIPS5 (CPU_MIPS4 | ISA_MIPS5) -#define CPU_VR54XX (CPU_MIPS4 | INSN_VR54XX) -#define CPU_LOONGSON2E (CPU_MIPS3 | INSN_LOONGSON2E) -#define CPU_LOONGSON2F (CPU_MIPS3 | INSN_LOONGSON2F | ASE_LMMI) =20 #define CPU_MIPS64 (ISA_MIPS3) =20 @@ -86,8 +83,6 @@ #define CPU_MIPS32R6 (CPU_MIPS32R5 | ISA_MIPS_R6) #define CPU_MIPS64R6 (CPU_MIPS64R5 | CPU_MIPS32R6) =20 -#define CPU_LOONGSON3A (CPU_MIPS64R2 | INSN_LOONGSON3A | ASE_LMMI | ASE_L= EXT) - /* * Strictly follow the architecture standard: * - Disallow "special" instruction handling for PMON/SPIM. diff --git a/target/mips/cpu-defs.c.inc b/target/mips/cpu-defs.c.inc index 9f7bac87932..e03b2a998cd 100644 --- a/target/mips/cpu-defs.c.inc +++ b/target/mips/cpu-defs.c.inc @@ -531,7 +531,7 @@ const mips_def_t mips_defs[] =3D .CP1_fcr31_rw_bitmask =3D 0xFF83FFFF, .SEGBITS =3D 40, .PABITS =3D 32, - .insn_flags =3D CPU_VR54XX, + .insn_flags =3D CPU_MIPS4 | INSN_VR54XX, .mmu_type =3D MMU_TYPE_R4000, }, { @@ -781,7 +781,7 @@ const mips_def_t mips_defs[] =3D .CP1_fcr31_rw_bitmask =3D 0xFF83FFFF, .SEGBITS =3D 40, .PABITS =3D 40, - .insn_flags =3D CPU_LOONGSON2E, + .insn_flags =3D CPU_MIPS3 | INSN_LOONGSON2E, .mmu_type =3D MMU_TYPE_R4000, }, { @@ -801,7 +801,7 @@ const mips_def_t mips_defs[] =3D .CP1_fcr31_rw_bitmask =3D 0xFF83FFFF, .SEGBITS =3D 40, .PABITS =3D 40, - .insn_flags =3D CPU_LOONGSON2F, + .insn_flags =3D CPU_MIPS3 | INSN_LOONGSON2F | ASE_LMMI, .mmu_type =3D MMU_TYPE_R4000, }, { @@ -830,7 +830,8 @@ const mips_def_t mips_defs[] =3D .CP1_fcr31_rw_bitmask =3D 0xFF83FFFF, .SEGBITS =3D 42, .PABITS =3D 48, - .insn_flags =3D CPU_LOONGSON3A, + .insn_flags =3D CPU_MIPS64R2 | INSN_LOONGSON3A | + ASE_LMMI | ASE_LEXT, .mmu_type =3D MMU_TYPE_R4000, }, { @@ -887,7 +888,8 @@ const mips_def_t mips_defs[] =3D .CP1_fcr31_rw_bitmask =3D 0xFF83FFFF, .SEGBITS =3D 48, .PABITS =3D 48, - .insn_flags =3D CPU_LOONGSON3A, + .insn_flags =3D CPU_MIPS64R2 | INSN_LOONGSON3A | + ASE_LMMI | ASE_LEXT, .mmu_type =3D MMU_TYPE_R4000, }, { --=20 2.26.2