diff options
Diffstat (limited to 'usr/src/cmd/mdb')
20 files changed, 161 insertions, 173 deletions
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_cmds.c b/usr/src/cmd/mdb/common/mdb/mdb_cmds.c index cd50cdce17..9943773424 100644 --- a/usr/src/cmd/mdb/common/mdb/mdb_cmds.c +++ b/usr/src/cmd/mdb/common/mdb/mdb_cmds.c @@ -1956,14 +1956,14 @@ cmd_findsym(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) } else value = argv[i].a_un.a_val; - if (value != NULL) + if (value != (uintptr_t)NULL) symlist[len++] = value; } if (flags & DCMD_ADDRSPEC) symlist[len++] = addr; - symlist[len] = NULL; + symlist[len] = (uintptr_t)NULL; if (optg) type = MDB_TGT_BIND_GLOBAL | MDB_TGT_TYPE_FUNC; diff --git a/usr/src/cmd/mdb/common/modules/genunix/streams.c b/usr/src/cmd/mdb/common/modules/genunix/streams.c index 245fca6070..7f18b59f23 100644 --- a/usr/src/cmd/mdb/common/modules/genunix/streams.c +++ b/usr/src/cmd/mdb/common/modules/genunix/streams.c @@ -23,6 +23,10 @@ * Use is subject to license terms. */ +/* + * Copyright 2020 OmniOS Community Edition (OmniOSce) Association. + */ + #include <mdb/mdb_modapi.h> #include <mdb/mdb_ks.h> @@ -147,7 +151,7 @@ static const struct str_flags stdf[] = { { SF(STRCLOSE), "wait for a close to complete" }, { SF(SNDMREAD), "used for read notification" }, { SF(OLDNDELAY), "use old NDELAY TTY semantics" }, - { SF(0x00020000), "unused" }, + { SF(STRXPG4TTY), "Use XPG4 TTY semantics" }, { SF(0x00040000), "unused" }, { SF(STRTOSTOP), "block background writes" }, { SF(STRCMDWAIT), "someone is doing an _I_CMD" }, diff --git a/usr/src/cmd/mdb/common/modules/sd/sd.c b/usr/src/cmd/mdb/common/modules/sd/sd.c index 3de82ff809..7e87cf005b 100644 --- a/usr/src/cmd/mdb/common/modules/sd/sd.c +++ b/usr/src/cmd/mdb/common/modules/sd/sd.c @@ -139,7 +139,7 @@ buf_avforw_walk_step(mdb_walk_state_t *wsp) } status = wsp->walk_callback(wsp->walk_addr, wsp->walk_data, - wsp->walk_cbdata); + wsp->walk_cbdata); wsp->walk_addr = (uintptr_t)(((buf_t *)wsp->walk_data)->av_forw); return (status); @@ -221,37 +221,37 @@ static void dump_xbuf_attr(struct __ddi_xbuf_attr *xba_ptr, uintptr_t mem_addr) { mdb_printf("0x%8lx:\tmutex\t\tallocsize\tpending\n", - mem_addr + offsetof(struct __ddi_xbuf_attr, xa_mutex)); + mem_addr + offsetof(struct __ddi_xbuf_attr, xa_mutex)); mdb_printf(" \t%lx\t\t%d\t\t%d\n", - xba_ptr->xa_mutex._opaque[0], xba_ptr->xa_allocsize, - xba_ptr->xa_pending); + xba_ptr->xa_mutex._opaque[0], xba_ptr->xa_allocsize, + xba_ptr->xa_pending); mdb_printf("0x%8lx:\tactive_limit\tactive_count\tactive_lowater\n", - mem_addr + offsetof(struct __ddi_xbuf_attr, xa_active_limit)); + mem_addr + offsetof(struct __ddi_xbuf_attr, xa_active_limit)); mdb_printf(" \t%lx\t\t%lx\t\t%lx\n", - xba_ptr->xa_active_limit, xba_ptr->xa_active_count, - xba_ptr->xa_active_lowater); + xba_ptr->xa_active_limit, xba_ptr->xa_active_count, + xba_ptr->xa_active_lowater); mdb_printf("0x%8lx:\theadp\t\ttailp\n", - mem_addr + offsetof(struct __ddi_xbuf_attr, xa_headp)); + mem_addr + offsetof(struct __ddi_xbuf_attr, xa_headp)); mdb_printf(" \t%lx%c\t%lx\n", - xba_ptr->xa_headp, (xba_ptr->xa_headp == 0?'\t':' '), - xba_ptr->xa_tailp); + xba_ptr->xa_headp, (xba_ptr->xa_headp == 0?'\t':' '), + xba_ptr->xa_tailp); mdb_printf( "0x%8lx:\treserve_mutex\treserve_limit\treserve_count\treserve_headp\n", - mem_addr + offsetof(struct __ddi_xbuf_attr, xa_reserve_mutex)); + mem_addr + offsetof(struct __ddi_xbuf_attr, xa_reserve_mutex)); mdb_printf(" \t%lx\t\t%lx\t\t%lx\t\t%lx\n", - xba_ptr->xa_reserve_mutex._opaque[0], xba_ptr->xa_reserve_limit, - xba_ptr->xa_reserve_count, xba_ptr->xa_reserve_headp); + xba_ptr->xa_reserve_mutex._opaque[0], xba_ptr->xa_reserve_limit, + xba_ptr->xa_reserve_count, xba_ptr->xa_reserve_headp); mdb_printf("0x%8lx:\ttimeid\t\ttq\n", - mem_addr + offsetof(struct __ddi_xbuf_attr, xa_timeid)); + mem_addr + offsetof(struct __ddi_xbuf_attr, xa_timeid)); mdb_printf(" \t%lx%c\t%lx\n", - xba_ptr->xa_timeid, (xba_ptr->xa_timeid == 0?'\t':' '), - xba_ptr->xa_tq); + xba_ptr->xa_timeid, (xba_ptr->xa_timeid == 0?'\t':' '), + xba_ptr->xa_tq); } /* @@ -278,7 +278,7 @@ init_softstate_members(mdb_walk_state_t *wsp) SD_DATA(valid_root_count) = 0; if (mdb_vread((void *)&SD_DATA(sd_state_data), - sizeof (sd_state_str_t), wsp->walk_addr) == -1) { + sizeof (sd_state_str_t), wsp->walk_addr) == -1) { mdb_warn("failed to sd_state at %p", wsp->walk_addr); return (WALK_ERR); } @@ -333,7 +333,7 @@ sd_state_walk_init(mdb_walk_state_t *wsp) static int ssd_state_walk_init(mdb_walk_state_t *wsp) { - if (wsp->walk_addr == NULL && + if (wsp->walk_addr == (uintptr_t)NULL && mdb_readvar(&wsp->walk_addr, "ssd_state") == -1) { mdb_warn("failed to read 'ssd_state'"); return (WALK_ERR); @@ -381,7 +381,7 @@ sd_state_walk_step(mdb_walk_state_t *wsp) } status = wsp->walk_callback((uintptr_t)tp, wsp->walk_data, - wsp->walk_cbdata); + wsp->walk_cbdata); if (tp != 0) { /* Count the number of non-zero un entries. */ SD_DATA(valid_root_count++); @@ -442,7 +442,7 @@ process_semo_sleepq(uintptr_t walk_addr, int silent) } if (mdb_vread((void *)¤tBuf, sizeof (buf_t), - rootBuf) == -1) { + rootBuf) == -1) { mdb_warn("failed to read buf at %p", rootBuf); return (FAIL); } @@ -459,7 +459,7 @@ process_semo_sleepq(uintptr_t walk_addr, int silent) if (rootBuf == 0) { mdb_printf("------------------------------\n"); mdb_printf("Processed %d SEMOCLOSE SLEEP Q entries\n", - semo_sleepq_count); + semo_sleepq_count); mdb_printf("------------------------------\n"); } @@ -498,9 +498,9 @@ process_sdlun_waitq(uintptr_t walk_addr, int silent) } if (mdb_vread(¤tBuf, sizeof (buf_t), - (uintptr_t)rootBuf) == -1) { + (uintptr_t)rootBuf) == -1) { mdb_warn("failed to read buf at %p", - (uintptr_t)rootBuf); + (uintptr_t)rootBuf); return (FAIL); } @@ -550,7 +550,7 @@ process_xbuf(uintptr_t xbuf_attr, int silent) /* Process the Xbuf Attr struct for a device. */ if (mdb_vread((void *)&xba, sizeof (struct __ddi_xbuf_attr), - xbuf_attr) == -1) { + xbuf_attr) == -1) { mdb_warn("failed to read xbuf_attr at %p", xbuf_attr); return (FAIL); } @@ -578,9 +578,9 @@ process_xbuf(uintptr_t xbuf_attr, int silent) } if (mdb_vread((void *)&xba_current, sizeof (buf_t), - (uintptr_t)xba_root) == -1) { + (uintptr_t)xba_root) == -1) { mdb_warn("failed to read buf at %p", - (uintptr_t)xba_root); + (uintptr_t)xba_root); return (FAIL); } if (!silent) { @@ -612,10 +612,10 @@ static void print_footer(const void *walk_data) { if (SD_DATA_IN_CBACK(current_list_count) >= - (SD_DATA_IN_CBACK(sd_state_data.n_items) - 1)) { + (SD_DATA_IN_CBACK(sd_state_data.n_items) - 1)) { mdb_printf("---------------------------\n"); mdb_printf("Processed %d UN softstate entries\n", - SD_DATA_IN_CBACK(valid_root_count)); + SD_DATA_IN_CBACK(valid_root_count)); mdb_printf("---------------------------\n"); } } @@ -651,13 +651,13 @@ sd_callback(uintptr_t addr, const void *walk_data, void *flg_silent) if (SD_DATA_IN_CBACK(current_list_count) == 0) { mdb_printf("walk_addr = %lx\n", SD_DATA_IN_CBACK(sd_state)); mdb_printf("walking sd_state units via ptr: %lx\n", - SD_DATA_IN_CBACK(current_root)); + SD_DATA_IN_CBACK(current_root)); mdb_printf("%d entries in sd_state table\n", - SD_DATA_IN_CBACK(sd_state_data.n_items)); + SD_DATA_IN_CBACK(sd_state_data.n_items)); } mdb_printf("\nun %d: %lx\n", SD_DATA_IN_CBACK(current_list_count), - addr); + addr); mdb_printf("--------------\n"); @@ -691,7 +691,7 @@ sd_callback(uintptr_t addr, const void *walk_data, void *flg_silent) /* process device semoclose wait Q */ if (sdLun.un_semoclose._opaque[1] == 0) { process_semo_sleepq((uintptr_t)sdLun.un_semoclose._opaque[0], - silent); + silent); } /* print the actual number of soft state processed */ @@ -725,7 +725,7 @@ dcmd_sd_state(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) /* Enable the silent mode if '-s' option specified the user */ if (mdb_getopts(argc, argv, 's', MDB_OPT_SETBITS, TRUE, &silent, NULL) - != argc) { + != argc) { return (DCMD_USAGE); } @@ -764,7 +764,7 @@ dcmd_sd_state(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) /* process device's semoclose wait Q */ if (sdLun.un_semoclose._opaque[1] == 0) { process_semo_sleepq( - (uintptr_t)sdLun.un_semoclose._opaque[0], silent); + (uintptr_t)sdLun.un_semoclose._opaque[0], silent); } } return (DCMD_OK); @@ -797,7 +797,7 @@ dcmd_ssd_state(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) /* Enable the silent mode if '-s' option specified the user */ if (mdb_getopts(argc, argv, 's', MDB_OPT_SETBITS, TRUE, &silent, NULL) - != argc) { + != argc) { return (DCMD_USAGE); } @@ -835,7 +835,7 @@ dcmd_ssd_state(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) /* process device's semoclose wait Q */ if (sdLun.un_semoclose._opaque[1] == 0) { process_semo_sleepq( - (uintptr_t)sdLun.un_semoclose._opaque[0], silent); + (uintptr_t)sdLun.un_semoclose._opaque[0], silent); } } return (DCMD_OK); @@ -872,7 +872,7 @@ dcmd_buf_avforw(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) */ if ((flags & DCMD_ADDRSPEC)) { mdb_pwalk("buf_avforw", buf_callback, (void *)&buf_entries, - addr); + addr); return (DCMD_OK); } else { mdb_printf("buffer address required with the command\n"); diff --git a/usr/src/cmd/mdb/i86pc/modules/unix/unix.c b/usr/src/cmd/mdb/i86pc/modules/unix/unix.c index bd7dfda6ed..c3b7e809e4 100644 --- a/usr/src/cmd/mdb/i86pc/modules/unix/unix.c +++ b/usr/src/cmd/mdb/i86pc/modules/unix/unix.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. * Copyright 2019 Joyent, Inc. */ diff --git a/usr/src/cmd/mdb/intel/Makefile.kmdb b/usr/src/cmd/mdb/intel/Makefile.kmdb index fea041a6dc..6151a2e46a 100644 --- a/usr/src/cmd/mdb/intel/Makefile.kmdb +++ b/usr/src/cmd/mdb/intel/Makefile.kmdb @@ -22,7 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# Copyright 2019, Joyent, Inc. +# Copyright 2019 Joyent, Inc. # PROMSRCS += \ diff --git a/usr/src/cmd/mdb/intel/mdb/proc_ia32dep.c b/usr/src/cmd/mdb/intel/mdb/proc_ia32dep.c index 728ece57a8..c03a73f31e 100644 --- a/usr/src/cmd/mdb/intel/mdb/proc_ia32dep.c +++ b/usr/src/cmd/mdb/intel/mdb/proc_ia32dep.c @@ -24,8 +24,8 @@ * Use is subject to license terms. */ /* - * Copyright (c) 2018, Joyent, Inc. * Copyright 2019 Doma Gergő Mihály <doma.gergo.mihaly@gmail.com> + * Copyright 2018 Joyent, Inc. */ /* diff --git a/usr/src/cmd/mdb/sparc/kmdb/kaif.c b/usr/src/cmd/mdb/sparc/kmdb/kaif.c index b8a8565b16..6251b2e30e 100644 --- a/usr/src/cmd/mdb/sparc/kmdb/kaif.c +++ b/usr/src/cmd/mdb/sparc/kmdb/kaif.c @@ -397,7 +397,7 @@ kaif_wapt_reserve(kmdb_wapt_t *wp) else addrp = &kaif_vwapt_addr; - if (*addrp != NULL) + if (*addrp != 0) return (set_errno(EMDB_WPTOOMANY)); *addrp = wp->wp_addr; @@ -412,8 +412,8 @@ kaif_wapt_release(kmdb_wapt_t *wp) uint64_t *addrp = (wp->wp_type == DPI_WAPT_TYPE_PHYS ? &kaif_pwapt_addr : &kaif_vwapt_addr); - ASSERT(*addrp != NULL); - *addrp = NULL; + ASSERT(*addrp != 0); + *addrp = 0; } /*ARGSUSED*/ @@ -487,10 +487,10 @@ kaif_wapt_set_regs(void) ASSERT((kaif_lsuctl & ~KAIF_LSUCTL_WAPT_MASK) == NULL); - lsu = rdasi(ASI_LSU, NULL); + lsu = rdasi(ASI_LSU, (uintptr_t)NULL); lsu &= ~KAIF_LSUCTL_WAPT_MASK; lsu |= kaif_lsuctl; - wrasi(ASI_LSU, NULL, lsu); + wrasi(ASI_LSU, (uintptr_t)NULL, lsu); #endif /* sun4v */ } @@ -501,9 +501,9 @@ kaif_wapt_clear_regs(void) * Sun4v doesn't have watch point regs */ #ifndef sun4v - uint64_t lsu = rdasi(ASI_LSU, NULL); + uint64_t lsu = rdasi(ASI_LSU, (uintptr_t)NULL); lsu &= ~KAIF_LSUCTL_WAPT_MASK; - wrasi(ASI_LSU, NULL, lsu); + wrasi(ASI_LSU, (uintptr_t)NULL, lsu); #endif /* sun4v */ } @@ -742,7 +742,7 @@ static const mdb_bitmask_t krm_flag_bits[] = { { "M_PE", KAIF_CRUMB_F_MAIN_OBPPENT, KAIF_CRUMB_F_MAIN_OBPPENT }, { "M_NRM", KAIF_CRUMB_F_MAIN_NORMAL, KAIF_CRUMB_F_MAIN_NORMAL }, { "I_RE", KAIF_CRUMB_F_IVEC_REENTER, KAIF_CRUMB_F_IVEC_REENTER }, - { "I_OBP", KAIF_CRUMB_F_IVEC_INOBP, KAIF_CRUMB_F_IVEC_INOBP }, + { "I_OBP", KAIF_CRUMB_F_IVEC_INOBP, KAIF_CRUMB_F_IVEC_INOBP }, { "I_NRM", KAIF_CRUMB_F_IVEC_NORMAL, KAIF_CRUMB_F_IVEC_NORMAL }, { "O_NRM", KAIF_CRUMB_F_OBP_NORMAL, KAIF_CRUMB_F_OBP_NORMAL }, { "O_REVEC", KAIF_CRUMB_F_OBP_REVECT, KAIF_CRUMB_F_OBP_REVECT }, @@ -798,7 +798,7 @@ kaif_dump_crumbs(uintptr_t addr, int cpuid) { int i; - if (addr != NULL) { + if (addr != (uintptr_t)NULL) { /* dump_crumb will protect us from bogus addresses */ dump_crumb((kaif_crumb_t *)addr); diff --git a/usr/src/cmd/mdb/sparc/kmdb/kmdb_kdi_isadep.c b/usr/src/cmd/mdb/sparc/kmdb/kmdb_kdi_isadep.c index b7cc077dee..0b7b150c40 100644 --- a/usr/src/cmd/mdb/sparc/kmdb/kmdb_kdi_isadep.c +++ b/usr/src/cmd/mdb/sparc/kmdb/kmdb_kdi_isadep.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * SPARC-specific portions of the KDI */ @@ -66,7 +64,8 @@ kdi_cpu_ready_iter(int (*cb)(int, void *), void *arg) static int kdi_xc_one(int cpuid, void (*cb)(void)) { - return (mdb.m_kdi->mkdi_xc_one(cpuid, (void (*)())cb, NULL, NULL)); + return (mdb.m_kdi->mkdi_xc_one(cpuid, (void (*)())cb, (uintptr_t)NULL, + (uintptr_t)NULL)); } /*ARGSUSED1*/ @@ -157,7 +156,7 @@ kdi_halt_cpu(int cpuid, void *state_saverp) if (state != DPI_CPU_STATE_MASTER && state != DPI_CPU_STATE_SLAVE) { res = kdi_xc_one(cpuid, state_saver); - rc = 1; + rc = 1; if (res == KDI_XC_RES_OK) msg = "accepted the"; diff --git a/usr/src/cmd/mdb/sparc/kmdb/kmdb_makecontext.c b/usr/src/cmd/mdb/sparc/kmdb/kmdb_makecontext.c index 1d3781f1e9..3b233209de 100644 --- a/usr/src/cmd/mdb/sparc/kmdb/kmdb_makecontext.c +++ b/usr/src/cmd/mdb/sparc/kmdb/kmdb_makecontext.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Context-saving routine used for pipelines. Designed for use only * with kmdb_setcontext, and with the assumption that func() will never @@ -59,6 +57,6 @@ kmdb_makecontext(ucontext_t *ucp, void (*func)(void *), void *arg, caddr_t stk, ucp->uc_mcontext.gregs[REG_nPC] = (greg_t)func + 4; ucp->uc_mcontext.gregs[REG_O0] = (greg_t)arg; ucp->uc_mcontext.gregs[REG_SP] = (greg_t)(stack - STACK_BIAS); - ucp->uc_mcontext.gregs[REG_O7] = NULL; - ucp->uc_mcontext.gregs[REG_G7] = NULL; + ucp->uc_mcontext.gregs[REG_O7] = 0; + ucp->uc_mcontext.gregs[REG_G7] = 0; } diff --git a/usr/src/cmd/mdb/sparc/kmdb/kmdb_promif_isadep.c b/usr/src/cmd/mdb/sparc/kmdb/kmdb_promif_isadep.c index 6db4861bd7..ff7aa494a0 100644 --- a/usr/src/cmd/mdb/sparc/kmdb/kmdb_promif_isadep.c +++ b/usr/src/cmd/mdb/sparc/kmdb/kmdb_promif_isadep.c @@ -75,7 +75,7 @@ kmdb_prom_get_ddi_prop(kmdb_auxv_t *kav, char *propname) ssize_t len; char *val; - if ((node = prom_finddevice("/options")) == NULL) + if ((node = prom_finddevice("/options")) == 0) return (NULL); if ((len = prom_getproplen(node, propname)) < 0) diff --git a/usr/src/cmd/mdb/sparc/modules/genunix/gcore_isadep.c b/usr/src/cmd/mdb/sparc/modules/genunix/gcore_isadep.c index 50f60516a1..2839f47219 100644 --- a/usr/src/cmd/mdb/sparc/modules/genunix/gcore_isadep.c +++ b/usr/src/cmd/mdb/sparc/modules/genunix/gcore_isadep.c @@ -17,8 +17,6 @@ * implemented. */ -#ifndef _KMDB - #include <mdb/mdb_gcore.h> /* ARGSUSED */ @@ -54,5 +52,3 @@ gcore_prgetrvals(mdb_klwp_t *lwp, long *rval1, long *rval2) { return (0); } - -#endif /* _KMDB */ diff --git a/usr/src/cmd/mdb/sparc/modules/intr/intr.c b/usr/src/cmd/mdb/sparc/modules/intr/intr.c index cdfbf1c4ce..1ffb7edcce 100644 --- a/usr/src/cmd/mdb/sparc/modules/intr/intr.c +++ b/usr/src/cmd/mdb/sparc/modules/intr/intr.c @@ -64,7 +64,7 @@ static int detailed = 0; /* Print detailed view */ static int intr_walk_init(mdb_walk_state_t *wsp) { - wsp->walk_addr = NULL; + wsp->walk_addr = (uintptr_t)NULL; return (WALK_NEXT); } diff --git a/usr/src/cmd/mdb/sparc/v9/genunix/Makefile b/usr/src/cmd/mdb/sparc/v9/genunix/Makefile index 00dadda34b..8bfb17c607 100644 --- a/usr/src/cmd/mdb/sparc/v9/genunix/Makefile +++ b/usr/src/cmd/mdb/sparc/v9/genunix/Makefile @@ -38,6 +38,7 @@ KMODSRCS = \ MODSRCS = \ $(COMMONSRCS) \ + gcore.c \ typegraph.c # diff --git a/usr/src/cmd/mdb/sun4u/modules/opl/oplhwd/oplhwd.c b/usr/src/cmd/mdb/sun4u/modules/opl/oplhwd/oplhwd.c index 48aed6c313..5bdea9bc81 100644 --- a/usr/src/cmd/mdb/sun4u/modules/opl/oplhwd/oplhwd.c +++ b/usr/src/cmd/mdb/sun4u/modules/opl/oplhwd/oplhwd.c @@ -23,7 +23,6 @@ * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" #include <sys/mdb_modapi.h> #include <sys/types.h> @@ -151,7 +150,7 @@ dumpmemhwd(hwd_memory_t *memp, int v, int mv) mdb_printf("\tDIMM %d\tstatus\t0x%x (%s)\n", i, memp->mem_dimms[i].dimm_status, hwd_stat_decode( - memp->mem_dimms[i].dimm_status)); + memp->mem_dimms[i].dimm_status)); continue; } mdb_printf("\tDIMM %d\tstatus\t0x%x (%s)\tcapacity\t0x%llx\n", @@ -241,16 +240,16 @@ dumpchiphwd(hwd_cpu_chip_t *chipp, int ch, int v, int mv) mdb_printf("\tsharing\t%x\n", corep->core_l2_cache_sharing); mdb_printf("\t\tITLB entries\t0x%x\tDTLB entries " - "0x%x\n", corep->core_num_itlb_entries, + "0x%x\n", corep->core_num_itlb_entries, corep->core_num_dtlb_entries); } for (cp = 0; cp < HWD_CPUS_PER_CORE; cp++) { cpup = &corep->core_cpus[cp]; mdb_printf("\t\tCPU %d:\tstatus\t0x%x (%s)\tcpuid" - " = 0x%x\n", cp, cpup->cpu_status, - hwd_stat_decode(cpup->cpu_status), - cpup->cpu_cpuid); + " = 0x%x\n", cp, cpup->cpu_status, + hwd_stat_decode(cpup->cpu_status), + cpup->cpu_cpuid); if (v & DUMP_COMP_NAME) mdb_printf("\t\t\tcomponent name:%s\n", cpup->cpu_component_name); @@ -320,10 +319,10 @@ dumpahwd(int bd, int v) if (mdb_vread(&boardcfg, sizeof (opl_board_cfg_t), - tmptr + (bd * sizeof (opl_board_cfg_t))) == -1) { + tmptr + (bd * sizeof (opl_board_cfg_t))) == -1) { mdb_warn("failed to read opl_board_cfg at %p", - (tmptr + (bd * sizeof (opl_board_cfg_t)))); - return; + (tmptr + (bd * sizeof (opl_board_cfg_t)))); + return; } if (boardcfg.cfg_hwd == NULL) { @@ -335,9 +334,9 @@ dumpahwd(int bd, int v) /* We always need the header, for offsets */ if (mdb_vread(&hwd_hdr, sizeof (hwd_header_t), - (uintptr_t)boardcfg.cfg_hwd) == -1) { + (uintptr_t)boardcfg.cfg_hwd) == -1) { mdb_warn("failed to read hwd_header_t at %p\n", - boardcfg.cfg_hwd); + boardcfg.cfg_hwd); return; } @@ -370,7 +369,7 @@ dumpahwd(int bd, int v) if (mdb_vread(&hwd_sb_status, sizeof (hwd_sb_status_t), (uintptr_t)statusp) == -1) { mdb_warn("failed to read hwd_sb_status_t at %p\n", - statusp); + statusp); return; } mdb_printf("\nSTATUS:\tBoard\tStatus\n"); @@ -388,7 +387,7 @@ dumpahwd(int bd, int v) if (mdb_vread(&hwd_dinfo, sizeof (hwd_domain_info_t), (uintptr_t)dinfop) == -1) { mdb_warn("failed to read hwd_domain_info_t at %p\n", - dinfop); + dinfop); return; } mdb_printf("\nDomain info:\tReset reason\t0x%x", @@ -445,7 +444,7 @@ dumpahwd(int bd, int v) cmup = &hwd_sb.sb_cmu.cmu_ch; mdb_printf("\nCMU CH: status\t0x%x (%s)\tportid=0x%x" - " LSB = 0x%x\n", + " LSB = 0x%x\n", cmup->chan_status, hwd_stat_decode(cmup->chan_status), cmup->chan_portid, ((cmup->chan_portid) >> 4)); @@ -504,16 +503,16 @@ dumpahwd(int bd, int v) scp = &hwd_sb.sb_cmu.cmu_scs[sc]; - if (DONT_BOTHER(scp->sc_status, mv)) - mdb_printf("\nSC %d:\tstatus\t0x%x (%s)\n", - sc, scp->sc_status, - hwd_stat_decode(scp->sc_status)); - else { - mdb_printf("\nSC %d:\tstatus\t0x%x (%s)\t", - sc, scp->sc_status, - hwd_stat_decode(scp->sc_status)); - mdb_printf("register addr\t0x%llx\n", - scp->sc_register_address); + if (DONT_BOTHER(scp->sc_status, mv)) { + mdb_printf("\nSC %d:\tstatus\t0x%x (%s)\n", + sc, scp->sc_status, + hwd_stat_decode(scp->sc_status)); + } else { + mdb_printf("\nSC %d:\tstatus\t0x%x (%s)\t", + sc, scp->sc_status, + hwd_stat_decode(scp->sc_status)); + mdb_printf("register addr\t0x%llx\n", + scp->sc_register_address); } } @@ -607,7 +606,7 @@ oplhwd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) if (bdi < 0) { /* get active boards */ for (bdi = 0; bdi < OPL_MAX_BOARDS; bdi++) - dumpahwd(bdi, v_mode); + dumpahwd(bdi, v_mode); } else { dumpahwd(bdi, v_mode); } @@ -621,22 +620,22 @@ static void oplhwd_help(void) { mdb_printf("oplhwd will dump HWD only for a particular board" - " on which,"); + " on which,"); mdb_printf("an earlier DR operation has been executed.\n"); mdb_printf("-b NUM \tlist oplhwd entry for a board\n" - "-s \t\tlist oplhwd entry with SB status\n" - "-d \t\tlist oplhwd entry with Domain info.\n" - "-i \t\tlist oplhwd entry with SB info.\n" - "-h \t\tlist oplhwd entry with Chips details\n" - "-o \t\tlist oplhwd entry with Core details\n" - "-m \t\tlist oplhwd entry with Memory info.\n" - "-k \t\tlist oplhwd entry with Memory Bank info.\n" - "-r \t\tlist oplhwd entry with SC info.\n" - "-c \t\tlist oplhwd entry with CMU channels\n" - "-p \t\tlist oplhwd entry with PCI channels\n" - "-a \t\tlist oplhwd entry with all possible info.\n" - "-C \t\tlist oplhwd entry with component names\n" - "-v \t\tlist oplhwd entry in verbose mode\n"); + "-s \t\tlist oplhwd entry with SB status\n" + "-d \t\tlist oplhwd entry with Domain info.\n" + "-i \t\tlist oplhwd entry with SB info.\n" + "-h \t\tlist oplhwd entry with Chips details\n" + "-o \t\tlist oplhwd entry with Core details\n" + "-m \t\tlist oplhwd entry with Memory info.\n" + "-k \t\tlist oplhwd entry with Memory Bank info.\n" + "-r \t\tlist oplhwd entry with SC info.\n" + "-c \t\tlist oplhwd entry with CMU channels\n" + "-p \t\tlist oplhwd entry with PCI channels\n" + "-a \t\tlist oplhwd entry with all possible info.\n" + "-C \t\tlist oplhwd entry with component names\n" + "-v \t\tlist oplhwd entry in verbose mode\n"); } /* diff --git a/usr/src/cmd/mdb/sun4u/modules/unix/sfmmu.c b/usr/src/cmd/mdb/sun4u/modules/unix/sfmmu.c index 20b59d7e56..ce4a1035f1 100644 --- a/usr/src/cmd/mdb/sun4u/modules/unix/sfmmu.c +++ b/usr/src/cmd/mdb/sun4u/modules/unix/sfmmu.c @@ -131,7 +131,7 @@ sfmmu_vtop(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) if (ret == 0) { mdb_printf("address space %p: virtual %lr mapped to physical " - "%llr", asp, addr, paddr); + "%llr", asp, addr, paddr); } else { return (DCMD_ERR); } @@ -174,7 +174,7 @@ sfmmu_vtop_common(struct as *asp, uintptr_t addr, physaddr_t *pap) static int sfmmu_vtop_impl(uintptr_t addr, sfmmu_t *sfmmup, sfmmu_t *msfmmup, - physaddr_t *pap) + physaddr_t *pap) { struct hmehash_bucket *uhme_hash; struct hmehash_bucket *khme_hash; @@ -225,7 +225,7 @@ sfmmu_vtop_impl(uintptr_t addr, sfmmu_t *sfmmup, sfmmu_t *msfmmup, } ism_blkp = &mism_blk; ism_map = ism_blkp->iblk_maps; - for (i = 0; ism_map[i].imap_ismhat && i < ISM_MAP_SLOTS; i++) { + for (i = 0; i < ISM_MAP_SLOTS && ism_map[i].imap_ismhat; i++) { if ((caddr_t)addr >= ism_start(ism_map[i]) && (caddr_t)addr < ism_end(ism_map[i])) { sfmmup = ism_hatid = ism_map[i].imap_ismhat; @@ -252,18 +252,18 @@ sfmmu_vtop_impl(uintptr_t addr, sfmmu_t *sfmmup, sfmmu_t *msfmmup, #ifdef __sparcv9 SFMMU_VTOP_DBG_DBG("hblktag=%lx %lx\n", - (uint64_t)hblktag.htag_tag[0], - (uint64_t)hblktag.htag_tag[1]); + (uint64_t)hblktag.htag_tag[0], + (uint64_t)hblktag.htag_tag[1]); #else SFMMU_VTOP_DBG_DBG("hblktag=%llx\n", - (uint64_t)hblktag.htag_tag); + (uint64_t)hblktag.htag_tag); #endif hmebp = shmebp = HME_HASH_FUNCTION(sfmmup, addr, hmeshift); SFMMU_VTOP_DBG_DBG("hmebp=%p\n", hmebp); if (mdb_vread(&mbucket, sizeof (mbucket), - (uintptr_t)hmebp) == -1) { + (uintptr_t)hmebp) == -1) { mdb_warn("couldn't read mbucket at %p\n", hmebp); return (DCMD_ERR); } @@ -271,7 +271,7 @@ sfmmu_vtop_impl(uintptr_t addr, sfmmu_t *sfmmup, sfmmu_t *msfmmup, hmebp = &mbucket; for (hmeblkp = hmebp->hmeblkp; hmeblkp; - hmeblkp = hmeblkp->hblk_next) { + hmeblkp = hmeblkp->hblk_next) { SFMMU_VTOP_DBG_DBG("hmeblkp=%p\n", hmeblkp); @@ -279,9 +279,9 @@ sfmmu_vtop_impl(uintptr_t addr, sfmmu_t *sfmmup, sfmmu_t *msfmmup, break; if (mdb_vread(&mhmeblkmax, sizeof (struct hme_blk), - (uintptr_t)hmeblkp) == -1) { + (uintptr_t)hmeblkp) == -1) { mdb_warn("couldn't read hme_blk at %p\n", - hmeblkp); + hmeblkp); return (DCMD_ERR); } @@ -298,7 +298,7 @@ sfmmu_vtop_impl(uintptr_t addr, sfmmu_t *sfmmup, sfmmu_t *msfmmup, sfmmu_vtop_print_hmeblk(hmeblkp); sfhmep = mdb_sfmmu_hblktohme(hmeblkp, (caddr_t)addr, - &sfhmeinx); + &sfhmeinx); SFMMU_VTOP_DBG_DBG("sfhmeinx=%d ", sfhmeinx); @@ -307,28 +307,26 @@ sfmmu_vtop_impl(uintptr_t addr, sfmmu_t *sfmmup, sfmmu_t *msfmmup, sizeof (struct sf_hment) * (sfhmeinx - 1); if (mdb_vread(sfhmep, sizeof (struct sf_hment), - thmeblkp) == -1) { + thmeblkp) == -1) { mdb_warn("couldn't read msfhme at %p\n", - sfhmep); + sfhmep); return (DCMD_ERR); } } SFMMU_VTOP_DBG_VRB("sfmmup=%p hmebp=%p hmeblkp=%p\n", - sfmmup, shmebp, thmeblkp); + sfmmup, shmebp, thmeblkp); tte = sfhmep->hme_tte; SFMMU_VTOP_DBG_VRB("tte=%llx ", tte.ll); if (TTE_IS_VALID(&tte)) { start_pfn = TTE_TO_TTEPFN(&tte); *pap = (start_pfn << MMU_PAGESHIFT) + - (addr & TTE_PAGE_OFFSET(tte.tte_size)); + (addr & TTE_PAGE_OFFSET(tte.tte_size)); pfn = *pap >> MMU_PAGESHIFT; pp = (sfhmep->hme_page != 0) ? - sfhmep->hme_page + (pfn - start_pfn) : - 0; - SFMMU_VTOP_DBG_VRB("pfn=%lx pp=%p\n", - pfn, pp); + sfhmep->hme_page + (pfn - start_pfn) : 0; + SFMMU_VTOP_DBG_VRB("pfn=%lx pp=%p\n", pfn, pp); ret = 0; } break; @@ -345,13 +343,13 @@ static void sfmmu_vtop_print_hmeblk(struct hme_blk *hmeblkp) { - if ((sfmmu_vtop_dbg & SFMMU_VTOP_DBG_DEBUG) == NULL) + if ((sfmmu_vtop_dbg & SFMMU_VTOP_DBG_DEBUG) == 0) return; mdb_printf(" hblk_nextpa=%llx\n", hmeblkp->hblk_nextpa); #ifdef __sparcv9 mdb_printf(" hblktag=%lx %lx\n", hmeblkp->hblk_tag.htag_tag[0], - hmeblkp->hblk_tag.htag_tag[1]); + hmeblkp->hblk_tag.htag_tag[1]); #else mdb_printf(" hblktag=%llx\n", hmeblkp->hblk_tag.htag_tag); #endif @@ -403,7 +401,7 @@ memseg_list(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) if (DCMD_HDRSPEC(flags)) mdb_printf("%<u>%?s %?s %?s %?s %?s%</u>\n", "ADDR", - "PAGES", "EPAGES", "BASE", "END"); + "PAGES", "EPAGES", "BASE", "END"); if (mdb_vread(&ms, sizeof (struct memseg), addr) == -1) { mdb_warn("can't read memseg at %#lx", addr); @@ -411,7 +409,7 @@ memseg_list(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) } mdb_printf("%0?lx %0?lx %0?lx %0?lx %0?lx\n", addr, - ms.pages, ms.epages, ms.pages_base, ms.pages_end); + ms.pages, ms.epages, ms.pages_base, ms.pages_end); return (DCMD_OK); } @@ -422,7 +420,7 @@ memseg_list(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) int memseg_walk_init(mdb_walk_state_t *wsp) { - if (wsp->walk_addr != NULL) { + if (wsp->walk_addr != (uintptr_t)NULL) { mdb_warn("memseg only supports global walks\n"); return (WALK_ERR); } @@ -535,9 +533,9 @@ tsbinfo_list(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) } if (mdb_getopts(argc, argv, - 'l', MDB_OPT_SETBITS, TRUE, &lflag, - 'a', MDB_OPT_SETBITS, TRUE, &aflag, - NULL) != argc) { + 'l', MDB_OPT_SETBITS, TRUE, &lflag, + 'a', MDB_OPT_SETBITS, TRUE, &aflag, + NULL) != argc) { return (DCMD_USAGE); } @@ -600,24 +598,24 @@ tsbinfo_list(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) UM_SLEEP); if (mdb_vread(tsbp, sizeof (struct tsbe) * entries, - (uintptr_t)tsbinfo.tsb_va) == -1) { + (uintptr_t)tsbinfo.tsb_va) == -1) { mdb_warn("failed to read TSB at %p", tsbinfo.tsb_va); return (DCMD_ERR); } mdb_printf( - "TSB @ %lx (%d entries)\n" - "%-?s %-17s %s\n" - "%<u>%-?s %1s %1s %-11s " - "%1s %1s %1s %1s %1s %1s %8s " - "%1s %1s %1s %1s %1s %1s %1s " - "%1s %1s %1s %1s %1s %1s%</u>\n", - tsbinfo.tsb_va, entries, "", "TAG", "TTE", - "ADDR", "I", "L", "VA 63:22", - "V", "S", "N", "I", "H", "S", "PA 42:13", - "N", "U", "R", "W", "E", "X", "L", - "P", "V", "E", "P", "W", "G"); + "TSB @ %lx (%d entries)\n" + "%-?s %-17s %s\n" + "%<u>%-?s %1s %1s %-11s " + "%1s %1s %1s %1s %1s %1s %8s " + "%1s %1s %1s %1s %1s %1s %1s " + "%1s %1s %1s %1s %1s %1s%</u>\n", + tsbinfo.tsb_va, entries, "", "TAG", "TTE", + "ADDR", "I", "L", "VA 63:22", + "V", "S", "N", "I", "H", "S", "PA 42:13", + "N", "U", "R", "W", "E", "X", "L", + "P", "V", "E", "P", "W", "G"); tsbend = tsbp + entries; for (tsbstart = tsbp; tsbp < tsbend; tsbp++) { @@ -626,8 +624,8 @@ tsbinfo_list(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) va = (caddr_t) (((uint64_t)tsbp->tte_tag.tag_vahi - << 32) + - tsbp->tte_tag.tag_valo); + << 32) + + tsbp->tte_tag.tag_valo); pa = (tsbp->tte_data.tte_pahi << 19) + tsbp->tte_data.tte_palo; mdb_printf("%0?lx %-1u %-1u %011lx " diff --git a/usr/src/cmd/mdb/sun4u/modules/unix/unix.c b/usr/src/cmd/mdb/sun4u/modules/unix/unix.c index 09303f5345..e43449f9db 100644 --- a/usr/src/cmd/mdb/sun4u/modules/unix/unix.c +++ b/usr/src/cmd/mdb/sun4u/modules/unix/unix.c @@ -676,7 +676,7 @@ ttrace_walk_init(mdb_walk_state_t *wsp) ttrace_cpu_data_t *tc; struct trap_trace_record *buf; - if (wsp->walk_addr != NULL) { + if (wsp->walk_addr != (uintptr_t)NULL) { mdb_warn("ttrace only supports global walks\n"); return (WALK_ERR); } @@ -965,7 +965,7 @@ httrace_walk_init(mdb_walk_state_t *wsp) struct htrap_trace_record *buf; htrap_trace_hdr_t *hdr; - if (wsp->walk_addr != NULL) { + if (wsp->walk_addr != (uintptr_t)NULL) { mdb_warn("httrace only supports global walks\n"); return (WALK_ERR); } @@ -1347,7 +1347,7 @@ vecint_walk_init(mdb_walk_state_t *wsp) { vecint_walk_data_t *vecint; - if (wsp->walk_addr != NULL) { + if (wsp->walk_addr != (uintptr_t)NULL) { mdb_warn("vecint walk only supports global walks\n"); return (WALK_ERR); } @@ -1378,13 +1378,14 @@ vecint_walk_step(mdb_walk_state_t *wsp) intr_vec_t iv; int status; - if (wsp->walk_addr == NULL) { + if (wsp->walk_addr == (uintptr_t)NULL) { while ((vecint->vec_idx < max) && ((wsp->walk_addr = - (uintptr_t)vecint->vec_table[vecint->vec_idx++]) == NULL)) + (uintptr_t)vecint->vec_table[vecint->vec_idx++]) == + (uintptr_t)NULL)) continue; } - if (wsp->walk_addr == NULL) + if (wsp->walk_addr == (uintptr_t)NULL) return (WALK_DONE); status = wsp->walk_callback(wsp->walk_addr, wsp->walk_data, @@ -1443,7 +1444,7 @@ softint_walk_init(mdb_walk_state_t *wsp) { intr_vec_t *list; - if (wsp->walk_addr != NULL) { + if (wsp->walk_addr != (uintptr_t)NULL) { mdb_warn("softint walk only supports global walks\n"); return (WALK_ERR); } @@ -1471,7 +1472,7 @@ softint_walk_step(mdb_walk_state_t *wsp) intr_vec_t iv; int status; - if (wsp->walk_addr == NULL) + if (wsp->walk_addr == (uintptr_t)NULL) return (WALK_DONE); status = wsp->walk_callback(wsp->walk_addr, wsp->walk_data, @@ -1568,7 +1569,7 @@ mutex_owner_step(mdb_walk_state_t *wsp) if (!MUTEX_TYPE_ADAPTIVE(&mtx)) return (WALK_DONE); - if ((owner = (uintptr_t)MUTEX_OWNER(&mtx)) == NULL) + if ((owner = (uintptr_t)MUTEX_OWNER(&mtx)) == (uintptr_t)NULL) return (WALK_DONE); if (mdb_vread(&thr, sizeof (thr), owner) != -1) diff --git a/usr/src/cmd/mdb/sun4v/modules/errh/errh.c b/usr/src/cmd/mdb/sun4v/modules/errh/errh.c index 6525746f3b..3554e1d559 100644 --- a/usr/src/cmd/mdb/sun4v/modules/errh/errh.c +++ b/usr/src/cmd/mdb/sun4v/modules/errh/errh.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/time.h> #include <sys/sysmacros.h> @@ -208,14 +206,13 @@ errh_prtaddr(uintptr_t addr, const void *data, void *private) return (WALK_NEXT); } -/*ARGSUSED*/ int rq_walk_init(mdb_walk_state_t *wsp) { cpu_t cpu; uintptr_t *ao, *lower, *upper; - if (wsp->walk_addr == NULL) { + if (wsp->walk_addr == (uintptr_t)NULL) { mdb_warn("address of struct cpu_t is required\n"); return (WALK_ERR); } @@ -245,14 +242,13 @@ rq_walk_init(mdb_walk_state_t *wsp) return (WALK_NEXT); } -/*ARGSUSED*/ int nrq_walk_init(mdb_walk_state_t *wsp) { cpu_t cpu; uintptr_t *ao, *lower, *upper; - if (wsp->walk_addr == NULL) { + if (wsp->walk_addr == (uintptr_t)NULL) { mdb_warn("address of struct cpu_t is required\n"); return (WALK_ERR); } @@ -282,14 +278,13 @@ nrq_walk_init(mdb_walk_state_t *wsp) return (WALK_NEXT); } -/*ARGSUSED*/ int errh_walk_step(mdb_walk_state_t *wsp) { int status; uintptr_t *ao, *lower, *upper; - if (wsp->walk_addr == NULL) + if (wsp->walk_addr == (uintptr_t)NULL) return (WALK_DONE); status = wsp->walk_callback(wsp->walk_addr, wsp->walk_data, diff --git a/usr/src/cmd/mdb/sun4v/modules/ldc/ldc.c b/usr/src/cmd/mdb/sun4v/modules/ldc/ldc.c index 8cd92bc435..766f799e6e 100644 --- a/usr/src/cmd/mdb/sun4v/modules/ldc/ldc.c +++ b/usr/src/cmd/mdb/sun4v/modules/ldc/ldc.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This module provides debugging tools for the LDoms channels (ldc) */ @@ -233,13 +231,13 @@ ldc_walk_init(mdb_walk_state_t *wsp) ldc_soft_state_t softstate; /* Must have a start addr. */ - if (wsp->walk_addr == NULL) { + if (wsp->walk_addr == (uintptr_t)NULL) { if (mdb_readvar(&wsp->walk_addr, "ldcssp") == -1) { mdb_warn("failed to read 'ldcssp'"); return (WALK_ERR); } - if (wsp->walk_addr == NULL) + if (wsp->walk_addr == (uintptr_t)NULL) return (WALK_DONE); if (mdb_vread(&softstate, sizeof (softstate), wsp->walk_addr) @@ -263,7 +261,7 @@ ldc_walk_step(mdb_walk_state_t *wsp) int status; ldc_chan_t ldcp; - if (wsp->walk_addr == NULL) + if (wsp->walk_addr == (uintptr_t)NULL) return (WALK_DONE); if (mdb_vread(&ldcp, sizeof (ldc_chan_t), wsp->walk_addr) == -1) { @@ -289,7 +287,7 @@ int ldcmsg(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) { ldc_msg_t msg; - uint64_t count = 1; + uint64_t count = 1; int i; /* @@ -476,7 +474,7 @@ ldcmhdl(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) mdb_printf("\n"); } - if ((addr = (uintptr_t)mhdl.next) == NULL) + if ((addr = (uintptr_t)mhdl.next) == (uintptr_t)NULL) break; } diff --git a/usr/src/cmd/mdb/sun4v/modules/mdesc/mdesc.c b/usr/src/cmd/mdb/sun4v/modules/mdesc/mdesc.c index d0184bc7c8..b2c791690e 100644 --- a/usr/src/cmd/mdb/sun4v/modules/mdesc/mdesc.c +++ b/usr/src/cmd/mdb/sun4v/modules/mdesc/mdesc.c @@ -68,7 +68,7 @@ mdhdr(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) else mdb_printf("%p\n", mdp); - } while ((mdp = (uintptr_t)md.next) != NULL); + } while ((mdp = (uintptr_t)md.next) != (uintptr_t)NULL); return (DCMD_OK); } diff --git a/usr/src/cmd/mdb/sun4v/modules/vdsk/vdsk.c b/usr/src/cmd/mdb/sun4v/modules/vdsk/vdsk.c index b43c3f9d95..c404a3fb98 100644 --- a/usr/src/cmd/mdb/sun4v/modules/vdsk/vdsk.c +++ b/usr/src/cmd/mdb/sun4v/modules/vdsk/vdsk.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This module provides debugging tools for the LDoms vDisk drivers * (vds and vdc). @@ -41,7 +39,7 @@ int vd_dring_entry_walk_init(mdb_walk_state_t *wsp) { /* Must have a start addr. */ - if (wsp->walk_addr == NULL) { + if (wsp->walk_addr == (uintptr_t)NULL) { mdb_warn("Descriptor Ring base address required\n"); return (WALK_ERR); |