Commit 3579a389 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: merge HOST_... of registers common on i386 and amd64 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 8edc4147

arch/x86/um/ptrace_32.c

+7 −7
Original line number Diff line number Diff line
@@ -51,13 +51,13 @@ int is_syscall(unsigned long addr) 
#define FLAG_MASK 0x00044dd5



static const int reg_offsets[] = {

	[EBX] = HOST_EBX,

	[ECX] = HOST_ECX,

	[EDX] = HOST_EDX,

	[ESI] = HOST_ESI,

	[EDI] = HOST_EDI,

	[EBP] = HOST_EBP,

	[EAX] = HOST_EAX,

	[EBX] = HOST_BX,

	[ECX] = HOST_CX,

	[EDX] = HOST_DX,

	[ESI] = HOST_SI,

	[EDI] = HOST_DI,

	[EBP] = HOST_BP,

	[EAX] = HOST_AX,

	[DS] = HOST_DS,

	[ES] = HOST_ES,

	[FS] = HOST_FS,

arch/x86/um/ptrace_64.c

+7 −7
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ static const int reg_offsets[] = 
	[R15 >> 3] = HOST_R15,

	[RIP >> 3] = HOST_IP,

	[RSP >> 3] = HOST_SP,

	[RAX >> 3] = HOST_RAX,

	[RBX >> 3] = HOST_RBX,

	[RCX >> 3] = HOST_RCX,

	[RDX >> 3] = HOST_RDX,

	[RSI >> 3] = HOST_RSI,

	[RDI >> 3] = HOST_RDI,

	[RBP >> 3] = HOST_RBP,

	[RAX >> 3] = HOST_AX,

	[RBX >> 3] = HOST_BX,

	[RCX >> 3] = HOST_CX,

	[RDX >> 3] = HOST_DX,

	[RSI >> 3] = HOST_SI,

	[RDI >> 3] = HOST_DI,

	[RBP >> 3] = HOST_BP,

	[CS >> 3] = HOST_CS,

	[SS >> 3] = HOST_SS,

	[FS_BASE >> 3] = HOST_FS_BASE,

arch/x86/um/shared/sysdep/ptrace_32.h

+7 −7
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ extern int sysemu_supported; 
#define REGS_IP(r) ((r)[HOST_IP])

#define REGS_SP(r) ((r)[HOST_SP])

#define REGS_EFLAGS(r) ((r)[HOST_EFLAGS])

#define REGS_EAX(r) ((r)[HOST_EAX])

#define REGS_EBX(r) ((r)[HOST_EBX])

#define REGS_ECX(r) ((r)[HOST_ECX])

#define REGS_EDX(r) ((r)[HOST_EDX])

#define REGS_ESI(r) ((r)[HOST_ESI])

#define REGS_EDI(r) ((r)[HOST_EDI])

#define REGS_EBP(r) ((r)[HOST_EBP])

#define REGS_EAX(r) ((r)[HOST_AX])

#define REGS_EBX(r) ((r)[HOST_BX])

#define REGS_ECX(r) ((r)[HOST_CX])

#define REGS_EDX(r) ((r)[HOST_DX])

#define REGS_ESI(r) ((r)[HOST_SI])

#define REGS_EDI(r) ((r)[HOST_DI])

#define REGS_EBP(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])

arch/x86/um/shared/sysdep/ptrace_64.h

+7 −7
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
#define REGS_IP(r) ((r)[HOST_IP])

#define REGS_SP(r) ((r)[HOST_SP])



#define REGS_RBX(r) ((r)[HOST_RBX])

#define REGS_RCX(r) ((r)[HOST_RCX])

#define REGS_RDX(r) ((r)[HOST_RDX])

#define REGS_RSI(r) ((r)[HOST_RSI])

#define REGS_RDI(r) ((r)[HOST_RDI])

#define REGS_RBP(r) ((r)[HOST_RBP])

#define REGS_RAX(r) ((r)[HOST_RAX])

#define REGS_RBX(r) ((r)[HOST_BX])

#define REGS_RCX(r) ((r)[HOST_CX])

#define REGS_RDX(r) ((r)[HOST_DX])

#define REGS_RSI(r) ((r)[HOST_SI])

#define REGS_RDI(r) ((r)[HOST_DI])

#define REGS_RBP(r) ((r)[HOST_BP])

#define REGS_RAX(r) ((r)[HOST_AX])

#define REGS_R8(r) ((r)[HOST_R8])

#define REGS_R9(r) ((r)[HOST_R9])

#define REGS_R10(r) ((r)[HOST_R10])

arch/x86/um/signal_32.c

+7 −7
Original line number Diff line number Diff line
@@ -160,14 +160,14 @@ static int copy_sc_from_user(struct pt_regs *regs, 
	GETREG(FS, fs);

	GETREG(ES, es);

	GETREG(DS, ds);

	GETREG(EDI, di);

	GETREG(ESI, si);

	GETREG(EBP, bp);

	GETREG(DI, di);

	GETREG(SI, si);

	GETREG(BP, bp);

	GETREG(SP, sp);

	GETREG(EBX, bx);

	GETREG(EDX, dx);

	GETREG(ECX, cx);

	GETREG(EAX, ax);

	GETREG(BX, bx);

	GETREG(DX, dx);

	GETREG(CX, cx);

	GETREG(AX, ax);

	GETREG(IP, ip);

	GETREG(CS, cs);

	GETREG(EFLAGS, flags);