jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-30 00:02:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Added a setjmp() and a longjmp() so that an unexpected trap inside

Browse Source 
ddb isn't necessarily fatal.  You can now do silly things like
`call vprint' and `show map' without losing control.
This commit is contained in:
Bruce Evans 1997-03-28 12:56:07 +00:00
parent b825df51c6
commit b8fa61d129
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=24345
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/amd64/amd64/db_interface.c
View File

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id$
* $Id: db_interface.c,v 1.26 1997/02/22 09:32:14 peter Exp $
*/
/*
@ -44,6 +44,7 @@
#include <vm/pmap.h>
#include <ddb/ddb.h>
#include <setjmp.h>
static jmp_buf *db_nofault = 0;
@ -53,6 +54,9 @@ extern void gdb_handle_exception __P((db_regs_t *, int, int));
db_regs_t ddb_regs;
static jmp_buf db_global_jmpbuf;
static int db_global_jmpbuf_valid;
#ifdef __GNUC__
#define rss() ({u_short ss; __asm __volatile("movl %%ss,%0" : "=r" (ss)); ss;})
#endif
@ -107,6 +111,14 @@ kdb_trap(type, code, regs)
}
}
/*
* This handles unexpected traps in ddb commands, including calls to
* non-ddb functions. db_nofault only applies to memory accesses by
* internal ddb commands.
*/
if (db_global_jmpbuf_valid)
longjmp(db_global_jmpbuf, 1);
/*
* XXX We really should switch to a local stack here.
*/
@ -122,10 +134,13 @@ kdb_trap(type, code, regs)
cnpollc(TRUE);
(void) setjmp(db_global_jmpbuf);
db_global_jmpbuf_valid = TRUE;
if (ddb_mode)
db_trap(type, code);
else
gdb_handle_exception(&ddb_regs, type, code);
db_global_jmpbuf_valid = FALSE;
cnpollc(FALSE);

17
sys/i386/i386/db_interface.c
View File

@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id$
* $Id: db_interface.c,v 1.26 1997/02/22 09:32:14 peter Exp $
*/
/*
@ -44,6 +44,7 @@
#include <vm/pmap.h>
#include <ddb/ddb.h>
#include <setjmp.h>
static jmp_buf *db_nofault = 0;
@ -53,6 +54,9 @@ extern void gdb_handle_exception __P((db_regs_t *, int, int));
db_regs_t ddb_regs;
static jmp_buf db_global_jmpbuf;
static int db_global_jmpbuf_valid;
#ifdef __GNUC__
#define rss() ({u_short ss; __asm __volatile("movl %%ss,%0" : "=r" (ss)); ss;})
#endif
@ -107,6 +111,14 @@ kdb_trap(type, code, regs)
}
}
/*
* This handles unexpected traps in ddb commands, including calls to
* non-ddb functions. db_nofault only applies to memory accesses by
* internal ddb commands.
*/
if (db_global_jmpbuf_valid)
longjmp(db_global_jmpbuf, 1);
/*
* XXX We really should switch to a local stack here.
*/
@ -122,10 +134,13 @@ kdb_trap(type, code, regs)
cnpollc(TRUE);
(void) setjmp(db_global_jmpbuf);
db_global_jmpbuf_valid = TRUE;
if (ddb_mode)
db_trap(type, code);
else
gdb_handle_exception(&ddb_regs, type, code);
db_global_jmpbuf_valid = FALSE;
cnpollc(FALSE);