From nobody Wed Nov 5 16:54:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538337636752627.1414682113217; Sun, 30 Sep 2018 13:00:36 -0700 (PDT) Received: from localhost ([::1]:57139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6htL-0005F7-4i for importer@patchew.org; Sun, 30 Sep 2018 16:00:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6hq2-0002D2-HD for qemu-devel@nongnu.org; Sun, 30 Sep 2018 15:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6hpz-0006rm-Mh for qemu-devel@nongnu.org; Sun, 30 Sep 2018 15:57:10 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34138) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g6hpz-0006rS-Ff for qemu-devel@nongnu.org; Sun, 30 Sep 2018 15:57:07 -0400 Received: by mail-wr1-x444.google.com with SMTP id z4-v6so10135912wrb.1 for ; Sun, 30 Sep 2018 12:57:07 -0700 (PDT) Received: from x1.local ([80.31.72.241]) by smtp.gmail.com with ESMTPSA id x24-v6sm12385633wrd.13.2018.09.30.12.57.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 12:57:05 -0700 (PDT) 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=9LMq6S1mU7eZ1THhUUzPL6BcDJlsgDKuANMPle2ne2k=; b=hX75cEpt+2FLo01UkT0u+y0d9MbL1CnLHhWCPoMGnjJu51OF/mHRCnprVNNC1Ch2t3 TEQLizzoNWVRDZr5R/iHvsh8zx1qkRvKtNBRSgtcpqVu6lc0aApFgvhQb/sJVxdhSGuD YW2HOaamJJyl9neMdzsGb9DuZb7NDW0u8CfxnyxVT+NrLYCcYadWRZsWZ0wk1qmt+aO9 1GjEzaSTKwp8x+bnfAgkDcg7w4isPFuaZDwo6Usl+jKHTo5lrXVhPn7//LdSqRwYxlU4 c1KEfTMcBFMMrUcOK6f5v5j3bjLXQk8m/8gAaq2oU02da+rTJMLQudxDIRN3SjEFzuZj dgyQ== 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=9LMq6S1mU7eZ1THhUUzPL6BcDJlsgDKuANMPle2ne2k=; b=LtFY30XUzOcaTnIywS+Vy1V8V6eCCUKDF9UMb5wvl1eLk+aMUgSoBpNQj69sXBqxyt P8JOf5FSgE2BRxkP3OU8SuVgR4ZIlfmbsmFgOknUmlf9W1rWxhVxUNgfQiDPZWprAoTR d4JjfJKElC0jNDqXrs8Fu0EW6qZt7G/RvdIBvxR4gZT00EIJcm6qGVH0AynJ/0TuSyP7 ZlFwJP/iLi6sk65V6la8Bc6+ijMvDVVx82rodpECyKHj8iyD15AphKodh5n63nQrmfIT Kuke5mWn8qm5atoAnQxawnvDWTlSfdawRDWbvJ5wxQTIDkUNrZO0PnbGwVQ1d7CpZ/xb glmg== X-Gm-Message-State: ABuFfoiiyjINrhYbOh22RuEHu3uCM+ay5fUKIFi3TozCWjmRMCIlhXYm x+zcvCS21fA0yX0yjlZ+H8w= X-Google-Smtp-Source: ACcGV61pyDrVcSgzZ1B5c763BppaVaNwBJ6jKP/YXvML+3KKYCLLU0ESpbzTC2v0xaUpGu/QJ8YiUw== X-Received: by 2002:a5d:5002:: with SMTP id e2-v6mr5171592wrt.210.1538337426397; Sun, 30 Sep 2018 12:57:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Aurelien Jarno , Aleksandar Markovic Date: Sun, 30 Sep 2018 21:56:52 +0200 Message-Id: <20180930195655.24684-2-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180930195655.24684-1-f4bug@amsat.org> References: <20180930195655.24684-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v2 1/4] target/mips: Increase the 'supported instructions' flags holder size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Currently this holder is limited to at most 32 flags on a 32-bit architecture, which lets an unique bit available for another 'chip specific instructions' flag. Relax this limit using a 64-bit integer. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/cpu.h | 2 +- target/mips/internal.h | 2 +- target/mips/translate.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 28af4d191c..f2a5031fd2 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -614,7 +614,7 @@ struct CPUMIPSState { int CCRes; /* Cycle count resolution/divisor */ uint32_t CP0_Status_rw_bitmask; /* Read/write bits in CP0_Status */ uint32_t CP0_TCStatus_rw_bitmask; /* Read/write bits in CP0_TCStatus */ - int insn_flags; /* Supported instruction set */ + uint64_t insn_flags; /* Supported instruction set */ =20 /* Fields up to this point are cleared by a CPU reset */ struct {} end_reset_fields; diff --git a/target/mips/internal.h b/target/mips/internal.h index e41051f8e6..bfe83ee613 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -59,7 +59,7 @@ struct mips_def_t { int32_t CP0_PageGrain_rw_bitmask; int32_t CP0_PageGrain; target_ulong CP0_EBaseWG_rw_bitmask; - int insn_flags; + uint64_t insn_flags; enum mips_mmu_types mmu_type; }; =20 diff --git a/target/mips/translate.c b/target/mips/translate.c index 5a5021fe36..2aa8dd884d 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -1447,7 +1447,7 @@ typedef struct DisasContext { target_ulong saved_pc; target_ulong page_start; uint32_t opcode; - int insn_flags; + uint64_t insn_flags; int32_t CP0_Config1; int32_t CP0_Config3; int32_t CP0_Config5; @@ -1870,7 +1870,7 @@ static inline void check_dspr2(DisasContext *ctx) =20 /* This code generates a "reserved instruction" exception if the CPU does not support the instruction set corresponding to flags. */ -static inline void check_insn(DisasContext *ctx, int flags) +static inline void check_insn(DisasContext *ctx, uint64_t flags) { if (unlikely(!(ctx->insn_flags & flags))) { generate_exception_end(ctx, EXCP_RI); @@ -1880,7 +1880,7 @@ static inline void check_insn(DisasContext *ctx, int = flags) /* This code generates a "reserved instruction" exception if the CPU has corresponding flag set which indicates that the instruction has been removed. */ -static inline void check_insn_opc_removed(DisasContext *ctx, int flags) +static inline void check_insn_opc_removed(DisasContext *ctx, uint64_t flag= s) { if (unlikely(ctx->insn_flags & flags)) { generate_exception_end(ctx, EXCP_RI); @@ -1895,7 +1895,7 @@ static inline void check_insn_opc_removed(DisasContex= t *ctx, int flags) * A reserved instruction exception is generated for flagged CPUs if * QEMU runs in system mode. */ -static inline void check_insn_opc_user_only(DisasContext *ctx, int flags) +static inline void check_insn_opc_user_only(DisasContext *ctx, uint64_t fl= ags) { #ifndef CONFIG_USER_ONLY check_insn_opc_removed(ctx, flags); --=20 2.19.0 From nobody Wed Nov 5 16:54:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538337552475470.42231362797224; Sun, 30 Sep 2018 12:59:12 -0700 (PDT) Received: from localhost ([::1]:57129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6hro-0003Nx-0L for importer@patchew.org; Sun, 30 Sep 2018 15:59:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6hq2-0002D1-HB for qemu-devel@nongnu.org; Sun, 30 Sep 2018 15:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6hq1-0006su-4h for qemu-devel@nongnu.org; Sun, 30 Sep 2018 15:57:10 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g6hq0-0006s2-UK for qemu-devel@nongnu.org; Sun, 30 Sep 2018 15:57:09 -0400 Received: by mail-wr1-x42a.google.com with SMTP id y8-v6so11517854wrh.7 for ; Sun, 30 Sep 2018 12:57:08 -0700 (PDT) Received: from x1.local ([80.31.72.241]) by smtp.gmail.com with ESMTPSA id x24-v6sm12385633wrd.13.2018.09.30.12.57.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 12:57:07 -0700 (PDT) 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=bL6MfXHL0dGftPTh8VN0pZ1dgMv2bAc7ckSrMU1gu2I=; b=otQooUXS8qX2JeQId2n5KgdCsOIbBCOgDUyALJRRvw9I8DMXj4Az6+XyUzZNY2bOnt qboNEkt49OWYTvZKQtGUDehKF6ukxEXKwoQZcRCICopOhmN7WTv8z98VPsnUtteoVcfg 8S7yw/kdoouyv+ut8ML5atNAdUZdGOMuX8a4hcSI/wwTpgI2GLrj5wZTPV+5xi363tBi UPZjLJX3ocE5L1WstUQQysaiAqMNSWoACMnQjYZbZjzMHFSkG/xAskLbTsEMoz1OiqxD PxQiMcI7vJ6IiaRhwI7eWit2dbWm6sBAzVHnq2QbwdQSDTv1Gws2EsE2yRuUXbj1Lej1 6IeA== 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=bL6MfXHL0dGftPTh8VN0pZ1dgMv2bAc7ckSrMU1gu2I=; b=lM2rAXv2q0jFpEYcYykOTEVpIZh0m0xf3zQo3H954gc9qdD2vzx6lJkKRbYHReE+Lp Jb0lkXSJwMwl7/4msWv0WqJBSOZ5WSq6TpLOzgGRVw0UpJJSkCqClMGcuWfMUbEqNN1U YXyd2uNSVkOohAvjiSDHdv2jk4RhUk2aSIrEKD7wWos6X2PmTGy7skChktb+5+xVgh0D S6AwpjTjhu8FL7ZPy2z1plUYn3RfrxJAX1Hk2DbD72ndpsjAUCrvhHYfKidqo5HR7R/K 6t59KY2lVkCCALeMZMmpcSKx64gQ1Ub1yRfZIKNwCGfbrlRujJvh5WhsDKNKd86evmeX bfMA== X-Gm-Message-State: ABuFfojxkfe/Ks4ZLfqQ0rwsmI+46XO0Y+mAQffkaS8ElaJ7Ch1UiLTL ijxhULeovetrN4u47jZsYGQ= X-Google-Smtp-Source: ACcGV61AwEOYT+rMQcpZhl+opBG2v6R/fTfMFI4eewOfOyAQo6YNGDSOxWSnutwhsYLD2RHd4hcTfw== X-Received: by 2002:adf:e792:: with SMTP id n18-v6mr4720038wrm.136.1538337427855; Sun, 30 Sep 2018 12:57:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Aurelien Jarno , Aleksandar Markovic Date: Sun, 30 Sep 2018 21:56:53 +0200 Message-Id: <20180930195655.24684-3-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180930195655.24684-1-f4bug@amsat.org> References: <20180930195655.24684-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PATCH v2 2/4] target/mips: Remove definitions that are only used once X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 There is no gain in adding cpu definition which is used only once. Use the chip specific flags directly in place. This also clears the 'MIPS CPU defines' namespace. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/mips-defs.h | 5 ----- target/mips/translate_init.inc.c | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h index 76550de2da..84607d8933 100644 --- a/target/mips/mips-defs.h +++ b/target/mips/mips-defs.h @@ -63,11 +63,6 @@ #define CPU_MIPS2 (CPU_MIPS1 | ISA_MIPS2) #define CPU_MIPS3 (CPU_MIPS2 | ISA_MIPS3) #define CPU_MIPS4 (CPU_MIPS3 | ISA_MIPS4) -#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) - #define CPU_MIPS5 (CPU_MIPS4 | ISA_MIPS5) =20 /* MIPS Technologies "Release 1" */ diff --git a/target/mips/translate_init.inc.c b/target/mips/translate_init.= inc.c index b5dacf4ffe..bf697b64cc 100644 --- a/target/mips/translate_init.inc.c +++ b/target/mips/translate_init.inc.c @@ -466,7 +466,7 @@ const mips_def_t mips_defs[] =3D #endif /* !CONFIG_USER_ONLY */ .SEGBITS =3D 32, .PABITS =3D 32, - .insn_flags =3D CPU_R5900, + .insn_flags =3D CPU_MIPS3 | INSN_R5900, .mmu_type =3D MMU_TYPE_R4000, }, { @@ -586,7 +586,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, }, { @@ -796,7 +796,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, }, { @@ -816,7 +816,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, .mmu_type =3D MMU_TYPE_R4000, }, { --=20 2.19.0 From nobody Wed Nov 5 16:54:39 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538337553032567.1945068804959; Sun, 30 Sep 2018 12:59:13 -0700 (PDT) Received: from localhost ([::1]:57131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6hrt-0003d1-2q for importer@patchew.org; Sun, 30 Sep 2018 15:59:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6hq5-0002EH-Lb for qemu-devel@nongnu.org; Sun, 30 Sep 2018 15:57:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6hq2-0006tu-9E for qemu-devel@nongnu.org; Sun, 30 Sep 2018 15:57:11 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:45158) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g6hq2-0006tV-23 for qemu-devel@nongnu.org; Sun, 30 Sep 2018 15:57:10 -0400 Received: by mail-wr1-x432.google.com with SMTP id q5-v6so5035734wrw.12 for ; Sun, 30 Sep 2018 12:57:09 -0700 (PDT) Received: from x1.local ([80.31.72.241]) by smtp.gmail.com with ESMTPSA id x24-v6sm12385633wrd.13.2018.09.30.12.57.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 12:57:08 -0700 (PDT) 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=UIGAxiafLgqHuWbx1xIACtgVdjDdr+JB7rJt1q1yvDY=; b=uv0Mod0KAJsuIFhCD3M+V7/07nPwVwNdAikIgifOjKjwnZSlnSb43UaJF5Du6bK7ZZ BWd0Rpp4c3Nd+xEil5S5NKhBVPABLlD1E7043lNDWwmIcxqeZdV2AOqm1UkR6dpWuXol S70tH6RuUMXFfW/Ks23jBke/OTXxRRLRwyUASOXSTJa/H7riK2tCtex1XKmOn7Rx38Im N7xm7iSBquYduXeSHjFQiSe1X+3hlNt24Mwb4xqBuKlum5wOcWa/NKF4R0xOhiWF9zmG uMjBvzNzEvMgTx6ovSID2VVyyc/eJvDX0WAulc04fYMzcQJ9FX+IjMVr2W0GWJ14a2PI kbbA== 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=UIGAxiafLgqHuWbx1xIACtgVdjDdr+JB7rJt1q1yvDY=; b=VeI0FFt51Ezhok4Jk9TSCGu7cYvXRwKaETOuWOmevZ/eXlkMFXZOSwl9nzwE1O21Z6 P0NS5J4vOQdiF8nulEb8ECdxiu2d77WuF2q2GsjzCTS1MIMovxqLsXxS0KNnoQQ3qPRI BIoc7TyUBEtlF0wPAlP2kHT3hM4sGGKjZJNfZy8/KLrMVkWnpGq7m8JihSbGwyHnkl1P axPSkrA7st4RBzrgKUzEPWnbPit6nO4JivgZaPpFEP2by3hQ1+bwiFX9AJ8o/OtE50El s8ZX7SAfzJc8nfpebauvGqjLVcJGViX4AKNvfXYmqFhUYOTL2sv5SbYTmLzMGBOh9U9Y 2bYQ== X-Gm-Message-State: ABuFfojpY4/hWiSbQ9o6aCpMsxGDDdINBtAjjkeOsajATQrQNyT1ByDO 4FoCzcIEcSpuwZ4N++9AWkdeyuJD X-Google-Smtp-Source: ACcGV63dYbVohrPcJ6OzRCh1I6WOfnekOgskz1dSgldDnICVwZiUKCPLVFq9IZ9CaCfcR03uN5pTbw== X-Received: by 2002:adf:f651:: with SMTP id x17-v6mr4504150wrp.317.1538337428995; Sun, 30 Sep 2018 12:57:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Aurelien Jarno , Aleksandar Markovic Date: Sun, 30 Sep 2018 21:56:54 +0200 Message-Id: <20180930195655.24684-4-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180930195655.24684-1-f4bug@amsat.org> References: <20180930195655.24684-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 Subject: [Qemu-devel] [PATCH v2 3/4] target/mips: Clean the 'insn_flags' namespace X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 Let space available for ASE_DSPR3 and INSN_R3900 entries. Suggested-by: Aleksandar Markovic Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/mips-defs.h | 87 ++++++++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 35 deletions(-) diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h index 84607d8933..2c5a294c16 100644 --- a/target/mips/mips-defs.h +++ b/target/mips/mips-defs.h @@ -22,41 +22,58 @@ #endif #endif =20 -/* Masks used to mark instructions to indicate which ISA level they - were introduced in. */ -#define ISA_MIPS1 0x00000001 -#define ISA_MIPS2 0x00000002 -#define ISA_MIPS3 0x00000004 -#define ISA_MIPS4 0x00000008 -#define ISA_MIPS5 0x00000010 -#define ISA_MIPS32 0x00000020 -#define ISA_MIPS32R2 0x00000040 -#define ISA_MIPS64 0x00000080 -#define ISA_MIPS64R2 0x00000100 -#define ISA_MIPS32R3 0x00000200 -#define ISA_MIPS64R3 0x00000400 -#define ISA_MIPS32R5 0x00000800 -#define ISA_MIPS64R5 0x00001000 -#define ISA_MIPS32R6 0x00002000 -#define ISA_MIPS64R6 0x00004000 -#define ISA_NANOMIPS32 0x00008000 - -/* MIPS ASEs. */ -#define ASE_MIPS16 0x00010000 -#define ASE_MIPS3D 0x00020000 -#define ASE_MDMX 0x00040000 -#define ASE_DSP 0x00080000 -#define ASE_DSPR2 0x00100000 -#define ASE_MT 0x00200000 -#define ASE_SMARTMIPS 0x00400000 -#define ASE_MICROMIPS 0x00800000 -#define ASE_MSA 0x01000000 - -/* Chip specific instructions. */ -#define INSN_R5900 0x10000000 -#define INSN_LOONGSON2E 0x20000000 -#define INSN_LOONGSON2F 0x40000000 -#define INSN_VR54XX 0x80000000 +/* +* insn_flags: mask used to mark instructions to indicate which ISA +* level they were introduced in. +*/ + +/* + * bits 0-31 MIPS base instruction sets + */ +#define ISA_MIPS1 0x0000000000000001 +#define ISA_MIPS2 0x0000000000000002 +#define ISA_MIPS3 0x0000000000000004 +#define ISA_MIPS4 0x0000000000000008 +#define ISA_MIPS5 0x0000000000000010 +#define ISA_MIPS32 0x0000000000000020 +#define ISA_MIPS32R2 0x0000000000000040 +#define ISA_MIPS64 0x0000000000000080 +#define ISA_MIPS64R2 0x0000000000000100 +#define ISA_MIPS32R3 0x0000000000000200 +#define ISA_MIPS64R3 0x0000000000000400 +#define ISA_MIPS32R5 0x0000000000000800 +#define ISA_MIPS64R5 0x0000000000001000 +#define ISA_MIPS32R6 0x0000000000002000 +#define ISA_MIPS64R6 0x0000000000004000 +#define ISA_NANOMIPS32 0x0000000000008000 + +/* + * bits 32-47 MIPS ASEs + */ +#define ASE_MIPS16 0x0000000100000000ULL +#define ASE_MIPS3D 0x0000000200000000ULL +#define ASE_MDMX 0x0000000400000000ULL +#define ASE_DSP 0x0000000800000000ULL +#define ASE_DSPR2 0x0000001000000000ULL +#define ASE_MT 0x0000004000000000ULL +#define ASE_SMARTMIPS 0x0000008000000000ULL +#define ASE_MICROMIPS 0x0000010000000000ULL +#define ASE_MSA 0x0000020000000000ULL + +/* + * bits 48-55 vendor-specific base instruction sets + */ +#define INSN_LOONGSON2E 0x0001000000000000ULL +#define INSN_LOONGSON2F 0x0002000000000000ULL +#define INSN_VR54XX 0x0004000000000000ULL +#define INSN_R5900 0x0010000000000000ULL + +/* + * bits 56-63 vendor-specific ASEs + * + * Example: Igenic ASE_MXU and ASE MXU2 + */ + =20 /* MIPS CPU defines. */ #define CPU_MIPS1 (ISA_MIPS1) --=20 2.19.0 From nobody Wed Nov 5 16:54:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538337724689294.68944389026035; Sun, 30 Sep 2018 13:02:04 -0700 (PDT) Received: from localhost ([::1]:57149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6hul-0005xd-7n for importer@patchew.org; Sun, 30 Sep 2018 16:02:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6hqC-0002Jy-4H for qemu-devel@nongnu.org; Sun, 30 Sep 2018 15:57:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6hq5-00070z-SX for qemu-devel@nongnu.org; Sun, 30 Sep 2018 15:57:17 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:55195) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g6hq4-0006uB-IC for qemu-devel@nongnu.org; Sun, 30 Sep 2018 15:57:13 -0400 Received: by mail-wm1-x341.google.com with SMTP id r63-v6so2617232wma.4 for ; Sun, 30 Sep 2018 12:57:11 -0700 (PDT) Received: from x1.local ([80.31.72.241]) by smtp.gmail.com with ESMTPSA id x24-v6sm12385633wrd.13.2018.09.30.12.57.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 12:57:09 -0700 (PDT) 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=fgpksnECoCKRpPBxPstE5CI4hh8ZFKgo8cjSYRU9feg=; b=Yn3PbhkSnyCSNfwGWpoadIcIk1C+Vm1OpMeDFx4FDzOdb4Lm0S7g3niOjxyx0u/+KV tSEoggaDqgJ8hZ5giSnQFkTvWy5Rs5Uhz6CucoyJu2PvgHxNaTAxXYginAl2qUnQ+ryo UjPrMH0Y86hymBO8ClFZD4mRLHhiuBC7yfy9CXaENkUDXzbVVw4ivYOxvRi+Kc4wJdOg iw2sFrkqjdg6mKHkPZ3/rCEx+D7zNkgzifmXh4MKP2YUrDft77ICfIcSahr7V85aty9y fQyW4d0ERwMhE7Zcdm/MWPD755rH9h4nW1tgVVxSUpmFiMqDYmi15I8NP0bBB3n6w4wp rozQ== 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=fgpksnECoCKRpPBxPstE5CI4hh8ZFKgo8cjSYRU9feg=; b=fSci3MLTKPDnnPb9PEV3tvomLLnNFNrRVHe/+Q0st+3F62/lWo2/EFJsXstEIXHhQ0 vqsmx3bSLCnF0lQySLX03lMRPfNpe36peqdaql10iavh7lMxFKvklqLdXY1sgMvWGLOy gegJjsYQu4kYB06m+bIVFVqu1BqH55Qlwqr5BrzzeBFEyQHdW3Yya/Lik2WIaHWcQrMu qOhBJTgcMxzxbQKw0gYwDtIs/Ui/Z6bUH11Y7USoWQ9Xc/Ebnw2qnIctrkUXDDqhX8Rd jhbtw1TzGCUNPvUQJH4VoyHQrOTsk5uOftBUkOGLeH+1eroLlUZZJcZq/UaP44JSm2wa f0qA== X-Gm-Message-State: ABuFfoi7Qxec4EBrgquO2FRf+fhP3CeQtopixiQaNGm5T22Yd2L0+viY 08pAD7D6e3Tjy3DMZh4N57WDa0aT X-Google-Smtp-Source: ACcGV60U18179Qd5u1rDdta77PAUIQOJbs4usAxqPPCXJ1vGiLnx31M74JQZwFf5dPBprKnTFSoKUQ== X-Received: by 2002:a1c:2dc7:: with SMTP id t190-v6mr6906659wmt.31.1538337430148; Sun, 30 Sep 2018 12:57:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Aurelien Jarno , Aleksandar Markovic Date: Sun, 30 Sep 2018 21:56:55 +0200 Message-Id: <20180930195655.24684-5-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180930195655.24684-1-f4bug@amsat.org> References: <20180930195655.24684-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v2 4/4] MAINTAINERS: Voluntary to review hobbyist MIPS contributions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index ce7c351afa..2708745bf7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -188,6 +188,7 @@ F: disas/microblaze.c MIPS M: Aurelien Jarno M: Aleksandar Markovic +R: Philippe Mathieu-Daud=C3=A9 S: Maintained F: target/mips/ F: hw/mips/ @@ -1948,6 +1949,7 @@ F: disas/i386.c =20 MIPS target M: Aurelien Jarno +R: Philippe Mathieu-Daud=C3=A9 S: Maintained F: tcg/mips/ F: disas/mips.c --=20 2.19.0