* amd64obsd-tdep.c (amd64obsd_trapframe_cache): Fix typos.

(amd64obsd_trapframe_sniffer): Add comment.
* i386obsd-tdep.c (i386obsd_trapframe_cache): Fix typos.
(i386obsd_trapframe_sniffer): Add comment.
This commit is contained in:
Mark Kettenis 2005-12-22 15:57:04 +00:00
parent 1f6293bd04
commit 6d566cffb0
3 changed files with 15 additions and 5 deletions

View File

@ -1,7 +1,13 @@
2005-12-22 Mark Kettenis <kettenis@gnu.org>
* amd64obsd-tdep.c (amd64obsd_trapframe_cache): Fix typos.
(amd64obsd_trapframe_sniffer): Add comment.
* i386obsd-tdep.c (i386obsd_trapframe_cache): Fix typos.
(i386obsd_trapframe_sniffer): Add comment.
* amd64obsd-tdep.c (amd64obsd_trapframe_cache): Fix detection of
interrupts from user space.
* i386obsd-tdep.c (i386obsd_trapframe_cache): Handle interrupt
frames too.
(i386obsd_trapframe_sniffer): Turn into a proper unwinder sniffer.

View File

@ -360,7 +360,7 @@ amd64obsd_trapframe_cache(struct frame_info *next_frame, void **this_cache)
sp = frame_unwind_register_unsigned (next_frame, AMD64_RSP_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;
@ -374,7 +374,7 @@ amd64obsd_trapframe_cache(struct frame_info *next_frame, void **this_cache)
cs = read_memory_unsigned_integer (addr, 8);
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
@ -418,6 +418,8 @@ amd64obsd_trapframe_sniffer (const struct frame_unwind *self,
ULONGEST cs;
char *name;
/* Check Current Privilige Level and bail out if we're not executing
in kernel space. */
cs = frame_unwind_register_unsigned (next_frame, AMD64_CS_REGNUM);
if ((cs & I386_SEL_RPL) == I386_SEL_UPL)
return 0;

View File

@ -358,7 +358,7 @@ i386obsd_trapframe_cache(struct frame_info *next_frame, void **this_cache)
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 +372,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,9 +416,11 @@ i386obsd_trapframe_sniffer (const struct frame_unwind *self,
ULONGEST cs;
char *name;
/* Check Current Privilige 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)