From nobody Tue Nov 18 07:25:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1608126263; cv=none; d=zohomail.com; s=zohoarc; b=MWpz0M+vZs7vKOE4RymQs7F+bZU39jHiVuytTJx1lQdTIT6JkYl/aY9+Rnr1sxkZRsju0CGwmVFiL5x1aTyyTO/sqmOcHIX02Cwld3huuq36/rOFeV7hjeyCPBKe+kEoy7dk7OFe9zUPNrl2NivgXVTLOPnvlPbUduEVDNxjfac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608126263; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wLFcl6Vi44+jgM/M1PEATPZTUeRmUNN1l1qQcgVBAnw=; b=N6OCBWUkuwqyvqEUvMSqcJiAXnMs00lAgIGNgmsgnzx1nmV5RnnTgkz764uBlRSeDaxvauPG/zFapVgkHJ9GUBZ2h8hhYJe1ouvfellrWi5/bwsLP6KPMjzHamnHCx01n75mqyDtd2PAhSDtpJvtz6QSzJ4a2D5To9IxFRBEKME= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1608126263115749.1782528444049; Wed, 16 Dec 2020 05:44:23 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id g185so2490858wmf.3 for ; Wed, 16 Dec 2020 05:44:21 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id z64sm2833660wme.10.2020.12.16.05.44.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 05:44:19 -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=wLFcl6Vi44+jgM/M1PEATPZTUeRmUNN1l1qQcgVBAnw=; b=ZWupw9rokBEvovxkaWwo+oDlGRCDQKzYxtv+uf5nYSjI7Z3Ipwz0vWGDDR4Oh49ryt ERTQFzlDSvRHfO3e/OiMYlCBbZlFdkeMpyZ5+vAZ8743fdMwEZEUOCsarOF2fkF7FGN7 aPKjnSwY9GA5wPScEmI5dJCx3tSIMqlKQtXL4mm1c73nloSIL7abHBatlk0jaMnredZU o0SAU928MeMvThW7ysFfFu7/X6mWleezVuzv/lUuZXbm4wi61FBUFT2o833Ipy1u8bfZ 86kifkeblUBKHoMmv+Kv/Cy8mffNEhGUJz/YNxvTta5Uqc4KX1kDKWLA/jIrNFc51O6t SYlA== 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=wLFcl6Vi44+jgM/M1PEATPZTUeRmUNN1l1qQcgVBAnw=; b=UigF2a0N2ZGyBxHZ2D9UPYtSQykdlX33l2/94UmLpptnuJC4jDdhOc4SBL/Jj13K9C L4Q3w6qLBvz1+6K4Zf4KhUWyMiALUs3jQEVRV6l9Z6OlxcBmwxWVhJNNKQ2rY4PzKRjb m/KbfHkuq3LqASOEzojs7MffhTdwu0Dyz07CINFKLKdOrfQvC9ya3ecKxP/Jh2c7uww1 BZUqDWd9nKImF0injxVIuAQ+OFtrtdBp9YnccmVa7oYV2nJy9KZmjoKtkf9tKH1NDqi+ atgBFt0VlTNbOOUQ2IQOkCPvcDNwvh2j4s0INFHcGMEn18peLT77XWqWgERPWPEu/dWW FnNQ== X-Gm-Message-State: AOAM531jFTPsdoEKLa+kngzD9G2PDlZ95IpaEHxljZTqCkqFLR0ihn1H euuj7euqIom28DiIGJhNCtsLgpYb+T0= X-Google-Smtp-Source: ABdhPJwuZHb5FwUtzmbnO7QzQWri7mvN/ji7Qsw+fr85rHkoWn3J0eC4Gg8DYBVryynvN8TGD4I5Ag== X-Received: by 2002:a05:600c:21d5:: with SMTP id x21mr3448500wmj.10.1608126260587; Wed, 16 Dec 2020 05:44:20 -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 , Aleksandar Rikalo , Jiaxun Yang , Paul Burton , Richard Henderson , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 10/11] target/mips/mips-defs: Rename ISA_MIPS32R5 as ISA_MIPS_R5 Date: Wed, 16 Dec 2020 14:43:27 +0100 Message-Id: <20201216134328.851840-11-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201216134328.851840-1-f4bug@amsat.org> References: <20201216134328.851840-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) The MIPS ISA release 5 is common to 32/64-bit CPUs. To avoid holes in the insn_flags type, update the definition with the next available bit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/mips-defs.h | 4 ++-- target/mips/translate.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h index 171d94c16dc..068fe9c8a19 100644 --- a/target/mips/mips-defs.h +++ b/target/mips/mips-defs.h @@ -25,7 +25,7 @@ #define ISA_MIPS_R1 0x0000000000000020ULL #define ISA_MIPS_R2 0x0000000000000040ULL #define ISA_MIPS_R3 0x0000000000000080ULL -#define ISA_MIPS32R5 0x0000000000000800ULL +#define ISA_MIPS_R5 0x0000000000000100ULL #define ISA_MIPS32R6 0x0000000000002000ULL #define ISA_NANOMIPS32 0x0000000000008000ULL /* @@ -84,7 +84,7 @@ #define CPU_MIPS64R3 (CPU_MIPS64R2 | CPU_MIPS32R3) =20 /* MIPS Technologies "Release 5" */ -#define CPU_MIPS32R5 (CPU_MIPS32R3 | ISA_MIPS32R5) +#define CPU_MIPS32R5 (CPU_MIPS32R3 | ISA_MIPS_R5) #define CPU_MIPS64R5 (CPU_MIPS64R3 | CPU_MIPS32R5) =20 /* MIPS Technologies "Release 6" */ diff --git a/target/mips/translate.c b/target/mips/translate.c index 842db4490ce..6406596293c 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -10588,7 +10588,7 @@ static void gen_cp0(CPUMIPSState *env, DisasContext= *ctx, uint32_t opc, if (ctx->opcode & (1 << bit_shift)) { /* OPC_ERETNC */ opn =3D "eretnc"; - check_insn(ctx, ISA_MIPS32R5); + check_insn(ctx, ISA_MIPS_R5); gen_helper_eretnc(cpu_env); } else { /* OPC_ERET */ --=20 2.26.2