Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8df9676d authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86: <asm/asm.h> consistency cleanups 



Rename _ASM_MOV_UL to _ASM_MOV for consistency with other _ASM_
instructions (_ASM_ADD, _ASM_SUB and so on.)

Add ASM_SP, _ASM_BP, _ASM_SI, and _ASM_DI for consistency with
_ASM_[ABCD]X.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 48e2bd56

include/asm-x86/asm.h

+6 −1
Original line number Diff line number Diff line
@@ -20,17 +20,22 @@ 


#define _ASM_PTR	__ASM_SEL(.long, .quad)

#define _ASM_ALIGN	__ASM_SEL(.balign 4, .balign 8)

#define _ASM_MOV_UL	__ASM_SIZE(mov)



#define _ASM_MOV	__ASM_SIZE(mov)

#define _ASM_INC	__ASM_SIZE(inc)

#define _ASM_DEC	__ASM_SIZE(dec)

#define _ASM_ADD	__ASM_SIZE(add)

#define _ASM_SUB	__ASM_SIZE(sub)

#define _ASM_XADD	__ASM_SIZE(xadd)



#define _ASM_AX		__ASM_REG(ax)

#define _ASM_BX		__ASM_REG(bx)

#define _ASM_CX		__ASM_REG(cx)

#define _ASM_DX		__ASM_REG(dx)

#define _ASM_SP		__ASM_REG(sp)

#define _ASM_BP		__ASM_REG(bp)

#define _ASM_SI		__ASM_REG(si)

#define _ASM_DI		__ASM_REG(di)



/* Exception table entry */

# define _ASM_EXTABLE(from,to) \

include/asm-x86/resume-trace.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
do {								\

	if (pm_trace_enabled) {					\

		const void *tracedata;				\

		asm volatile(_ASM_MOV_UL " $1f,%0\n"		\

		asm volatile(_ASM_MOV " $1f,%0\n"		\

			     ".section .tracedata,\"a\"\n"	\

			     "1:\t.word %c1\n\t"		\

			     _ASM_PTR " %c2\n"			\