From: Dmitry V. Levin Date: Tue, 23 Aug 2016 00:24:10 +0000 (+0000) Subject: Rename widen_to_ull to zero_extend_signed_to_ull X-Git-Tag: v4.14~178 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=031fc80059746ba0d125ed0f1965217a22e41da3;p=strace Rename widen_to_ull to zero_extend_signed_to_ull * defs.h (widen_to_ull): Rename to zero_extend_signed_to_ull. All callers changed. * tests/tests.h: Likewise. --- diff --git a/defs.h b/defs.h index 070f2b34..fc64d94e 100644 --- a/defs.h +++ b/defs.h @@ -747,9 +747,9 @@ extern unsigned current_wordsize; #endif /* - * Widen without sign-extension a signed integer type to unsigned long long. + * Zero-extend a signed integer type to unsigned long long. */ -#define widen_to_ull(v) \ +#define zero_extend_signed_to_ull(v) \ (sizeof(v) == sizeof(int) ? (unsigned long long) (unsigned int) (v) : \ sizeof(v) == sizeof(long) ? (unsigned long long) (unsigned long) (v) : \ (unsigned long long) (v)) diff --git a/dirent.c b/dirent.c index 75e36355..c2776752 100644 --- a/dirent.c +++ b/dirent.c @@ -48,8 +48,8 @@ print_old_dirent(struct tcb *tcp, long addr) return; tprintf("{d_ino=%llu, d_off=%llu, d_reclen=%u, d_name=", - widen_to_ull(d.d_ino), - widen_to_ull(d.d_off), d.d_reclen); + zero_extend_signed_to_ull(d.d_ino), + zero_extend_signed_to_ull(d.d_off), d.d_reclen); if (d.d_reclen > D_NAME_LEN_MAX) d.d_reclen = D_NAME_LEN_MAX; printpathn(tcp, addr + offsetof(kernel_dirent, d_name), d.d_reclen); @@ -127,8 +127,9 @@ SYS_FUNC(getdents) tprintf("%s{d_ino=%llu, d_off=%llu, d_reclen=%u" ", d_name=", i ? ", " : "", - widen_to_ull(d->d_ino), - widen_to_ull(d->d_off), d->d_reclen); + zero_extend_signed_to_ull(d->d_ino), + zero_extend_signed_to_ull(d->d_off), + d->d_reclen); if (print_quoted_string(d->d_name, d_name_len, QUOTE_0_TERMINATED) > 0) { diff --git a/fetch_struct_statfs.c b/fetch_struct_statfs.c index 0cfe5baf..ddb248b4 100644 --- a/fetch_struct_statfs.c +++ b/fetch_struct_statfs.c @@ -47,26 +47,26 @@ MPERS_PRINTER_DECL(bool, fetch_struct_statfs, if (umove_or_printaddr(tcp, addr, &b)) return false; - p->f_type = widen_to_ull(b.f_type); - p->f_bsize = widen_to_ull(b.f_bsize); - p->f_blocks = widen_to_ull(b.f_blocks); - p->f_bfree = widen_to_ull(b.f_bfree); - p->f_bavail = widen_to_ull(b.f_bavail); - p->f_files = widen_to_ull(b.f_files); - p->f_ffree = widen_to_ull(b.f_ffree); + p->f_type = zero_extend_signed_to_ull(b.f_type); + p->f_bsize = zero_extend_signed_to_ull(b.f_bsize); + p->f_blocks = zero_extend_signed_to_ull(b.f_blocks); + p->f_bfree = zero_extend_signed_to_ull(b.f_bfree); + p->f_bavail = zero_extend_signed_to_ull(b.f_bavail); + p->f_files = zero_extend_signed_to_ull(b.f_files); + p->f_ffree = zero_extend_signed_to_ull(b.f_ffree); #if defined HAVE_STRUCT_STATFS_F_FSID_VAL - p->f_fsid[0] = widen_to_ull(b.f_fsid.val[0]); - p->f_fsid[1] = widen_to_ull(b.f_fsid.val[1]); + p->f_fsid[0] = zero_extend_signed_to_ull(b.f_fsid.val[0]); + p->f_fsid[1] = zero_extend_signed_to_ull(b.f_fsid.val[1]); #elif defined HAVE_STRUCT_STATFS_F_FSID___VAL - p->f_fsid[0] = widen_to_ull(b.f_fsid.__val[0]); - p->f_fsid[1] = widen_to_ull(b.f_fsid.__val[1]); + p->f_fsid[0] = zero_extend_signed_to_ull(b.f_fsid.__val[0]); + p->f_fsid[1] = zero_extend_signed_to_ull(b.f_fsid.__val[1]); #endif - p->f_namelen = widen_to_ull(b.f_namelen); + p->f_namelen = zero_extend_signed_to_ull(b.f_namelen); #ifdef HAVE_STRUCT_STATFS_F_FRSIZE - p->f_frsize = widen_to_ull(b.f_frsize); + p->f_frsize = zero_extend_signed_to_ull(b.f_frsize); #endif #ifdef HAVE_STRUCT_STATFS_F_FLAGS - p->f_flags = widen_to_ull(b.f_flags); + p->f_flags = zero_extend_signed_to_ull(b.f_flags); #endif return true; @@ -95,26 +95,26 @@ MPERS_PRINTER_DECL(bool, fetch_struct_statfs64, if (umove_or_printaddr(tcp, addr, &b)) return false; - p->f_type = widen_to_ull(b.f_type); - p->f_bsize = widen_to_ull(b.f_bsize); - p->f_blocks = widen_to_ull(b.f_blocks); - p->f_bfree = widen_to_ull(b.f_bfree); - p->f_bavail = widen_to_ull(b.f_bavail); - p->f_files = widen_to_ull(b.f_files); - p->f_ffree = widen_to_ull(b.f_ffree); + p->f_type = zero_extend_signed_to_ull(b.f_type); + p->f_bsize = zero_extend_signed_to_ull(b.f_bsize); + p->f_blocks = zero_extend_signed_to_ull(b.f_blocks); + p->f_bfree = zero_extend_signed_to_ull(b.f_bfree); + p->f_bavail = zero_extend_signed_to_ull(b.f_bavail); + p->f_files = zero_extend_signed_to_ull(b.f_files); + p->f_ffree = zero_extend_signed_to_ull(b.f_ffree); #if defined HAVE_STRUCT_STATFS64_F_FSID_VAL - p->f_fsid[0] = widen_to_ull(b.f_fsid.val[0]); - p->f_fsid[1] = widen_to_ull(b.f_fsid.val[1]); + p->f_fsid[0] = zero_extend_signed_to_ull(b.f_fsid.val[0]); + p->f_fsid[1] = zero_extend_signed_to_ull(b.f_fsid.val[1]); #elif defined HAVE_STRUCT_STATFS64_F_FSID___VAL - p->f_fsid[0] = widen_to_ull(b.f_fsid.__val[0]); - p->f_fsid[1] = widen_to_ull(b.f_fsid.__val[1]); + p->f_fsid[0] = zero_extend_signed_to_ull(b.f_fsid.__val[0]); + p->f_fsid[1] = zero_extend_signed_to_ull(b.f_fsid.__val[1]); #endif - p->f_namelen = widen_to_ull(b.f_namelen); + p->f_namelen = zero_extend_signed_to_ull(b.f_namelen); #ifdef HAVE_STRUCT_STATFS64_F_FRSIZE - p->f_frsize = widen_to_ull(b.f_frsize); + p->f_frsize = zero_extend_signed_to_ull(b.f_frsize); #endif #ifdef HAVE_STRUCT_STATFS64_F_FLAGS - p->f_flags = widen_to_ull(b.f_flags); + p->f_flags = zero_extend_signed_to_ull(b.f_flags); #endif return true; diff --git a/io.c b/io.c index ee849733..907f9d24 100644 --- a/io.c +++ b/io.c @@ -201,8 +201,8 @@ print_lld_from_low_high_val(struct tcb *tcp, int arg) # if SUPPORTED_PERSONALITIES > 1 if (current_personality == 1) { tprintf("%lld", - (widen_to_ull(tcp->u_arg[arg + 1]) << sizeof(long) * 8) - | widen_to_ull(tcp->u_arg[arg])); + (zero_extend_signed_to_ull(tcp->u_arg[arg + 1]) << sizeof(long) * 8) + | zero_extend_signed_to_ull(tcp->u_arg[arg])); } else # endif { @@ -210,8 +210,8 @@ print_lld_from_low_high_val(struct tcb *tcp, int arg) } #else /* SIZEOF_LONG_LONG > SIZEOF_LONG && !HAVE_STRUCT_TCB_EXT_ARG */ tprintf("%lld", - (widen_to_ull(tcp->u_arg[arg + 1]) << sizeof(long) * 8) - | widen_to_ull(tcp->u_arg[arg])); + (zero_extend_signed_to_ull(tcp->u_arg[arg + 1]) << sizeof(long) * 8) + | zero_extend_signed_to_ull(tcp->u_arg[arg])); #endif } diff --git a/lseek.c b/lseek.c index 8d05dc1a..1846abe4 100644 --- a/lseek.c +++ b/lseek.c @@ -110,8 +110,8 @@ SYS_FUNC(llseek) if (entering(tcp)) { printfd(tcp, tcp->u_arg[0]); tprintf(", %lld, ", - (widen_to_ull(tcp->u_arg[1]) << 32) - | widen_to_ull(tcp->u_arg[2])); + (zero_extend_signed_to_ull(tcp->u_arg[1]) << 32) + | zero_extend_signed_to_ull(tcp->u_arg[2])); } else { printnum_int64(tcp, tcp->u_arg[3], "%" PRIu64); tprints(", "); diff --git a/printrusage.c b/printrusage.c index acf67eb1..548af828 100644 --- a/printrusage.c +++ b/printrusage.c @@ -45,27 +45,27 @@ MPERS_PRINTER_DECL(void, printrusage, struct tcb *tcp, long addr) return; tprintf("{ru_utime={%llu, %llu}, ru_stime={%llu, %llu}, ", - widen_to_ull(ru.ru_utime.tv_sec), - widen_to_ull(ru.ru_utime.tv_usec), - widen_to_ull(ru.ru_stime.tv_sec), - widen_to_ull(ru.ru_stime.tv_usec)); + zero_extend_signed_to_ull(ru.ru_utime.tv_sec), + zero_extend_signed_to_ull(ru.ru_utime.tv_usec), + zero_extend_signed_to_ull(ru.ru_stime.tv_sec), + zero_extend_signed_to_ull(ru.ru_stime.tv_usec)); if (abbrev(tcp)) tprints("...}"); else { - tprintf("ru_maxrss=%llu, ", widen_to_ull(ru.ru_maxrss)); - tprintf("ru_ixrss=%llu, ", widen_to_ull(ru.ru_ixrss)); - tprintf("ru_idrss=%llu, ", widen_to_ull(ru.ru_idrss)); - tprintf("ru_isrss=%llu, ", widen_to_ull(ru.ru_isrss)); - tprintf("ru_minflt=%llu, ", widen_to_ull(ru.ru_minflt)); - tprintf("ru_majflt=%llu, ", widen_to_ull(ru.ru_majflt)); - tprintf("ru_nswap=%llu, ", widen_to_ull(ru.ru_nswap)); - tprintf("ru_inblock=%llu, ", widen_to_ull(ru.ru_inblock)); - tprintf("ru_oublock=%llu, ", widen_to_ull(ru.ru_oublock)); - tprintf("ru_msgsnd=%llu, ", widen_to_ull(ru.ru_msgsnd)); - tprintf("ru_msgrcv=%llu, ", widen_to_ull(ru.ru_msgrcv)); - tprintf("ru_nsignals=%llu, ", widen_to_ull(ru.ru_nsignals)); - tprintf("ru_nvcsw=%llu, ", widen_to_ull(ru.ru_nvcsw)); - tprintf("ru_nivcsw=%llu}", widen_to_ull(ru.ru_nivcsw)); + tprintf("ru_maxrss=%llu, ", zero_extend_signed_to_ull(ru.ru_maxrss)); + tprintf("ru_ixrss=%llu, ", zero_extend_signed_to_ull(ru.ru_ixrss)); + tprintf("ru_idrss=%llu, ", zero_extend_signed_to_ull(ru.ru_idrss)); + tprintf("ru_isrss=%llu, ", zero_extend_signed_to_ull(ru.ru_isrss)); + tprintf("ru_minflt=%llu, ", zero_extend_signed_to_ull(ru.ru_minflt)); + tprintf("ru_majflt=%llu, ", zero_extend_signed_to_ull(ru.ru_majflt)); + tprintf("ru_nswap=%llu, ", zero_extend_signed_to_ull(ru.ru_nswap)); + tprintf("ru_inblock=%llu, ", zero_extend_signed_to_ull(ru.ru_inblock)); + tprintf("ru_oublock=%llu, ", zero_extend_signed_to_ull(ru.ru_oublock)); + tprintf("ru_msgsnd=%llu, ", zero_extend_signed_to_ull(ru.ru_msgsnd)); + tprintf("ru_msgrcv=%llu, ", zero_extend_signed_to_ull(ru.ru_msgrcv)); + tprintf("ru_nsignals=%llu, ", zero_extend_signed_to_ull(ru.ru_nsignals)); + tprintf("ru_nvcsw=%llu, ", zero_extend_signed_to_ull(ru.ru_nvcsw)); + tprintf("ru_nivcsw=%llu}", zero_extend_signed_to_ull(ru.ru_nivcsw)); } } diff --git a/printsiginfo.c b/printsiginfo.c index 699460f3..1f4a8258 100644 --- a/printsiginfo.c +++ b/printsiginfo.c @@ -172,8 +172,8 @@ print_si_info(const siginfo_t *sip) else printsignal(sip->si_status); tprintf(", si_utime=%llu, si_stime=%llu", - widen_to_ull(sip->si_utime), - widen_to_ull(sip->si_stime)); + zero_extend_signed_to_ull(sip->si_utime), + zero_extend_signed_to_ull(sip->si_stime)); break; case SIGILL: case SIGFPE: case SIGSEGV: case SIGBUS: diff --git a/printstat.h b/printstat.h index f7c42380..5786b61b 100644 --- a/printstat.h +++ b/printstat.h @@ -56,14 +56,15 @@ DO_PRINTSTAT(struct tcb *tcp, const STRUCT_STAT *statbuf) tprintf("st_dev=makedev(%u, %u), st_ino=%llu, st_mode=", (unsigned int) STAT_MAJOR(statbuf->st_dev), (unsigned int) STAT_MINOR(statbuf->st_dev), - widen_to_ull(statbuf->st_ino)); + zero_extend_signed_to_ull(statbuf->st_ino)); print_symbolic_mode_t(statbuf->st_mode); tprintf(", st_nlink=%u, st_uid=%u, st_gid=%u", (unsigned int) statbuf->st_nlink, (unsigned int) statbuf->st_uid, (unsigned int) statbuf->st_gid); tprintf(", st_blksize=%u", (unsigned int) statbuf->st_blksize); - tprintf(", st_blocks=%llu", widen_to_ull(statbuf->st_blocks)); + tprintf(", st_blocks=%llu", + zero_extend_signed_to_ull(statbuf->st_blocks)); } else { tprints("st_mode="); print_symbolic_mode_t(statbuf->st_mode); @@ -76,7 +77,8 @@ DO_PRINTSTAT(struct tcb *tcp, const STRUCT_STAT *statbuf) (unsigned int) STAT_MINOR(statbuf->st_rdev)); break; default: - tprintf(", st_size=%llu", widen_to_ull(statbuf->st_size)); + tprintf(", st_size=%llu", + zero_extend_signed_to_ull(statbuf->st_size)); break; } diff --git a/sysinfo.c b/sysinfo.c index c3cb9adc..a0f29cbf 100644 --- a/sysinfo.c +++ b/sysinfo.c @@ -59,19 +59,19 @@ SYS_FUNC(sysinfo) ", freehigh=%llu" ", mem_unit=%u" "}", - widen_to_ull(si.uptime) - , widen_to_ull(si.loads[0]) - , widen_to_ull(si.loads[1]) - , widen_to_ull(si.loads[2]) - , widen_to_ull(si.totalram) - , widen_to_ull(si.freeram) - , widen_to_ull(si.sharedram) - , widen_to_ull(si.bufferram) - , widen_to_ull(si.totalswap) - , widen_to_ull(si.freeswap) + zero_extend_signed_to_ull(si.uptime) + , zero_extend_signed_to_ull(si.loads[0]) + , zero_extend_signed_to_ull(si.loads[1]) + , zero_extend_signed_to_ull(si.loads[2]) + , zero_extend_signed_to_ull(si.totalram) + , zero_extend_signed_to_ull(si.freeram) + , zero_extend_signed_to_ull(si.sharedram) + , zero_extend_signed_to_ull(si.bufferram) + , zero_extend_signed_to_ull(si.totalswap) + , zero_extend_signed_to_ull(si.freeswap) , (unsigned) si.procs - , widen_to_ull(si.totalhigh) - , widen_to_ull(si.freehigh) + , zero_extend_signed_to_ull(si.totalhigh) + , zero_extend_signed_to_ull(si.freehigh) , si.mem_unit ); } diff --git a/tests/siginfo.c b/tests/siginfo.c index 48cfaf3a..2ecb13fd 100644 --- a/tests/siginfo.c +++ b/tests/siginfo.c @@ -86,7 +86,8 @@ main(void) ", si_pid=%d, si_uid=%u, si_status=%d" ", si_utime=%llu, si_stime=%llu} ---\n", sinfo.si_pid, sinfo.si_uid, sinfo.si_status, - widen_to_ull(sinfo.si_utime), widen_to_ull(sinfo.si_stime)); + zero_extend_signed_to_ull(sinfo.si_utime), + zero_extend_signed_to_ull(sinfo.si_stime)); int s; assert(wait(&s) == pid); @@ -116,7 +117,8 @@ main(void) ", si_pid=%d, si_uid=%u, si_status=SIGUSR1" ", si_utime=%llu, si_stime=%llu} ---\n", sinfo.si_pid, sinfo.si_uid, - widen_to_ull(sinfo.si_utime), widen_to_ull(sinfo.si_stime)); + zero_extend_signed_to_ull(sinfo.si_utime), + zero_extend_signed_to_ull(sinfo.si_stime)); assert(wait(&s) == pid); assert(WIFSIGNALED(s) && WTERMSIG(s) == SIGUSR1); @@ -142,7 +144,8 @@ main(void) ", si_pid=%d, si_uid=%u, si_status=SIGSTOP" ", si_utime=%llu, si_stime=%llu} ---\n", sinfo.si_pid, sinfo.si_uid, - widen_to_ull(sinfo.si_utime), widen_to_ull(sinfo.si_stime)); + zero_extend_signed_to_ull(sinfo.si_utime), + zero_extend_signed_to_ull(sinfo.si_stime)); assert(kill(pid, SIGCONT) == 0); @@ -151,7 +154,8 @@ main(void) ", si_pid=%d, si_uid=%u, si_status=SIGCONT" ", si_utime=%llu, si_stime=%llu} ---\n", sinfo.si_pid, sinfo.si_uid, - widen_to_ull(sinfo.si_utime), widen_to_ull(sinfo.si_stime)); + zero_extend_signed_to_ull(sinfo.si_utime), + zero_extend_signed_to_ull(sinfo.si_stime)); assert(write(1, "", 1) == 1); (void) close(1); @@ -161,7 +165,8 @@ main(void) ", si_pid=%d, si_uid=%u, si_status=0" ", si_utime=%llu, si_stime=%llu} ---\n", sinfo.si_pid, sinfo.si_uid, - widen_to_ull(sinfo.si_utime), widen_to_ull(sinfo.si_stime)); + zero_extend_signed_to_ull(sinfo.si_utime), + zero_extend_signed_to_ull(sinfo.si_stime)); assert(wait(&s) == pid && s == 0); diff --git a/tests/tests.h b/tests/tests.h index ed47831e..5e170fec 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -121,9 +121,9 @@ int send_mmsg(int, struct mmsghdr *, unsigned int, unsigned int); # define LENGTH_OF(arg) ((unsigned int) sizeof(arg) - 1) /* - * Widen without sign-extension a signed integer type to unsigned long long. + * Zero-extend a signed integer type to unsigned long long. */ -#define widen_to_ull(v) \ +#define zero_extend_signed_to_ull(v) \ (sizeof(v) == sizeof(int) ? (unsigned long long) (unsigned int) (v) : \ sizeof(v) == sizeof(long) ? (unsigned long long) (unsigned long) (v) : \ (unsigned long long) (v)) diff --git a/tests/waitid.c b/tests/waitid.c index bbe6feec..126819ef 100644 --- a/tests/waitid.c +++ b/tests/waitid.c @@ -62,25 +62,25 @@ sprint_rusage(const struct rusage *const ru) #else ", ...}" #endif - , widen_to_ull(ru->ru_utime.tv_sec) - , widen_to_ull(ru->ru_utime.tv_usec) - , widen_to_ull(ru->ru_stime.tv_sec) - , widen_to_ull(ru->ru_stime.tv_usec) + , zero_extend_signed_to_ull(ru->ru_utime.tv_sec) + , zero_extend_signed_to_ull(ru->ru_utime.tv_usec) + , zero_extend_signed_to_ull(ru->ru_stime.tv_sec) + , zero_extend_signed_to_ull(ru->ru_stime.tv_usec) #ifdef VERBOSE_RUSAGE - , widen_to_ull(ru->ru_maxrss) - , widen_to_ull(ru->ru_ixrss) - , widen_to_ull(ru->ru_idrss) - , widen_to_ull(ru->ru_isrss) - , widen_to_ull(ru->ru_minflt) - , widen_to_ull(ru->ru_majflt) - , widen_to_ull(ru->ru_nswap) - , widen_to_ull(ru->ru_inblock) - , widen_to_ull(ru->ru_oublock) - , widen_to_ull(ru->ru_msgsnd) - , widen_to_ull(ru->ru_msgrcv) - , widen_to_ull(ru->ru_nsignals) - , widen_to_ull(ru->ru_nvcsw) - , widen_to_ull(ru->ru_nivcsw) + , zero_extend_signed_to_ull(ru->ru_maxrss) + , zero_extend_signed_to_ull(ru->ru_ixrss) + , zero_extend_signed_to_ull(ru->ru_idrss) + , zero_extend_signed_to_ull(ru->ru_isrss) + , zero_extend_signed_to_ull(ru->ru_minflt) + , zero_extend_signed_to_ull(ru->ru_majflt) + , zero_extend_signed_to_ull(ru->ru_nswap) + , zero_extend_signed_to_ull(ru->ru_inblock) + , zero_extend_signed_to_ull(ru->ru_oublock) + , zero_extend_signed_to_ull(ru->ru_msgsnd) + , zero_extend_signed_to_ull(ru->ru_msgrcv) + , zero_extend_signed_to_ull(ru->ru_nsignals) + , zero_extend_signed_to_ull(ru->ru_nvcsw) + , zero_extend_signed_to_ull(ru->ru_nivcsw) #endif ); return buf; @@ -130,8 +130,8 @@ sprint_siginfo(const siginfo_t *const si, const char *const status_text) si->si_pid, si->si_uid, status_text, - widen_to_ull(si->si_utime), - widen_to_ull(si->si_stime)); + zero_extend_signed_to_ull(si->si_utime), + zero_extend_signed_to_ull(si->si_stime)); return buf; } diff --git a/times.c b/times.c index 04df462e..6af4f95a 100644 --- a/times.c +++ b/times.c @@ -46,11 +46,11 @@ SYS_FUNC(times) if (!umove_or_printaddr(tcp, tcp->u_arg[0], &tbuf)) { tprintf("{tms_utime=%llu, tms_stime=%llu, ", - widen_to_ull(tbuf.tms_utime), - widen_to_ull(tbuf.tms_stime)); + zero_extend_signed_to_ull(tbuf.tms_utime), + zero_extend_signed_to_ull(tbuf.tms_stime)); tprintf("tms_cutime=%llu, tms_cstime=%llu}", - widen_to_ull(tbuf.tms_cutime), - widen_to_ull(tbuf.tms_cstime)); + zero_extend_signed_to_ull(tbuf.tms_cutime), + zero_extend_signed_to_ull(tbuf.tms_cstime)); } return syserror(tcp) ? RVAL_DECIMAL :