[PATCH 5/7] gdb: rename content of i386-windows-tdep.c, cygwin to windows

Simon Marchi
2020-03-16T17:08:53Z

From: Simon Marchi <simon.marchi@efficios.com>

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