Rewrite the I/O port code.

[pintos-anon] / src / threads / io.h

diff --git a/src/threads/io.h b/src/threads/io.h
index f59c79e4740730c34b513c9d5a108e6dfdc3fc91..30d52da046ee2faa2d0caac142f67a3730cb9c5f 100644 (file)
--- a/src/threads/io.h
+++ b/src/threads/io.h
@@ -1,94 +1,115 @@
-#ifndef PORTIO_H
-#define PORTIO_H 1
+#ifndef THREADS_IO_H
+#define THREADS_IO_H
 
 #include <stddef.h>
 #include <stdint.h>
 
+/* Reads and returns a byte from PORT. */
 static inline uint8_t
-inb(uint16_t port)
+inb (uint16_t port)
 {
+  /* See [IA32-v2a] "IN". */
   uint8_t data;
-  asm volatile ("inb %w1,%0" : "=a" (data) : "d" (port));
+  asm volatile ("inb %w1, %b0" : "=a" (data) : "Nd" (port));
   return data;
 }
 
+/* Reads CNT bytes from PORT, one after another, and stores them
+   into the buffer starting at ADDR. */
 static inline void
-insb(uint16_t port, void *addr, size_t cnt)
+insb (uint16_t port, void *addr, size_t cnt)
 {
-  asm volatile ("cld\n\trepne\n\tinsb"                 :
-                "=D" (addr), "=c" (cnt)                :
-                "d" (port), "0" (addr), "1" (cnt)      :
-                "memory", "cc");
+  /* See [IA32-v2a] "INS". */
+  asm volatile ("rep insb" : "+D" (addr), "+c" (cnt) : "d" (port) : "memory");
 }
 
+/* Reads and returns 16 bits from PORT. */
 static inline uint16_t
-inw(uint16_t port)
+inw (uint16_t port)
 {
   uint16_t data;
-  asm volatile ("inw %w1,%0" : "=a" (data) : "d" (port));
+  /* See [IA32-v2a] "IN". */
+  asm volatile ("inw %w1, %w0" : "=a" (data) : "Nd" (port));
   return data;
 }
 
+/* Reads CNT 16-bit (halfword) units from PORT, one after
+   another, and stores them into the buffer starting at ADDR. */
 static inline void
-insw(uint16_t port, void *addr, size_t cnt)
+insw (uint16_t port, void *addr, size_t cnt)
 {
-  asm volatile ("cld\n\trepne\n\tinsw" :
-                "=D" (addr), "=c" (cnt) :
-                "d" (port), "0" (addr), "1" (cnt) :
-                "memory", "cc");
+  /* See [IA32-v2a] "INS". */
+  asm volatile ("rep insw" : "+D" (addr), "+c" (cnt) : "d" (port) : "memory");
 }
 
+/* Reads and returns 32 bits from PORT. */
 static inline uint32_t
-inl(uint16_t port)
+inl (uint16_t port)
 {
+  /* See [IA32-v2a] "IN". */
   uint32_t data;
-  asm volatile ("inl %w1,%0" : "=a" (data) : "d" (port));
+  asm volatile ("inl %w1, %0" : "=a" (data) : "Nd" (port));
   return data;
 }
 
+/* Reads CNT 32-bit (word) units from PORT, one after another,
+   and stores them into the buffer starting at ADDR. */
 static inline void
-insl(uint16_t port, void *addr, size_t cnt)
+insl (uint16_t port, void *addr, size_t cnt)
 {
-  asm volatile ("cld\n\trepne\n\tinsl" :
-                "=D" (addr), "=c" (cnt) :
-                "d" (port), "0" (addr), "1" (cnt) :
-                "memory", "cc");
+  /* See [IA32-v2a] "INS". */
+  asm volatile ("rep insl" : "+D" (addr), "+c" (cnt) : "d" (port) : "memory");
 }
 
+/* Writes byte DATA to PORT. */
 static inline void
-outb(uint16_t port, uint8_t data)
+outb (uint16_t port, uint8_t data)
 {
-  asm volatile ("outb %0,%w1" : : "a" (data), "d" (port));
+  /* See [IA32-v2b] "OUT". */
+  asm volatile ("outb %b0, %w1" : : "a" (data), "Nd" (port));
 }
 
+/* Writes to PORT each byte of data in the CNT-byte buffer
+   starting at ADDR. */
 static inline void
-outsb(uint16_t port, const void *addr, size_t cnt)
+outsb (uint16_t port, const void *addr, size_t cnt)
 {
-  asm volatile ("cld\n\trepne\n\toutsb" :
-                "=S" (addr), "=c" (cnt) :
-                "d" (port), "0" (addr), "1" (cnt) :
-                "cc");
+  /* See [IA32-v2b] "OUTS". */
+  asm volatile ("rep outsb" : "+S" (addr), "+c" (cnt) : "d" (port));
 }
 
+/* Writes the 16-bit DATA to PORT. */
 static inline void
-outw(uint16_t port, uint16_t data)
+outw (uint16_t port, uint16_t data)
 {
-  asm volatile ("outw %0,%w1" : : "a" (data), "d" (port));
+  /* See [IA32-v2b] "OUT". */
+  asm volatile ("outw %w0, %w1" : : "a" (data), "Nd" (port));
 }
 
+/* Writes to PORT each 16-bit unit (halfword) of data in the
+   CNT-halfword buffer starting at ADDR. */
 static inline void
-outsw(uint16_t port, const void *addr, size_t cnt)
+outsw (uint16_t port, const void *addr, size_t cnt)
 {
-  asm volatile ("cld\n\trepne\n\toutsw" :
-                "=S" (addr), "=c" (cnt) :
-                "d" (port), "0" (addr), "1" (cnt) :
-                "cc");
+  /* See [IA32-v2b] "OUTS". */
+  asm volatile ("rep outsw" : "+S" (addr), "+c" (cnt) : "d" (port));
 }
 
+/* Writes the 32-bit DATA to PORT. */
 static inline void
-outl(uint16_t port, uint32_t data)
+outl (uint16_t port, uint32_t data)
 {
-  asm volatile ("outl %0,%w1" : : "a" (data), "d" (port));
+  /* See [IA32-v2b] "OUT". */
+  asm volatile ("outl %0, %w1" : : "a" (data), "Nd" (port));
 }
 
-#endif /* io.h */
+/* Writes to PORT each 32-bit unit (word) of data in the CNT-word
+   buffer starting at ADDR. */
+static inline void
+outsl (uint16_t port, const void *addr, size_t cnt)
+{
+  /* See [IA32-v2b] "OUTS". */
+  asm volatile ("rep outsl" : "+S" (addr), "+c" (cnt) : "d" (port));
+}
+
+#endif /* threads/io.h */