From nobody Mon Nov 17 23:55:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) client-ip=209.85.128.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1606829309; cv=none; d=zohomail.com; s=zohoarc; b=Dcc3gqWBn1lnG5wFlZ7V7wlTeU5r7YkFih2esaI7Oqg90r1189BFdZvVK6fHK1PfNFdCoM8QUCyH7K8zZbgfEDNr8L9eIT+ATIRYf3iEOJ2w+QUAVoe7S58zQVceLBDbuRlcHGswIsaZ36FsXk8RabwOxtA8kWNoXn6c0H5+DNU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606829309; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SkU0x0PsOvuU2zhH0806drjS01R88qBbsS1X8IGmXd4=; b=mpVsxT5vhIiD03SfqeZrwFTSGMPwdlY3ybmYofAOct1zArCbXWJRi6r12jT94ep2LKjcCtbPgWChkRrLpfuKOjHocnZ6SSiM6nOi8xhv2ZZUXQJUfPHGYh3is2fdaJb2hE3qLIN05JkkOyYJt6LnZfAC6Nl7yz3g9IoDepLio9M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.zohomail.com with SMTPS id 1606829309316927.8764597380374; Tue, 1 Dec 2020 05:28:29 -0800 (PST) Received: by mail-wm1-f65.google.com with SMTP id a3so4920307wmb.5 for ; Tue, 01 Dec 2020 05:28:26 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id x9sm3175063wru.55.2020.12.01.05.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 05:28:24 -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=SkU0x0PsOvuU2zhH0806drjS01R88qBbsS1X8IGmXd4=; b=LA/X9If1cVCFCMwkEgLppzUp/9UfevjG15I5JF7eCdbqqDE9PEumaHLJv89aznyfYk hoRR4feHL18uRP5ypbRZjAqhm/MqKuZRH93kFEaQtTw0+STl0pEXz0MdbtZ32HKnGML6 zp8I9zWKKLoMYUJVDRehIKnJTTHxi86R6AMYAnOeiuPcYlmHaOnimXvs+rDyHoaJ8lfb fxB4S1kteycO97KharTTvReKrgq45dXsS6MphjGsWfHcE1GEFmtcU83jg3KBckzWO/eg I5sFNIDn+/oTlI1crmlD1bXW0GsOsWiw1UVRVwJjePy2cOxZry5gSTLUi/67miNlOZkU 3KFA== 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=SkU0x0PsOvuU2zhH0806drjS01R88qBbsS1X8IGmXd4=; b=XcasyBlTAFBvu9jlqZN9PR00Vr2JJ0yYXZPXSUrx4wtVpieKczZ9Ss/YaTtYKuGJM9 cMhAKGH6xCY7KlsYROKsAZSEEczV2oHGg7zGzBp99DnffvX47/oRiL9RzyD7lLMjJH7C OOcVQDvjpr0i/dazOtTYI4tPrLl0WLhxd/ozfMujx7WcJQgE9Wwe7HybqUDJcKm8nTtA s49pxWH2tFgT8Q3rNEu+OO3+SJA4kiH8Rn2MEYyYv70hCXoSgxpk7Rd/hgw6aOm1mC9o rSQKqbjbhRNlIFLu0SUDWASJJVtX9h6bditDlbv5oQPN7woJhGXmlOmxXfzhhx04SN4C nYdg== X-Gm-Message-State: AOAM532BspIardESeGg/uxCWQWWq2C/lN2xWIcSBtJasb4SOhD2UF+Y2 7w08XXujPxn7Qd/wpNIWh8nNZAatigQ= X-Google-Smtp-Source: ABdhPJzMH4QBH1zWvlegMx2xfQw27rH86wcqPxfO889BQy68vSQ6O5s6Z+7EeQeb/TDoUFoZF+fgCQ== X-Received: by 2002:a05:600c:2188:: with SMTP id e8mr1846926wme.99.1606829305464; Tue, 01 Dec 2020 05:28:25 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Huacai Chen , qemu-devel@nongnu.org, Jiaxun Yang Cc: Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aurelien Jarno Subject: [PATCH 1/3] target/mips: Add CP0 Config0 register definitions for MIPS3 ISA Date: Tue, 1 Dec 2020 14:28:15 +0100 Message-Id: <20201201132817.2863301-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201201132817.2863301-1-f4bug@amsat.org> References: <20201201132817.2863301-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 MIPS3 and MIPS32/64 ISA use different definitions for the CP0 Config0 register. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/cpu.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 23f8c6f96cd..05291cee4db 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -828,7 +828,7 @@ struct CPUMIPSState { #define CP0EBase_WG 11 target_ulong CP0_CMGCRBase; /* - * CP0 Register 16 + * CP0 Register 16 (after Release 1) */ int32_t CP0_Config0; #define CP0C0_M 31 @@ -837,13 +837,20 @@ struct CPUMIPSState { #define CP0C0_MDU 20 #define CP0C0_MM 18 #define CP0C0_BM 16 -#define CP0C0_Impl 16 /* 24..16 */ #define CP0C0_BE 15 #define CP0C0_AT 13 /* 14..13 */ #define CP0C0_AR 10 /* 12..10 */ #define CP0C0_MT 7 /* 9..7 */ #define CP0C0_VI 3 #define CP0C0_K0 0 /* 2..0 */ +/* + * CP0 Register 16 (before Release 1) + */ +#define CP0C0_Impl 16 /* 24..16 */ +#define CP0C0_IC 9 /* 11..9 */ +#define CP0C0_DC 6 /* 8..6 */ +#define CP0C0_IB 5 +#define CP0C0_DB 4 int32_t CP0_Config1; #define CP0C1_M 31 #define CP0C1_MMU 25 /* 30..25 */ --=20 2.26.2 From nobody Mon Nov 17 23:55:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) client-ip=209.85.128.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1606829312; cv=none; d=zohomail.com; s=zohoarc; b=XzXESXyKTIx6D1ejbCU9/VzdTHCy8N+pk1+h3ks67CcleW6eoGySc4yorgbAL8K71DEC0ILQBRoF41L+YBGXFDjZLFEI7FmZE6g17gA4jwbEzO8Y+O398E5zvsnuRp2dAnnZaemkzkYeBNn4tpnSny7gb7M7hCHo1bpBxedymEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606829312; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rp4xnUJtd5sl4NVBjhV9Hzwn0rVDspRr7Rk8qpU8HFs=; b=dRRGNDtXiv6DN8c+PFDU07VTsxzuHhQR0eoS88oX6fmPS2+h47oTKWC+XoT0mWNIo8VUn20HuMYV579pms/IAW/QzSnGrfy1oi94g/nMm4hOaGdGTGhQuzathWUa7f/ale2HpsikpxaeWDAdmilv90J5RtqpjGyf/mFadHYwDQU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.zohomail.com with SMTPS id 16068293123905.876168722302623; Tue, 1 Dec 2020 05:28:32 -0800 (PST) Received: by mail-wm1-f66.google.com with SMTP id 3so4928687wmg.4 for ; Tue, 01 Dec 2020 05:28:31 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id i11sm3253089wrm.1.2020.12.01.05.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 05:28:29 -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=rp4xnUJtd5sl4NVBjhV9Hzwn0rVDspRr7Rk8qpU8HFs=; b=jsrnKPHGJrSbQU9I/pKISqEwGFA2aC9mJ1msXv+esIjKWWclVOQQ48/i+eZH3Jm/qV yZHCIB/0W0KnwrrTGPDbP/cfQHo5Ku9JLF/MvU6FrQ2tXD/0wA5M9w8EIdn499AkWpcU Zi9/+MhF9QZuZPYhrTleB+tA27KU31b8OS4qTx2x0k04+UId34w1Ase+rIMqKI1Bdj9I EKlH9dlXTX2vUasHmSE3kuNXAdgYtHP4OxdtlrTGslD0RsD1pKiL+2evk4seJdqzdbe3 nJCaNU4+ZCkMibl3dLqJWjzdilElhDgA+dc/MSjOF1z8Z27dz1JKH/2RyvXkrCaw9g0G qWSQ== 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=rp4xnUJtd5sl4NVBjhV9Hzwn0rVDspRr7Rk8qpU8HFs=; b=Ek46WLh9K+84QPr/WBP3Fjxs38NBUJDgsKtcggcf/lhghynBjO5tC/JwNS95d1+IwW Y2GJIL4Kp5IvzTdKMaKMBiRFiGO8vnwetTc7YIckzXv2tEeR6z/bQulmUM2s4RPBs1Xn ROqNWQcoA3OFRvAr8X64BUfBFpANUCdaF2D4qhr2LEs4Z1V10V0spNcYm3i94fguiNHf o6SVDjpZjwDVQFw9bxXC9Fr5GNSeVY9Wg5EI3Frjx+GFe127RgS0oZsR2gzHb808m+1M tjCPIRImaPZEWj298GSMvDUnCbkN7P5EfJw7CJUgYhKaAGT1zzI/aV6RaP2bRhm80C3k CJ4A== X-Gm-Message-State: AOAM532ydBfJLEefjKgmHxEj/r55q7qlkB52YbAZKeJtc2eyAX5n52cF TOMaXEXIinhQHaWhE0IHtwM= X-Google-Smtp-Source: ABdhPJyAkn2+wfBkeqakUxJj80cczQukKxaQAsXINRBFWBKDZuWOOLxa2AlmpNUa9jPzDLbEZp5Vcg== X-Received: by 2002:a1c:4e0a:: with SMTP id g10mr2696362wmh.51.1606829310366; Tue, 01 Dec 2020 05:28:30 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Huacai Chen , qemu-devel@nongnu.org, Jiaxun Yang Cc: Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aurelien Jarno Subject: [PATCH 2/3] target/mips: Replace CP0_Config0 magic values by proper definitions Date: Tue, 1 Dec 2020 14:28:16 +0100 Message-Id: <20201201132817.2863301-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201201132817.2863301-1-f4bug@amsat.org> References: <20201201132817.2863301-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/translate_init.c.inc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/target/mips/translate_init.c.inc b/target/mips/translate_init.= c.inc index ea85d5c6a79..4206d8f0859 100644 --- a/target/mips/translate_init.c.inc +++ b/target/mips/translate_init.c.inc @@ -495,7 +495,8 @@ const mips_def_t mips_defs[] =3D .name =3D "R4000", .CP0_PRid =3D 0x00000400, /* No L2 cache, icache size 8k, dcache size 8k, uncached coherency= . */ - .CP0_Config0 =3D (1 << 17) | (0x1 << 9) | (0x1 << 6) | (0x2 << CP0= C0_K0), + .CP0_Config0 =3D (2 << CP0C0_Impl) | (1 << CP0C0_IC) | (1 << CP0C0= _DC) | + (2 << CP0C0_K0), /* Note: Config1 is only used internally, the R4000 has only Confi= g0. */ .CP0_Config1 =3D (1 << CP0C1_FP) | (47 << CP0C1_MMU), .CP0_LLAddr_rw_bitmask =3D 0xFFFFFFFF, @@ -516,7 +517,8 @@ const mips_def_t mips_defs[] =3D .name =3D "VR5432", .CP0_PRid =3D 0x00005400, /* No L2 cache, icache size 8k, dcache size 8k, uncached coherency= . */ - .CP0_Config0 =3D (1 << 17) | (0x1 << 9) | (0x1 << 6) | (0x2 << CP0= C0_K0), + .CP0_Config0 =3D (2 << CP0C0_Impl) | (1 << CP0C0_IC) | (1 << CP0C0= _DC) | + (2 << CP0C0_K0), .CP0_Config1 =3D (1 << CP0C1_FP) | (47 << CP0C1_MMU), .CP0_LLAddr_rw_bitmask =3D 0xFFFFFFFFL, .CP0_LLAddr_shift =3D 4, @@ -766,8 +768,8 @@ const mips_def_t mips_defs[] =3D .name =3D "Loongson-2E", .CP0_PRid =3D 0x6302, /* 64KB I-cache and d-cache. 4 way with 32 bit cache line size. */ - .CP0_Config0 =3D (0x1<<17) | (0x1<<16) | (0x1<<11) | (0x1<<8) | - (0x1<<5) | (0x1<<4) | (0x1<<1), + .CP0_Config0 =3D (3 << CP0C0_Impl) | (4 << CP0C0_IC) | (4 << CP0C0= _DC) | + (1 << CP0C0_IB) | (1 << CP0C0_DB) | (0x2 << CP0C0_K= 0), /* Note: Config1 is only used internally, Loongson-2E has only Config0. */ .CP0_Config1 =3D (1 << CP0C1_FP) | (47 << CP0C1_MMU), @@ -786,8 +788,8 @@ const mips_def_t mips_defs[] =3D .name =3D "Loongson-2F", .CP0_PRid =3D 0x6303, /* 64KB I-cache and d-cache. 4 way with 32 bit cache line size. */ - .CP0_Config0 =3D (0x1<<17) | (0x1<<16) | (0x1<<11) | (0x1<<8) | - (0x1<<5) | (0x1<<4) | (0x1<<1), + .CP0_Config0 =3D (3 << CP0C0_Impl) | (4 << CP0C0_IC) | (4 << CP0C0= _DC) | + (1 << CP0C0_IB) | (1 << CP0C0_DB) | (0x2 << CP0C0_K= 0), /* Note: Config1 is only used internally, Loongson-2F has only Config0. */ .CP0_Config1 =3D (1 << CP0C1_FP) | (47 << CP0C1_MMU), --=20 2.26.2 From nobody Mon Nov 17 23:55:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) client-ip=209.85.221.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1606829317; cv=none; d=zohomail.com; s=zohoarc; b=ckzYi5q5m35jurNhZfgsE8wmBUGTlEtAuj/WZK8YEK504i0Lk+rUJsg+Fw+YSKBgv7/PtyDP8gcGvfUh7Jav7gaeILw3aTy7osNiFshMXV7Yaj8zyIuER/IXYws08JhFYLtvbsQMHXCt6Z+b/5jyUhqNqv4KGiiSM63MmLt5O4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606829317; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iA0ePG/LyXWMj1HoCxSdhzXRV/vZBN9smpyyTyM9Sgc=; b=W4K2QZSCrqrolZQc7CT3R1DmjS0EVB45rcz2JbDnVAxoU8F/TqmEZvp9fS59Ib10i16dCFx9MksenQgnuGetgP23mjkLLWC2zxjnssDkADZkX+zmTXiKB1WikNR+7DCiIZSeI4Dhdd1oYlOF0iHONSWevUxzTBsvKB5kECMfk/Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.zohomail.com with SMTPS id 16068293172922.074042403248427; Tue, 1 Dec 2020 05:28:37 -0800 (PST) Received: by mail-wr1-f65.google.com with SMTP id g14so2588726wrm.13 for ; Tue, 01 Dec 2020 05:28:36 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id k11sm3123200wrv.88.2020.12.01.05.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 05:28:34 -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=iA0ePG/LyXWMj1HoCxSdhzXRV/vZBN9smpyyTyM9Sgc=; b=AYX/dUO9iRaS5JLYfq4RGdP57EsHxq9o8T5PAZ05+K6aHNEl759NSwDAW3QJRrdnna MT1dd4hJFP1+gZKt7CXsGCXB8jdz6hWBJZJ2LG6CnrVGjikld77VMtJPJR+mXn20tWwH neJCS+fK9mesDbpSJPSApf+phtEpRJiowR/qrWvbO+u/s3evrrDCD37B5LXarGR7hZS1 +OnXbJ+DmtVRrusG5T90E/RjFJjA8HRnx7oJ/zqpnB3GFIyW/6kvGdbstJKN/afzzEFA 8ZQquLpH72QhdoFm50ko1yOKgTUU4DEB2K1R7vTk+f88cCsUzNzUVWFAFVuEr7msmc2x 4OZg== 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=iA0ePG/LyXWMj1HoCxSdhzXRV/vZBN9smpyyTyM9Sgc=; b=D/O5cnMVXS0/uFLAZT8/Lc0v2IoeslXZ1aM3XNpSSoyMn0qhAMBJKoO2XjkeoVLmaV 3RLSyj7Zam7isYeWu5+Gf3s1WlnOUR/13dsgU8OLQCpUXzVVrBbqLSGX21j2q+oZ8mdc 441zWEcOv98NpgcewbGoXjIkKHlv3rTjSsYPGHp1fiymwHAr11S9tOusHeDkFYT6WuY0 5UVCdBuHlbTrtzlOA5mxCdXDlNGkscs0fcg/BhNk+s6pQ3D/lMVKla9pp1CLU5+bLNDc 4Ndq2RZFDvGKQTSGar5qEzAs4XV71yoiwGlAe+aQCYzbtM3LBBs9Nv/FP23OmtEJKBXz i3SA== X-Gm-Message-State: AOAM532CzXTeuLt4/8I2qznrZZUBjtIV4JG3I5lv45yXM9tLaSG3U0KI xyLIbXiBveQAUiBYr+q1Vsg= X-Google-Smtp-Source: ABdhPJzyoGuBk1IihaQyeqkhSCk0j//a6bocCS6Xx/EbK1u2xCLrwyl3TkxnEn5kB/r2owhOmnzZHw== X-Received: by 2002:adf:cf0b:: with SMTP id o11mr3939280wrj.162.1606829315358; Tue, 01 Dec 2020 05:28:35 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Huacai Chen , qemu-devel@nongnu.org, Jiaxun Yang Cc: Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aurelien Jarno Subject: [PATCH 3/3] target/mips: Explicit Release 6 MMU types Date: Tue, 1 Dec 2020 14:28:17 +0100 Message-Id: <20201201132817.2863301-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201201132817.2863301-1-f4bug@amsat.org> References: <20201201132817.2863301-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) As of Release 6, MMU type 4 is assigned to "Dual Variable-Page-Size and Fixed-Page-Size TLBs" and type 2 to "Block Address Translation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/internal.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index dd8a7809b64..d290c1afe30 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -15,10 +15,11 @@ * CP0C0_MT field. */ enum mips_mmu_types { - MMU_TYPE_NONE, - MMU_TYPE_R4000, - MMU_TYPE_RESERVED, - MMU_TYPE_FMT, + MMU_TYPE_NONE =3D 0, + MMU_TYPE_R4000 =3D 1, /* Standard TLB */ + MMU_TYPE_BAT =3D 2, /* Block Address Translation */ + MMU_TYPE_FMT =3D 3, /* Fixed Mapping */ + MMU_TYPE_DVF =3D 4, /* Dual VTLB and FTLB */ MMU_TYPE_R3000, MMU_TYPE_R6000, MMU_TYPE_R8000 --=20 2.26.2