Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

redo previous (simplify KPTR)

Browse Source
This commit is contained in:
itojun 2001-01-08 18:03:45 +00:00
parent e4de90b20d
commit adf3a0eef5
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bin/ps/print.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: print.c,v 1.60 2001/01/08 17:55:28 itojun Exp $ */ /* $NetBSD: print.c,v 1.61 2001/01/08 18:03:45 itojun Exp $ */
/* /*
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -74,7 +74,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
#else #else
__RCSID("$NetBSD: print.c,v 1.60 2001/01/08 17:55:28 itojun Exp $"); __RCSID("$NetBSD: print.c,v 1.61 2001/01/08 18:03:45 itojun Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -930,21 +930,11 @@ printval(bp, v, mode)
vok = VUNSIGN; vok = VUNSIGN;
break; break;
case KPTR: case KPTR:
if (sizeof(void *) == sizeof(u_int32_t)) uval = (unsigned long)GET(void *);
uval = GET(u_int32_t);
else if (sizeof(void *) == sizeof(u_int64_t))
uval = GET(u_int64_t);
else
errx(1, "assumption failed");
vok = VPTR; vok = VPTR;
break; break;
case KPTR24: case KPTR24:
if (sizeof(void *) == sizeof(u_int32_t)) uval = (unsigned long)GET(void *);
uval = GET(u_int32_t);
else if (sizeof(void *) == sizeof(u_int64_t))
uval = GET(u_int64_t);
else
errx(1, "assumption failed");
uval &= 0xffffff; uval &= 0xffffff;
vok = VPTR; vok = VPTR;
break; break;
@ -1041,10 +1031,12 @@ printval(bp, v, mode)
(void)printf(ofmt, width, CHK_INF127(GET(u_long))); (void)printf(ofmt, width, CHK_INF127(GET(u_long)));
return; return;
case KPTR: case KPTR:
(void)printf(ofmt, width, GET(u_long)); (void)printf(ofmt, width,
(unsigned long long)(unsigned long)GET(void *));
return; return;
case KPTR24: case KPTR24:
(void)printf(ofmt, width, GET(u_long) & 0xffffff); (void)printf(ofmt, width,
(unsigned long long)(unsigned long)GET(void *));
return; return;
case SIGLIST: case SIGLIST:
{ {