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

Commit c1a9d41f authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] Reindent macros in pda.h



Reindent the macros in x86-64 pda.h, making them much more readable.
Follows Jeremy's i386 version of this.

No functional changes

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 383d079b
Loading
Loading
Loading
Loading
+53 −32
Original line number Diff line number Diff line
@@ -41,26 +41,38 @@ extern struct x8664_pda boot_cpu_pda[];
 */ 
extern void __bad_pda_field(void);

/* proxy_pda doesn't actually exist, but tell gcc it is accessed
   for all PDA accesses so it gets read/write dependencies right. */
/*
 * proxy_pda doesn't actually exist, but tell gcc it is accessed for
 * all PDA accesses so it gets read/write dependencies right.
 */
extern struct x8664_pda _proxy_pda;

#define pda_offset(field) offsetof(struct x8664_pda, field)

#define pda_to_op(op,field,val) do {		\
	typedef typeof(_proxy_pda.field) T__;	\
	if (0) { T__ tmp__; tmp__ = (val); }  \
	if (0) { T__ tmp__; tmp__ = (val); }	/* type checking */ \
	switch (sizeof(_proxy_pda.field)) {	\
	case 2:					\
asm(op "w %1,%%gs:%c2" : "+m" (_proxy_pda.field) : \
	"ri" ((T__)val),"i"(pda_offset(field))); break; \
		asm(op "w %1,%%gs:%c2" : 	\
		    "+m" (_proxy_pda.field) :	\
		    "ri" ((T__)val),		\
		    "i"(pda_offset(field))); 	\
 		break;				\
	case 4:					\
asm(op "l %1,%%gs:%c2" : "+m" (_proxy_pda.field) : \
	"ri" ((T__)val),"i"(pda_offset(field))); break; \
		asm(op "l %1,%%gs:%c2" : 	\
		    "+m" (_proxy_pda.field) :	\
		    "ri" ((T__)val),		\
		    "i" (pda_offset(field))); 	\
		break;				\
	case 8:					\
asm(op "q %1,%%gs:%c2": "+m" (_proxy_pda.field) : \
	 "ri" ((T__)val),"i"(pda_offset(field))); break; \
default: __bad_pda_field(); 					\
		asm(op "q %1,%%gs:%c2": 	\
		    "+m" (_proxy_pda.field) :	\
		    "ri" ((T__)val),		\
		    "i"(pda_offset(field))); 	\
		break;				\
       default: 				\
		__bad_pda_field();		\
       }					\
       } while (0)

@@ -68,19 +80,28 @@ default: __bad_pda_field(); \
	typeof(_proxy_pda.field) ret__;		\
	switch (sizeof(_proxy_pda.field)) {	\
       	case 2:					\
asm(op "w %%gs:%c1,%0":"=r" (ret__):\
	"i" (pda_offset(field)), "m" (_proxy_pda.field)); break;\
		asm(op "w %%gs:%c1,%0" : 	\
		    "=r" (ret__) :		\
		    "i" (pda_offset(field)), 	\
		    "m" (_proxy_pda.field)); 	\
		 break;				\
	case 4:					\
asm(op "l %%gs:%c1,%0":"=r" (ret__):\
	"i" (pda_offset(field)), "m" (_proxy_pda.field)); break;\
		asm(op "l %%gs:%c1,%0":		\
		    "=r" (ret__):		\
		    "i" (pda_offset(field)), 	\
		    "m" (_proxy_pda.field)); 	\
		 break;				\
       case 8:					\
asm(op "q %%gs:%c1,%0":"=r" (ret__):\
	"i" (pda_offset(field)), "m" (_proxy_pda.field)); break;\
default: __bad_pda_field(); 					\
		asm(op "q %%gs:%c1,%0":		\
		    "=r" (ret__) :		\
		    "i" (pda_offset(field)), 	\
		    "m" (_proxy_pda.field)); 	\
		 break;				\
       default: 				\
		__bad_pda_field();		\
       }					\
       ret__; })


#define read_pda(field) pda_from_op("mov",field)
#define write_pda(field,val) pda_to_op("mov",field,val)
#define add_pda(field,val) pda_to_op("add",field,val)