Page MenuHomeFreeBSD
Files F136833780

D27637.id80778.diff
No OneTemporary
Actions

D27637.id80778.diff
View Options

Index: usr.bin/truss/syscalls.c
===================================================================
--- usr.bin/truss/syscalls.c
+++ usr.bin/truss/syscalls.c
@@ -68,6 +68,7 @@
#define _WANT_KERNEL_ERRNO
#include <errno.h>
#include <fcntl.h>
+#include <inttypes.h>
#include <signal.h>
#include <stdbool.h>
#include <stdio.h>
@@ -1900,32 +1901,30 @@
fputs(" ]", fp);
break;
}
-#ifdef __LP64__
- case Quad:
- fprintf(fp, "%ld", args[sc->offset]);
- break;
- case QuadHex:
- fprintf(fp, "0x%lx", args[sc->offset]);
- break;
-#else
case Quad:
case QuadHex: {
- unsigned long long ll;
+ uint64_t value;
+ size_t pointer_size =
+ trussinfo->curthread->proc->abi->pointer_size;
+ /* XXX: Do all 32-bit ABIs use this calling convention? */
+ if (pointer_size == 4) {
#if _BYTE_ORDER == _LITTLE_ENDIAN
- ll = (unsigned long long)args[sc->offset + 1] << 32 |
- args[sc->offset];
+ value = (uint64_t)args[sc->offset + 1] << 32 |
+ args[sc->offset];
#else
- ll = (unsigned long long)args[sc->offset] << 32 |
- args[sc->offset + 1];
+ value = (uint64_t)args[sc->offset] << 32 |
+ args[sc->offset + 1];
#endif
+ } else {
+ value = (uint64_t)args[sc->offset];
+ }
if ((sc->type & ARG_MASK) == Quad)
- fprintf(fp, "%lld", ll);
+ fprintf(fp, "%" PRId64, value);
else
- fprintf(fp, "0x%llx", ll);
+ fprintf(fp, "0x%" PRIx64, value);
break;
}
-#endif
case PQuadHex: {
uint64_t val;
@@ -2989,11 +2988,8 @@
fprintf(trussinfo->outfile, " ERR#%d '%s'\n",
sysdecode_freebsd_to_abi_errno(t->proc->abi->abi, error),
strerror(error));
- }
-#ifndef __LP64__
- else if (sc->info.ret_type == 2) {
+ } else if (sc->info.ret_type == 2 && t->proc->abi->pointer_size == 4) {
off_t off;
-
#if _BYTE_ORDER == _LITTLE_ENDIAN
off = (off_t)retval[1] << 32 | retval[0];
#else
@@ -3001,11 +2997,10 @@
#endif
fprintf(trussinfo->outfile, " = %jd (0x%jx)\n", (intmax_t)off,
(intmax_t)off);
- }
-#endif
- else
+ } else {
fprintf(trussinfo->outfile, " = %jd (0x%jx)\n",
(intmax_t)retval[0], (intmax_t)retval[0]);
+ }
}
void

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 20, 10:41 PM (15 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25742181
Default Alt Text
D27637.id80778.diff (2 KB)

Event Timeline