From nobody Tue Feb 10 15:45:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1610058223; cv=none; d=zohomail.com; s=zohoarc; b=dP4kQ1SQODq0Y6kfu7LgIkhJPi/z8f4yT6uPkmAxhIfBUlV9uod/qPg8htFfUdB30Ef/f5RwaLy183xe0BhSuVv9mNuvB9yaUxiSNVXTAUYllCTgBXL73DPS7UikZQrq37qBGklMUp9oQIj/wexquOBJ4R4w2IcQXTQqZetNszA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610058223; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CCcScCerij69CQ6oZxOAaSELOgitQBqHQwR1Q8IbG/E=; b=cAK0NpOE17j+DpeaZLBv5KzlKWkICa9nz1S76JEuFdWqBX5r3HsWjDdjC1VprgqSEqoancrqUPIIui02CyfizX5Ch5GoDwOoIIkwI0myfQWW0bVZqOR1iVRLpVKDYAVoCHMMpJIT+CH3w3WJkscBrJVCkEKBfcKMhHD7sLHaMcw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1610058223664282.2649490479831; Thu, 7 Jan 2021 14:23:43 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-270-tBW3KxGVOFCfjnLJc32YuQ-1; Thu, 07 Jan 2021 17:23:40 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A33BF180A093; Thu, 7 Jan 2021 22:23:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 82B4760C5F; Thu, 7 Jan 2021 22:23:34 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4B84D1809CA5; Thu, 7 Jan 2021 22:23:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 107MNWFS028742 for ; Thu, 7 Jan 2021 17:23:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id D430F2026D49; Thu, 7 Jan 2021 22:23:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CF1C32026D11 for ; Thu, 7 Jan 2021 22:23:31 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4842080120A for ; Thu, 7 Jan 2021 22:23:31 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-269-vz3CwCrTOtiLZ-kwbqUfnA-1; Thu, 07 Jan 2021 17:23:28 -0500 Received: by mail-wm1-f48.google.com with SMTP id 3so6817343wmg.4; Thu, 07 Jan 2021 14:23:28 -0800 (PST) Received: from x1w.redhat.com (241.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.241]) by smtp.gmail.com with ESMTPSA id c7sm11506623wro.16.2021.01.07.14.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 14:23:26 -0800 (PST) X-MC-Unique: tBW3KxGVOFCfjnLJc32YuQ-1 X-MC-Unique: vz3CwCrTOtiLZ-kwbqUfnA-1 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=CCcScCerij69CQ6oZxOAaSELOgitQBqHQwR1Q8IbG/E=; b=fQJ6YBby51FHEb9oeqCgNT5O6hO3Rm0dGiGMs4C7hLxuiIJ4d6mz0c/E9JBIKecn1e uzbX7w/gcU0g8IHutC4bttt9AXQMm9BKzR9KowA15A2UfJ5ZRzRVSrM8YM4uyoc/hVbL 8Ag+dk7BspekfHkgmJT6AvUnswWB/2Q5F14136ZkZwr89VqW00T0gwW6V0lUVg8e13R9 gQ5nUebM/8W7xIyHsvg5gtOMemonUTjFD8xWLtYYTN6k6RDLTKpEglY46e8qEUkUPcCf c34Md4au2Cyfd0KnrhlqC6XJpqTTV3uRj7oGEHcOYDDjJOuqSIhFZ5U0F2iKhukKph0b d8EQ== X-Gm-Message-State: AOAM5320PNx+OBr2eQ50KoKJCuMA9xkjEUapdKZZ9GSburT45cN4OO8N WJsyAmExUeZ+zYSFquIHaVg= X-Google-Smtp-Source: ABdhPJy/gw9y0iLygnNYCRbNVdeUgo3SJN/NH5crn6wIfiA04NxP/S7hfoDf86Rn9ZrhmLpdiaeK+g== X-Received: by 2002:a7b:cb4f:: with SMTP id v15mr489712wmj.123.1610058207316; Thu, 07 Jan 2021 14:23:27 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 06/66] target/mips/mips-defs: Rename CPU_MIPSxx Release 1 as CPU_MIPSxxR1 Date: Thu, 7 Jan 2021 23:21:53 +0100 Message-Id: <20210107222253.20382-7-f4bug@amsat.org> In-Reply-To: <20210107222253.20382-1-f4bug@amsat.org> References: <20210107222253.20382-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Paul Burton , kvm@vger.kernel.org, libvir-list@redhat.com, Huacai Chen , Richard Henderson , Laurent Vivier , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 'CPU_MIPS32' and 'CPU_MIPS64' definitions concern CPUs implementing the "Release 1" ISA. Rename it with the 'R1' suffix, as the other CPU definitions do. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210104221154.3127610-4-f4bug@amsat.org> --- target/mips/mips-defs.h | 8 ++++---- target/mips/translate_init.c.inc | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h index 48544ba73b4..1630ae20d59 100644 --- a/target/mips/mips-defs.h +++ b/target/mips/mips-defs.h @@ -72,12 +72,12 @@ #define CPU_LOONGSON2F (CPU_MIPS3 | INSN_LOONGSON2F | ASE_LMMI) =20 /* MIPS Technologies "Release 1" */ -#define CPU_MIPS32 (CPU_MIPS2 | ISA_MIPS32) -#define CPU_MIPS64 (CPU_MIPS5 | CPU_MIPS32 | ISA_MIPS64) +#define CPU_MIPS32R1 (CPU_MIPS2 | ISA_MIPS32) +#define CPU_MIPS64R1 (CPU_MIPS5 | CPU_MIPS32R1 | ISA_MIPS64) =20 /* MIPS Technologies "Release 2" */ -#define CPU_MIPS32R2 (CPU_MIPS32 | ISA_MIPS32R2) -#define CPU_MIPS64R2 (CPU_MIPS64 | CPU_MIPS32R2 | ISA_MIPS64R2) +#define CPU_MIPS32R2 (CPU_MIPS32R1 | ISA_MIPS32R2) +#define CPU_MIPS64R2 (CPU_MIPS64R1 | CPU_MIPS32R2 | ISA_MIPS64R2) =20 /* MIPS Technologies "Release 3" */ #define CPU_MIPS32R3 (CPU_MIPS32R2 | ISA_MIPS32R3) diff --git a/target/mips/translate_init.c.inc b/target/mips/translate_init.= c.inc index cac3d241831..0ba3cf18ef7 100644 --- a/target/mips/translate_init.c.inc +++ b/target/mips/translate_init.c.inc @@ -72,7 +72,7 @@ const mips_def_t mips_defs[] =3D .CP0_Status_rw_bitmask =3D 0x1278FF17, .SEGBITS =3D 32, .PABITS =3D 32, - .insn_flags =3D CPU_MIPS32, + .insn_flags =3D CPU_MIPS32R1, .mmu_type =3D MMU_TYPE_R4000, }, { @@ -94,7 +94,7 @@ const mips_def_t mips_defs[] =3D .CP0_Status_rw_bitmask =3D 0x1258FF17, .SEGBITS =3D 32, .PABITS =3D 32, - .insn_flags =3D CPU_MIPS32 | ASE_MIPS16, + .insn_flags =3D CPU_MIPS32R1 | ASE_MIPS16, .mmu_type =3D MMU_TYPE_FMT, }, { @@ -114,7 +114,7 @@ const mips_def_t mips_defs[] =3D .CP0_Status_rw_bitmask =3D 0x1278FF17, .SEGBITS =3D 32, .PABITS =3D 32, - .insn_flags =3D CPU_MIPS32, + .insn_flags =3D CPU_MIPS32R1, .mmu_type =3D MMU_TYPE_R4000, }, { @@ -134,7 +134,7 @@ const mips_def_t mips_defs[] =3D .CP0_Status_rw_bitmask =3D 0x1258FF17, .SEGBITS =3D 32, .PABITS =3D 32, - .insn_flags =3D CPU_MIPS32 | ASE_MIPS16, + .insn_flags =3D CPU_MIPS32R1 | ASE_MIPS16, .mmu_type =3D MMU_TYPE_FMT, }, { @@ -552,7 +552,7 @@ const mips_def_t mips_defs[] =3D .CP0_Status_rw_bitmask =3D 0x12F8FFFF, .SEGBITS =3D 42, .PABITS =3D 36, - .insn_flags =3D CPU_MIPS64, + .insn_flags =3D CPU_MIPS64R1, .mmu_type =3D MMU_TYPE_R4000, }, { @@ -578,7 +578,7 @@ const mips_def_t mips_defs[] =3D .CP1_fcr31_rw_bitmask =3D 0xFF83FFFF, .SEGBITS =3D 42, .PABITS =3D 36, - .insn_flags =3D CPU_MIPS64, + .insn_flags =3D CPU_MIPS64R1, .mmu_type =3D MMU_TYPE_R4000, }, { @@ -607,7 +607,7 @@ const mips_def_t mips_defs[] =3D .CP1_fcr31_rw_bitmask =3D 0xFF83FFFF, .SEGBITS =3D 40, .PABITS =3D 36, - .insn_flags =3D CPU_MIPS64 | ASE_MIPS3D, + .insn_flags =3D CPU_MIPS64R1 | ASE_MIPS3D, .mmu_type =3D MMU_TYPE_R4000, }, { --=20 2.26.2