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

um: unify KSTK_... 



... and switch get_thread_register() to HOST_... for register numbers

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

arch/x86/um/asm/processor.h

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ 
# include "processor_64.h"

#endif



#define KSTK_EIP(tsk) KSTK_REG(tsk, HOST_IP)

#define KSTK_ESP(tsk) KSTK_REG(tsk, HOST_IP)

#define KSTK_EBP(tsk) KSTK_REG(tsk, HOST_BP)



#define ARCH_IS_STACKGROW(address) \

       (address + 65536 + 32 * sizeof(unsigned long) >= UPT_SP(&current->thread.regs.regs))

arch/x86/um/asm/processor_32.h

+0 −4
Original line number Diff line number Diff line
@@ -63,8 +63,4 @@ static inline void rep_nop(void) 
#define current_text_addr() \

	({ void *pc; __asm__("movl $1f,%0\n1:":"=g" (pc)); pc; })



#define KSTK_EIP(tsk) KSTK_REG(tsk, EIP)

#define KSTK_ESP(tsk) KSTK_REG(tsk, UESP)

#define KSTK_EBP(tsk) KSTK_REG(tsk, EBP)



#endif

arch/x86/um/asm/processor_64.h

+0 −3
Original line number Diff line number Diff line
@@ -42,7 +42,4 @@ static inline void arch_copy_thread(struct arch_thread *from, 
#define current_text_addr() \

	({ void *pc; __asm__("movq $1f,%0\n1:":"=g" (pc)); pc; })



#define KSTK_EIP(tsk) KSTK_REG(tsk, RIP)

#define KSTK_ESP(tsk) KSTK_REG(tsk, RSP)



#endif

arch/x86/um/os-Linux/registers.c

+6 −6
Original line number Diff line number Diff line
@@ -89,18 +89,18 @@ unsigned long get_thread_reg(int reg, jmp_buf *buf) 
{

	switch (reg) {

#ifdef __i386__

	case EIP:

	case HOST_IP:

		return buf[0]->__eip;

	case UESP:

	case HOST_SP:

		return buf[0]->__esp;

	case EBP:

	case HOST_BP:

		return buf[0]->__ebp;

#else

	case RIP:

	case HOST_IP:

		return buf[0]->__rip;

	case RSP:

	case HOST_SP:

		return buf[0]->__rsp;

	case RBP:

	case HOST_BP:

		return buf[0]->__rbp;

#endif

	default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE