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

Commit 3e9b2327 authored by Jan-Simon Möller's avatar Jan-Simon Möller Committed by H. Peter Anvin
Browse files

x86, asm: Extend definitions of _ASM_* with a raw format 



The __ASM_* macros (e.g. __ASM_DX) are used to return the proper
register name (e.g. edx for 32bit / rdx for 64bit). We want to use
this also in arch/x86/include/asm/uaccess.h / get_user() .  For this
to work, we need a raw form as both gcc and clang choke on the
whitespace in a register asm() statement, and the __ASM_FORM macro
surrounds the argument with blanks.  A new macro, __ASM_FORM_RAW was
added and we change __ASM_REG to use the new RAW form.

Signed-off-by: default avatarJan-Simon Möller <dl9pf@gmx.de>
Link: http://lkml.kernel.org/r/1377803585-5913-2-git-send-email-dl9pf@gmx.de


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 3e21bb09

arch/x86/include/asm/asm.h

+5 −1
Original line number Diff line number Diff line
@@ -3,21 +3,25 @@ 


#ifdef __ASSEMBLY__

# define __ASM_FORM(x)	x

# define __ASM_FORM_RAW(x)     x

# define __ASM_FORM_COMMA(x) x,

#else

# define __ASM_FORM(x)	" " #x " "

# define __ASM_FORM_RAW(x)     #x

# define __ASM_FORM_COMMA(x) " " #x ","

#endif



#ifdef CONFIG_X86_32

# define __ASM_SEL(a,b) __ASM_FORM(a)

# define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(a)

#else

# define __ASM_SEL(a,b) __ASM_FORM(b)

# define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(b)

#endif



#define __ASM_SIZE(inst, ...)	__ASM_SEL(inst##l##__VA_ARGS__, \

					  inst##q##__VA_ARGS__)

#define __ASM_REG(reg)		__ASM_SEL(e##reg, r##reg)

#define __ASM_REG(reg)         __ASM_SEL_RAW(e##reg, r##reg)



#define _ASM_PTR	__ASM_SEL(.long, .quad)

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