x86: make asm/asm.h work for asm code.

This is useful for unifying some pieces of asm code.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Jeremy Fitzhardinge
2008-06-16 16:08:17 -07:00
committed by H. Peter Anvin
parent 1791a78c0b
commit e6e07d8a2d

View File

@@ -1,33 +1,29 @@
#ifndef _ASM_X86_ASM_H #ifndef _ASM_X86_ASM_H
#define _ASM_X86_ASM_H #define _ASM_X86_ASM_H
#ifdef CONFIG_X86_32 #ifdef __ASSEMBLY__
/* 32 bits */ # define __ASM_FORM(x) x
# define _ASM_PTR " .long "
# define _ASM_ALIGN " .balign 4 "
# define _ASM_MOV_UL " movl "
# define _ASM_INC " incl "
# define _ASM_DEC " decl "
# define _ASM_ADD " addl "
# define _ASM_SUB " subl "
# define _ASM_XADD " xaddl "
#else #else
/* 64 bits */ # define __ASM_FORM(x) " " #x " "
#endif
# define _ASM_PTR " .quad " #ifdef CONFIG_X86_32
# define _ASM_ALIGN " .balign 8 " # define __ASM_SEL(a,b) __ASM_FORM(a)
# define _ASM_MOV_UL " movq " #else
# define __ASM_SEL(a,b) __ASM_FORM(b)
#endif
# define _ASM_INC " incq " #define __ASM_SIZE(inst) __ASM_SEL(inst##l, inst##q)
# define _ASM_DEC " decq "
# define _ASM_ADD " addq "
# define _ASM_SUB " subq "
# define _ASM_XADD " xaddq "
#endif /* CONFIG_X86_32 */ #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_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)
/* Exception table entry */ /* Exception table entry */
# define _ASM_EXTABLE(from,to) \ # define _ASM_EXTABLE(from,to) \