Pull UML updates from Richard Weinberger: "Most changes are bug fixes and cleanups" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: um: missing checks of __put_user()/__get_user() return values um: stub_rt_sigsuspend isn't needed these days anymore um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h irq: Remove irq_chip->release() um: Remove CONFIG_IRQ_RELEASE_METHOD um: Remove usage of irq_chip->release() um: Implement um_free_irq() um: Fix __swp_type() um: Implement a custom pte_same() function um: Add BUG() to do_ops()'s error path um: Remove unused variables um: bury unused _TIF_RESTORE_SIGMASK um: wrong sigmask saved in case of multiple sigframes um: add TIF_NOTIFY_RESUME um: ->restart_block.fn needs to be reset on sigreturntirimbino
Linus Torvalds
13 years ago
commit
3a8580f820
@ -1,5 +1,39 @@ |
||||
#ifndef __UM_X86_PTRACE_H |
||||
#define __UM_X86_PTRACE_H |
||||
|
||||
#ifdef CONFIG_X86_32 |
||||
# include "ptrace_32.h" |
||||
#else |
||||
# include "ptrace_64.h" |
||||
#endif |
||||
|
||||
#define PT_REGS_AX(r) UPT_AX(&(r)->regs) |
||||
#define PT_REGS_BX(r) UPT_BX(&(r)->regs) |
||||
#define PT_REGS_CX(r) UPT_CX(&(r)->regs) |
||||
#define PT_REGS_DX(r) UPT_DX(&(r)->regs) |
||||
|
||||
#define PT_REGS_SI(r) UPT_SI(&(r)->regs) |
||||
#define PT_REGS_DI(r) UPT_DI(&(r)->regs) |
||||
#define PT_REGS_BP(r) UPT_BP(&(r)->regs) |
||||
#define PT_REGS_EFLAGS(r) UPT_EFLAGS(&(r)->regs) |
||||
|
||||
#define PT_REGS_CS(r) UPT_CS(&(r)->regs) |
||||
#define PT_REGS_SS(r) UPT_SS(&(r)->regs) |
||||
#define PT_REGS_DS(r) UPT_DS(&(r)->regs) |
||||
#define PT_REGS_ES(r) UPT_ES(&(r)->regs) |
||||
|
||||
#define PT_REGS_ORIG_SYSCALL(r) PT_REGS_AX(r) |
||||
#define PT_REGS_SYSCALL_RET(r) PT_REGS_AX(r) |
||||
|
||||
#define PT_FIX_EXEC_STACK(sp) do ; while(0) |
||||
|
||||
#define profile_pc(regs) PT_REGS_IP(regs) |
||||
|
||||
#define UPT_RESTART_SYSCALL(r) (UPT_IP(r) -= 2) |
||||
#define UPT_SET_SYSCALL_RETURN(r, res) (UPT_AX(r) = (res)) |
||||
|
||||
static inline long regs_return_value(struct uml_pt_regs *regs) |
||||
{ |
||||
return UPT_AX(regs); |
||||
} |
||||
#endif /* __UM_X86_PTRACE_H */ |
||||
|
||||
@ -1,15 +1,74 @@ |
||||
#ifndef __SYSDEP_X86_PTRACE_H |
||||
#define __SYSDEP_X86_PTRACE_H |
||||
|
||||
#include <generated/user_constants.h> |
||||
#include "sysdep/faultinfo.h" |
||||
|
||||
#define MAX_REG_OFFSET (UM_FRAME_SIZE) |
||||
#define MAX_REG_NR ((MAX_REG_OFFSET) / sizeof(unsigned long)) |
||||
|
||||
#define REGS_IP(r) ((r)[HOST_IP]) |
||||
#define REGS_SP(r) ((r)[HOST_SP]) |
||||
#define REGS_EFLAGS(r) ((r)[HOST_EFLAGS]) |
||||
#define REGS_AX(r) ((r)[HOST_AX]) |
||||
#define REGS_BX(r) ((r)[HOST_BX]) |
||||
#define REGS_CX(r) ((r)[HOST_CX]) |
||||
#define REGS_DX(r) ((r)[HOST_DX]) |
||||
#define REGS_SI(r) ((r)[HOST_SI]) |
||||
#define REGS_DI(r) ((r)[HOST_DI]) |
||||
#define REGS_BP(r) ((r)[HOST_BP]) |
||||
#define REGS_CS(r) ((r)[HOST_CS]) |
||||
#define REGS_SS(r) ((r)[HOST_SS]) |
||||
#define REGS_DS(r) ((r)[HOST_DS]) |
||||
#define REGS_ES(r) ((r)[HOST_ES]) |
||||
|
||||
#define UPT_IP(r) REGS_IP((r)->gp) |
||||
#define UPT_SP(r) REGS_SP((r)->gp) |
||||
#define UPT_EFLAGS(r) REGS_EFLAGS((r)->gp) |
||||
#define UPT_AX(r) REGS_AX((r)->gp) |
||||
#define UPT_BX(r) REGS_BX((r)->gp) |
||||
#define UPT_CX(r) REGS_CX((r)->gp) |
||||
#define UPT_DX(r) REGS_DX((r)->gp) |
||||
#define UPT_SI(r) REGS_SI((r)->gp) |
||||
#define UPT_DI(r) REGS_DI((r)->gp) |
||||
#define UPT_BP(r) REGS_BP((r)->gp) |
||||
#define UPT_CS(r) REGS_CS((r)->gp) |
||||
#define UPT_SS(r) REGS_SS((r)->gp) |
||||
#define UPT_DS(r) REGS_DS((r)->gp) |
||||
#define UPT_ES(r) REGS_ES((r)->gp) |
||||
|
||||
#ifdef __i386__ |
||||
#include "ptrace_32.h" |
||||
#else |
||||
#include "ptrace_64.h" |
||||
#endif |
||||
|
||||
static inline long regs_return_value(struct uml_pt_regs *regs) |
||||
{ |
||||
return UPT_SYSCALL_RET(regs); |
||||
} |
||||
struct syscall_args { |
||||
unsigned long args[6]; |
||||
}; |
||||
|
||||
#define SYSCALL_ARGS(r) ((struct syscall_args) \ |
||||
{ .args = { UPT_SYSCALL_ARG1(r), \
|
||||
UPT_SYSCALL_ARG2(r), \
|
||||
UPT_SYSCALL_ARG3(r), \
|
||||
UPT_SYSCALL_ARG4(r), \
|
||||
UPT_SYSCALL_ARG5(r), \
|
||||
UPT_SYSCALL_ARG6(r) } } ) |
||||
|
||||
struct uml_pt_regs { |
||||
unsigned long gp[MAX_REG_NR]; |
||||
unsigned long fp[MAX_FP_NR]; |
||||
struct faultinfo faultinfo; |
||||
long syscall; |
||||
int is_user; |
||||
}; |
||||
|
||||
#define EMPTY_UML_PT_REGS { } |
||||
|
||||
#define UPT_SYSCALL_NR(r) ((r)->syscall) |
||||
#define UPT_FAULTINFO(r) (&(r)->faultinfo) |
||||
#define UPT_IS_USER(r) ((r)->is_user) |
||||
|
||||
extern int user_context(unsigned long sp); |
||||
|
||||
#endif /* __SYSDEP_X86_PTRACE_H */ |
||||
|
||||
Loading…
Reference in new issue