Remove HAVE_STRUCT_TCB_EXT_ARG, ext_arg, and u_lrval

[strace] / defs.h

diff --git a/defs.h b/defs.h
index 054ca01a299b37e1321177b57f48b15e5e8cc051..61a5e1200232c676cd4aab78c5f48ed6a6f8881c 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -220,12 +220,6 @@ struct fault_opts {
        uint16_t err;
 };
 
-#if defined LINUX_MIPSN32 || defined X32
-# define HAVE_STRUCT_TCB_EXT_ARG 1
-#else
-# define HAVE_STRUCT_TCB_EXT_ARG 0
-#endif
-
 /* Trace Control Block */
 struct tcb {
        int flags;              /* See below for TCB_ values */
@@ -234,10 +228,6 @@ struct tcb {
        unsigned long u_error;  /* Error code */
        kernel_ulong_t scno;    /* System call number */
        kernel_ulong_t u_arg[MAX_ARGS]; /* System call arguments */
-#if HAVE_STRUCT_TCB_EXT_ARG
-       unsigned long long ext_arg[MAX_ARGS];
-       long long u_lrval;      /* long long return value */
-#endif
        kernel_long_t u_rval;   /* Return value */
 #if SUPPORTED_PERSONALITIES > 1
        unsigned int currpers;  /* Personality at the time of scno update */
@@ -329,16 +319,8 @@ extern const struct xlat whence_codes[];
 #define RVAL_HEX       001     /* hex format */
 #define RVAL_OCTAL     002     /* octal format */
 #define RVAL_UDECIMAL  003     /* unsigned decimal format */
-#if HAVE_STRUCT_TCB_EXT_ARG
-# if 0 /* unused so far */
-#  define RVAL_LDECIMAL        004     /* long decimal format */
-#  define RVAL_LHEX    005     /* long hex format */
-#  define RVAL_LOCTAL  006     /* long octal format */
-# endif
-# define RVAL_LUDECIMAL        007     /* long unsigned decimal format */
-#endif /* HAVE_STRUCT_TCB_EXT_ARG */
 #define RVAL_FD                010     /* file descriptor */
-#define RVAL_MASK      017     /* mask for these values */
+#define RVAL_MASK      013     /* mask for these values */
 
 #define RVAL_STR       020     /* Print `auxstr' field after return val */
 #define RVAL_NONE      040     /* Print nothing */
@@ -580,14 +562,13 @@ extern int getllval(struct tcb *, unsigned long long *, int);
 extern int printllval(struct tcb *, const char *, int)
        ATTRIBUTE_FORMAT((printf, 2, 0));
 
-extern void printaddr_klu(kernel_ulong_t addr);
+extern void printaddr(kernel_ulong_t addr);
 extern int printxvals(const uint64_t, const char *, const struct xlat *, ...)
        ATTRIBUTE_SENTINEL;
 extern int printxval_searchn(const struct xlat *xlat, size_t xlat_size,
        uint64_t val, const char *dflt);
 #define printxval_search(xlat__, val__, dflt__) \
        printxval_searchn(xlat__, ARRAY_SIZE(xlat__), val__, dflt__)
-extern kernel_ulong_t getarg_klu(struct tcb *tcp, int argn);
 extern int printargs(struct tcb *);
 extern int printargs_u(struct tcb *);
 extern int printargs_d(struct tcb *);
@@ -758,12 +739,6 @@ extern void unwind_print_stacktrace(struct tcb* tcp);
 extern void unwind_capture_stacktrace(struct tcb* tcp);
 #endif
 
-static inline void
-printaddr(kernel_ulong_t addr)
-{
-       printaddr_klu(addr);
-}
-
 static inline void
 printstrn(struct tcb *tcp, kernel_ulong_t addr, kernel_ulong_t len)
 {