From nobody Sun May 19 22:46:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1622473191; cv=none; d=zohomail.com; s=zohoarc; b=jB9EMgXPLv7apNFVKO9D8x89rMAqgm4lnfbx0vzRfveXxwR/sAiI0EzdK7cVnqwoBSbuBPeNcieFGE9oliAJqhz/a/7Ft6Cl3DCOreaWZ/cMgNXSD09ITHkVyXt3a9Qebn1iuiB4Ay2SpEdwGYV8YbwvkM2i9EBWFmte49red+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622473191; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Gq0IdMS8zq7r81Cltc65l4tiFSF2mrtHCbqawGAtxiI=; b=ERurIgSdMP6tCeN4HrNOBLPYVEULKGxsZFeu8jcJEKc/U6bgsYTIiug6awwZ1D4V4xtyPRAKObWgxFVKXCvAAxaYB/VN5MTc9aGs/VFzqx3syzW+CN99QcdKxnZGGVbuL9+x3YA/rHBphifM5YbAmAKMJiAUErYEanDz0ietFwA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622473191626769.0876172126094; Mon, 31 May 2021 07:59:51 -0700 (PDT) Received: from localhost ([::1]:51110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnjOQ-0000sf-9t for importer@patchew.org; Mon, 31 May 2021 10:59:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnjMK-0007Rd-TV; Mon, 31 May 2021 10:57:41 -0400 Received: from [201.28.113.2] (port=60167 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnjMJ-0001Ug-DM; Mon, 31 May 2021 10:57:40 -0400 Received: from power9a ([10.10.71.235]) by outlook.eldorado.org.br with Microsoft SMTPSVC(8.5.9600.16384); Mon, 31 May 2021 11:57:32 -0300 Received: from eldorado.org.br (unknown [10.10.71.235]) by power9a (Postfix) with ESMTP id A22CB801481; Mon, 31 May 2021 11:57:32 -0300 (-03) From: "Bruno Larsen (billionai)" To: qemu-devel@nongnu.org Subject: [PATCH v3 1/4] hw/core/cpu: removed cpu_dump_statistics function Date: Mon, 31 May 2021 11:56:26 -0300 Message-Id: <20210531145629.21300-2-bruno.larsen@eldorado.org.br> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210531145629.21300-1-bruno.larsen@eldorado.org.br> References: <20210531145629.21300-1-bruno.larsen@eldorado.org.br> X-OriginalArrivalTime: 31 May 2021 14:57:32.0820 (UTC) FILETIME=[48F43540:01D7562D] X-Host-Lookup-Failed: Reverse DNS lookup failed for 201.28.113.2 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=201.28.113.2; envelope-from=bruno.larsen@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , farosas@linux.ibm.com, richard.henderson@linaro.org, luis.pires@eldorado.org.br, lucas.araujo@eldorado.org.br, fernando.valle@eldorado.org.br, qemu-ppc@nongnu.org, matheus.ferst@eldorado.org.br, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" No more architectures set the pointer to dump_statistics, so there's no point in keeping it, or the related cpu_dump_statistics function. Suggested-by: Richard Henderson Signed-off-by: Bruno Larsen (billionai) Message-Id: <20210526202104.127910-6-bruno.larsen@eldorado.org.br> Reviewed-by: Richard Henderson Reviewed-by: Luis Pires Signed-off-by: David Gibson --- hw/core/cpu-common.c | 9 --------- include/hw/core/cpu.h | 12 ------------ 2 files changed, 21 deletions(-) diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index 9530e266ec..e2f5a64604 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -109,15 +109,6 @@ void cpu_dump_state(CPUState *cpu, FILE *f, int flags) } } =20 -void cpu_dump_statistics(CPUState *cpu, int flags) -{ - CPUClass *cc =3D CPU_GET_CLASS(cpu); - - if (cc->dump_statistics) { - cc->dump_statistics(cpu, flags); - } -} - void cpu_reset(CPUState *cpu) { device_cold_reset(DEVICE(cpu)); diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 044f668a6e..6b3bd3a1d4 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -92,7 +92,6 @@ struct SysemuCPUOps; * @has_work: Callback for checking if there is work to do. * @memory_rw_debug: Callback for GDB memory access. * @dump_state: Callback for dumping state. - * @dump_statistics: Callback for dumping statistics. * @get_arch_id: Callback for getting architecture-dependent CPU ID. * @set_pc: Callback for setting the Program Counter register. This * should have the semantics used by the target architecture when @@ -134,7 +133,6 @@ struct CPUClass { int (*memory_rw_debug)(CPUState *cpu, vaddr addr, uint8_t *buf, int len, bool is_write); void (*dump_state)(CPUState *cpu, FILE *, int flags); - void (*dump_statistics)(CPUState *cpu, int flags); int64_t (*get_arch_id)(CPUState *cpu); void (*set_pc)(CPUState *cpu, vaddr value); int (*gdb_read_register)(CPUState *cpu, GByteArray *buf, int reg); @@ -534,16 +532,6 @@ enum CPUDumpFlags { */ void cpu_dump_state(CPUState *cpu, FILE *f, int flags); =20 -/** - * cpu_dump_statistics: - * @cpu: The CPU whose state is to be dumped. - * @flags: Flags what to dump. - * - * Dump CPU statistics to the current monitor if we have one, else to - * stdout. - */ -void cpu_dump_statistics(CPUState *cpu, int flags); - #ifndef CONFIG_USER_ONLY /** * cpu_get_phys_page_attrs_debug: --=20 2.17.1 From nobody Sun May 19 22:46:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1622473526; cv=none; d=zohomail.com; s=zohoarc; b=PaAO6ult9ND/1dN4oOnr8b3DW19IUKoMIxyOqPVLSHlQLzheCVC2dU2gORUThpW3vyovv+c2PbnhKGqhRucHD7uHOXzd1uR2RsSNLkPmQJ/YjgXF+/UH5zVnLdFSrE4LBLGLgxTcb4Vou5Rkt880oAhnEDL4sMCJs7nQ2Low5HM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622473526; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Uu8tlrSze2Da7JJ1ouhS2WQbMW2Y/W2wkZE8U8RkH/k=; b=RwpL0DtkmwAtq+q3plQMtN8qmcJSEVKwTIiCDCFIrpDA6AnHW2vXQM8VgbtZHgkwEtMDbNSoK+v/P1+AhSnlw3gI7jCllRTZ631yjSpBWNP2zvjUaSUTyIq1KcpUld7Kqc0RUtAnojRWgyx5bqm4kLA0n+duoGQ9ZFbJWMWyAJM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622473526595624.6823578503966; Mon, 31 May 2021 08:05:26 -0700 (PDT) Received: from localhost ([::1]:55468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnjTo-0004Hk-Lh for importer@patchew.org; Mon, 31 May 2021 11:05:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnjMP-0007TJ-7E; Mon, 31 May 2021 10:57:45 -0400 Received: from [201.28.113.2] (port=60167 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnjML-0001Ug-Sj; Mon, 31 May 2021 10:57:44 -0400 Received: from power9a ([10.10.71.235]) by outlook.eldorado.org.br with Microsoft SMTPSVC(8.5.9600.16384); Mon, 31 May 2021 11:57:32 -0300 Received: from eldorado.org.br (unknown [10.10.71.235]) by power9a (Postfix) with ESMTP id C88E4801482; Mon, 31 May 2021 11:57:32 -0300 (-03) From: "Bruno Larsen (billionai)" To: qemu-devel@nongnu.org Subject: [PATCH v3 2/4] HMP: added info cpustats to removed_features.rst Date: Mon, 31 May 2021 11:56:27 -0300 Message-Id: <20210531145629.21300-3-bruno.larsen@eldorado.org.br> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210531145629.21300-1-bruno.larsen@eldorado.org.br> References: <20210531145629.21300-1-bruno.larsen@eldorado.org.br> X-OriginalArrivalTime: 31 May 2021 14:57:32.0992 (UTC) FILETIME=[490E7400:01D7562D] X-Host-Lookup-Failed: Reverse DNS lookup failed for 201.28.113.2 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=201.28.113.2; envelope-from=bruno.larsen@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_20=-0.001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: farosas@linux.ibm.com, richard.henderson@linaro.org, luis.pires@eldorado.org.br, lucas.araujo@eldorado.org.br, fernando.valle@eldorado.org.br, qemu-ppc@nongnu.org, matheus.ferst@eldorado.org.br, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Documented the removal of the HMP command info cpustats Signed-off-by: Bruno Larsen (billionai) Reviewed-by: Greg Kurz Reviewed-by: Lucas Mateus Reviewed-by: Luis Pires --- docs/system/removed-features.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index 5a462ac568..2feae41089 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -249,6 +249,11 @@ Use ``migrate-set-parameters`` and ``info migrate-para= meters`` instead. =20 Use ``migrate-set-parameters`` instead. =20 +``info cpustats`` (removed in 6.1) +''''''''''''''''''''''''''''' + +This command didn't produce any output already. Removed with no replacemen= t. + Guest Emulator ISAs ------------------- =20 --=20 2.17.1 From nobody Sun May 19 22:46:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1622473613; cv=none; d=zohomail.com; s=zohoarc; b=eYXQRbp5K4+6pMzuQNT9LUya7QlviHOGImG2tGA1fA7P3IvLz+O/DuHahk2K3Ru1ryRJ0CGFojRrMvRpnzjyuCxMyR9m6ZW/4WbErDLyTtReuMKF6nPm0wR/qBOAWNvTrGYiYGKhpkTe9e3T8mxZxi1KaPKY/rsR05SBppBLs+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622473613; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=gcVLXrM1+FNiak831IZtu2FRGNBcNtW4EeJc61wPitQ=; b=IQe2xRNepWkcc9buQ6yInvrzkRatKV7Zf8cO69TemIgUxX6T99qZaxFbtB2QGWPUbW5d2bxvLA67ByDlz3TfW6KIVyu4enVEoRe+hGlfuC0RPyFC63DO5EsFlNk6qbCQqD6TSX6K4RYbDibh0gWfA8MGU4mf5ZX5+md3Oh4vSNc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622473613240510.60820870870725; Mon, 31 May 2021 08:06:53 -0700 (PDT) Received: from localhost ([::1]:56684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnjVE-0005Le-1Z for importer@patchew.org; Mon, 31 May 2021 11:06:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnjMR-0007VN-Qh; Mon, 31 May 2021 10:57:47 -0400 Received: from [201.28.113.2] (port=60167 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnjMQ-0001Ug-9K; Mon, 31 May 2021 10:57:47 -0400 Received: from power9a ([10.10.71.235]) by outlook.eldorado.org.br with Microsoft SMTPSVC(8.5.9600.16384); Mon, 31 May 2021 11:57:33 -0300 Received: from eldorado.org.br (unknown [10.10.71.235]) by power9a (Postfix) with ESMTP id EF153801481; Mon, 31 May 2021 11:57:32 -0300 (-03) From: "Bruno Larsen (billionai)" To: qemu-devel@nongnu.org Subject: [PATCH v3 3/4] target/ppc: removed GEN_OPCODE decision tree Date: Mon, 31 May 2021 11:56:28 -0300 Message-Id: <20210531145629.21300-4-bruno.larsen@eldorado.org.br> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210531145629.21300-1-bruno.larsen@eldorado.org.br> References: <20210531145629.21300-1-bruno.larsen@eldorado.org.br> X-OriginalArrivalTime: 31 May 2021 14:57:33.0149 (UTC) FILETIME=[492668D0:01D7562D] X-Host-Lookup-Failed: Reverse DNS lookup failed for 201.28.113.2 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=201.28.113.2; envelope-from=bruno.larsen@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: farosas@linux.ibm.com, richard.henderson@linaro.org, luis.pires@eldorado.org.br, Greg Kurz , lucas.araujo@eldorado.org.br, fernando.valle@eldorado.org.br, qemu-ppc@nongnu.org, matheus.ferst@eldorado.org.br, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" since both, PPC_DO_STATISTICS and PPC_DUMP_CPU, are obsoleted as target/ppc moves to decodetree, we can remove this ifdef based decision tree, and only have what is now the standard option for the macro. Signed-off-by: Bruno Larsen (billionai) --- target/ppc/translate.c | 79 ------------------------------------------ 1 file changed, 79 deletions(-) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 5c56e33c3c..4b66563998 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -1341,7 +1341,6 @@ typedef struct opcode_t { /*************************************************************************= ****/ /* PowerPC instructions table = */ =20 -#if defined(DO_PPC_STATISTICS) #define GEN_OPCODE(name, op1, op2, op3, invl, _typ, _typ2) = \ { = \ .opc1 =3D op1, = \ @@ -1353,7 +1352,6 @@ typedef struct opcode_t { .type =3D _typ, = \ .type2 =3D _typ2, = \ .handler =3D &gen_##name, = \ - .oname =3D stringify(name), = \ }, = \ .oname =3D stringify(name), = \ } @@ -1369,7 +1367,6 @@ typedef struct opcode_t { .type =3D _typ, = \ .type2 =3D _typ2, = \ .handler =3D &gen_##name, = \ - .oname =3D stringify(name), = \ }, = \ .oname =3D stringify(name), = \ } @@ -1384,7 +1381,6 @@ typedef struct opcode_t { .type =3D _typ, = \ .type2 =3D _typ2, = \ .handler =3D &gen_##name, = \ - .oname =3D onam, = \ }, = \ .oname =3D onam, = \ } @@ -1399,7 +1395,6 @@ typedef struct opcode_t { .type =3D _typ, = \ .type2 =3D _typ2, = \ .handler =3D &gen_##name, = \ - .oname =3D stringify(name), = \ }, = \ .oname =3D stringify(name), = \ } @@ -1414,83 +1409,9 @@ typedef struct opcode_t { .type =3D _typ, = \ .type2 =3D _typ2, = \ .handler =3D &gen_##name, = \ - .oname =3D onam, = \ }, = \ .oname =3D onam, = \ } -#else -#define GEN_OPCODE(name, op1, op2, op3, invl, _typ, _typ2) = \ -{ = \ - .opc1 =3D op1, = \ - .opc2 =3D op2, = \ - .opc3 =3D op3, = \ - .opc4 =3D 0xff, = \ - .handler =3D { = \ - .inval1 =3D invl, = \ - .type =3D _typ, = \ - .type2 =3D _typ2, = \ - .handler =3D &gen_##name, = \ - }, = \ - .oname =3D stringify(name), = \ -} -#define GEN_OPCODE_DUAL(name, op1, op2, op3, invl1, invl2, _typ, _typ2) = \ -{ = \ - .opc1 =3D op1, = \ - .opc2 =3D op2, = \ - .opc3 =3D op3, = \ - .opc4 =3D 0xff, = \ - .handler =3D { = \ - .inval1 =3D invl1, = \ - .inval2 =3D invl2, = \ - .type =3D _typ, = \ - .type2 =3D _typ2, = \ - .handler =3D &gen_##name, = \ - }, = \ - .oname =3D stringify(name), = \ -} -#define GEN_OPCODE2(name, onam, op1, op2, op3, invl, _typ, _typ2) = \ -{ = \ - .opc1 =3D op1, = \ - .opc2 =3D op2, = \ - .opc3 =3D op3, = \ - .opc4 =3D 0xff, = \ - .handler =3D { = \ - .inval1 =3D invl, = \ - .type =3D _typ, = \ - .type2 =3D _typ2, = \ - .handler =3D &gen_##name, = \ - }, = \ - .oname =3D onam, = \ -} -#define GEN_OPCODE3(name, op1, op2, op3, op4, invl, _typ, _typ2) = \ -{ = \ - .opc1 =3D op1, = \ - .opc2 =3D op2, = \ - .opc3 =3D op3, = \ - .opc4 =3D op4, = \ - .handler =3D { = \ - .inval1 =3D invl, = \ - .type =3D _typ, = \ - .type2 =3D _typ2, = \ - .handler =3D &gen_##name, = \ - }, = \ - .oname =3D stringify(name), = \ -} -#define GEN_OPCODE4(name, onam, op1, op2, op3, op4, invl, _typ, _typ2) = \ -{ = \ - .opc1 =3D op1, = \ - .opc2 =3D op2, = \ - .opc3 =3D op3, = \ - .opc4 =3D op4, = \ - .handler =3D { = \ - .inval1 =3D invl, = \ - .type =3D _typ, = \ - .type2 =3D _typ2, = \ - .handler =3D &gen_##name, = \ - }, = \ - .oname =3D onam, = \ -} -#endif =20 /* Invalid instruction */ static void gen_invalid(DisasContext *ctx) --=20 2.17.1 From nobody Sun May 19 22:46:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1622473909; cv=none; d=zohomail.com; s=zohoarc; b=LluU+YBZ5GCSSg6BbpKkZy3AbJand1FB6ITyrZV6m75YFKExITqSEH/5uQlV8/aSoaRK7jFnNmtyAGc9zpeE1/Xwp/Wmmk00SHzZa3pvF9jEBY0sWq3vxDtk4ujQTxJQdHmGi/tdwxeIwXS8SEIMt6vEMRCU4IIRELWDQdkwFso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622473909; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=LDY0X26vK/HI7h+FhiqOpI/GYo6DWd+Sy1pBJS1/ARE=; b=N2Y3LExrA/ncIIuP0Zb7kLQD3C49Lfu9T2tn+jbD3NKkqrPRmCP1wY2HKMMLsV0tRAd/Blzq+RjGKues1lpCTlwPir98wbN12HJ+RlsoPySfdFOQvbz9FagusS2QE1h7cXpyFlj4k8P0k5HnWsQaV7oLuyI3KW66gc9UgFKTzHc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622473909213914.671147069896; Mon, 31 May 2021 08:11:49 -0700 (PDT) Received: from localhost ([::1]:33810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnjZx-0001O9-DP for importer@patchew.org; Mon, 31 May 2021 11:11:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnjMW-0007bV-0D; Mon, 31 May 2021 10:57:52 -0400 Received: from [201.28.113.2] (port=60167 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnjMS-0001Ug-VI; Mon, 31 May 2021 10:57:50 -0400 Received: from power9a ([10.10.71.235]) by outlook.eldorado.org.br with Microsoft SMTPSVC(8.5.9600.16384); Mon, 31 May 2021 11:57:33 -0300 Received: from eldorado.org.br (unknown [10.10.71.235]) by power9a (Postfix) with ESMTP id 2E39E801481; Mon, 31 May 2021 11:57:33 -0300 (-03) From: "Bruno Larsen (billionai)" To: qemu-devel@nongnu.org Subject: [PATCH v3 4/4] target/ppc: removed all mentions to PPC_DUMP_CPU Date: Mon, 31 May 2021 11:56:29 -0300 Message-Id: <20210531145629.21300-5-bruno.larsen@eldorado.org.br> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210531145629.21300-1-bruno.larsen@eldorado.org.br> References: <20210531145629.21300-1-bruno.larsen@eldorado.org.br> X-OriginalArrivalTime: 31 May 2021 14:57:33.0352 (UTC) FILETIME=[49456280:01D7562D] X-Host-Lookup-Failed: Reverse DNS lookup failed for 201.28.113.2 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=201.28.113.2; envelope-from=bruno.larsen@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: farosas@linux.ibm.com, richard.henderson@linaro.org, luis.pires@eldorado.org.br, Greg Kurz , lucas.araujo@eldorado.org.br, fernando.valle@eldorado.org.br, qemu-ppc@nongnu.org, matheus.ferst@eldorado.org.br, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This feature will no longer be useful as ppc moves to using decotree for TCG. And building with it enabled is no longer possible, due to changes in opc_handler_t. Since the last commit that mentions it happened in 2014, I think it is safe to remove it. Signed-off-by: Bruno Larsen (billionai) Reviewed-by: Luis Pires --- target/ppc/cpu_init.c | 205 ----------------------------------------- target/ppc/internal.h | 2 - target/ppc/translate.c | 105 --------------------- 3 files changed, 312 deletions(-) diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 74a397ad6c..d0411e7302 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -8541,45 +8541,6 @@ static void init_ppc_proc(PowerPCCPU *cpu) } } =20 -#if defined(PPC_DUMP_CPU) -static void dump_ppc_sprs(CPUPPCState *env) -{ - ppc_spr_t *spr; -#if !defined(CONFIG_USER_ONLY) - uint32_t sr, sw; -#endif - uint32_t ur, uw; - int i, j, n; - - printf("Special purpose registers:\n"); - for (i =3D 0; i < 32; i++) { - for (j =3D 0; j < 32; j++) { - n =3D (i << 5) | j; - spr =3D &env->spr_cb[n]; - uw =3D spr->uea_write !=3D NULL && spr->uea_write !=3D SPR_NOA= CCESS; - ur =3D spr->uea_read !=3D NULL && spr->uea_read !=3D SPR_NOACC= ESS; -#if !defined(CONFIG_USER_ONLY) - sw =3D spr->oea_write !=3D NULL && spr->oea_write !=3D SPR_NOA= CCESS; - sr =3D spr->oea_read !=3D NULL && spr->oea_read !=3D SPR_NOACC= ESS; - if (sw || sr || uw || ur) { - printf("SPR: %4d (%03x) %-8s s%c%c u%c%c\n", - (i << 5) | j, (i << 5) | j, spr->name, - sw ? 'w' : '-', sr ? 'r' : '-', - uw ? 'w' : '-', ur ? 'r' : '-'); - } -#else - if (uw || ur) { - printf("SPR: %4d (%03x) %-8s u%c%c\n", - (i << 5) | j, (i << 5) | j, spr->name, - uw ? 'w' : '-', ur ? 'r' : '-'); - } -#endif - } - } - fflush(stdout); - fflush(stderr); -} -#endif =20 static void ppc_cpu_realize(DeviceState *dev, Error **errp) { @@ -8616,172 +8577,6 @@ static void ppc_cpu_realize(DeviceState *dev, Error= **errp) =20 pcc->parent_realize(dev, errp); =20 -#if defined(PPC_DUMP_CPU) - { - CPUPPCState *env =3D &cpu->env; - const char *mmu_model, *excp_model, *bus_model; - switch (env->mmu_model) { - case POWERPC_MMU_32B: - mmu_model =3D "PowerPC 32"; - break; - case POWERPC_MMU_SOFT_6xx: - mmu_model =3D "PowerPC 6xx/7xx with software driven TLBs"; - break; - case POWERPC_MMU_SOFT_74xx: - mmu_model =3D "PowerPC 74xx with software driven TLBs"; - break; - case POWERPC_MMU_SOFT_4xx: - mmu_model =3D "PowerPC 4xx with software driven TLBs"; - break; - case POWERPC_MMU_SOFT_4xx_Z: - mmu_model =3D "PowerPC 4xx with software driven TLBs " - "and zones protections"; - break; - case POWERPC_MMU_REAL: - mmu_model =3D "PowerPC real mode only"; - break; - case POWERPC_MMU_MPC8xx: - mmu_model =3D "PowerPC MPC8xx"; - break; - case POWERPC_MMU_BOOKE: - mmu_model =3D "PowerPC BookE"; - break; - case POWERPC_MMU_BOOKE206: - mmu_model =3D "PowerPC BookE 2.06"; - break; - case POWERPC_MMU_601: - mmu_model =3D "PowerPC 601"; - break; -#if defined(TARGET_PPC64) - case POWERPC_MMU_64B: - mmu_model =3D "PowerPC 64"; - break; -#endif - default: - mmu_model =3D "Unknown or invalid"; - break; - } - switch (env->excp_model) { - case POWERPC_EXCP_STD: - excp_model =3D "PowerPC"; - break; - case POWERPC_EXCP_40x: - excp_model =3D "PowerPC 40x"; - break; - case POWERPC_EXCP_601: - excp_model =3D "PowerPC 601"; - break; - case POWERPC_EXCP_602: - excp_model =3D "PowerPC 602"; - break; - case POWERPC_EXCP_603: - excp_model =3D "PowerPC 603"; - break; - case POWERPC_EXCP_603E: - excp_model =3D "PowerPC 603e"; - break; - case POWERPC_EXCP_604: - excp_model =3D "PowerPC 604"; - break; - case POWERPC_EXCP_7x0: - excp_model =3D "PowerPC 740/750"; - break; - case POWERPC_EXCP_7x5: - excp_model =3D "PowerPC 745/755"; - break; - case POWERPC_EXCP_74xx: - excp_model =3D "PowerPC 74xx"; - break; - case POWERPC_EXCP_BOOKE: - excp_model =3D "PowerPC BookE"; - break; -#if defined(TARGET_PPC64) - case POWERPC_EXCP_970: - excp_model =3D "PowerPC 970"; - break; -#endif - default: - excp_model =3D "Unknown or invalid"; - break; - } - switch (env->bus_model) { - case PPC_FLAGS_INPUT_6xx: - bus_model =3D "PowerPC 6xx"; - break; - case PPC_FLAGS_INPUT_BookE: - bus_model =3D "PowerPC BookE"; - break; - case PPC_FLAGS_INPUT_405: - bus_model =3D "PowerPC 405"; - break; - case PPC_FLAGS_INPUT_401: - bus_model =3D "PowerPC 401/403"; - break; - case PPC_FLAGS_INPUT_RCPU: - bus_model =3D "RCPU / MPC8xx"; - break; -#if defined(TARGET_PPC64) - case PPC_FLAGS_INPUT_970: - bus_model =3D "PowerPC 970"; - break; -#endif - default: - bus_model =3D "Unknown or invalid"; - break; - } - printf("PowerPC %-12s : PVR %08x MSR %016" PRIx64 "\n" - " MMU model : %s\n", - object_class_get_name(OBJECT_CLASS(pcc)), - pcc->pvr, pcc->msr_mask, mmu_model); -#if !defined(CONFIG_USER_ONLY) - if (env->tlb.tlb6) { - printf(" %d %s TLB in %d ways\n", - env->nb_tlb, env->id_tlbs ? "splitted" : "merged", - env->nb_ways); - } -#endif - printf(" Exceptions model : %s\n" - " Bus model : %s\n", - excp_model, bus_model); - printf(" MSR features :\n"); - if (env->flags & POWERPC_FLAG_SPE) { - printf(" signal processing engine enabl= e" - "\n"); - } else if (env->flags & POWERPC_FLAG_VRE) { - printf(" vector processor enable\n"); - } - if (env->flags & POWERPC_FLAG_TGPR) { - printf(" temporary GPRs\n"); - } else if (env->flags & POWERPC_FLAG_CE) { - printf(" critical input enable\n"); - } - if (env->flags & POWERPC_FLAG_SE) { - printf(" single-step trace mode\n"); - } else if (env->flags & POWERPC_FLAG_DWE) { - printf(" debug wait enable\n"); - } else if (env->flags & POWERPC_FLAG_UBLE) { - printf(" user BTB lock enable\n"); - } - if (env->flags & POWERPC_FLAG_BE) { - printf(" branch-step trace mode\n"); - } else if (env->flags & POWERPC_FLAG_DE) { - printf(" debug interrupt enable\n"); - } - if (env->flags & POWERPC_FLAG_PX) { - printf(" inclusive protection\n"); - } else if (env->flags & POWERPC_FLAG_PMM) { - printf(" performance monitor mark\n"); - } - if (env->flags =3D=3D POWERPC_FLAG_NONE) { - printf(" none\n"); - } - printf(" Time-base/decrementer clock source: %s\n", - env->flags & POWERPC_FLAG_RTC_CLK ? "RTC clock" : "bus cloc= k"); - dump_ppc_insns(env); - dump_ppc_sprs(env); - fflush(stdout); - } -#endif return; =20 unrealize: diff --git a/target/ppc/internal.h b/target/ppc/internal.h index 2b4b06eb76..f1fd3c8d04 100644 --- a/target/ppc/internal.h +++ b/target/ppc/internal.h @@ -218,8 +218,6 @@ void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr ad= dr, =20 /* translate.c */ =20 -/* #define PPC_DUMP_CPU */ - int ppc_fixup_cpu(PowerPCCPU *cpu); void create_ppc_opcodes(PowerPCCPU *cpu, Error **errp); void destroy_ppc_opcodes(PowerPCCPU *cpu); diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 4b66563998..e16a2721e2 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -216,9 +216,6 @@ struct opc_handler_t { uint64_t type2; /* handler */ void (*handler)(DisasContext *ctx); -#if defined(PPC_DUMP_CPU) - const char *oname; -#endif }; =20 /* SPR load/store helpers */ @@ -8463,10 +8460,6 @@ static int register_direct_insn(opc_handler_t **ppc_= opcodes, if (insert_in_table(ppc_opcodes, idx, handler) < 0) { printf("*** ERROR: opcode %02x already assigned in main " "opcode table\n", idx); -#if defined(PPC_DUMP_CPU) - printf(" Registered handler '%s' - new handler '%s'\n", - ppc_opcodes[idx]->oname, handler->oname); -#endif return -1; } =20 @@ -8487,10 +8480,6 @@ static int register_ind_in_table(opc_handler_t **tab= le, if (!is_indirect_opcode(table[idx1])) { printf("*** ERROR: idx %02x already assigned to a direct " "opcode\n", idx1); -#if defined(PPC_DUMP_CPU) - printf(" Registered handler '%s' - new handler '%s'\= n", - ind_table(table[idx1])[idx2]->oname, handler->oname); -#endif return -1; } } @@ -8498,10 +8487,6 @@ static int register_ind_in_table(opc_handler_t **tab= le, insert_in_table(ind_table(table[idx1]), idx2, handler) < 0) { printf("*** ERROR: opcode %02x already assigned in " "opcode table %02x\n", idx2, idx1); -#if defined(PPC_DUMP_CPU) - printf(" Registered handler '%s' - new handler '%s'\n", - ind_table(table[idx1])[idx2]->oname, handler->oname); -#endif return -1; } =20 @@ -8683,96 +8668,6 @@ void destroy_ppc_opcodes(PowerPCCPU *cpu) } } =20 -#if defined(PPC_DUMP_CPU) -static void dump_ppc_insns(CPUPPCState *env) -{ - opc_handler_t **table, *handler; - const char *p, *q; - uint8_t opc1, opc2, opc3, opc4; - - printf("Instructions set:\n"); - /* opc1 is 6 bits long */ - for (opc1 =3D 0x00; opc1 < PPC_CPU_OPCODES_LEN; opc1++) { - table =3D env->opcodes; - handler =3D table[opc1]; - if (is_indirect_opcode(handler)) { - /* opc2 is 5 bits long */ - for (opc2 =3D 0; opc2 < PPC_CPU_INDIRECT_OPCODES_LEN; opc2++) { - table =3D env->opcodes; - handler =3D env->opcodes[opc1]; - table =3D ind_table(handler); - handler =3D table[opc2]; - if (is_indirect_opcode(handler)) { - table =3D ind_table(handler); - /* opc3 is 5 bits long */ - for (opc3 =3D 0; opc3 < PPC_CPU_INDIRECT_OPCODES_LEN; - opc3++) { - handler =3D table[opc3]; - if (is_indirect_opcode(handler)) { - table =3D ind_table(handler); - /* opc4 is 5 bits long */ - for (opc4 =3D 0; opc4 < PPC_CPU_INDIRECT_OPCOD= ES_LEN; - opc4++) { - handler =3D table[opc4]; - if (handler->handler !=3D &gen_invalid) { - printf("INSN: %02x %02x %02x %02x -- " - "(%02d %04d %02d) : %s\n", - opc1, opc2, opc3, opc4, - opc1, (opc3 << 5) | opc2, opc4, - handler->oname); - } - } - } else { - if (handler->handler !=3D &gen_invalid) { - /* Special hack to properly dump SPE insns= */ - p =3D strchr(handler->oname, '_'); - if (p =3D=3D NULL) { - printf("INSN: %02x %02x %02x (%02d %04= d) : " - "%s\n", - opc1, opc2, opc3, opc1, - (opc3 << 5) | opc2, - handler->oname); - } else { - q =3D "speundef"; - if ((p - handler->oname) !=3D strlen(q) - || (memcmp(handler->oname, q, strl= en(q)) - !=3D 0)) { - /* First instruction */ - printf("INSN: %02x %02x %02x" - "(%02d %04d) : %.*s\n", - opc1, opc2 << 1, opc3, opc1, - (opc3 << 6) | (opc2 << 1), - (int)(p - handler->oname), - handler->oname); - } - if (strcmp(p + 1, q) !=3D 0) { - /* Second instruction */ - printf("INSN: %02x %02x %02x " - "(%02d %04d) : %s\n", opc1, - (opc2 << 1) | 1, opc3, opc1, - (opc3 << 6) | (opc2 << 1) |= 1, - p + 1); - } - } - } - } - } - } else { - if (handler->handler !=3D &gen_invalid) { - printf("INSN: %02x %02x -- (%02d %04d) : %s\n", - opc1, opc2, opc1, opc2, handler->oname); - } - } - } - } else { - if (handler->handler !=3D &gen_invalid) { - printf("INSN: %02x -- -- (%02d ----) : %s\n", - opc1, opc1, handler->oname); - } - } - } -} -#endif int ppc_fixup_cpu(PowerPCCPU *cpu) { CPUPPCState *env =3D &cpu->env; --=20 2.17.1