d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print function args in the current radix instead of always in hex.

Browse Source 
Print the stack pointer together with the frame pointer in the trap,
syscall and interrupt messages.  The frame pointer is not very useful
for locating syscall args since syscall functions don't have a frame
pointer.

Print all the numbers in the trap, syscall and interrupt messages in
the default radix.  The syscall number was confusing because it was
printed in decimal.

Use %#n format more and 0x%x less.  0x%x of course doesn't work with
a variable radix.  ddb is now fairly consistent about using %+#n to
print all numbers.  It omits the '+' for signed numbers the '#' in a
few cases (e.g., for function args) to save space.
This commit is contained in:
Bruce Evans 1997-02-28 12:36:18 +00:00
parent 93437134e2
commit 9bb932b6f2
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/amd64/amd64/db_trace.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_trace.c,v 1.18 1997/02/22 09:32:15 peter Exp $
*/
#include <sys/param.h>
@ -127,7 +127,7 @@ db_print_stack_entry(name, narg, argnp, argp, callpc)
while (narg) {
if (argnp)
db_printf("%s=", *argnp++);
db_printf("%x", db_get_value((int)argp, 4, FALSE));
db_printf("%n", db_get_value((int)argp, 4, FALSE));
argp++;
if (--narg != 0)
db_printf(",");
@ -147,7 +147,7 @@ db_nextframe(fp, ip)
{
struct trapframe *tf;
int frame_type;
int eip, ebp;
int eip, esp, ebp;
db_expr_t offset;
char *sym, *name;
@ -189,21 +189,24 @@ db_nextframe(fp, ip)
*/
tf = (struct trapframe *) ((int)*fp + 8);
esp = (ISPL(tf->tf_cs) == SEL_UPL) ? tf->tf_esp : (int)&tf->tf_esp;
switch (frame_type) {
case TRAP:
if (INKERNEL((int) tf)) {
eip = tf->tf_eip;
ebp = tf->tf_ebp;
db_printf("--- trap %d, eip = 0x%x, ebp = 0x%x ---\n",
tf->tf_trapno, eip, ebp);
db_printf(
"--- trap %#n, eip = %#n, esp = %#n, ebp = %#n ---\n",
tf->tf_trapno, eip, esp, ebp);
}
break;
case SYSCALL:
if (INKERNEL((int) tf)) {
eip = tf->tf_eip;
ebp = tf->tf_ebp;
db_printf("--- syscall %d, eip = 0x%x, ebp = 0x%x ---\n",
tf->tf_eax, eip, ebp);
db_printf(
"--- syscall %#n, eip = %#n, esp = %#n, ebp = %#n ---\n",
tf->tf_eax, eip, esp, ebp);
}
break;
case INTERRUPT:
@ -211,7 +214,9 @@ db_nextframe(fp, ip)
if (INKERNEL((int) tf)) {
eip = tf->tf_eip;
ebp = tf->tf_ebp;
db_printf("--- interrupt, eip = 0x%x, ebp = 0x%x ---\n", eip, ebp);
db_printf(
"--- interrupt, eip = %#n, esp = %#n, ebp = %#n ---\n",
eip, esp, ebp);
}
break;
default:

21
sys/i386/i386/db_trace.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_trace.c,v 1.18 1997/02/22 09:32:15 peter Exp $
*/
#include <sys/param.h>
@ -127,7 +127,7 @@ db_print_stack_entry(name, narg, argnp, argp, callpc)
while (narg) {
if (argnp)
db_printf("%s=", *argnp++);
db_printf("%x", db_get_value((int)argp, 4, FALSE));
db_printf("%n", db_get_value((int)argp, 4, FALSE));
argp++;
if (--narg != 0)
db_printf(",");
@ -147,7 +147,7 @@ db_nextframe(fp, ip)
{
struct trapframe *tf;
int frame_type;
int eip, ebp;
int eip, esp, ebp;
db_expr_t offset;
char *sym, *name;
@ -189,21 +189,24 @@ db_nextframe(fp, ip)
*/
tf = (struct trapframe *) ((int)*fp + 8);
esp = (ISPL(tf->tf_cs) == SEL_UPL) ? tf->tf_esp : (int)&tf->tf_esp;
switch (frame_type) {
case TRAP:
if (INKERNEL((int) tf)) {
eip = tf->tf_eip;
ebp = tf->tf_ebp;
db_printf("--- trap %d, eip = 0x%x, ebp = 0x%x ---\n",
tf->tf_trapno, eip, ebp);
db_printf(
"--- trap %#n, eip = %#n, esp = %#n, ebp = %#n ---\n",
tf->tf_trapno, eip, esp, ebp);
}
break;
case SYSCALL:
if (INKERNEL((int) tf)) {
eip = tf->tf_eip;
ebp = tf->tf_ebp;
db_printf("--- syscall %d, eip = 0x%x, ebp = 0x%x ---\n",
tf->tf_eax, eip, ebp);
db_printf(
"--- syscall %#n, eip = %#n, esp = %#n, ebp = %#n ---\n",
tf->tf_eax, eip, esp, ebp);
}
break;
case INTERRUPT:
@ -211,7 +214,9 @@ db_nextframe(fp, ip)
if (INKERNEL((int) tf)) {
eip = tf->tf_eip;
ebp = tf->tf_ebp;
db_printf("--- interrupt, eip = 0x%x, ebp = 0x%x ---\n", eip, ebp);
db_printf(
"--- interrupt, eip = %#n, esp = %#n, ebp = %#n ---\n",
eip, esp, ebp);
}
break;
default: