X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Famd64-windows-tdep.c;h=e1e777c4355e74a617527fcebee594fcf182f778;hb=6a053cb1ff643cec3349d7f2f47ae5573f82d613;hp=9dfa8e4e9d8cf2ac1e04383fe53bb61f66af930d;hpb=d55e5aa6b29906346c51ad00e6a9b112590aa294;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
index 9dfa8e4e9d..e1e777c435 100644
--- a/gdb/amd64-windows-tdep.c
+++ b/gdb/amd64-windows-tdep.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2019 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2020 Free Software Foundation, Inc.
This file is part of GDB.
@@ -16,26 +16,22 @@
along with this program. If not, see . */
#include "defs.h"
-
-/* Standard C++ includes. */
-#include
-
-/* Local non-gdb includes. */
+#include "osabi.h"
#include "amd64-tdep.h"
-#include "coff/i386.h"
+#include "gdbsupport/x86-xstate.h"
+#include "gdbtypes.h"
+#include "gdbcore.h"
+#include "regcache.h"
+#include "windows-tdep.h"
+#include "frame.h"
+#include "objfiles.h"
+#include "frame-unwind.h"
#include "coff/internal.h"
+#include "coff/i386.h"
#include "coff/pe.h"
-#include "common/x86-xstate.h"
-#include "frame-unwind.h"
-#include "frame.h"
-#include "gdbcore.h"
-#include "gdbtypes.h"
#include "libcoff.h"
-#include "objfiles.h"
-#include "osabi.h"
-#include "regcache.h"
#include "value.h"
-#include "windows-tdep.h"
+#include
/* The registers used to pass integer arguments during a function call. */
static int amd64_windows_dummy_call_integer_regs[] =
@@ -362,8 +358,8 @@ amd64_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
call_dest = pc + 5 + extract_signed_integer (buf, 4, byte_order);
s = lookup_minimal_symbol_by_pc (call_dest);
if (s.minsym != NULL
- && MSYMBOL_LINKAGE_NAME (s.minsym) != NULL
- && strcmp (MSYMBOL_LINKAGE_NAME (s.minsym), "__main") == 0)
+ && s.minsym->linkage_name () != NULL
+ && strcmp (s.minsym->linkage_name (), "__main") == 0)
pc += 5;
}
}
@@ -957,8 +953,8 @@ amd64_windows_find_unwind_info (struct gdbarch *gdbarch, CORE_ADDR pc,
pe = pe_data (sec->objfile->obfd);
dir = &pe->pe_opthdr.DataDirectory[PE_EXCEPTION_TABLE];
- base = pe->pe_opthdr.ImageBase
- + ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+ base = (pe->pe_opthdr.ImageBase
+ + objfile->section_offsets[SECT_OFF_TEXT (objfile)]);
*image_base = base;
/* Find the entry.
@@ -1191,7 +1187,7 @@ amd64_windows_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
= (indirect_addr
? lookup_minimal_symbol_by_pc (indirect_addr).minsym
: NULL);
- const char *symname = indsym ? MSYMBOL_LINKAGE_NAME (indsym) : NULL;
+ const char *symname = indsym ? indsym->linkage_name () : NULL;
if (symname)
{
@@ -1218,7 +1214,7 @@ amd64_windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
/* The dwarf2 unwinder (appended very early by i386_gdbarch_init) is
preferred over the SEH one. The reasons are:
- - binaries without SEH but with dwarf2 debug info are correcly handled
+ - binaries without SEH but with dwarf2 debug info are correctly handled
(although they aren't ABI compliant, gcc before 4.7 didn't emit SEH
info).
- dwarf3 DW_OP_call_frame_cfa is correctly handled (it can only be