*** empty log message ***

[deliverable/binutils-gdb.git] / gdb / i386obsd-tdep.c

diff --git a/gdb/i386obsd-tdep.c b/gdb/i386obsd-tdep.c
index c3643c7fa8f7dd3cfe15c61afdf764666c1a0435..282a7e56f74073b39eaefd9c7f31bbc0d8cb81f7 100644 (file)
--- a/gdb/i386obsd-tdep.c
+++ b/gdb/i386obsd-tdep.c
@@ -1,13 +1,13 @@
 /* Target-dependent code for OpenBSD/i386.
 
    Copyright (C) 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002, 2003,
 /* Target-dependent code for OpenBSD/i386.
 
    Copyright (C) 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002, 2003,

-   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   2004, 2005, 2006, 2007, 2008 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,


@@ -16,9 +16,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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "arch-utils.h"
 
 #include "defs.h"
 #include "arch-utils.h"


@@ -65,13 +63,13 @@ static const int i386obsd_sigreturn_offset[] = {
   -1
 };
 
   -1
 };
 

-/* Return whether the frame preceding NEXT_FRAME corresponds to an
-   OpenBSD sigtramp routine.  */
+/* Return whether THIS_FRAME corresponds to an OpenBSD sigtramp
+   routine.  */

 
 static int
 
 static int

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

 {
 {

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

   CORE_ADDR start_pc = (pc & ~(i386obsd_page_size - 1));
   /* The call sequence invoking sigreturn(2).  */
   const gdb_byte sigreturn[] =
   CORE_ADDR start_pc = (pc & ~(i386obsd_page_size - 1));
   /* The call sequence invoking sigreturn(2).  */
   const gdb_byte sigreturn[] =


@@ -103,7 +101,7 @@ i386obsd_sigtramp_p (struct frame_info *next_frame)
   for (offset = i386obsd_sigreturn_offset; *offset != -1; offset++)
     {
       /* If we can't read the instructions, return zero.  */
   for (offset = i386obsd_sigreturn_offset; *offset != -1; offset++)
     {
       /* If we can't read the instructions, return zero.  */

-      if (!safe_frame_unwind_memory (next_frame, start_pc + *offset,
+      if (!safe_frame_unwind_memory (this_frame, start_pc + *offset,

                                     buf, buflen))
        return 0;
 
                                     buf, buflen))
        return 0;
 


@@ -339,7 +337,7 @@ static int i386obsd_tf_reg_offset[] =
 };
 
 static struct trad_frame_cache *
 };
 
 static struct trad_frame_cache *

-i386obsd_trapframe_cache(struct frame_info *next_frame, void **this_cache)
+i386obsd_trapframe_cache (struct frame_info *this_frame, void **this_cache)

 {
   struct trad_frame_cache *cache;
   CORE_ADDR func, sp, addr;
 {
   struct trad_frame_cache *cache;
   CORE_ADDR func, sp, addr;


@@ -350,11 +348,11 @@ i386obsd_trapframe_cache(struct frame_info *next_frame, void **this_cache)
   if (*this_cache)
     return *this_cache;
 
   if (*this_cache)
     return *this_cache;
 

-  cache = trad_frame_cache_zalloc (next_frame);
+  cache = trad_frame_cache_zalloc (this_frame);

   *this_cache = cache;
 
   *this_cache = cache;
 

-  func = frame_func_unwind (next_frame);
-  sp = frame_unwind_register_unsigned (next_frame, I386_ESP_REGNUM);
+  func = get_frame_func (this_frame);
+  sp = get_frame_register_unsigned (this_frame, I386_ESP_REGNUM);

 
   find_pc_partial_function (func, &name, NULL, NULL);
   if (name && strncmp (name, "Xintr", 5) == 0)
 
   find_pc_partial_function (func, &name, NULL, NULL);
   if (name && strncmp (name, "Xintr", 5) == 0)


@@ -384,32 +382,28 @@ i386obsd_trapframe_cache(struct frame_info *next_frame, void **this_cache)
 }
 
 static void
 }
 
 static void

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

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

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

   
   trad_frame_get_id (cache, this_id);
 }
 
   
   trad_frame_get_id (cache, this_id);
 }
 

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

 {
   struct trad_frame_cache *cache =
 {
   struct trad_frame_cache *cache =

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

 
 

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

 }
 
 static int
 i386obsd_trapframe_sniffer (const struct frame_unwind *self,
 }
 
 static int
 i386obsd_trapframe_sniffer (const struct frame_unwind *self,

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

                            void **this_prologue_cache)
 {
   ULONGEST cs;
                            void **this_prologue_cache)
 {
   ULONGEST cs;


@@ -417,11 +411,11 @@ i386obsd_trapframe_sniffer (const struct frame_unwind *self,
 
   /* Check Current Privilege Level and bail out if we're not executing
      in kernel space.  */
 
   /* Check Current Privilege Level and bail out if we're not executing
      in kernel space.  */

-  cs = frame_unwind_register_unsigned (next_frame, I386_CS_REGNUM);
+  cs = get_frame_register_unsigned (this_frame, I386_CS_REGNUM);

   if ((cs & I386_SEL_RPL) == I386_SEL_UPL)
     return 0;
 
   if ((cs & I386_SEL_RPL) == I386_SEL_UPL)
     return 0;
 

-  find_pc_partial_function (frame_pc_unwind (next_frame), &name, NULL, NULL);
+  find_pc_partial_function (get_frame_pc (this_frame), &name, NULL, NULL);

   return (name && (strcmp (name, "calltrap") == 0
                   || strcmp (name, "syscall1") == 0
                   || strncmp (name, "Xintr", 5) == 0
   return (name && (strcmp (name, "calltrap") == 0
                   || strcmp (name, "syscall1") == 0
                   || strncmp (name, "Xintr", 5) == 0