From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id 992053942033 for ; Mon, 16 Mar 2020 17:08:53 +0000 (GMT) X-ASG-Debug-ID: 1584378531-0c856e098a1287e20001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id zutPxcAYhQLZ8by1 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 16 Mar 2020 13:08:51 -0400 (EDT) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.lan (unknown [192.222.164.54]) by smtp.ebox.ca (Postfix) with ESMTP id EB008441B21; Mon, 16 Mar 2020 13:08:50 -0400 (EDT) From: Simon Marchi X-Barracuda-Effective-Source-IP: 192-222-164-54.qc.cable.ebox.net[192.222.164.54] X-Barracuda-Apparent-Source-IP: 192.222.164.54 X-Barracuda-RBL-IP: 192.222.164.54 To: gdb-patches@sourceware.org Cc: Eli Zaretskii , Jon Turney , Simon Marchi Subject: [PATCH 5/7] gdb: rename content of i386-windows-tdep.c, cygwin to windows Date: Mon, 16 Mar 2020 13:08:43 -0400 X-ASG-Orig-Subj: [PATCH 5/7] gdb: rename content of i386-windows-tdep.c, cygwin to windows Message-Id: <20200316170845.184386-6-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200316170845.184386-1-simon.marchi@polymtl.ca> References: <20200316170845.184386-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1584378531 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 3742 X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.80637 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-Spam-Status: No, score=-23.5 required=5.0 tests=GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_QUARANTINE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_SOFTFAIL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Mar 2020 17:08:54 -0000 From: Simon Marchi i386-cygwin-tdep.c has just been renamed to i386-windows-tdep.c, this patch now renames everything in it that is not Cygwin-specific to replace "cygwin" with "windows". Note that I did not rename i386_cygwin_core_osabi_sniffer, since that appears to be Cygwin-specific. gdb/ChangeLog: * i386-windows-tdep.c: Mass-rename "cygwin" to "windows", except i386_cygwin_core_osabi_sniffer. --- gdb/i386-windows-tdep.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gdb/i386-windows-tdep.c b/gdb/i386-windows-tdep.c index b9a959d3c7d4..a71ceda781f8 100644 --- a/gdb/i386-windows-tdep.c +++ b/gdb/i386-windows-tdep.c @@ -1,4 +1,5 @@ -/* Target-dependent code for Cygwin running on i386's, for GDB. +/* Target-dependent code for Windows (including Cygwin) running on i386's, + for GDB. Copyright (C) 2003-2020 Free Software Foundation, Inc. @@ -188,25 +189,25 @@ i386_windows_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid) } static CORE_ADDR -i386_cygwin_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc) +i386_windows_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc) { return i386_pe_skip_trampoline_code (frame, pc, NULL); } static const char * -i386_cygwin_auto_wide_charset (void) +i386_windows_auto_wide_charset (void) { return "UTF-16"; } static void -i386_cygwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +i386_windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); windows_init_abi (info, gdbarch); - set_gdbarch_skip_trampoline_code (gdbarch, i386_cygwin_skip_trampoline_code); + set_gdbarch_skip_trampoline_code (gdbarch, i386_windows_skip_trampoline_code); set_gdbarch_skip_main_prologue (gdbarch, i386_skip_main_prologue); @@ -223,11 +224,11 @@ i386_cygwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) (gdbarch, windows_core_xfer_shared_libraries); set_gdbarch_core_pid_to_str (gdbarch, i386_windows_core_pid_to_str); - set_gdbarch_auto_wide_charset (gdbarch, i386_cygwin_auto_wide_charset); + set_gdbarch_auto_wide_charset (gdbarch, i386_windows_auto_wide_charset); } -static enum gdb_osabi -i386_cygwin_osabi_sniffer (bfd *abfd) +static gdb_osabi +i386_windows_osabi_sniffer (bfd *abfd) { const char *target_name = bfd_get_target (abfd); @@ -255,20 +256,20 @@ i386_cygwin_core_osabi_sniffer (bfd *abfd) return GDB_OSABI_UNKNOWN; } -void _initialize_i386_cygwin_tdep (); +void _initialize_i386_windows_tdep (); void -_initialize_i386_cygwin_tdep () +_initialize_i386_windows_tdep () { gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_coff_flavour, - i386_cygwin_osabi_sniffer); + i386_windows_osabi_sniffer); /* Cygwin uses elf core dumps. */ gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_elf_flavour, i386_cygwin_core_osabi_sniffer); - /* The Cygwin and Windows OS ABIs are currently equivalent. */ - gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_CYGWIN, - i386_cygwin_init_abi); + /* The Windows and Cygwin OS ABIs are currently equivalent. */ gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_WINDOWS, - i386_cygwin_init_abi); + i386_windows_init_abi); + gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_CYGWIN, + i386_windows_init_abi); } -- 2.25.1