Skip to contentSkip to conversation

i386 / Clean up asm and volatile keywords in desc

PATCH In review [email protected] 4 participants 4 messages Aug 11, 2005 – Aug 16, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 4/14 i386 / Clean up asm and volatile keywords in desc

Stop using extra underscores on asm and volatiles, that is just silly. Also, make lgdt/lidt/sgdt/sldt explicitly "l".

Patch-base: 2.6.13-rc5-mm1
Patch-keys: i386 desc cleanup

include/asm-i386/mach-default/mach_desc.h +13 -13
Index: linux-2.6.13/include/asm-i386/mach-default/mach_desc.h
===================================================================
@@ -24,30 +24,30 @@
 #ifndef __MACH_DESC_H
 #define __MACH_DESC_H
 
-#define load_TR_desc() __asm__ __volatile__("ltr %w0"::"q" (GDT_ENTRY_TSS*8))
-#define load_LDT_desc() __asm__ __volatile__("lldt %w0"::"q" (GDT_ENTRY_LDT*8))
+#define load_TR_desc() asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8))
+#define load_LDT_desc() asm volatile("lldt %w0"::"q" (GDT_ENTRY_LDT*8))
 
-#define load_gdt(dtr) __asm__ __volatile("lgdt %0"::"m" (*dtr))
-#define load_idt(dtr) __asm__ __volatile("lidt %0"::"m" (*dtr))
-#define load_tr(tr) __asm__ __volatile("ltr %0"::"mr" (tr))
-#define load_ldt(ldt) __asm__ __volatile("lldt %0"::"mr" (ldt))
-
-#define store_gdt(dtr) __asm__ ("sgdt %0":"=m" (*dtr))
-#define store_idt(dtr) __asm__ ("sidt %0":"=m" (*dtr))
-#define store_tr(tr) __asm__ ("str %0":"=mr" (tr))
-#define store_ldt(ldt) __asm__ ("sldt %0":"=mr" (ldt))
+#define load_gdt(dtr) asm volatile("lgdtl %0"::"m" (*dtr))
+#define load_idt(dtr) asm volatile("lidtl %0"::"m" (*dtr))
+#define load_tr(tr) asm volatile("ltr %0"::"mr" (tr))
+#define load_ldt(ldt) asm volatile("lldt %0"::"mr" (ldt))
+
+#define store_gdt(dtr) asm ("sgdtl %0":"=m" (*dtr))
+#define store_idt(dtr) asm ("sidtl %0":"=m" (*dtr))
+#define store_tr(tr) asm ("str %0":"=mr" (tr))
+#define store_ldt(ldt) asm ("sldt %0":"=mr" (ldt))
 
 static inline unsigned int get_TR_desc(void)
 {
 	unsigned int tr;
-	__asm__ ("str %w0":"=q" (tr));
+	asm ("str %w0":"=q" (tr));
 	return tr;
 }
 
 static inline unsigned int get_LDT_desc(void)
 {
 	unsigned int ldt;
-	__asm__ ("sldt %w0":"=q" (ldt));
+	asm ("sldt %w0":"=q" (ldt));
 	return ldt;
 }
 
#1 lore raw
Quoted 1 line · On Wed, Aug 10, 2005 at 09:53:51PM -0700, [email protected] wrote:

Stop using extra underscores on asm and volatiles, that is just silly.

Actually the volatiles might be still useful. Or if you drop them at least add memory clobbers. I had sometimes bugs on x86-64 with the compiler moving such assembly statements with invisible side effects around too aggressively and causing weird problems.

Agreed on the underscores, I hate them too :)

-Andi

#2 lore raw
Quoted 10 lines · Andi Kleen
Quoted 1 line · On Wed, Aug 10, 2005 at 09:53:51PM -0700, [email protected] wrote:

Stop using extra underscores on asm and volatiles, that is just silly.

Actually the volatiles might be still useful. Or if you drop them
at least add memory clobbers. I had sometimes bugs on x86-64
with the compiler moving such assembly statements with invisible side effects around too aggressively and causing weird problems.

Agreed on the underscores, I hate them too :)

Well, put volatiles in *unless* the only effect of an asm statement is producing the output values.

-hpa

#3 lore raw
In reply to Andi Kleen
Quoted 5 lines · * Andi Kleen ([email protected]) wrote:
Quoted 1 line · On Wed, Aug 10, 2005 at 09:53:51PM -0700, [email protected] wrote:

Stop using extra underscores on asm and volatiles, that is just silly.

Actually the volatiles might be still useful. Or if you drop them at least add memory clobbers.

They are still there, just the underscores on both asm and volatile got pulled.

Quoted 5 lines

I had sometimes bugs on x86-64
with the compiler moving such assembly statements with invisible side effects around too aggressively and causing weird problems.

Agreed on the underscores, I hate them too :)

Heh, same here ;-)

thanks,
-chris