From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 1E78B3858428 for ; Mon, 1 Jan 2024 23:22:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1E78B3858428 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1E78B3858428 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704151353; cv=none; b=Vl+Z18juO5w4niXpJw83xUgSEnRRdtIVt7L6KS8cJbE0GZUbUs4G0Hv1wU9LDSzBs5LuALiQ119rlyOVm2nClwETdAgR110uSyuCOsMse0scDHc+WeW7zKJLKBR4TX/z3FmTWAli3Njl8WHLHmPnck97bfkS1QGpRLeUdH3NAy4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704151353; c=relaxed/simple; bh=U6fBSKwm4sHYXOYgeMixl6JqrYizYHiIQsk75jqMdes=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=pz3l1vpN8ATLgAZycY+lAFlzoH0U33bGe7FOnWSGdBuxya3h5FC9sg7y/ltMvW3R+Gluz/+d6oGHZERkmQZNg4YI5Gj/c+YPiGM7Ges2pmAVKjqIQACe9XjKEgqF9crOxl7PvTCNUasAjPQYHPN91W+mdsb5lJngRmmyMc+SH7M= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id E8CE43407E6; Mon, 1 Jan 2024 23:22:31 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH/committed 5/8] sim: ppc: rename igen max_insn_bit_size Date: Mon, 1 Jan 2024 18:22:16 -0500 Message-ID: <20240101232219.3003-5-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240101232219.3003-1-vapier@gentoo.org> References: <20240101232219.3003-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: We want to avoid conflicts with the common igen enums. This should get migrated over to the common parsing logic, but for now, switch the name to avoid redefinition. --- sim/ppc/igen.c | 4 ++-- sim/ppc/ld-insn.c | 2 +- sim/ppc/ld-insn.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sim/ppc/igen.c b/sim/ppc/igen.c index 4de7469b4e36..61afa491bb9e 100644 --- a/sim/ppc/igen.c +++ b/sim/ppc/igen.c @@ -40,7 +40,7 @@ #include "gen-support.h" int hi_bit_nr; -int insn_bit_size = max_insn_bit_size; +int insn_bit_size = ppc_max_insn_bit_size; igen_code code = generate_calls; @@ -472,7 +472,7 @@ main(int argc, break; case 'B': insn_bit_size = a2i(optarg); - ASSERT(insn_bit_size > 0 && insn_bit_size <= max_insn_bit_size + ASSERT(insn_bit_size > 0 && insn_bit_size <= ppc_max_insn_bit_size && (hi_bit_nr == insn_bit_size-1 || hi_bit_nr == 0)); break; case 'H': diff --git a/sim/ppc/ld-insn.c b/sim/ppc/ld-insn.c index a94464d44bbf..5cb72b226226 100644 --- a/sim/ppc/ld-insn.c +++ b/sim/ppc/ld-insn.c @@ -966,7 +966,7 @@ dump_insn_table(insn_table *table, } } -int insn_bit_size = max_insn_bit_size; +int insn_bit_size = ppc_max_insn_bit_size; int hi_bit_nr; int generate_expanded_instructions; diff --git a/sim/ppc/ld-insn.h b/sim/ppc/ld-insn.h index 52baeaa2d846..562e6d8742b4 100644 --- a/sim/ppc/ld-insn.h +++ b/sim/ppc/ld-insn.h @@ -56,7 +56,7 @@ /* Global constants */ enum { - max_insn_bit_size = 32, + ppc_max_insn_bit_size = 32, }; @@ -77,7 +77,7 @@ struct _insn_field { typedef struct _insn_fields insn_fields; struct _insn_fields { - insn_field *bits[max_insn_bit_size]; + insn_field *bits[ppc_max_insn_bit_size]; insn_field *first; insn_field *last; unsigned value; -- 2.43.0