X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Farm-wince-tdep.c;h=5971b29bd596093a2159ff898348914a0493866c;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=dd7e3efed5d703da02d4bee1cfa68452d24f8b20;hpb=6dc134122f43d3607284c0e372e239321b4ab7fb;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/arm-wince-tdep.c b/gdb/arm-wince-tdep.c
index dd7e3efed5..5971b29bd5 100644
--- a/gdb/arm-wince-tdep.c
+++ b/gdb/arm-wince-tdep.c
@@ -1,7 +1,7 @@
 /* Target-dependent code for Windows CE running on ARM processors,
    for GDB.
 
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -22,49 +22,55 @@
 #include "osabi.h"
 #include "gdbcore.h"
 #include "target.h"
+#include "frame.h"
 
-#include "gdb_string.h"
-
+#include "arch/arm.h"
 #include "arm-tdep.h"
+#include "windows-tdep.h"
 
-static const char arm_wince_le_breakpoint[] = { 0x10, 0x00, 0x00, 0xe6 };
-static const char arm_wince_thumb_le_breakpoint[] = { 0xfe, 0xdf };
+static const gdb_byte arm_wince_le_breakpoint[] = { 0x10, 0x00, 0x00, 0xe6 };
+static const gdb_byte arm_wince_thumb_le_breakpoint[] = { 0xfe, 0xdf };
 
 /* Description of the longjmp buffer.  */
-#define ARM_WINCE_JB_ELEMENT_SIZE	INT_REGISTER_SIZE
+#define ARM_WINCE_JB_ELEMENT_SIZE	ARM_INT_REGISTER_SIZE
 #define ARM_WINCE_JB_PC			10
 
 static CORE_ADDR
 arm_pe_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
 {
+  struct gdbarch *gdbarch = get_frame_arch (frame);
+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   ULONGEST indirect;
-  struct minimal_symbol *indsym;
-  char *symname;
+  struct bound_minimal_symbol indsym;
+  const char *symname;
   CORE_ADDR next_pc;
 
   /* The format of an ARM DLL trampoline is:
+
        ldr  ip, [pc]
        ldr  pc, [ip]
-       .dw __imp_<func>  */
+       .dw __imp_<func>
+
+  */
 
   if (pc == 0
-      || read_memory_unsigned_integer (pc + 0, 4) != 0xe59fc000
-      || read_memory_unsigned_integer (pc + 4, 4) != 0xe59cf000)
+      || read_memory_unsigned_integer (pc + 0, 4, byte_order) != 0xe59fc000
+      || read_memory_unsigned_integer (pc + 4, 4, byte_order) != 0xe59cf000)
     return 0;
 
-  indirect = read_memory_unsigned_integer (pc + 8, 4);
+  indirect = read_memory_unsigned_integer (pc + 8, 4, byte_order);
   if (indirect == 0)
     return 0;
 
   indsym = lookup_minimal_symbol_by_pc (indirect);
-  if (indsym == NULL)
+  if (indsym.minsym == NULL)
     return 0;
 
-  symname = SYMBOL_LINKAGE_NAME (indsym);
-  if (symname == NULL || strncmp (symname, "__imp_", 6) != 0)
+  symname = indsym.minsym->linkage_name ();
+  if (symname == NULL || !startswith (symname, "__imp_"))
     return 0;
 
-  next_pc = read_memory_unsigned_integer (indirect, 4);
+  next_pc = read_memory_unsigned_integer (indirect, 4, byte_order);
   if (next_pc != 0)
     return next_pc;
 
@@ -72,11 +78,47 @@ arm_pe_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
   return arm_skip_stub (frame, pc);
 }
 
+/* GCC emits a call to __gccmain in the prologue of main.
+
+   The function below examines the code pointed at by PC and checks to
+   see if it corresponds to a call to __gccmain.  If so, it returns
+   the address of the instruction following that call.  Otherwise, it
+   simply returns PC.  */
+
+static CORE_ADDR
+arm_wince_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
+{
+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+  ULONGEST this_instr;
+
+  this_instr = read_memory_unsigned_integer (pc, 4, byte_order);
+
+  /* bl offset <__gccmain> */
+  if ((this_instr & 0xfff00000) == 0xeb000000)
+    {
+#define sign_extend(V, N) \
+  (((long) (V) ^ (1L << ((N) - 1))) - (1L << ((N) - 1)))
+
+      long offset = sign_extend (this_instr & 0x000fffff, 23) << 2;
+      CORE_ADDR call_dest = (pc + 8 + offset) & 0xffffffffU;
+      struct bound_minimal_symbol s = lookup_minimal_symbol_by_pc (call_dest);
+
+      if (s.minsym != NULL
+	  && s.minsym->linkage_name () != NULL
+	  && strcmp (s.minsym->linkage_name (), "__gccmain") == 0)
+	pc += 4;
+    }
+
+  return pc;
+}
+
 static void
 arm_wince_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
+  windows_init_abi (info, gdbarch);
+
   tdep->arm_breakpoint = arm_wince_le_breakpoint;
   tdep->arm_breakpoint_size = sizeof (arm_wince_le_breakpoint);
   tdep->thumb_breakpoint = arm_wince_thumb_le_breakpoint;
@@ -96,6 +138,9 @@ arm_wince_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
   /* Single stepping.  */
   set_gdbarch_software_single_step (gdbarch, arm_software_single_step);
+
+  /* Skip call to __gccmain that gcc places in main.  */
+  set_gdbarch_skip_main_prologue (gdbarch, arm_wince_skip_main_prologue);
 }
 
 static enum gdb_osabi
@@ -109,11 +154,9 @@ arm_wince_osabi_sniffer (bfd *abfd)
   return GDB_OSABI_UNKNOWN;
 }
 
-/* Provide a prototype to silence -Wmissing-prototypes.  */
-void _initialize_arm_wince_tdep (void);
-
+void _initialize_arm_wince_tdep ();
 void
-_initialize_arm_wince_tdep (void)
+_initialize_arm_wince_tdep ()
 {
   gdbarch_register_osabi_sniffer (bfd_arch_arm, bfd_target_coff_flavour,
                                   arm_wince_osabi_sniffer);