Page MenuHomeFreeBSD
Files F156947120

D5123.diff
No OneTemporary
Actions

D5123.diff
View Options

Index: head/lib/libsysdecode/syscallnames.c
===================================================================
--- head/lib/libsysdecode/syscallnames.c
+++ head/lib/libsysdecode/syscallnames.c
@@ -70,30 +70,30 @@
{
switch (abi) {
- case FREEBSD:
+ case SYSDECODE_ABI_FREEBSD:
if (code < nitems(syscallnames))
return (syscallnames[code]);
break;
#if defined(__amd64__) || defined(__powerpc64__)
- case FREEBSD32:
+ case SYSDECODE_ABI_FREEBSD32:
if (code < nitems(freebsd32_syscallnames))
return (freebsd32_syscallnames[code]);
break;
#endif
#if defined(__amd64__) || defined(__i386__)
- case LINUX:
+ case SYSDECODE_ABI_LINUX:
if (code < nitems(linux_syscallnames))
return (linux_syscallnames[code]);
break;
#endif
#ifdef __amd64__
- case LINUX32:
+ case SYSDECODE_ABI_LINUX32:
if (code < nitems(linux32_syscallnames))
return (linux32_syscallnames[code]);
break;
#endif
#if defined(__amd64__) || defined(__aarch64__)
- case CLOUDABI64:
+ case SYSDECODE_ABI_CLOUDABI64:
if (code < nitems(cloudabi64_syscallnames))
return (cloudabi64_syscallnames[code]);
break;
Index: head/lib/libsysdecode/sysdecode.h
===================================================================
--- head/lib/libsysdecode/sysdecode.h
+++ head/lib/libsysdecode/sysdecode.h
@@ -30,12 +30,12 @@
#define __SYSDECODE_H__
enum sysdecode_abi {
- UNKNOWN_ABI = 0,
- FREEBSD,
- FREEBSD32,
- LINUX,
- LINUX32,
- CLOUDABI64
+ SYSDECODE_ABI_UNKNOWN = 0,
+ SYSDECODE_ABI_FREEBSD,
+ SYSDECODE_ABI_FREEBSD32,
+ SYSDECODE_ABI_LINUX,
+ SYSDECODE_ABI_LINUX32,
+ SYSDECODE_ABI_CLOUDABI64
};
const char *sysdecode_ioctlname(unsigned long _val);
Index: head/lib/libsysdecode/sysdecode.3
===================================================================
--- head/lib/libsysdecode/sysdecode.3
+++ head/lib/libsysdecode/sysdecode.3
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 24, 2016
+.Dd January 29, 2016
.Dt SYSDECODE 3
.Os
.Sh NAME
@@ -44,23 +44,23 @@
.Vt enum sysdecode_abi
enumeration.
.Pp
-.Bl -tag -width "Li UNKNOWN_ABI" -compact
-.It Li FREEBSD
+.Bl -tag -width "Li SYSDECODE_ABI_CLOUDABI64" -compact
+.It Li SYSDECODE_ABI_FREEBSD
Native FreeBSD binaries.
Supported on all platforms.
-.It Li FREEBSD32
+.It Li SYSDECODE_ABI_FREEBSD32
32-bit FreeBSD binaries.
Supported on amd64 and powerpc64.
-.It Li LINUX
+.It Li SYSDECODE_ABI_LINUX
Linux binaries of the same platform.
Supported on amd64 and i386.
-.It Li LINUX32
+.It Li SYSDECODE_ABI_LINUX32
32-bit Linux binaries.
Supported on amd64.
-.It Li CLOUDABI64
+.It Li SYSDECODE_ABI_CLOUDABI64
64-bit CloudABI binaries.
Supported on aarch64 and amd64.
-.It Li UNKNOWN_ABI
+.It Li SYSDECODE_ABI_UNKNOWN
A placeholder for use when the ABI is not known.
.El
.Sh SEE ALSO
Index: head/usr.bin/kdump/kdump.c
===================================================================
--- head/usr.bin/kdump/kdump.c
+++ head/usr.bin/kdump/kdump.c
@@ -690,20 +690,20 @@
{
if (sv_flags == 0)
- return (FREEBSD);
+ return (SYSDECODE_ABI_FREEBSD);
switch (sv_flags & SV_ABI_MASK) {
case SV_ABI_FREEBSD:
- return (FREEBSD);
+ return (SYSDECODE_ABI_FREEBSD);
#if defined(__amd64__) || defined(__i386__)
case SV_ABI_LINUX:
#ifdef __amd64__
if (sv_flags & SV_ILP32)
- return (LINUX32);
+ return (SYSDECODE_ABI_LINUX32);
#endif
- return (LINUX);
+ return (SYSDECODE_ABI_LINUX);
#endif
default:
- return (UNKNOWN_ABI);
+ return (SYSDECODE_ABI_UNKNOWN);
}
}
Index: head/usr.bin/truss/aarch64-cloudabi64.c
===================================================================
--- head/usr.bin/truss/aarch64-cloudabi64.c
+++ head/usr.bin/truss/aarch64-cloudabi64.c
@@ -81,7 +81,7 @@
static struct procabi aarch64_cloudabi64 = {
"CloudABI ELF64",
- CLOUDABI64,
+ SYSDECODE_ABI_CLOUDABI64,
aarch64_cloudabi64_fetch_args,
aarch64_cloudabi64_fetch_retval
};
Index: head/usr.bin/truss/aarch64-freebsd.c
===================================================================
--- head/usr.bin/truss/aarch64-freebsd.c
+++ head/usr.bin/truss/aarch64-freebsd.c
@@ -99,7 +99,7 @@
static struct procabi aarch64_freebsd = {
"FreeBSD ELF64",
- FREEBSD,
+ SYSDECODE_ABI_FREEBSD,
aarch64_fetch_args,
aarch64_fetch_retval
};
Index: head/usr.bin/truss/amd64-cloudabi64.c
===================================================================
--- head/usr.bin/truss/amd64-cloudabi64.c
+++ head/usr.bin/truss/amd64-cloudabi64.c
@@ -90,7 +90,7 @@
static struct procabi amd64_cloudabi64 = {
"CloudABI ELF64",
- CLOUDABI64,
+ SYSDECODE_ABI_CLOUDABI64,
amd64_cloudabi64_fetch_args,
amd64_cloudabi64_fetch_retval
};
Index: head/usr.bin/truss/amd64-freebsd.c
===================================================================
--- head/usr.bin/truss/amd64-freebsd.c
+++ head/usr.bin/truss/amd64-freebsd.c
@@ -121,7 +121,7 @@
static struct procabi amd64_freebsd = {
"FreeBSD ELF64",
- FREEBSD,
+ SYSDECODE_ABI_FREEBSD,
amd64_fetch_args,
amd64_fetch_retval
};
Index: head/usr.bin/truss/amd64-freebsd32.c
===================================================================
--- head/usr.bin/truss/amd64-freebsd32.c
+++ head/usr.bin/truss/amd64-freebsd32.c
@@ -117,7 +117,7 @@
static struct procabi amd64_freebsd32 = {
"FreeBSD ELF32",
- FREEBSD32,
+ SYSDECODE_ABI_FREEBSD32,
amd64_freebsd32_fetch_args,
amd64_freebsd32_fetch_retval
};
@@ -126,7 +126,7 @@
static struct procabi amd64_freebsd32_aout = {
"FreeBSD a.out",
- FREEBSD32,
+ SYSDECODE_ABI_FREEBSD32,
amd64_freebsd32_fetch_args,
amd64_freebsd32_fetch_retval
};
Index: head/usr.bin/truss/amd64-linux32.c
===================================================================
--- head/usr.bin/truss/amd64-linux32.c
+++ head/usr.bin/truss/amd64-linux32.c
@@ -131,7 +131,7 @@
static struct procabi amd64_linux32 = {
"Linux ELF32",
- LINUX32,
+ SYSDECODE_ABI_LINUX32,
amd64_linux32_fetch_args,
amd64_linux32_fetch_retval
};
Index: head/usr.bin/truss/arm-freebsd.c
===================================================================
--- head/usr.bin/truss/arm-freebsd.c
+++ head/usr.bin/truss/arm-freebsd.c
@@ -128,7 +128,7 @@
static struct procabi arm_freebsd = {
"FreeBSD ELF32",
- FREEBSD,
+ SYSDECODE_ABI_FREEBSD,
arm_fetch_args,
arm_fetch_retval
};
Index: head/usr.bin/truss/i386-freebsd.c
===================================================================
--- head/usr.bin/truss/i386-freebsd.c
+++ head/usr.bin/truss/i386-freebsd.c
@@ -110,7 +110,7 @@
static struct procabi i386_freebsd = {
"FreeBSD ELF32",
- FREEBSD,
+ SYSDECODE_ABI_FREEBSD,
i386_fetch_args,
i386_fetch_retval
};
@@ -119,7 +119,7 @@
static struct procabi i386_freebsd_aout = {
"FreeBSD a.out",
- FREEBSD,
+ SYSDECODE_ABI_FREEBSD,
i386_fetch_args,
i386_fetch_retval
};
Index: head/usr.bin/truss/i386-linux.c
===================================================================
--- head/usr.bin/truss/i386-linux.c
+++ head/usr.bin/truss/i386-linux.c
@@ -130,7 +130,7 @@
static struct procabi i386_linux = {
"Linux ELF32",
- LINUX,
+ SYSDECODE_ABI_LINUX,
i386_linux_fetch_args,
i386_linux_fetch_retval
};
Index: head/usr.bin/truss/mips-freebsd.c
===================================================================
--- head/usr.bin/truss/mips-freebsd.c
+++ head/usr.bin/truss/mips-freebsd.c
@@ -131,7 +131,7 @@
#else
"FreeBSD ELF32",
#endif
- FREEBSD,
+ SYSDECODE_ABI_FREEBSD,
mips_fetch_args,
mips_fetch_retval
};
Index: head/usr.bin/truss/powerpc-freebsd.c
===================================================================
--- head/usr.bin/truss/powerpc-freebsd.c
+++ head/usr.bin/truss/powerpc-freebsd.c
@@ -112,7 +112,7 @@
static struct procabi powerpc_freebsd = {
"FreeBSD ELF32",
- FREEBSD,
+ SYSDECODE_ABI_FREEBSD,
powerpc_fetch_args,
powerpc_fetch_retval
};
Index: head/usr.bin/truss/powerpc64-freebsd.c
===================================================================
--- head/usr.bin/truss/powerpc64-freebsd.c
+++ head/usr.bin/truss/powerpc64-freebsd.c
@@ -108,7 +108,7 @@
static struct procabi powerpc64_freebsd = {
"FreeBSD ELF64",
- FREEBSD,
+ SYSDECODE_ABI_FREEBSD,
powerpc64_fetch_args,
powerpc64_fetch_retval
};
Index: head/usr.bin/truss/powerpc64-freebsd32.c
===================================================================
--- head/usr.bin/truss/powerpc64-freebsd32.c
+++ head/usr.bin/truss/powerpc64-freebsd32.c
@@ -117,7 +117,7 @@
static struct procabi powerpc64_freebsd32 = {
"FreeBSD ELF32",
- FREEBSD32,
+ SYSDECODE_ABI_FREEBSD32,
powerpc64_freebsd32_fetch_args,
powerpc64_freebsd32_fetch_retval
};
Index: head/usr.bin/truss/sparc64-freebsd.c
===================================================================
--- head/usr.bin/truss/sparc64-freebsd.c
+++ head/usr.bin/truss/sparc64-freebsd.c
@@ -115,7 +115,7 @@
static struct procabi sparc64_freebsd = {
"FreeBSD ELF64",
- FREEBSD,
+ SYSDECODE_ABI_FREEBSD,
sparc64_fetch_args,
sparc64_fetch_retval
};

File Metadata

Mime Type
text/plain
Expires
Mon, May 18, 1:51 PM (3 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33250937
Default Alt Text
D5123.diff (8 KB)

Event Timeline