PERFORCE change 75279 for review

[John Baldwin]

http://perforce.freebsd.org/chv.cgi?CH=75279

Change 75279 by jhb at jhb_slimer on 2005/04/15 22:03:44

	Track merging of bus_amd64.h into bus.h.

Affected files ...

.. //depot/projects/smpng/sys/amd64/include/bus.h#4 edit

Differences ...

==== //depot/projects/smpng/sys/amd64/include/bus.h#4 (text+ko) ====

@@ -322,8 +322,8 @@
 		1:	movb (%2),%%al				\n\
 			stosb					\n\
 			loop 1b"				:
-		    "=D" (addr), "=c" (count)			:
-		    "r" (bsh + offset), "0" (addr), "1" (count)	:
+		    "+D" (addr), "+c" (count)			:
+		    "r" (bsh + offset)				:
 		    "%eax", "memory");
 #endif
 	}
@@ -351,8 +351,8 @@
 		1:	movw (%2),%%ax				\n\
 			stosw					\n\
 			loop 1b"				:
-		    "=D" (addr), "=c" (count)			:
-		    "r" (bsh + offset), "0" (addr), "1" (count)	:
+		    "+D" (addr), "+c" (count)			:
+		    "r" (bsh + offset)				:
 		    "%eax", "memory");
 #endif
 	}
@@ -380,8 +380,8 @@
 		1:	movl (%2),%%eax				\n\
 			stosl					\n\
 			loop 1b"				:
-		    "=D" (addr), "=c" (count)			:
-		    "r" (bsh + offset), "0" (addr), "1" (count)	:
+		    "+D" (addr), "+c" (count)			:
+		    "r" (bsh + offset)				:
 		    "%eax", "memory");
 #endif
 	}
@@ -430,8 +430,7 @@
 			stosb					\n\
 			incl %2					\n\
 			loop 1b"				:
-		    "=D" (addr), "=c" (count), "=d" (_port_)	:
-		    "0" (addr), "1" (count), "2" (_port_)	:
+		    "+D" (addr), "+c" (count), "+d" (_port_)	::
 		    "%eax", "memory", "cc");
 #endif
 	}
@@ -447,8 +446,7 @@
 			cld					\n\
 			repne					\n\
 			movsb"					:
-		    "=D" (addr), "=c" (count), "=S" (_port_)	:
-		    "0" (addr), "1" (count), "2" (_port_)	:
+		    "+D" (addr), "+c" (count), "+S" (_port_)	::
 		    "memory", "cc");
 #endif
 	}
@@ -472,8 +470,7 @@
 			stosw					\n\
 			addl $2,%2				\n\
 			loop 1b"				:
-		    "=D" (addr), "=c" (count), "=d" (_port_)	:
-		    "0" (addr), "1" (count), "2" (_port_)	:
+		    "+D" (addr), "+c" (count), "+d" (_port_)	::
 		    "%eax", "memory", "cc");
 #endif
 	}
@@ -489,8 +486,7 @@
 			cld					\n\
 			repne					\n\
 			movsw"					:
-		    "=D" (addr), "=c" (count), "=S" (_port_)	:
-		    "0" (addr), "1" (count), "2" (_port_)	:
+		    "+D" (addr), "+c" (count), "+S" (_port_)	::
 		    "memory", "cc");
 #endif
 	}
@@ -514,8 +510,7 @@
 			stosl					\n\
 			addl $4,%2				\n\
 			loop 1b"				:
-		    "=D" (addr), "=c" (count), "=d" (_port_)	:
-		    "0" (addr), "1" (count), "2" (_port_)	:
+		    "+D" (addr), "+c" (count), "+d" (_port_)	::
 		    "%eax", "memory", "cc");
 #endif
 	}
@@ -531,8 +526,7 @@
 			cld					\n\
 			repne					\n\
 			movsl"					:
-		    "=D" (addr), "=c" (count), "=S" (_port_)	:
-		    "0" (addr), "1" (count), "2" (_port_)	:
+		    "+D" (addr), "+c" (count), "+S" (_port_)	::
 		    "memory", "cc");
 #endif
 	}
@@ -661,8 +655,8 @@
 		1:	lodsb					\n\
 			movb %%al,(%2)				\n\
 			loop 1b"				:
-		    "=S" (addr), "=c" (count)			:
-		    "r" (bsh + offset), "0" (addr), "1" (count)	:
+		    "+S" (addr), "+c" (count)			:
+		    "r" (bsh + offset)				:
 		    "%eax", "memory", "cc");
 #endif
 	}
@@ -690,8 +684,8 @@
 		1:	lodsw					\n\
 			movw %%ax,(%2)				\n\
 			loop 1b"				:
-		    "=S" (addr), "=c" (count)			:
-		    "r" (bsh + offset), "0" (addr), "1" (count)	:
+		    "+S" (addr), "+c" (count)			:
+		    "r" (bsh + offset)				:
 		    "%eax", "memory", "cc");
 #endif
 	}
@@ -719,8 +713,8 @@
 		1:	lodsl					\n\
 			movl %%eax,(%2)				\n\
 			loop 1b"				:
-		    "=S" (addr), "=c" (count)			:
-		    "r" (bsh + offset), "0" (addr), "1" (count)	:
+		    "+S" (addr), "+c" (count)			:
+		    "r" (bsh + offset)				:
 		    "%eax", "memory", "cc");
 #endif
 	}
@@ -770,8 +764,7 @@
 			outb %%al,%w0				\n\
 			incl %0					\n\
 			loop 1b"				:
-		    "=d" (_port_), "=S" (addr), "=c" (count)	:
-		    "0" (_port_), "1" (addr), "2" (count)	:
+		    "+d" (_port_), "+S" (addr), "+c" (count)	::
 		    "%eax", "memory", "cc");
 #endif
 	}
@@ -787,8 +780,7 @@
 			cld					\n\
 			repne					\n\
 			movsb"					:
-		    "=D" (_port_), "=S" (addr), "=c" (count)	:
-		    "0" (_port_), "1" (addr), "2" (count)	:
+		    "+D" (_port_), "+S" (addr), "+c" (count)	::
 		    "memory", "cc");
 #endif
 	}
@@ -812,8 +804,7 @@
 			outw %%ax,%w0				\n\
 			addl $2,%0				\n\
 			loop 1b"				:
-		    "=d" (_port_), "=S" (addr), "=c" (count)	:
-		    "0" (_port_), "1" (addr), "2" (count)	:
+		    "+d" (_port_), "+S" (addr), "+c" (count)	::
 		    "%eax", "memory", "cc");
 #endif
 	}
@@ -829,8 +820,7 @@
 			cld					\n\
 			repne					\n\
 			movsw"					:
-		    "=D" (_port_), "=S" (addr), "=c" (count)	:
-		    "0" (_port_), "1" (addr), "2" (count)	:
+		    "+D" (_port_), "+S" (addr), "+c" (count)	::
 		    "memory", "cc");
 #endif
 	}
@@ -854,8 +844,7 @@
 			outl %%eax,%w0				\n\
 			addl $4,%0				\n\
 			loop 1b"				:
-		    "=d" (_port_), "=S" (addr), "=c" (count)	:
-		    "0" (_port_), "1" (addr), "2" (count)	:
+		    "+d" (_port_), "+S" (addr), "+c" (count)	::
 		    "%eax", "memory", "cc");
 #endif
 	}
@@ -871,8 +860,7 @@
 			cld					\n\
 			repne					\n\
 			movsl"					:
-		    "=D" (_port_), "=S" (addr), "=c" (count)	:
-		    "0" (_port_), "1" (addr), "2" (count)	:
+		    "+D" (_port_), "+S" (addr), "+c" (count)	::
 		    "memory", "cc");
 #endif
 	}
@@ -1247,9 +1235,9 @@
 {
 #ifdef __GNUCLIKE_ASM
 	if (flags & BUS_SPACE_BARRIER_READ)
-		__asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory");
+		__asm __volatile("lfence" : : : "memory");
 	else
-		__asm __volatile("" : : : "memory");
+		__asm __volatile("sfence");
 #endif
 }