* gdbarch.sh (deprecated_register_size): Remove.

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

diff --git a/gdb/i386obsd-tdep.c b/gdb/i386obsd-tdep.c
index dafb657af8c6975687df10828744dc3a3cab3095..38058bfeaafd6f0681d4407b5fec6b69a5a69daf 100644 (file)
--- a/gdb/i386obsd-tdep.c
+++ b/gdb/i386obsd-tdep.c
@@ -1,8 +1,7 @@
 /* Target-dependent code for OpenBSD/i386.
 
-   Copyright (C) 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002,
-   2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -354,11 +353,13 @@ i386obsd_trapframe_cache(struct frame_info *next_frame, void **this_cache)
   cache = trad_frame_cache_zalloc (next_frame);
   *this_cache = cache;
 
-  func = frame_func_unwind (next_frame);
+  /* NORMAL_FRAME matches the type in i386obsd_trapframe_unwind, but
+     SIGTRAMP_FRAME might be more appropriate.  */
+  func = frame_func_unwind (next_frame, NORMAL_FRAME);
   sp = frame_unwind_register_unsigned (next_frame, I386_ESP_REGNUM);
 
   find_pc_partial_function (func, &name, NULL, NULL);
-  if (name && strncmp(name, "Xintr", 5) == 0)
+  if (name && strncmp (name, "Xintr", 5) == 0)
     addr = sp + 8;             /* It's an interrupt frame.  */
   else
     addr = sp;
@@ -372,7 +373,7 @@ i386obsd_trapframe_cache(struct frame_info *next_frame, void **this_cache)
   cs = read_memory_unsigned_integer (addr, 4); 
   if ((cs & I386_SEL_RPL) == I386_SEL_UPL)
     {
-      /* Trap from use space; terminate backtrace.  */
+      /* Trap from user space; terminate backtrace.  */
       trad_frame_set_id (cache, null_frame_id);
     }
   else
@@ -416,14 +417,17 @@ i386obsd_trapframe_sniffer (const struct frame_unwind *self,
   ULONGEST cs;
   char *name;
 
+  /* 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);
   if ((cs & I386_SEL_RPL) == I386_SEL_UPL)
-    return NULL;
+    return 0;
 
   find_pc_partial_function (frame_pc_unwind (next_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
+                  || strncmp (name, "Xsoft", 5) == 0));
 }
 
 static const struct frame_unwind i386obsd_trapframe_unwind = {