From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 4A1B33858D38 for ; Tue, 9 Jan 2024 02:23:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4A1B33858D38 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 4A1B33858D38 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=1704767035; cv=none; b=PNC2ETIzEIZTo1SY8sHhl/cFoYiyqnXYYuOfsJyC5GqVKCPZLnNyBktgStkIDTB1++rwZmYK4Fz5Ng6vAEtp1gdzJR2804eBgG5WOKgC1HdFr/AMhb4nemgNPnK7oWe4EOixnqZvfT3SkWL9wOjD51rKKTS3UpgGzeqEck9ubyU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704767035; c=relaxed/simple; bh=d9bQFv5bYZO7+VJEy5OSMlrhK2RjzraS2nvwgu0Hh5s=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=YPnBSeYFeibrU9VszZ+FxEbkph3LX0W9O305DZvuDHOXZuxyX3ZzkJG+LZsuF8w8lWB0VcD9vhnZo5sBVb2r/AT/IYL4BWdaRecBbRn30rO0xg+JUm2T5brtz2Cnjsy5go1EvnYgQDSnWjLOfYe+GK3HJh0iiLJY4CO/A3T4SZQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id BCAD0343272; Tue, 9 Jan 2024 02:23:50 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH/committed] sim: warnings: fix unused variable warnings Date: Mon, 8 Jan 2024 21:23:49 -0500 Message-ID: <20240109022349.24789-1-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 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: Leave the igen code in place as it's meant to be used with newer (to-be-written) code ported from the ppc version. The sh code isn't really necessary as the opcodes enums have been maintained independently from here, and the lists are out-of-sync already. --- sim/igen/ld-decode.c | 2 ++ sim/igen/table.c | 11 ++++--- sim/sh/gencode.c | 70 -------------------------------------------- 3 files changed, 7 insertions(+), 76 deletions(-) diff --git a/sim/igen/ld-decode.c b/sim/igen/ld-decode.c index 6edd7c8ec3d6..6a2d859deb30 100644 --- a/sim/igen/ld-decode.c +++ b/sim/igen/ld-decode.c @@ -61,12 +61,14 @@ static const name_map decode_combine_map[] = { {NULL, 0}, }; +#if 0 static const name_map decode_search_map[] = { {"constants", decode_find_constants}, {"mixed", decode_find_mixed}, {"strings", decode_find_strings}, {NULL, decode_find_mixed}, }; +#endif static void diff --git a/sim/igen/table.c b/sim/igen/table.c index fdca9cb32554..90b4102ac02d 100644 --- a/sim/igen/table.c +++ b/sim/igen/table.c @@ -490,7 +490,6 @@ extern void table_print_code (lf *file, const table_entry *entry) { int field_nr; - int nr = 0; for (field_nr = 0; field_nr < entry->nr_fields; field_nr++) { char *chp = entry->field[field_nr]; @@ -502,20 +501,20 @@ table_print_code (lf *file, const table_entry *entry) if (chp[0] == '{' && !isspace (chp[1]) && chp[1] != '\0') { in_bit_field = 1; - nr += lf_putchr (file, '_'); + lf_putchr (file, '_'); } else if (in_bit_field && chp[0] == ':') { - nr += lf_putchr (file, '_'); + lf_putchr (file, '_'); } else if (in_bit_field && *chp == '}') { - nr += lf_putchr (file, '_'); + lf_putchr (file, '_'); in_bit_field = 0; } else { - nr += lf_putchr (file, *chp); + lf_putchr (file, *chp); } chp++; } @@ -525,7 +524,7 @@ table_print_code (lf *file, const table_entry *entry) line.line_nr += field_nr; error (&line, "Bit field brace miss match\n"); } - nr += lf_putchr (file, '\n'); + lf_putchr (file, '\n'); } } diff --git a/sim/sh/gencode.c b/sim/sh/gencode.c index 8246e89432f0..b00a16a445a4 100644 --- a/sim/sh/gencode.c +++ b/sim/sh/gencode.c @@ -2468,76 +2468,6 @@ static op ppi_tab[] = {0, 0} }; -/* Tables of things to put into enums for sh-opc.h */ -static -const char * const nibble_type_list[] = -{ - "HEX_0", - "HEX_1", - "HEX_2", - "HEX_3", - "HEX_4", - "HEX_5", - "HEX_6", - "HEX_7", - "HEX_8", - "HEX_9", - "HEX_A", - "HEX_B", - "HEX_C", - "HEX_D", - "HEX_E", - "HEX_F", - "REG_N", - "REG_M", - "BRANCH_12", - "BRANCH_8", - "DISP_8", - "DISP_4", - "IMM_4", - "IMM_4BY2", - "IMM_4BY4", - "PCRELIMM_8BY2", - "PCRELIMM_8BY4", - "IMM_8", - "IMM_8BY2", - "IMM_8BY4", - 0 -}; -static -const char * const arg_type_list[] = -{ - "A_END", - "A_BDISP12", - "A_BDISP8", - "A_DEC_M", - "A_DEC_N", - "A_DISP_GBR", - "A_DISP_PC", - "A_DISP_REG_M", - "A_DISP_REG_N", - "A_GBR", - "A_IMM", - "A_INC_M", - "A_INC_N", - "A_IND_M", - "A_IND_N", - "A_IND_R0_REG_M", - "A_IND_R0_REG_N", - "A_MACH", - "A_MACL", - "A_PR", - "A_R0", - "A_R0_GBR", - "A_REG_M", - "A_REG_N", - "A_SR", - "A_VBR", - "A_SSR", - "A_SPC", - 0, -}; - static int qfunc (const void *va, const void *vb) { -- 2.43.0