From patchwork Mon Jan 1 23:22:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 83083 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 51D143858293 for ; Mon, 1 Jan 2024 23:23:47 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 5FED63858CDB for ; Mon, 1 Jan 2024 23:22:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5FED63858CDB 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 5FED63858CDB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704151347; cv=none; b=thgl1mQhsB8eDpqHt373qPiOn2yX4n4O/hGj4oU71zT7Q3n1ujVYw+K9zW2d4SlXIuCqEYuq73rjkyaY4L4Hq5MCbn31lo/DRoH0ap8WsW7ww+ga7DU2017hhNddF8NGoTbcWewE0LvlmYEFGtTZocUGiGXtHj7LqNe9o87H7bE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704151347; c=relaxed/simple; bh=5iut+5noL6ipo6ou8v08gfXBp51yCpqxkuKNoAeWd9o=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=Ja3FAqnKN2zJAfcg6o258bgY/9qSpnA43gzQPz7jt0cUGkQaxgSvgJsttnceEp2v1O59JjUsdzgVTcmUHYdgl9ib0v47cqMo4Y/xQFv5dRhATTTnrIXmqzIrWvGXM9a+bxczBSSXTM8JXQvojHqNjGNprjvXfyJurF5XONZNeRw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id B40CD340775; Mon, 1 Jan 2024 23:22:25 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH/committed 2/8] sim: ppc: replace filter_filename with lbasename Date: Mon, 1 Jan 2024 18:22:13 -0500 Message-ID: <20240101232219.3003-2-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 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org The lbasename function from libiberty provides the same API as this custom function. The common/ code already made the switch, so make the same change to the ppc code to avoid target duplication. --- sim/ppc/Makefile.in | 11 ++--------- sim/ppc/debug.h | 12 ++++++------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index f7c37cc68f79..b8e7fbfd45f1 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -198,8 +198,7 @@ CPU_H = \ cpu.c DEBUG_H = \ - debug.h \ - $(FILTER_FILENAME_H) + debug.h DEVICE_H = \ device.h @@ -240,9 +239,6 @@ EMUL_UNIX_H = \ EVENTS_H = \ events.h -FILTER_FILENAME_H = \ - filter_filename.h - FILTER_H = \ filter.h @@ -304,8 +300,7 @@ LF_H = \ MISC_H = \ misc.h \ - $(CONFIG_H) \ - $(FILTER_FILENAME_H) + $(CONFIG_H) MON_H = \ mon.h \ @@ -466,7 +461,6 @@ COMMON_OBJS = $(COMMON_OBJS_NAMES:%=../common/%) # first LIB_OBJ = \ debug.o \ - filter_filename.o \ bits.o \ sim-endian.o \ os_emul.o \ @@ -519,7 +513,6 @@ psim.o: psim.c $(CPU_H) $(IDECODE_H) $(OPTIONS_H) $(TREE_H) $(BFD_H) bits.o: bits.c $(BASICS_H) debug.o: debug.c $(CONFIG_H) $(BASICS_H) -filter_filename.o: filter_filename.c $(CONFIG_H) $(FILTER_FILENAME_H) sim-endian.o: sim-endian.c $(CONFIG_H) $(BASICS_H) $(SIM_ENDIAN_N_H) diff --git a/sim/ppc/debug.h b/sim/ppc/debug.h index 28e42c7bb753..e221ce553d36 100644 --- a/sim/ppc/debug.h +++ b/sim/ppc/debug.h @@ -21,7 +21,7 @@ #ifndef _DEBUG_H_ #define _DEBUG_H_ -#include "filter_filename.h" +#include "libiberty.h" typedef enum { trace_invalid, @@ -87,7 +87,7 @@ extern int ppc_trace[nr_trace_options]; do { \ if (WITH_TRACE) { \ if (ppc_trace[OBJECT]) { \ - sim_io_printf_filtered("%s:%d: ", filter_filename(__FILE__), __LINE__); \ + sim_io_printf_filtered("%s:%d: ", lbasename(__FILE__), __LINE__); \ sim_io_printf_filtered ARGS; \ } \ } \ @@ -113,7 +113,7 @@ do { \ || ppc_trace[trace_##OBJECT##_device] \ || trace_device) { \ sim_io_printf_filtered("%s:%d:%s:%s%s ", \ - filter_filename(__FILE__), __LINE__, #OBJECT, \ + lbasename(__FILE__), __LINE__, #OBJECT, \ trace_device ? device_path(me) : "", \ trace_device ? ":" : ""); \ sim_io_printf_filtered ARGS; \ @@ -131,7 +131,7 @@ do { \ || ppc_trace[trace_##OBJECT##_device] \ || trace_device) { \ sim_io_printf_filtered("%s:%d:%s:%s%s ", \ - filter_filename(__FILE__), __LINE__, #OBJECT, \ + lbasename(__FILE__), __LINE__, #OBJECT, \ trace_device ? device_path(_me) : "", \ trace_device ? ":" : ""); \ sim_io_printf_filtered ARGS; \ @@ -144,7 +144,7 @@ do { \ do { \ if (WITH_TRACE) { \ if (ppc_trace[trace_##OBJECT##_package]) { \ - sim_io_printf_filtered("%s:%d:%s: ", filter_filename(__FILE__), __LINE__, #OBJECT); \ + sim_io_printf_filtered("%s:%d:%s: ", lbasename(__FILE__), __LINE__, #OBJECT); \ sim_io_printf_filtered ARGS; \ } \ } \ @@ -156,7 +156,7 @@ do { \ if (WITH_ASSERT) { \ if (!(EXPRESSION)) { \ error("%s:%d: assertion failed - %s\n", \ - filter_filename(__FILE__), __LINE__, #EXPRESSION); \ + lbasename(__FILE__), __LINE__, #EXPRESSION); \ } \ } \ } while (0)