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

Syscall arguments are now properly aligned. Print them, and syscall return

Browse Source 
values, as longs, instead of int.
This commit is contained in:
Dmitrij Tejblum 1999-06-16 18:46:40 +00:00
parent 71ddfdbbd5
commit 7a6ec4cfb2
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
usr.bin/kdump/kdump.c
View File

@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)kdump.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)kdump.c 8.1 (Berkeley) 6/6/93";
#endif #endif
static const char rcsid[] = static const char rcsid[] =
"$Id: kdump.c,v 1.11 1997/07/16 06:49:49 charnier Exp $"; "$Id: kdump.c,v 1.12 1999/05/21 01:09:45 jmz Exp $";
#endif /* not lint */ #endif /* not lint */
#define KERNEL #define KERNEL
@ -240,32 +240,32 @@ ktrsyscall(ktr)
register struct ktr_syscall *ktr; register struct ktr_syscall *ktr;
{ {
register narg = ktr->ktr_narg; register narg = ktr->ktr_narg;
register int *ip; register register_t *ip;
char *ioctlname(); char *ioctlname();
if (ktr->ktr_code >= nsyscalls || ktr->ktr_code < 0) if (ktr->ktr_code >= nsyscalls || ktr->ktr_code < 0)
(void)printf("[%d]", ktr->ktr_code); (void)printf("[%d]", ktr->ktr_code);
else else
(void)printf("%s", syscallnames[ktr->ktr_code]); (void)printf("%s", syscallnames[ktr->ktr_code]);
ip = (int *)((char *)ktr + sizeof(struct ktr_syscall)); ip = &ktr->ktr_args[0];
if (narg) { if (narg) {
char c = '('; char c = '(';
if (fancy) { if (fancy) {
if (ktr->ktr_code == SYS_ioctl) { if (ktr->ktr_code == SYS_ioctl) {
char *cp; char *cp;
if (decimal) if (decimal)
(void)printf("(%d", *ip); (void)printf("(%ld", (long)*ip);
else else
(void)printf("(%#x", *ip); (void)printf("(%#lx", (long)*ip);
ip++; ip++;
narg--; narg--;
if ((cp = ioctlname(*ip)) != NULL) if ((cp = ioctlname(*ip)) != NULL)
(void)printf(",%s", cp); (void)printf(",%s", cp);
else { else {
if (decimal) if (decimal)
(void)printf(",%d", *ip); (void)printf(",%ld", (long)*ip);
else else
(void)printf(",%#x ", *ip); (void)printf(",%#lx ", (long)*ip);
} }
c = ','; c = ',';
ip++; ip++;
@ -274,7 +274,7 @@ ktrsyscall(ktr)
if (*ip <= PT_STEP && *ip >= 0) if (*ip <= PT_STEP && *ip >= 0)
(void)printf("(%s", ptrace_ops[*ip]); (void)printf("(%s", ptrace_ops[*ip]);
else else
(void)printf("(%d", *ip); (void)printf("(%ld", (long)*ip);
c = ','; c = ',';
ip++; ip++;
narg--; narg--;
@ -282,9 +282,9 @@ ktrsyscall(ktr)
} }
while (narg) { while (narg) {
if (decimal) if (decimal)
(void)printf("%c%d", c, *ip); (void)printf("%c%ld", c, (long)*ip);
else else
(void)printf("%c%#x", c, *ip); (void)printf("%c%#lx", c, (long)*ip);
c = ','; c = ',';
ip++; ip++;
narg--; narg--;
@ -297,7 +297,7 @@ ktrsyscall(ktr)
ktrsysret(ktr) ktrsysret(ktr)
struct ktr_sysret *ktr; struct ktr_sysret *ktr;
{ {
register int ret = ktr->ktr_retval; register register_t ret = ktr->ktr_retval;
register int error = ktr->ktr_error; register int error = ktr->ktr_error;
register int code = ktr->ktr_code; register int code = ktr->ktr_code;
@ -310,12 +310,12 @@ ktrsysret(ktr)
if (fancy) { if (fancy) {
(void)printf("%d", ret); (void)printf("%d", ret);
if (ret < 0 || ret > 9) if (ret < 0 || ret > 9)
(void)printf("/%#x", ret); (void)printf("/%#lx", (long)ret);
} else { } else {
if (decimal) if (decimal)
(void)printf("%d", ret); (void)printf("%ld", (long)ret);
else else
(void)printf("%#x", ret); (void)printf("%#lx", (long)ret);
} }
} else if (error == ERESTART) } else if (error == ERESTART)
(void)printf("RESTART"); (void)printf("RESTART");
@ -414,8 +414,8 @@ ktrpsig(psig)
if (psig->action == SIG_DFL) if (psig->action == SIG_DFL)
(void)printf("SIG_DFL\n"); (void)printf("SIG_DFL\n");
else else
(void)printf("caught handler=0x%x mask=0x%x code=0x%x\n", (void)printf("caught handler=0x%lx mask=0x%x code=0x%x\n",
(u_int)psig->action, psig->mask, psig->code); (u_long)psig->action, psig->mask, psig->code);
} }
ktrcsw(cs) ktrcsw(cs)