Module Name: src Committed By: christos Date: Wed Aug 31 21:57:17 UTC 2011
Modified Files: src/external/cddl/osnet/dev/dtrace: dtrace_debug.c dtrace_ioctl.c dtrace_load.c src/external/cddl/osnet/dev/dtrace/amd64: dtrace_subr.c src/external/cddl/osnet/dev/fbt: fbt.c src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c Log Message: fix shadow warnings. XXX: might be a good idea to kill global 'cpu' and 'version' variables. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dev/dtrace/dtrace_debug.c cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c \ src/external/cddl/osnet/dev/dtrace/dtrace_load.c cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/dev/fbt/fbt.c cvs rdiff -u -r1.16 -r1.17 \ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/cddl/osnet/dev/dtrace/dtrace_debug.c diff -u src/external/cddl/osnet/dev/dtrace/dtrace_debug.c:1.3 src/external/cddl/osnet/dev/dtrace/dtrace_debug.c:1.4 --- src/external/cddl/osnet/dev/dtrace/dtrace_debug.c:1.3 Sat Mar 13 17:31:15 2010 +++ src/external/cddl/osnet/dev/dtrace/dtrace_debug.c Wed Aug 31 17:57:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dtrace_debug.c,v 1.3 2010/03/13 22:31:15 christos Exp $ */ +/* $NetBSD: dtrace_debug.c,v 1.4 2011/08/31 21:57:16 christos Exp $ */ /*- * Copyright (C) 2008 John Birrell <j...@freebsd.org>. @@ -94,17 +94,17 @@ static volatile u_long dtrace_debug_flag[MAXCPUS]; static void -dtrace_debug_lock(int cpu) +dtrace_debug_lock(int xcpu) { - while (dtrace_cmpset_long(&dtrace_debug_flag[cpu], 0, 1) == 0) + while (dtrace_cmpset_long(&dtrace_debug_flag[xcpu], 0, 1) == 0) /* Loop until the lock is obtained. */ ; } static void -dtrace_debug_unlock(int cpu) +dtrace_debug_unlock(int xcpu) { - dtrace_debug_flag[cpu] = 0; + dtrace_debug_flag[xcpu] = 0; } static void @@ -248,21 +248,21 @@ * Put a NUL-terminated ASCII number (base <= 36) in a buffer in reverse * order; return an optional length and a pointer to the last character * written in the buffer (i.e., the first character of the string). - * The buffer pointed to by `nbuf' must have length >= MAXNBUF. + * The buffer pointed to by `xbuf' must have length >= MAXNBUF. */ static char * -dtrace_debug_ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper) +dtrace_debug_ksprintn(char *xbuf, uintmax_t num, int base, int *lenp, int upper) { char *p, c; - p = nbuf; + p = xbuf; *p = '\0'; do { c = hex2ascii(num % base); *++p = upper ? toupper(c) : c; } while (num /= base); if (lenp) - *lenp = p - nbuf; + *lenp = p - xbuf; return (p); } @@ -271,7 +271,7 @@ static void dtrace_debug_vprintf(const char *fmt, va_list ap) { - char nbuf[MAXNBUF]; + char xbuf[MAXNBUF]; const char *p, *percent, *q; u_char *up; int ch, n; @@ -350,7 +350,7 @@ case 'b': num = (u_int)va_arg(ap, int); p = va_arg(ap, char *); - for (q = dtrace_debug_ksprintn(nbuf, num, *p++, NULL, 0); *q;) + for (q = dtrace_debug_ksprintn(xbuf, num, *p++, NULL, 0); *q;) dtrace_debug__putc(*q--); if (num == 0) @@ -522,7 +522,7 @@ neg = 1; num = -(intmax_t)num; } - p = dtrace_debug_ksprintn(nbuf, num, base, &tmp, upper); + p = dtrace_debug_ksprintn(xbuf, num, base, &tmp, upper); if (sharpflag && num != 0) { if (base == 8) tmp++; Index: src/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c diff -u src/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c:1.2 src/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c:1.3 --- src/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c:1.2 Sat Feb 20 20:46:33 2010 +++ src/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c Wed Aug 31 17:57:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dtrace_ioctl.c,v 1.2 2010/02/21 01:46:33 darran Exp $ */ +/* $NetBSD: dtrace_ioctl.c,v 1.3 2011/08/31 21:57:16 christos Exp $ */ /* * CDDL HEADER START @@ -167,7 +167,7 @@ "DTRACEIOC_AGGSNAP":"DTRACEIOC_BUFSNAP", cpu_number(), desc.dtbd_cpu); - if (desc.dtbd_cpu < 0 || desc.dtbd_cpu >= ncpu) + if (desc.dtbd_cpu >= ncpu) return (ENOENT); mutex_enter(&dtrace_lock); Index: src/external/cddl/osnet/dev/dtrace/dtrace_load.c diff -u src/external/cddl/osnet/dev/dtrace/dtrace_load.c:1.2 src/external/cddl/osnet/dev/dtrace/dtrace_load.c:1.3 --- src/external/cddl/osnet/dev/dtrace/dtrace_load.c:1.2 Sat Feb 20 20:46:33 2010 +++ src/external/cddl/osnet/dev/dtrace/dtrace_load.c Wed Aug 31 17:57:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dtrace_load.c,v 1.2 2010/02/21 01:46:33 darran Exp $ */ +/* $NetBSD: dtrace_load.c,v 1.3 2011/08/31 21:57:16 christos Exp $ */ /* * CDDL HEADER START @@ -81,7 +81,7 @@ dtrace_arena = vmem_create("dtrace", 1, INT_MAX, 1, NULL, NULL, NULL, 0, VM_SLEEP, IPL_NONE); - dtrace_state_cache = kmem_cache_create("dtrace_state_cache", + dtrace_state_cache = kmem_cache_create(__UNCONST("dtrace_state_cache"), sizeof (dtrace_dstate_percpu_t) * NCPU, DTRACE_STATE_ALIGN, NULL, NULL, NULL, NULL, NULL, 0); Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.4 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.5 --- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.4 Fri Apr 23 07:39:53 2010 +++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c Wed Aug 31 17:57:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dtrace_subr.c,v 1.4 2010/04/23 11:39:53 ahoka Exp $ */ +/* $NetBSD: dtrace_subr.c,v 1.5 2011/08/31 21:57:16 christos Exp $ */ /* * CDDL HEADER START @@ -129,11 +129,11 @@ } void -dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg) +dtrace_xcall(processorid_t xcpu, dtrace_xcall_t func, void *arg) { uint64_t where; - if (cpu == DTRACE_CPUALL) { + if (xcpu == DTRACE_CPUALL) { where = xc_broadcast(0, xcall_func, func, arg); } else { struct cpu_info *cinfo = cpu_lookup(cpu); Index: src/external/cddl/osnet/dev/fbt/fbt.c diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.8 src/external/cddl/osnet/dev/fbt/fbt.c:1.9 --- src/external/cddl/osnet/dev/fbt/fbt.c:1.8 Sun Jul 17 16:54:33 2011 +++ src/external/cddl/osnet/dev/fbt/fbt.c Wed Aug 31 17:57:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: fbt.c,v 1.8 2011/07/17 20:54:33 joerg Exp $ */ +/* $NetBSD: fbt.c,v 1.9 2011/08/31 21:57:16 christos Exp $ */ /* * CDDL HEADER START @@ -182,7 +182,7 @@ static int fbt_invop(uintptr_t addr, uintptr_t *stack, uintptr_t rval) { - solaris_cpu_t *cpu = &solaris_cpu[cpu_number()]; + solaris_cpu_t *xcpu = &solaris_cpu[cpu_number()]; uintptr_t stack0, stack1, stack2, stack3, stack4; fbt_probe_t *fbt = fbt_probetab[FBT_ADDR2NDX(addr)]; @@ -199,7 +199,7 @@ * disabled. */ DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT); - cpu->cpu_dtrace_caller = stack[i++]; + xcpu->cpu_dtrace_caller = stack[i++]; stack0 = stack[i++]; stack1 = stack[i++]; stack2 = stack[i++]; @@ -211,7 +211,7 @@ dtrace_probe(fbt->fbtp_id, stack0, stack1, stack2, stack3, stack4); - cpu->cpu_dtrace_caller = 0; + xcpu->cpu_dtrace_caller = 0; } else { #ifdef __amd64__ /* @@ -221,14 +221,14 @@ * action is correct. */ DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT); - cpu->cpu_dtrace_caller = stack[0]; + xcpu->cpu_dtrace_caller = stack[0]; DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT | CPU_DTRACE_BADADDR); #endif dtrace_probe(fbt->fbtp_id, fbt->fbtp_roffset, rval, 0, 0, 0); - cpu->cpu_dtrace_caller = 0; + xcpu->cpu_dtrace_caller = 0; } return (fbt->fbtp_rval); @@ -792,12 +792,12 @@ } static ssize_t -fbt_get_ctt_size(uint8_t version, const ctf_type_t *tp, ssize_t *sizep, +fbt_get_ctt_size(uint8_t xversion, const ctf_type_t *tp, ssize_t *sizep, ssize_t *incrementp) { ssize_t size, increment; - if (version > CTF_VERSION_1 && + if (xversion > CTF_VERSION_1 && tp->ctt_size == CTF_LSIZE_SENT) { size = CTF_TYPE_LSIZE(tp); increment = sizeof (ctf_type_t); Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.16 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.17 --- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.16 Tue Jul 26 08:54:28 2011 +++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Wed Aug 31 17:57:16 2011 @@ -1448,7 +1448,7 @@ uint64_t hashval = DTRACE_DYNHASH_VALID; dtrace_dynhash_t *hash = dstate->dtds_hash; dtrace_dynvar_t *free, *new_free, *next, *dvar, *start, *prev = NULL; - processorid_t me = curcpu_id, cpu = me; + processorid_t me = curcpu_id, xcpu = me; dtrace_dstate_percpu_t *dcpu = &dstate->dtds_percpu[me]; size_t bucket, ksize; size_t chunksize = dstate->dtds_chunksize; @@ -1754,8 +1754,8 @@ case DTRACE_DSTATE_CLEAN: { void *sp = &dstate->dtds_state; - if (++cpu >= NCPU) - cpu = 0; + if (++xcpu >= NCPU) + xcpu = 0; if (dcpu->dtdsc_dirty != NULL && nstate == DTRACE_DSTATE_EMPTY) @@ -1764,9 +1764,9 @@ if (dcpu->dtdsc_rinsing != NULL) nstate = DTRACE_DSTATE_RINSING; - dcpu = &dstate->dtds_percpu[cpu]; + dcpu = &dstate->dtds_percpu[xcpu]; - if (cpu != me) + if (xcpu != me) goto retry; (void) dtrace_cas32(sp, @@ -2330,7 +2330,7 @@ * to the state transition diagram outlined in <sys/dtrace_impl.h> */ static void -dtrace_speculation_commit(dtrace_state_t *state, processorid_t cpu, +dtrace_speculation_commit(dtrace_state_t *state, processorid_t xcpu, dtrace_specid_t which) { dtrace_speculation_t *spec; @@ -2343,13 +2343,13 @@ return; if (which > state->dts_nspeculations) { - cpu_core[cpu].cpuc_dtrace_flags |= CPU_DTRACE_ILLOP; + cpu_core[xcpu].cpuc_dtrace_flags |= CPU_DTRACE_ILLOP; return; } spec = &state->dts_speculations[which - 1]; - src = &spec->dtsp_buffer[cpu]; - dest = &state->dts_buffer[cpu]; + src = &spec->dtsp_buffer[xcpu]; + dest = &state->dts_buffer[xcpu]; do { current = spec->dtsp_state; @@ -2468,7 +2468,7 @@ * according to the state transition diagram outlined in <sys/dtrace_impl.h> */ static void -dtrace_speculation_discard(dtrace_state_t *state, processorid_t cpu, +dtrace_speculation_discard(dtrace_state_t *state, processorid_t xcpu, dtrace_specid_t which) { dtrace_speculation_t *spec; @@ -2479,12 +2479,12 @@ return; if (which > state->dts_nspeculations) { - cpu_core[cpu].cpuc_dtrace_flags |= CPU_DTRACE_ILLOP; + cpu_core[xcpu].cpuc_dtrace_flags |= CPU_DTRACE_ILLOP; return; } spec = &state->dts_speculations[which - 1]; - buf = &spec->dtsp_buffer[cpu]; + buf = &spec->dtsp_buffer[xcpu]; do { current = spec->dtsp_state; @@ -2530,8 +2530,8 @@ dtrace_speculation_clean_here(dtrace_state_t *state) { dtrace_icookie_t cookie; - processorid_t cpu = curcpu_id; - dtrace_buffer_t *dest = &state->dts_buffer[cpu]; + processorid_t xcpu = curcpu_id; + dtrace_buffer_t *dest = &state->dts_buffer[xcpu]; dtrace_specid_t i; cookie = dtrace_interrupt_disable(); @@ -2543,7 +2543,7 @@ for (i = 0; i < state->dts_nspeculations; i++) { dtrace_speculation_t *spec = &state->dts_speculations[i]; - dtrace_buffer_t *src = &spec->dtsp_buffer[cpu]; + dtrace_buffer_t *src = &spec->dtsp_buffer[xcpu]; if (src->dtb_tomax == NULL) continue; @@ -2559,7 +2559,7 @@ if (src->dtb_offset == 0) continue; - dtrace_speculation_commit(state, cpu, i + 1); + dtrace_speculation_commit(state, xcpu, i + 1); } dtrace_interrupt_enable(cookie); @@ -5631,8 +5631,8 @@ dtrace_probe_t *probe = ecb->dte_probe; dtrace_provider_t *prov = probe->dtpr_provider; char c[DTRACE_FULLNAMELEN + 80], *str; - char *msg = "dtrace: breakpoint action at probe "; - char *ecbmsg = " (ecb "; + const char *msg = "dtrace: breakpoint action at probe "; + const char *ecbmsg = " (ecb "; uintptr_t mask = (0xf << (sizeof (uintptr_t) * NBBY / 4)); uintptr_t val = (uintptr_t)ecb; int shift = (sizeof (uintptr_t) * NBBY) - 4, i = 0; @@ -8035,7 +8035,7 @@ mod_nbsd = kmem_zalloc(sizeof(*mod_nbsd), KM_SLEEP); mod_nbsd->mod_info = kmem_zalloc(sizeof(modinfo_t), KM_SLEEP); mod_nbsd->mod_refcnt = 1; - *((char **)&mod_nbsd->mod_info->mi_name) = "netbsd"; + *((char **)(intptr_t)&mod_nbsd->mod_info->mi_name) = __UNCONST("netbsd"); } kernconfig_lock(); @@ -10545,12 +10545,12 @@ * of creating our own (saving both time and space). */ dtrace_ecb_t *cached = dtrace_ecb_create_cache; - dtrace_action_t *act = cached->dte_action; + dtrace_action_t *xact = cached->dte_action; - if (act != NULL) { - ASSERT(act->dta_refcnt > 0); - act->dta_refcnt++; - ecb->dte_action = act; + if (xact != NULL) { + ASSERT(xact->dta_refcnt > 0); + xact->dta_refcnt++; + ecb->dte_action = xact; ecb->dte_action_last = cached->dte_action_last; ecb->dte_needed = cached->dte_needed; ecb->dte_size = cached->dte_size; @@ -10700,7 +10700,7 @@ static int dtrace_buffer_alloc(dtrace_buffer_t *bufs, size_t size, int flags, - processorid_t cpu) + processorid_t xcpu) { #if defined(sun) cpu_t *cp; @@ -10721,7 +10721,7 @@ cp = cpu_list; do { - if (cpu != DTRACE_CPUALL && cpu != cp->cpu_id) + if (xcpu != DTRACE_CPUALL && xcpu != cp->cpu_id) continue; buf = &bufs[cp->cpu_id]; @@ -10758,7 +10758,7 @@ cp = cpu_list; do { - if (cpu != DTRACE_CPUALL && cpu != cp->cpu_id) + if (xcpu != DTRACE_CPUALL && xcpu != cp->cpu_id) continue; buf = &bufs[cp->cpu_id]; @@ -10794,7 +10794,7 @@ ASSERT(MUTEX_HELD(&dtrace_lock)); for (CPU_INFO_FOREACH(cpuind, cinfo)) { - if (cpu != DTRACE_CPUALL && cpu != cpu_index(cinfo)) + if (xcpu != DTRACE_CPUALL && xcpu != cpu_index(cinfo)) continue; buf = &bufs[cpu_index(cinfo)]; @@ -10834,7 +10834,7 @@ * allocated before the failed allocation. */ for (CPU_INFO_FOREACH(cpuind, cinfo)) { - if (cpu != DTRACE_CPUALL && cpu != cpu_index(cinfo)) + if (xcpu != DTRACE_CPUALL && xcpu != cpu_index(cinfo)) continue; buf = &bufs[cpu_index(cinfo)]; @@ -11995,7 +11995,7 @@ size_t ttl = 0; dof_difohdr_t *dofd; uintptr_t daddr = (uintptr_t)dof; - size_t max = dtrace_difo_maxsize; + size_t maxx = dtrace_difo_maxsize; int i, l, n; static const struct { @@ -12056,7 +12056,7 @@ dofd->dofd_links[l])) == NULL) goto err; /* invalid section link */ - if (ttl + subsec->dofs_size > max) { + if (ttl + subsec->dofs_size > maxx) { dtrace_dof_error(dof, "exceeds maximum size"); goto err; } @@ -12697,7 +12697,7 @@ static int dtrace_dstate_init(dtrace_dstate_t *dstate, size_t size) { - size_t hashsize, maxper, min, chunksize = dstate->dtds_chunksize; + size_t hashsize, maxper, minn, chunksize = dstate->dtds_chunksize; void *base; uintptr_t limit; dtrace_dynvar_t *dvar, *next, *start; @@ -12711,8 +12711,8 @@ if ((dstate->dtds_chunksize = chunksize) == 0) dstate->dtds_chunksize = DTRACE_DYNVAR_CHUNKSIZE; - if (size < (min = dstate->dtds_chunksize + sizeof (dtrace_dynhash_t))) - size = min; + if (size < (minn = dstate->dtds_chunksize + sizeof (dtrace_dynhash_t))) + size = minn; if ((base = kmem_zalloc(size, KM_NOSLEEP)) == NULL) return (ENOMEM); @@ -13178,7 +13178,7 @@ dtrace_state_buffer(dtrace_state_t *state, dtrace_buffer_t *buf, int which) { dtrace_optval_t *opt = state->dts_options, size; - processorid_t cpu = 0;; + processorid_t xcpu = 0;; int flags = 0, rval; ASSERT(MUTEX_HELD(&dtrace_lock)); @@ -13192,7 +13192,7 @@ return (0); if (opt[DTRACEOPT_CPU] != DTRACEOPT_UNSET) - cpu = opt[DTRACEOPT_CPU]; + xcpu = opt[DTRACEOPT_CPU]; if (which == DTRACEOPT_SPECSIZE) flags |= DTRACEBUF_NOSWITCH; @@ -13227,7 +13227,7 @@ return (E2BIG); } - rval = dtrace_buffer_alloc(buf, size, flags, cpu); + rval = dtrace_buffer_alloc(buf, size, flags, xcpu); if (rval != ENOMEM) { opt[which] = size; @@ -13291,7 +13291,7 @@ } static int -dtrace_state_go(dtrace_state_t *state, processorid_t *cpu) +dtrace_state_go(dtrace_state_t *state, processorid_t *xcpu) { dtrace_optval_t *opt = state->dts_options, sz, nspec; dtrace_speculation_t *spec; @@ -13379,7 +13379,7 @@ state->dts_options[DTRACEOPT_GRABANON] = opt[DTRACEOPT_GRABANON]; - *cpu = dtrace_anon.dta_beganon; + *xcpu = dtrace_anon.dta_beganon; /* * If the anonymous state is active (as it almost certainly @@ -13521,9 +13521,9 @@ * level) and to manually activate the buffer for this CPU. */ cookie = dtrace_interrupt_disable(); - *cpu = curcpu_id; - ASSERT(state->dts_buffer[*cpu].dtb_flags & DTRACEBUF_INACTIVE); - state->dts_buffer[*cpu].dtb_flags &= ~DTRACEBUF_INACTIVE; + *xcpu = curcpu_id; + ASSERT(state->dts_buffer[*xcpu].dtb_flags & DTRACEBUF_INACTIVE); + state->dts_buffer[*xcpu].dtb_flags &= ~DTRACEBUF_INACTIVE; dtrace_probe(dtrace_probeid_begin, (uint64_t)(uintptr_t)state, 0, 0, 0, 0); @@ -13582,7 +13582,7 @@ } static int -dtrace_state_stop(dtrace_state_t *state, processorid_t *cpu) +dtrace_state_stop(dtrace_state_t *state, processorid_t *xcpu) { dtrace_icookie_t cookie; @@ -13622,7 +13622,7 @@ state->dts_reserve = 0; cookie = dtrace_interrupt_disable(); - *cpu = curcpu_id; + *xcpu = curcpu_id; dtrace_probe(dtrace_probeid_end, (uint64_t)(uintptr_t)state, 0, 0, 0, 0); dtrace_interrupt_enable(cookie); @@ -15129,7 +15129,7 @@ #endif static int -dtrace_cpu_setup(cpu_setup_t what, processorid_t cpu) +dtrace_cpu_setup(cpu_setup_t what, processorid_t xcpu) { ASSERT(MUTEX_HELD(&cpu_lock)); mutex_enter(&dtrace_lock);