X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fio.h;h=cf9eee01a2174af6e5682f74f611a92b1b0baa89;hb=47868ce911e401077a0afb2f26f12685ff53a706;hp=b6d1e4ba2afc46869ad3687bcbc4831199c68d83;hpb=02b240e9eff605dbb42a294a6defd48f587634d2;p=pintos-anon

diff --git a/src/threads/io.h b/src/threads/io.h
index b6d1e4b..cf9eee0 100644
--- a/src/threads/io.h
+++ b/src/threads/io.h
@@ -38,8 +38,8 @@
  * the copyright notices, if any, listed below.
  */
 
-#ifndef HEADER_IO_H
-#define HEADER_IO_H 1
+#ifndef THREADS_IO_H
+#define THREADS_IO_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -48,8 +48,9 @@
 static inline uint8_t
 inb (uint16_t port)
 {
+  /* See [IA32-v2a] "IN". */
   uint8_t data;
-  asm volatile ("inb %w1,%0" : "=a" (data) : "d" (port));
+  asm volatile ("inb %0, %w1" : "=a" (data) : "d" (port));
   return data;
 }
 
@@ -58,7 +59,8 @@ inb (uint16_t port)
 static inline void
 insb (uint16_t port, void *addr, size_t cnt)
 {
-  asm volatile ("cld; repne; insb"
+  /* See [IA32-v2a] "INS". */
+  asm volatile ("cld; repne insb"
                 : "=D" (addr), "=c" (cnt)
                 : "d" (port), "0" (addr), "1" (cnt)
                 : "memory", "cc");
@@ -69,7 +71,8 @@ static inline uint16_t
 inw (uint16_t port)
 {
   uint16_t data;
-  asm volatile ("inw %w1,%0" : "=a" (data) : "d" (port));
+  /* See [IA32-v2a] "IN". */
+  asm volatile ("inw %0, %w1" : "=a" (data) : "d" (port));
   return data;
 }
 
@@ -78,7 +81,8 @@ inw (uint16_t port)
 static inline void
 insw (uint16_t port, void *addr, size_t cnt)
 {
-  asm volatile ("cld; repne; insw"
+  /* See [IA32-v2a] "INS". */
+  asm volatile ("cld; repne insw"
                 : "=D" (addr), "=c" (cnt)
                 : "d" (port), "0" (addr), "1" (cnt)
                 : "memory", "cc");
@@ -88,8 +92,9 @@ insw (uint16_t port, void *addr, size_t cnt)
 static inline uint32_t
 inl (uint16_t port)
 {
+  /* See [IA32-v2a] "IN". */
   uint32_t data;
-  asm volatile ("inl %w1,%0" : "=a" (data) : "d" (port));
+  asm volatile ("ind %0, %w1" : "=a" (data) : "d" (port));
   return data;
 }
 
@@ -98,7 +103,8 @@ inl (uint16_t port)
 static inline void
 insl (uint16_t port, void *addr, size_t cnt)
 {
-  asm volatile ("cld; repne; insl"
+  /* See [IA32-v2a] "INS". */
+  asm volatile ("cld; repne insd"
                 : "=D" (addr), "=c" (cnt)
                 : "d" (port), "0" (addr), "1" (cnt)
                 : "memory", "cc");
@@ -108,7 +114,8 @@ insl (uint16_t port, void *addr, size_t cnt)
 static inline void
 outb (uint16_t port, uint8_t data)
 {
-  asm volatile ("outb %0,%w1" : : "a" (data), "d" (port));
+  /* See [IA32-v2b] "OUT". */
+  asm volatile ("outb %w1, %0" : : "a" (data), "d" (port));
 }
 
 /* Writes to PORT each byte of data in the CNT-byte buffer
@@ -116,7 +123,8 @@ outb (uint16_t port, uint8_t data)
 static inline void
 outsb (uint16_t port, const void *addr, size_t cnt)
 {
-  asm volatile ("cld; repne; outsb"
+  /* See [IA32-v2b] "OUTS". */
+  asm volatile ("cld; repne outsb"
                 : "=S" (addr), "=c" (cnt)
                 : "d" (port), "0" (addr), "1" (cnt)
                 : "cc");
@@ -126,7 +134,8 @@ outsb (uint16_t port, const void *addr, size_t cnt)
 static inline void
 outw (uint16_t port, uint16_t data)
 {
-  asm volatile ("outw %0,%w1" : : "a" (data), "d" (port));
+  /* See [IA32-v2b] "OUT". */
+  asm volatile ("outw %w1, %0" : : "a" (data), "d" (port));
 }
 
 /* Writes to PORT each 16-bit unit (halfword) of data in the
@@ -134,7 +143,8 @@ outw (uint16_t port, uint16_t data)
 static inline void
 outsw (uint16_t port, const void *addr, size_t cnt)
 {
-  asm volatile ("cld; repne; outsw"
+  /* See [IA32-v2b] "OUTS". */
+  asm volatile ("cld; repne outsw"
                 : "=S" (addr), "=c" (cnt)
                 : "d" (port), "0" (addr), "1" (cnt)
                 : "cc");
@@ -144,7 +154,8 @@ outsw (uint16_t port, const void *addr, size_t cnt)
 static inline void
 outl (uint16_t port, uint32_t data)
 {
-  asm volatile ("outl %0,%w1" : : "a" (data), "d" (port));
+  /* See [IA32-v2b] "OUT". */
+  asm volatile ("outd %w1, %0" : : "a" (data), "d" (port));
 }
 
 /* Writes to PORT each 32-bit unit (word) of data in the CNT-word
@@ -152,10 +163,11 @@ outl (uint16_t port, uint32_t data)
 static inline void
 outsl (uint16_t port, const void *addr, size_t cnt)
 {
-  asm volatile ("cld; repne; outsl"
+  /* See [IA32-v2b] "OUTS". */
+  asm volatile ("cld; repne outsd"
                 : "=S" (addr), "=c" (cnt)
                 : "d" (port), "0" (addr), "1" (cnt)
                 : "cc");
 }
 
-#endif /* io.h */
+#endif /* threads/io.h */