* value.h (struct internalvar): Remove.

[deliverable/binutils-gdb.git] / gdb / m32r-linux-tdep.c

diff --git a/gdb/m32r-linux-tdep.c b/gdb/m32r-linux-tdep.c
index d60d8fa977f17a5329b3d41a51a834067e5b78c6..061a44d21f82090aa8202a41c81401408cbd946b 100644 (file)
--- a/gdb/m32r-linux-tdep.c
+++ b/gdb/m32r-linux-tdep.c
@@ -1,12 +1,12 @@
 /* Target-dependent code for GNU/Linux m32r.
 
 /* Target-dependent code for GNU/Linux m32r.
 

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

 
    This file is part of GDB.
 
    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 file is part of GDB.
 
    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,


@@ -15,9 +15,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 "gdbcore.h"
 
 #include "defs.h"
 #include "gdbcore.h"


@@ -33,6 +31,7 @@
 
 #include "glibc-tdep.h"
 #include "solib-svr4.h"
 
 #include "glibc-tdep.h"
 #include "solib-svr4.h"

+#include "symtab.h"

 
 #include "trad-frame.h"
 #include "frame-unwind.h"
 
 #include "trad-frame.h"
 #include "frame-unwind.h"


@@ -77,7 +76,7 @@
    to the ones used by the kernel.  Therefore, these trampolines are
    supported too.  */
 
    to the ones used by the kernel.  Therefore, these trampolines are
    supported too.  */
 

-static const unsigned char linux_sigtramp_code[] = {
+static const gdb_byte linux_sigtramp_code[] = {

   0x67, 0x77, 0x10, 0xf2,
 };
 
   0x67, 0x77, 0x10, 0xf2,
 };
 


@@ -85,9 +84,9 @@ static const unsigned char linux_sigtramp_code[] = {
    the routine.  Otherwise, return 0.  */
 
 static CORE_ADDR
    the routine.  Otherwise, return 0.  */
 
 static CORE_ADDR

-m32r_linux_sigtramp_start (CORE_ADDR pc, struct frame_info *next_frame)
+m32r_linux_sigtramp_start (CORE_ADDR pc, struct frame_info *this_frame)

 {
 {

-  unsigned char buf[4];
+  gdb_byte buf[4];

 
   /* We only recognize a signal trampoline if PC is at the start of
      one of the instructions.  We optimize for finding the PC at the
 
   /* We only recognize a signal trampoline if PC is at the start of
      one of the instructions.  We optimize for finding the PC at the


@@ -99,7 +98,7 @@ m32r_linux_sigtramp_start (CORE_ADDR pc, struct frame_info *next_frame)
 
   if (pc % 2 != 0)
     {
 
   if (pc % 2 != 0)
     {

-      if (!safe_frame_unwind_memory (next_frame, pc, buf, 2))
+      if (!safe_frame_unwind_memory (this_frame, pc, buf, 2))

        return 0;
 
       if (memcmp (buf, linux_sigtramp_code, 2) == 0)
        return 0;
 
       if (memcmp (buf, linux_sigtramp_code, 2) == 0)


@@ -108,7 +107,7 @@ m32r_linux_sigtramp_start (CORE_ADDR pc, struct frame_info *next_frame)
        return 0;
     }
 
        return 0;
     }
 

-  if (!safe_frame_unwind_memory (next_frame, pc, buf, 4))
+  if (!safe_frame_unwind_memory (this_frame, pc, buf, 4))

     return 0;
 
   if (memcmp (buf, linux_sigtramp_code, 4) != 0)
     return 0;
 
   if (memcmp (buf, linux_sigtramp_code, 4) != 0)


@@ -125,7 +124,7 @@ m32r_linux_sigtramp_start (CORE_ADDR pc, struct frame_info *next_frame)
 
    The effect is to call the system call rt_sigreturn.  */
 
 
    The effect is to call the system call rt_sigreturn.  */
 

-static const unsigned char linux_rt_sigtramp_code[] = {
+static const gdb_byte linux_rt_sigtramp_code[] = {

   0x97, 0xf0, 0x00, 0xad, 0x10, 0xf2, 0xf0, 0x00,
 };
 
   0x97, 0xf0, 0x00, 0xad, 0x10, 0xf2, 0xf0, 0x00,
 };
 


@@ -133,9 +132,9 @@ static const unsigned char linux_rt_sigtramp_code[] = {
    of the routine.  Otherwise, return 0.  */
 
 static CORE_ADDR
    of the routine.  Otherwise, return 0.  */
 
 static CORE_ADDR

-m32r_linux_rt_sigtramp_start (CORE_ADDR pc, struct frame_info *next_frame)
+m32r_linux_rt_sigtramp_start (CORE_ADDR pc, struct frame_info *this_frame)

 {
 {

-  unsigned char buf[4];
+  gdb_byte buf[4];

 
   /* We only recognize a signal trampoline if PC is at the start of
      one of the instructions.  We optimize for finding the PC at the
 
   /* We only recognize a signal trampoline if PC is at the start of
      one of the instructions.  We optimize for finding the PC at the


@@ -148,12 +147,12 @@ m32r_linux_rt_sigtramp_start (CORE_ADDR pc, struct frame_info *next_frame)
   if (pc % 2 != 0)
     return 0;
 
   if (pc % 2 != 0)
     return 0;
 

-  if (!safe_frame_unwind_memory (next_frame, pc, buf, 4))
+  if (!safe_frame_unwind_memory (this_frame, pc, buf, 4))

     return 0;
 
   if (memcmp (buf, linux_rt_sigtramp_code, 4) == 0)
     {
     return 0;
 
   if (memcmp (buf, linux_rt_sigtramp_code, 4) == 0)
     {

-      if (!safe_frame_unwind_memory (next_frame, pc + 4, buf, 4))
+      if (!safe_frame_unwind_memory (this_frame, pc + 4, buf, 4))

        return 0;
 
       if (memcmp (buf, linux_rt_sigtramp_code + 4, 4) == 0)
        return 0;
 
       if (memcmp (buf, linux_rt_sigtramp_code + 4, 4) == 0)


@@ -161,7 +160,7 @@ m32r_linux_rt_sigtramp_start (CORE_ADDR pc, struct frame_info *next_frame)
     }
   else if (memcmp (buf, linux_rt_sigtramp_code + 4, 4) == 0)
     {
     }
   else if (memcmp (buf, linux_rt_sigtramp_code + 4, 4) == 0)
     {

-      if (!safe_frame_unwind_memory (next_frame, pc - 4, buf, 4))
+      if (!safe_frame_unwind_memory (this_frame, pc - 4, buf, 4))

        return 0;
 
       if (memcmp (buf, linux_rt_sigtramp_code, 4) == 0)
        return 0;
 
       if (memcmp (buf, linux_rt_sigtramp_code, 4) == 0)


@@ -173,7 +172,7 @@ m32r_linux_rt_sigtramp_start (CORE_ADDR pc, struct frame_info *next_frame)
 
 static int
 m32r_linux_pc_in_sigtramp (CORE_ADDR pc, char *name,
 
 static int
 m32r_linux_pc_in_sigtramp (CORE_ADDR pc, char *name,

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

 {
   /* If we have NAME, we can optimize the search.  The trampolines are
      named __restore and __restore_rt.  However, they aren't dynamically
 {
   /* If we have NAME, we can optimize the search.  The trampolines are
      named __restore and __restore_rt.  However, they aren't dynamically


@@ -181,8 +180,8 @@ m32r_linux_pc_in_sigtramp (CORE_ADDR pc, char *name,
      be part of the preceding function.  This should always be sigaction,
      __sigaction, or __libc_sigaction (all aliases to the same function).  */
   if (name == NULL || strstr (name, "sigaction") != NULL)
      be part of the preceding function.  This should always be sigaction,
      __sigaction, or __libc_sigaction (all aliases to the same function).  */
   if (name == NULL || strstr (name, "sigaction") != NULL)

-    return (m32r_linux_sigtramp_start (pc, next_frame) != 0
-           || m32r_linux_rt_sigtramp_start (pc, next_frame) != 0);
+    return (m32r_linux_sigtramp_start (pc, this_frame) != 0
+           || m32r_linux_rt_sigtramp_start (pc, this_frame) != 0);

 
   return (strcmp ("__restore", name) == 0
          || strcmp ("__restore_rt", name) == 0);
 
   return (strcmp ("__restore", name) == 0
          || strcmp ("__restore_rt", name) == 0);


@@ -223,7 +222,7 @@ struct m32r_frame_cache
 };
 
 static struct m32r_frame_cache *
 };
 
 static struct m32r_frame_cache *

-m32r_linux_sigtramp_frame_cache (struct frame_info *next_frame,
+m32r_linux_sigtramp_frame_cache (struct frame_info *this_frame,

                                 void **this_cache)
 {
   struct m32r_frame_cache *cache;
                                 void **this_cache)
 {
   struct m32r_frame_cache *cache;


@@ -234,26 +233,26 @@ m32r_linux_sigtramp_frame_cache (struct frame_info *next_frame,
     return (*this_cache);
   cache = FRAME_OBSTACK_ZALLOC (struct m32r_frame_cache);
   (*this_cache) = cache;
     return (*this_cache);
   cache = FRAME_OBSTACK_ZALLOC (struct m32r_frame_cache);
   (*this_cache) = cache;

-  cache->saved_regs = trad_frame_alloc_saved_regs (next_frame);
+  cache->saved_regs = trad_frame_alloc_saved_regs (this_frame);

 
 

-  cache->base = frame_unwind_register_unsigned (next_frame, M32R_SP_REGNUM);
+  cache->base = get_frame_register_unsigned (this_frame, M32R_SP_REGNUM);

   sigcontext_addr = cache->base + 4;
 
   sigcontext_addr = cache->base + 4;
 

-  cache->pc = frame_pc_unwind (next_frame);
-  addr = m32r_linux_sigtramp_start (cache->pc, next_frame);
+  cache->pc = get_frame_pc (this_frame);
+  addr = m32r_linux_sigtramp_start (cache->pc, this_frame);

   if (addr == 0)
     {
       /* If this is a RT signal trampoline, adjust SIGCONTEXT_ADDR
          accordingly.  */
   if (addr == 0)
     {
       /* If this is a RT signal trampoline, adjust SIGCONTEXT_ADDR
          accordingly.  */

-      addr = m32r_linux_rt_sigtramp_start (cache->pc, next_frame);
+      addr = m32r_linux_rt_sigtramp_start (cache->pc, this_frame);

       if (addr)
        sigcontext_addr += 128;
       else
       if (addr)
        sigcontext_addr += 128;
       else

-       addr = frame_func_unwind (next_frame);
+       addr = get_frame_func (this_frame);

     }
   cache->pc = addr;
 
     }
   cache->pc = addr;
 

-  cache->saved_regs = trad_frame_alloc_saved_regs (next_frame);
+  cache->saved_regs = trad_frame_alloc_saved_regs (this_frame);

 
   for (regnum = 0; regnum < sizeof (m32r_linux_sc_reg_offset) / 4; regnum++)
     {
 
   for (regnum = 0; regnum < sizeof (m32r_linux_sc_reg_offset) / 4; regnum++)
     {


@@ -266,50 +265,49 @@ m32r_linux_sigtramp_frame_cache (struct frame_info *next_frame,
 }
 
 static void
 }
 
 static void

-m32r_linux_sigtramp_frame_this_id (struct frame_info *next_frame,
+m32r_linux_sigtramp_frame_this_id (struct frame_info *this_frame,

                                   void **this_cache,
                                   struct frame_id *this_id)
 {
   struct m32r_frame_cache *cache =
                                   void **this_cache,
                                   struct frame_id *this_id)
 {
   struct m32r_frame_cache *cache =

-    m32r_linux_sigtramp_frame_cache (next_frame, this_cache);
+    m32r_linux_sigtramp_frame_cache (this_frame, this_cache);

 
   (*this_id) = frame_id_build (cache->base, cache->pc);
 }
 
 
   (*this_id) = frame_id_build (cache->base, cache->pc);
 }
 

-static void
-m32r_linux_sigtramp_frame_prev_register (struct frame_info *next_frame,
-                                        void **this_cache,
-                                        int regnum, int *optimizedp,
-                                        enum lval_type *lvalp,
-                                        CORE_ADDR *addrp,
-                                        int *realnump, void *valuep)
+static struct value *
+m32r_linux_sigtramp_frame_prev_register (struct frame_info *this_frame,
+                                        void **this_cache, int regnum)

 {
   struct m32r_frame_cache *cache =
 {
   struct m32r_frame_cache *cache =

-    m32r_linux_sigtramp_frame_cache (next_frame, this_cache);
+    m32r_linux_sigtramp_frame_cache (this_frame, this_cache);

 
 

-  trad_frame_get_prev_register (next_frame, cache->saved_regs, regnum,
-                               optimizedp, lvalp, addrp, realnump, valuep);
+  return trad_frame_get_prev_register (this_frame, cache->saved_regs, regnum);

 }
 
 }
 

-static const struct frame_unwind m32r_linux_sigtramp_frame_unwind = {
-  SIGTRAMP_FRAME,
-  m32r_linux_sigtramp_frame_this_id,
-  m32r_linux_sigtramp_frame_prev_register
-};
-
-static const struct frame_unwind *
-m32r_linux_sigtramp_frame_sniffer (struct frame_info *next_frame)
+static int
+m32r_linux_sigtramp_frame_sniffer (const struct frame_unwind *self,
+                                  struct frame_info *this_frame,
+                                  void **this_cache)

 {
 {

-  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);
   char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);

-  if (m32r_linux_pc_in_sigtramp (pc, name, next_frame))
-    return &m32r_linux_sigtramp_frame_unwind;
+  if (m32r_linux_pc_in_sigtramp (pc, name, this_frame))
+    return 1;

 
 

-  return NULL;
+  return 0;

 }
 
 }
 

+static const struct frame_unwind m32r_linux_sigtramp_frame_unwind = {
+  SIGTRAMP_FRAME,
+  m32r_linux_sigtramp_frame_this_id,
+  m32r_linux_sigtramp_frame_prev_register,
+  NULL,
+  m32r_linux_sigtramp_frame_sniffer
+};
+

 /* Mapping between the registers in `struct pt_regs'
    format and GDB's register array layout.  */
 
 /* Mapping between the registers in `struct pt_regs'
    format and GDB's register array layout.  */
 


@@ -382,7 +380,7 @@ m32r_linux_supply_gregset (const struct regset *regset,
          break;
        }
 
          break;
        }
 

-      regcache_raw_supply (current_regcache, i,
+      regcache_raw_supply (regcache, i,

                           regs + m32r_pt_regs_offset[i]);
     }
 }
                           regs + m32r_pt_regs_offset[i]);
     }
 }


@@ -410,15 +408,20 @@ m32r_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
      the number of registers.  */
   set_gdbarch_num_regs (gdbarch, M32R_NUM_REGS - 1);
 
      the number of registers.  */
   set_gdbarch_num_regs (gdbarch, M32R_NUM_REGS - 1);
 

-  frame_unwind_append_sniffer (gdbarch, m32r_linux_sigtramp_frame_sniffer);
+  frame_unwind_append_unwinder (gdbarch, &m32r_linux_sigtramp_frame_unwind);

 
   /* GNU/Linux uses SVR4-style shared libraries.  */
 
   /* GNU/Linux uses SVR4-style shared libraries.  */

+  set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);

   set_solib_svr4_fetch_link_map_offsets
     (gdbarch, svr4_ilp32_fetch_link_map_offsets);
 
   /* Core file support.  */
   set_gdbarch_regset_from_core_section
     (gdbarch, m32r_linux_regset_from_core_section);
   set_solib_svr4_fetch_link_map_offsets
     (gdbarch, svr4_ilp32_fetch_link_map_offsets);
 
   /* Core file support.  */
   set_gdbarch_regset_from_core_section
     (gdbarch, m32r_linux_regset_from_core_section);

+
+  /* Enable TLS support.  */
+  set_gdbarch_fetch_tls_load_module_address (gdbarch,
+                                             svr4_fetch_objfile_link_map);

 }
 
 /* Provide a prototype to silence -Wmissing-prototypes.  */
 }
 
 /* Provide a prototype to silence -Wmissing-prototypes.  */