diff options
Diffstat (limited to 'arch/um/include')
| -rw-r--r-- | arch/um/include/sysdep-i386/ptrace.h | 36 | ||||
| -rw-r--r-- | arch/um/include/sysdep-x86_64/ptrace.h | 64 |
2 files changed, 50 insertions, 50 deletions
diff --git a/arch/um/include/sysdep-i386/ptrace.h b/arch/um/include/sysdep-i386/ptrace.h index b843941acd1..c0019d92fc7 100644 --- a/arch/um/include/sysdep-i386/ptrace.h +++ b/arch/um/include/sysdep-i386/ptrace.h @@ -53,7 +53,7 @@ extern int sysemu_supported; #endif struct uml_pt_regs { - unsigned long regs[MAX_REG_NR]; + unsigned long gp[MAX_REG_NR]; unsigned long fp[HOST_FP_SIZE]; unsigned long xfp[HOST_XFP_SIZE]; struct faultinfo faultinfo; @@ -63,23 +63,23 @@ struct uml_pt_regs { #define EMPTY_UML_PT_REGS { } -#define UPT_IP(r) REGS_IP((r)->regs) -#define UPT_SP(r) REGS_SP((r)->regs) -#define UPT_EFLAGS(r) REGS_EFLAGS((r)->regs) -#define UPT_EAX(r) REGS_EAX((r)->regs) -#define UPT_EBX(r) REGS_EBX((r)->regs) -#define UPT_ECX(r) REGS_ECX((r)->regs) -#define UPT_EDX(r) REGS_EDX((r)->regs) -#define UPT_ESI(r) REGS_ESI((r)->regs) -#define UPT_EDI(r) REGS_EDI((r)->regs) -#define UPT_EBP(r) REGS_EBP((r)->regs) +#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_EAX(r) REGS_EAX((r)->gp) +#define UPT_EBX(r) REGS_EBX((r)->gp) +#define UPT_ECX(r) REGS_ECX((r)->gp) +#define UPT_EDX(r) REGS_EDX((r)->gp) +#define UPT_ESI(r) REGS_ESI((r)->gp) +#define UPT_EDI(r) REGS_EDI((r)->gp) +#define UPT_EBP(r) REGS_EBP((r)->gp) #define UPT_ORIG_EAX(r) ((r)->syscall) -#define UPT_CS(r) REGS_CS((r)->regs) -#define UPT_SS(r) REGS_SS((r)->regs) -#define UPT_DS(r) REGS_DS((r)->regs) -#define UPT_ES(r) REGS_ES((r)->regs) -#define UPT_FS(r) REGS_FS((r)->regs) -#define UPT_GS(r) REGS_GS((r)->regs) +#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) +#define UPT_FS(r) REGS_FS((r)->gp) +#define UPT_GS(r) REGS_GS((r)->gp) #define UPT_SYSCALL_ARG1(r) UPT_EBX(r) #define UPT_SYSCALL_ARG2(r) UPT_ECX(r) @@ -161,7 +161,7 @@ struct syscall_args { #define UPT_SET_SYSCALL_RETURN(r, res) \ REGS_SET_SYSCALL_RETURN((r)->regs, (res)) -#define UPT_RESTART_SYSCALL(r) REGS_RESTART_SYSCALL((r)->regs) +#define UPT_RESTART_SYSCALL(r) REGS_RESTART_SYSCALL((r)->gp) #define UPT_ORIG_SYSCALL(r) UPT_EAX(r) #define UPT_SYSCALL_NR(r) UPT_ORIG_EAX(r) diff --git a/arch/um/include/sysdep-x86_64/ptrace.h b/arch/um/include/sysdep-x86_64/ptrace.h index ea4afdce59c..ebc2fd5dc31 100644 --- a/arch/um/include/sysdep-x86_64/ptrace.h +++ b/arch/um/include/sysdep-x86_64/ptrace.h @@ -85,7 +85,7 @@ #define REGS_ERR(r) ((r)->fault_type) struct uml_pt_regs { - unsigned long regs[MAX_REG_NR]; + unsigned long gp[MAX_REG_NR]; unsigned long fp[HOST_FP_SIZE]; struct faultinfo faultinfo; long syscall; @@ -94,36 +94,36 @@ struct uml_pt_regs { #define EMPTY_UML_PT_REGS { } -#define UPT_RBX(r) REGS_RBX((r)->regs) -#define UPT_RCX(r) REGS_RCX((r)->regs) -#define UPT_RDX(r) REGS_RDX((r)->regs) -#define UPT_RSI(r) REGS_RSI((r)->regs) -#define UPT_RDI(r) REGS_RDI((r)->regs) -#define UPT_RBP(r) REGS_RBP((r)->regs) -#define UPT_RAX(r) REGS_RAX((r)->regs) -#define UPT_R8(r) REGS_R8((r)->regs) -#define UPT_R9(r) REGS_R9((r)->regs) -#define UPT_R10(r) REGS_R10((r)->regs) -#define UPT_R11(r) REGS_R11((r)->regs) -#define UPT_R12(r) REGS_R12((r)->regs) -#define UPT_R13(r) REGS_R13((r)->regs) -#define UPT_R14(r) REGS_R14((r)->regs) -#define UPT_R15(r) REGS_R15((r)->regs) -#define UPT_CS(r) REGS_CS((r)->regs) -#define UPT_FS_BASE(r) REGS_FS_BASE((r)->regs) -#define UPT_FS(r) REGS_FS((r)->regs) -#define UPT_GS_BASE(r) REGS_GS_BASE((r)->regs) -#define UPT_GS(r) REGS_GS((r)->regs) -#define UPT_DS(r) REGS_DS((r)->regs) -#define UPT_ES(r) REGS_ES((r)->regs) -#define UPT_CS(r) REGS_CS((r)->regs) -#define UPT_SS(r) REGS_SS((r)->regs) -#define UPT_ORIG_RAX(r) REGS_ORIG_RAX((r)->regs) - -#define UPT_IP(r) REGS_IP((r)->regs) -#define UPT_SP(r) REGS_SP((r)->regs) - -#define UPT_EFLAGS(r) REGS_EFLAGS((r)->regs) +#define UPT_RBX(r) REGS_RBX((r)->gp) +#define UPT_RCX(r) REGS_RCX((r)->gp) +#define UPT_RDX(r) REGS_RDX((r)->gp) +#define UPT_RSI(r) REGS_RSI((r)->gp) +#define UPT_RDI(r) REGS_RDI((r)->gp) +#define UPT_RBP(r) REGS_RBP((r)->gp) +#define UPT_RAX(r) REGS_RAX((r)->gp) +#define UPT_R8(r) REGS_R8((r)->gp) +#define UPT_R9(r) REGS_R9((r)->gp) +#define UPT_R10(r) REGS_R10((r)->gp) +#define UPT_R11(r) REGS_R11((r)->gp) +#define UPT_R12(r) REGS_R12((r)->gp) +#define UPT_R13(r) REGS_R13((r)->gp) +#define UPT_R14(r) REGS_R14((r)->gp) +#define UPT_R15(r) REGS_R15((r)->gp) +#define UPT_CS(r) REGS_CS((r)->gp) +#define UPT_FS_BASE(r) REGS_FS_BASE((r)->gp) +#define UPT_FS(r) REGS_FS((r)->gp) +#define UPT_GS_BASE(r) REGS_GS_BASE((r)->gp) +#define UPT_GS(r) REGS_GS((r)->gp) +#define UPT_DS(r) REGS_DS((r)->gp) +#define UPT_ES(r) REGS_ES((r)->gp) +#define UPT_CS(r) REGS_CS((r)->gp) +#define UPT_SS(r) REGS_SS((r)->gp) +#define UPT_ORIG_RAX(r) REGS_ORIG_RAX((r)->gp) + +#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_SYSCALL_NR(r) ((r)->syscall) #define UPT_SYSCALL_RET(r) UPT_RAX(r) @@ -228,7 +228,7 @@ struct syscall_args { #define UPT_SET_SYSCALL_RETURN(r, res) \ REGS_SET_SYSCALL_RETURN((r)->regs, (res)) -#define UPT_RESTART_SYSCALL(r) REGS_RESTART_SYSCALL((r)->regs) +#define UPT_RESTART_SYSCALL(r) REGS_RESTART_SYSCALL((r)->gp) #define UPT_SEGV_IS_FIXABLE(r) REGS_SEGV_IS_FIXABLE(&r->skas) |