From f50e7141d5b5aedafa220d851a8b6afe753d679a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 18 Mar 2012 04:16:59 +0100 Subject: [PATCH] Remove code which is not used on Linux Compile tested in qemu on armv4l,armv4tl,armv5l,armv6l,i686, mipsel,mips,x86_64 * syscall.c: Remove code which handles RVAL_Lfoo constants. * defs.h: Remove struct tcb::u_lrval member - it is never set. Remove RVAL_Lfoo constants which signify return of "long" result - they are never used. Signed-off-by: Denys Vlasenko --- defs.h | 9 +-------- syscall.c | 14 -------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/defs.h b/defs.h index a91e196d..e9df327b 100644 --- a/defs.h +++ b/defs.h @@ -312,9 +312,6 @@ struct tcb { long long ext_arg[MAX_ARGS]; /* System call arguments */ #endif long u_rval; /* (first) return value */ -#ifdef HAVE_LONG_LONG - long long u_lrval; /* long long return value */ -#endif int ptrace_errno; #if SUPPORTED_PERSONALITIES > 1 int currpers; /* Personality at the time of scno update */ @@ -406,11 +403,7 @@ extern const struct xlat open_access_modes[]; #define RVAL_HEX 001 /* hex format */ #define RVAL_OCTAL 002 /* octal format */ #define RVAL_UDECIMAL 003 /* unsigned decimal format */ -#define RVAL_LDECIMAL 004 /* long decimal format */ -#define RVAL_LHEX 005 /* long hex format */ -#define RVAL_LOCTAL 006 /* long octal format */ -#define RVAL_LUDECIMAL 007 /* long unsigned decimal format */ -#define RVAL_MASK 007 /* mask for these values */ +#define RVAL_MASK 003 /* mask for these values */ #define RVAL_STR 010 /* Print `auxstr' field after return val */ #define RVAL_NONE 020 /* Print nothing */ diff --git a/syscall.c b/syscall.c index 6737f287..272e3a0d 100644 --- a/syscall.c +++ b/syscall.c @@ -2033,20 +2033,6 @@ trace_syscall_exiting(struct tcb *tcp) case RVAL_DECIMAL: tprintf("= %ld", tcp->u_rval); break; -#ifdef HAVE_LONG_LONG - case RVAL_LHEX: - tprintf("= %#llx", tcp->u_lrval); - break; - case RVAL_LOCTAL: - tprintf("= %#llo", tcp->u_lrval); - break; - case RVAL_LUDECIMAL: - tprintf("= %llu", tcp->u_lrval); - break; - case RVAL_LDECIMAL: - tprintf("= %lld", tcp->u_lrval); - break; -#endif default: fprintf(stderr, "invalid rval format\n"); -- 2.40.0