Enable XML target descriptions for x86.

[deliverable/binutils-gdb.git] / gdb / i386-nto-tdep.c

diff --git a/gdb/i386-nto-tdep.c b/gdb/i386-nto-tdep.c
index d58af0c26e71f5bf499399544f74bfbf2869ca9d..09c55e2dba1c30c538a8242573261b85558975a0 100644 (file)
--- a/gdb/i386-nto-tdep.c
+++ b/gdb/i386-nto-tdep.c
@@ -1,6 +1,7 @@
 /* Target-dependent code for QNX Neutrino x86.
 
 /* Target-dependent code for QNX Neutrino x86.
 

-   Copyright 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.

 
    Contributed by QNX Software Systems Ltd.
 
 
    Contributed by QNX Software Systems Ltd.
 


@@ -8,7 +9,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -17,9 +18,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "frame.h"
 
 #include "defs.h"
 #include "frame.h"


@@ -33,11 +32,9 @@
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 #include "nto-tdep.h"
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 #include "nto-tdep.h"

+#include "solib.h"

 #include "solib-svr4.h"
 
 #include "solib-svr4.h"
 

-/* Target vector for QNX NTO x86.  */
-static struct nto_target_ops i386_nto_target;
-

 #ifndef X86_CPU_FXSR
 #define X86_CPU_FXSR (1L << 12)
 #endif
 #ifndef X86_CPU_FXSR
 #define X86_CPU_FXSR (1L << 12)
 #endif


@@ -81,38 +78,39 @@ nto_reg_offset (int regnum)
 }
 
 static void
 }
 
 static void

-i386nto_supply_gregset (char *gpregs)
+i386nto_supply_gregset (struct regcache *regcache, char *gpregs)

 {
 {

-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

 
   if(tdep->gregset == NULL)
 
   if(tdep->gregset == NULL)

-    tdep->gregset = regset_alloc (current_gdbarch, i386_supply_gregset,
+    tdep->gregset = regset_alloc (gdbarch, i386_supply_gregset,

                                  i386_collect_gregset);
 
   gdb_assert (tdep->gregset_reg_offset == i386nto_gregset_reg_offset);
                                  i386_collect_gregset);
 
   gdb_assert (tdep->gregset_reg_offset == i386nto_gregset_reg_offset);

-  tdep->gregset->supply_regset (tdep->gregset, current_regcache, -1,
+  tdep->gregset->supply_regset (tdep->gregset, regcache, -1,

                                gpregs, NUM_GPREGS * 4);
 }
 
 static void
                                gpregs, NUM_GPREGS * 4);
 }
 
 static void

-i386nto_supply_fpregset (char *fpregs)
+i386nto_supply_fpregset (struct regcache *regcache, char *fpregs)

 {
   if (nto_cpuinfo_valid && nto_cpuinfo_flags | X86_CPU_FXSR)
 {
   if (nto_cpuinfo_valid && nto_cpuinfo_flags | X86_CPU_FXSR)

-    i387_supply_fxsave (current_regcache, -1, fpregs);
+    i387_supply_fxsave (regcache, -1, fpregs);

   else
   else

-    i387_supply_fsave (current_regcache, -1, fpregs);
+    i387_supply_fsave (regcache, -1, fpregs);

 }
 
 static void
 }
 
 static void

-i386nto_supply_regset (int regset, char *data)
+i386nto_supply_regset (struct regcache *regcache, int regset, char *data)

 {
   switch (regset)
     {
     case NTO_REG_GENERAL:
 {
   switch (regset)
     {
     case NTO_REG_GENERAL:

-      i386nto_supply_gregset (data);
+      i386nto_supply_gregset (regcache, data);

       break;
     case NTO_REG_FLOAT:
       break;
     case NTO_REG_FLOAT:

-      i386nto_supply_fpregset (data);
+      i386nto_supply_fpregset (regcache, data);

       break;
     }
 }
       break;
     }
 }


@@ -124,15 +122,19 @@ i386nto_regset_id (int regno)
     return NTO_REG_END;
   else if (regno < I386_NUM_GREGS)
     return NTO_REG_GENERAL;
     return NTO_REG_END;
   else if (regno < I386_NUM_GREGS)
     return NTO_REG_GENERAL;

-  else if (regno < I386_NUM_GREGS + I386_NUM_FREGS)
+  else if (regno < I386_NUM_GREGS + I387_NUM_REGS)

     return NTO_REG_FLOAT;
     return NTO_REG_FLOAT;

+  else if (regno < I386_SSE_NUM_REGS)
+    return NTO_REG_FLOAT; /* We store xmm registers in fxsave_area.  */

 
   return -1;                   /* Error.  */
 }
 
 static int
 
   return -1;                   /* Error.  */
 }
 
 static int

-i386nto_register_area (int regno, int regset, unsigned *off)
+i386nto_register_area (struct gdbarch *gdbarch,
+                      int regno, int regset, unsigned *off)

 {
 {

+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

   int len;
 
   *off = 0;
   int len;
 
   *off = 0;


@@ -148,36 +150,106 @@ i386nto_register_area (int regno, int regset, unsigned *off)
     }
   else if (regset == NTO_REG_FLOAT)
     {
     }
   else if (regset == NTO_REG_FLOAT)
     {

-      unsigned off_adjust, regsize, regset_size;
+      unsigned off_adjust, regsize, regset_size, regno_base;
+      /* The following are flags indicating number in our fxsave_area.  */
+      int first_four = (regno >= I387_FCTRL_REGNUM (tdep)
+                       && regno <= I387_FISEG_REGNUM (tdep));
+      int second_four = (regno > I387_FISEG_REGNUM (tdep)
+                        && regno <= I387_FOP_REGNUM (tdep));
+      int st_reg = (regno >= I387_ST0_REGNUM (tdep)
+                   && regno < I387_ST0_REGNUM (tdep) + 8);
+      int xmm_reg = (regno >= I387_XMM0_REGNUM (tdep)
+                    && regno < I387_MXCSR_REGNUM (tdep));

 
       if (nto_cpuinfo_valid && nto_cpuinfo_flags | X86_CPU_FXSR)
        {
          off_adjust = 32;
          regsize = 16;
          regset_size = 512;
 
       if (nto_cpuinfo_valid && nto_cpuinfo_flags | X86_CPU_FXSR)
        {
          off_adjust = 32;
          regsize = 16;
          regset_size = 512;

+         /* fxsave_area structure.  */
+         if (first_four)
+           {
+             /* fpu_control_word, fpu_status_word, fpu_tag_word, fpu_operand
+                registers.  */
+             regsize = 2; /* Two bytes each.  */
+             off_adjust = 0;
+             regno_base = I387_FCTRL_REGNUM (tdep);
+           }
+         else if (second_four)
+           {
+             /* fpu_ip, fpu_cs, fpu_op, fpu_ds registers.  */
+             regsize = 4;
+             off_adjust = 8;
+             regno_base = I387_FISEG_REGNUM (tdep) + 1;
+           }
+         else if (st_reg)
+           {
+             /* ST registers.  */
+             regsize = 16;
+             off_adjust = 32;
+             regno_base = I387_ST0_REGNUM (tdep);
+           }
+         else if (xmm_reg)
+           {
+             /* XMM registers.  */
+             regsize = 16;
+             off_adjust = 160;
+             regno_base = I387_XMM0_REGNUM (tdep);
+           }
+         else if (regno == I387_MXCSR_REGNUM (tdep))
+           {
+             regsize = 4;
+             off_adjust = 24;
+             regno_base = I387_MXCSR_REGNUM (tdep);
+           }
+         else
+           {
+             /* Whole regset.  */
+             gdb_assert (regno == -1);
+             off_adjust = 0;
+             regno_base = 0;
+             regsize = regset_size;
+           }

        }
       else
        {
        }
       else
        {

-         off_adjust = 28;
-         regsize = 10;
-         regset_size = 128;
+         regset_size = 108;
+         /* fsave_area structure.  */
+         if (first_four || second_four)
+           {
+             /* fpu_control_word, ... , fpu_ds registers.  */
+             regsize = 4;
+             off_adjust = 0;
+             regno_base = I387_FCTRL_REGNUM (tdep);
+           }
+         else if (st_reg)
+           {
+             /* One of ST registers.  */
+             regsize = 10;
+             off_adjust = 7 * 4;
+             regno_base = I387_ST0_REGNUM (tdep);
+           }
+         else
+           {
+             /* Whole regset.  */
+             gdb_assert (regno == -1);
+             off_adjust = 0;
+             regno_base = 0;
+             regsize = regset_size;
+           }

        }
 
        }
 

-      if (regno == -1)
-       return regset_size;
-
-      *off = (regno - FP0_REGNUM) * regsize + off_adjust;
-      return 10;
-      /* Why 10 instead of regsize?  GDB only stores 10 bytes per FP
-         register so if we're sending a register back to the target,
-         we only want pdebug to write 10 bytes so as not to clobber
-         the reserved 6 bytes in the fxsave structure.  */
+      if (regno != -1)
+       *off = off_adjust + (regno - regno_base) * regsize;
+      else
+       *off = 0;
+      return regsize;

     }
   return -1;
 }
 
 static int
     }
   return -1;
 }
 
 static int

-i386nto_regset_fill (int regset, char *data)
+i386nto_regset_fill (const struct regcache *regcache, int regset, char *data)

 {
   if (regset == NTO_REG_GENERAL)
     {
 {
   if (regset == NTO_REG_GENERAL)
     {


@@ -187,15 +259,15 @@ i386nto_regset_fill (int regset, char *data)
        {
          int offset = nto_reg_offset (regno);
          if (offset != -1)
        {
          int offset = nto_reg_offset (regno);
          if (offset != -1)

-           regcache_raw_collect (current_regcache, regno, data + offset);
+           regcache_raw_collect (regcache, regno, data + offset);

        }
     }
   else if (regset == NTO_REG_FLOAT)
     {
       if (nto_cpuinfo_valid && nto_cpuinfo_flags | X86_CPU_FXSR)
        }
     }
   else if (regset == NTO_REG_FLOAT)
     {
       if (nto_cpuinfo_valid && nto_cpuinfo_flags | X86_CPU_FXSR)

-       i387_fill_fxsave (data, -1);
+       i387_collect_fxsave (regcache, -1, data);

       else
       else

-       i387_fill_fsave (data, -1);
+       i387_collect_fsave (regcache, -1, data);

     }
   else
     return -1;
     }
   else
     return -1;


@@ -203,47 +275,49 @@ i386nto_regset_fill (int regset, char *data)
   return 0;
 }
 
   return 0;
 }
 

-/* Return whether the frame preceding NEXT_FRAME corresponds to a QNX
-   Neutrino sigtramp routine.  */
+/* Return whether THIS_FRAME corresponds to a QNX Neutrino sigtramp
+   routine.  */

 
 static int
 
 static int

-i386nto_sigtramp_p (struct frame_info *next_frame)
+i386nto_sigtramp_p (struct frame_info *this_frame)

 {
 {

-  CORE_ADDR pc = frame_pc_unwind (next_frame);
+  CORE_ADDR pc = get_frame_pc (this_frame);

   char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   return name && strcmp ("__signalstub", name) == 0;
 }
 
   char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   return name && strcmp ("__signalstub", name) == 0;
 }
 

-#define I386_NTO_SIGCONTEXT_OFFSET 136
-
-/* Assuming NEXT_FRAME is a frame following a QNX Neutrino sigtramp
-   routine, return the address of the associated sigcontext structure.  */
+/* Assuming THIS_FRAME is a QNX Neutrino sigtramp routine, return the
+   address of the associated sigcontext structure.  */

 
 static CORE_ADDR
 
 static CORE_ADDR

-i386nto_sigcontext_addr (struct frame_info *next_frame)
+i386nto_sigcontext_addr (struct frame_info *this_frame)

 {
 {

+  struct gdbarch *gdbarch = get_frame_arch (this_frame);
+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);

   char buf[4];
   char buf[4];

-  CORE_ADDR sp;
+  CORE_ADDR ptrctx;

 
 

-  frame_unwind_register (next_frame, I386_ESP_REGNUM, buf);
-  sp = extract_unsigned_integer (buf, 4);
+  /* We store __ucontext_t addr in EDI register.  */
+  get_frame_register (this_frame, I386_EDI_REGNUM, buf);
+  ptrctx = extract_unsigned_integer (buf, 4, byte_order);
+  ptrctx += 24 /* Context pointer is at this offset.  */;

 
 

-  return sp + I386_NTO_SIGCONTEXT_OFFSET;
+  return ptrctx;

 }
 
 static void
 init_i386nto_ops (void)
 {
 }
 
 static void
 init_i386nto_ops (void)
 {

-  i386_nto_target.regset_id = i386nto_regset_id;
-  i386_nto_target.supply_gregset = i386nto_supply_gregset;
-  i386_nto_target.supply_fpregset = i386nto_supply_fpregset;
-  i386_nto_target.supply_altregset = nto_dummy_supply_regset;
-  i386_nto_target.supply_regset = i386nto_supply_regset;
-  i386_nto_target.register_area = i386nto_register_area;
-  i386_nto_target.regset_fill = i386nto_regset_fill;
-  i386_nto_target.fetch_link_map_offsets =
+  nto_regset_id = i386nto_regset_id;
+  nto_supply_gregset = i386nto_supply_gregset;
+  nto_supply_fpregset = i386nto_supply_fpregset;
+  nto_supply_altregset = nto_dummy_supply_regset;
+  nto_supply_regset = i386nto_supply_regset;
+  nto_register_area = i386nto_register_area;
+  nto_regset_fill = i386nto_regset_fill;
+  nto_fetch_link_map_offsets =

     svr4_ilp32_fetch_link_map_offsets;
 }
 
     svr4_ilp32_fetch_link_map_offsets;
 }
 


@@ -251,6 +325,7 @@ static void
 i386nto_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 i386nto_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

+  static struct target_so_ops nto_svr4_so_ops;

 
   /* Deal with our strange signals.  */
   nto_initialize_signals ();
 
   /* Deal with our strange signals.  */
   nto_initialize_signals ();


@@ -268,8 +343,8 @@ i386nto_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
   tdep->sigtramp_p = i386nto_sigtramp_p;
   tdep->sigcontext_addr = i386nto_sigcontext_addr;
 
   tdep->sigtramp_p = i386nto_sigtramp_p;
   tdep->sigcontext_addr = i386nto_sigcontext_addr;

-  tdep->sc_pc_offset = 56;
-  tdep->sc_sp_offset = 68;
+  tdep->sc_reg_offset = i386nto_gregset_reg_offset;
+  tdep->sc_num_regs = ARRAY_SIZE (i386nto_gregset_reg_offset);

 
   /* Setjmp()'s return PC saved in EDX (5).  */
   tdep->jb_pc_offset = 20;     /* 5x32 bit ints in.  */
 
   /* Setjmp()'s return PC saved in EDX (5).  */
   tdep->jb_pc_offset = 20;     /* 5x32 bit ints in.  */


@@ -277,18 +352,30 @@ i386nto_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   set_solib_svr4_fetch_link_map_offsets
     (gdbarch, svr4_ilp32_fetch_link_map_offsets);
 
   set_solib_svr4_fetch_link_map_offsets
     (gdbarch, svr4_ilp32_fetch_link_map_offsets);
 

-  /* Our loader handles solib relocations slightly differently than svr4.  */
-  TARGET_SO_RELOCATE_SECTION_ADDRESSES = nto_relocate_section_addresses;
+  /* Initialize this lazily, to avoid an initialization order
+     dependency on solib-svr4.c's _initialize routine.  */
+  if (nto_svr4_so_ops.in_dynsym_resolve_code == NULL)
+    {
+      nto_svr4_so_ops = svr4_so_ops;

 
 

-  /* Supply a nice function to find our solibs.  */
-  TARGET_SO_FIND_AND_OPEN_SOLIB = nto_find_and_open_solib;
+      /* Our loader handles solib relocations differently than svr4.  */
+      nto_svr4_so_ops.relocate_section_addresses
+        = nto_relocate_section_addresses;

 
 

-  /* Our linker code is in libc.  */
-  TARGET_SO_IN_DYNSYM_RESOLVE_CODE = nto_in_dynsym_resolve_code;
+      /* Supply a nice function to find our solibs.  */
+      nto_svr4_so_ops.find_and_open_solib
+        = nto_find_and_open_solib;

 
 

-  nto_set_target (&i386_nto_target);
+      /* Our linker code is in libc.  */
+      nto_svr4_so_ops.in_dynsym_resolve_code
+        = nto_in_dynsym_resolve_code;
+    }
+  set_solib_ops (gdbarch, &nto_svr4_so_ops);

 }
 
 }
 

+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_i386nto_tdep;
+

 void
 _initialize_i386nto_tdep (void)
 {
 void
 _initialize_i386nto_tdep (void)
 {