X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fnto-tdep.h;h=2410a03a4a689a96c066cf53d8cd29edb77840e2;hb=1d29ab86cb5145cac5045c1a4113d8b8fbd4d9c6;hp=462ca32abceae1e75b1a13bec698a997a592b797;hpb=7b6bb8daaceb9ecf3f42dea57ae82733d6a3b2f6;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/nto-tdep.h b/gdb/nto-tdep.h
index 462ca32abc..2410a03a4a 100644
--- a/gdb/nto-tdep.h
+++ b/gdb/nto-tdep.h
@@ -1,7 +1,6 @@
 /* nto-tdep.h - QNX Neutrino target header.
 
-   Copyright (C) 2003, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
    Contributed by QNX Software Systems Ltd.
 
@@ -20,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef _NTO_TDEP_H
-#define _NTO_TDEP_H
+#ifndef NTO_TDEP_H
+#define NTO_TDEP_H
 
 #include "solist.h"
 #include "osabi.h"
@@ -32,9 +31,6 @@
 
 struct nto_target_ops
 {
-/* For 'maintenance debug nto-debug' command.  */
-  int internal_debugging;
-
 /* The CPUINFO flags from the remote.  Currently used by
    i386 for fxsave but future proofing other hosts.
    This is initialized in procfs_attach or nto_start_remote
@@ -65,7 +61,7 @@ struct nto_target_ops
    regset, 0 if unknown register.  */
   int (*register_area) (struct gdbarch *, int, int, unsigned *);
 
-/* Build the Neutrino register set info into the data buffer.  
+/* Build the Neutrino register set info into the data buffer.
    Return -1 if unknown regset, 0 otherwise.  */
   int (*regset_fill) (const struct regcache *, int, char *);
 
@@ -80,8 +76,6 @@ struct nto_target_ops
 
 extern struct nto_target_ops current_nto_target;
 
-#define nto_internal_debugging (current_nto_target.internal_debugging)
-
 #define nto_cpuinfo_flags (current_nto_target.cpuinfo_flags)
 
 #define nto_cpuinfo_valid (current_nto_target.cpuinfo_valid)
@@ -123,7 +117,7 @@ enum
   OSTYPE_NTO
 };
 
-/* These correspond to the DSMSG_* versions in dsmsgs.h. */
+/* These correspond to the DSMSG_* versions in dsmsgs.h.  */
 enum
 {
   NTO_REG_GENERAL,
@@ -140,12 +134,28 @@ typedef struct _debug_regs
   qnx_reg64 padding[1024];
 } nto_regset_t;
 
-struct private_thread_info
+struct nto_thread_info : public private_thread_info
+{
+  short tid = 0;
+  unsigned char state = 0;
+  unsigned char flags = 0;
+  std::string name;
+};
+
+static inline nto_thread_info *
+get_nto_thread_info (thread_info *thread)
 {
-  short tid;
-  unsigned char state;
-  unsigned char flags;
-  char name[1];
+  return static_cast<nto_thread_info *> (thread->priv.get ());
+}
+
+/* Per-inferior data, common for both procfs and remote.  */
+struct nto_inferior_data
+{
+  /* Last stopped flags result from wait function */
+  unsigned int stopped_flags = 0;
+
+  /* Last known stopped PC */
+  CORE_ADDR stopped_pc = 0;
 };
 
 /* Generic functions in nto-tdep.c.  */
@@ -160,7 +170,8 @@ void nto_relocate_section_addresses (struct so_list *,
 
 int nto_map_arch_to_cputype (const char *);
 
-int nto_find_and_open_solib (char *, unsigned, char **);
+int nto_find_and_open_solib (const char *, unsigned,
+			     gdb::unique_xmalloc_ptr<char> *);
 
 enum gdb_osabi nto_elf_osabi_sniffer (bfd *abfd);
 
@@ -172,6 +183,12 @@ void nto_dummy_supply_regset (struct regcache *regcache, char *regs);
 
 int nto_in_dynsym_resolve_code (CORE_ADDR pc);
 
-char *nto_extra_thread_info (struct thread_info *);
+const char *nto_extra_thread_info (struct target_ops *self, struct thread_info *);
+
+LONGEST nto_read_auxv_from_initial_stack (CORE_ADDR inital_stack,
+					  gdb_byte *readbuf,
+					  LONGEST len, size_t sizeof_auxv_t);
+
+struct nto_inferior_data *nto_inferior_data (struct inferior *inf);
 
-#endif
+#endif /* NTO_TDEP_H */