diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2012-04-16 13:00:01 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-04-16 13:00:01 +0200 |
| commit | 35be58119e3727a694d8c9f9b83f372401fcc4c0 (patch) | |
| tree | 779d300f7d1cd8bc1056e1d47afc2265e15501b6 /defs.h | |
| parent | dd0130b963151e37cffc8b593bebe3e3de58dfd4 (diff) | |
| download | strace-35be58119e3727a694d8c9f9b83f372401fcc4c0.tar.gz strace-35be58119e3727a694d8c9f9b83f372401fcc4c0.tar.bz2 strace-35be58119e3727a694d8c9f9b83f372401fcc4c0.tar.xz | |
Add x32 support to strace
X32 support is added to Linux kernel 3.4. In a nutshell, x32 is x86-64 with
32bit pointers. At system call level, x32 is also identical to x86-64,
as shown by many changes like "defined(X86_64) || defined(X32)". The
main differerence bewteen x32 and x86-64 is off_t in x32 is long long
instead of long.
This patch adds x32 support to strace. Tested on Linux/x32.
* configure.ac: Support X32.
* defs.h: Set SUPPORTED_PERSONALITIES to 3 for X86_64,
Set PERSONALITY2_WORDSIZE to 4 for X86_64.
Add tcb::ext_arg for X32.
* file.c (stat): New for X32.
(sys_lseek): Use 64-bit version for X32.
(printstat64): Check current_personality != 1 for X86_64.
* ipc.c (indirect_ipccall): Check current_personality == 1
for X86_64.
* mem.c (sys_mmap64): Also use tcp->u_arg for X32. Print NULL
for zero address. Call printllval for offset for X32.
* pathtrace.c (pathtrace_match): Don't check sys_old_mmap for
X32.
* process.c (ARG_FLAGS): Defined for X32.
(ARG_STACK): Likewise.
(ARG_PTID): Likewise.
(change_syscall): Handle X32.
(struct_user_offsets): Support X32.
(sys_arch_prctl): Likewise.
* signal.c: Include <asm/sigcontext.h> for X32.
(SA_RESTORER): Also define for X32.
* syscall.c (update_personality): Support X32 for X86_64.
(is_restart_error): Likewise.
(syscall_fixup_on_sysenter): Likewise.
(get_syscall_args): Likewise.
(get_syscall_result): Likewise.
(get_error): Likewise.
(__X32_SYSCALL_BIT): Define if not defined.
(__X32_SYSCALL_MASK): Likewise.
(get_scno): Check DS register value for X32. Use
__X32_SYSCALL_MASK on X32 system calls.
* util.c (printllval): Use ext_arg for X32.
(printcall): Support X32.
(change_syscall): Likewise.
(arg0_offset): Likewise.
(arg1_offset): Likewise.
* Makefile.am (EXTRA_DIST): Add linux/x32/errnoent.h,
linux/x32/ioctlent.h.in, linux/x32/signalent.h,
linux/x32/syscallent.h, linux/x86_64/errnoent2.h,
linux/x86_64/ioctlent2.h, linux/x86_64/signalent2.h and
linux/x86_64/syscallent2.h.
* linux/x32/errnoent.h: New.
* linux/x32/ioctlent.h.in: Likewise.
* linux/x32/signalent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/errnoent2.h: Likewise.
* linux/x86_64/ioctlent2.h: Likewise.
* linux/x86_64/signalent2.h: Likewise.
* linux/x86_64/syscallent2.h: Likewise.
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'defs.h')
| -rw-r--r-- | defs.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -153,7 +153,7 @@ extern long ptrace(int, int, char *, long); # define PTRACE_PEEKUSER PTRACE_PEEKUSR # define PTRACE_POKEUSER PTRACE_POKEUSR #endif -#if defined(X86_64) || defined(I386) +#if defined(X86_64) || defined(X32) || defined(I386) /* For struct pt_regs. x86 strace uses PTRACE_GETREGS. * PTRACE_GETREGS returns registers in the layout of this struct. */ @@ -221,9 +221,10 @@ extern long ptrace(int, int, char *, long); #ifdef X86_64 # undef SUPPORTED_PERSONALITIES -# define SUPPORTED_PERSONALITIES 2 +# define SUPPORTED_PERSONALITIES 3 # define PERSONALITY0_WORDSIZE 8 # define PERSONALITY1_WORDSIZE 4 +# define PERSONALITY2_WORDSIZE 4 #endif #ifdef ARM @@ -324,7 +325,7 @@ struct tcb { int u_error; /* Error code */ long scno; /* System call number */ long u_arg[MAX_ARGS]; /* System call arguments */ -#if defined(LINUX_MIPSN32) +#if defined(LINUX_MIPSN32) || defined(X32) long long ext_arg[MAX_ARGS]; /* System call arguments */ #endif long u_rval; /* return value */ |