WebSVN – HelenOS – Diff – /branches/dd/kernel/arch/ia32/include/asm.h

  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /** @addtogroup ia32
  * @{
  */
 /** @file
  */
 #ifndef KERN_ia32_ASM_H_
 #define KERN_ia32_ASM_H_
 #include <arch/pm.h>
 #include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 extern uint32_t interrupt_handler_size;
 extern void paging_on(void);
 /** Halt CPU
+ *
  * Halt the current CPU until interrupt event.
+ *
  */
 static inline void cpu_halt(void)
+{
     asm volatile ("hlt\n");
+}
+{
     asm volatile ("hlt\n");
+}
 #define GEN_READ_REG(reg) static inline unative_t read_ ##reg (void) \
     { \
-    unative_t res; \
+        unative_t res; \
+        asm volatile ( \
-    asm volatile ("movl %%" #reg ", %0" : "=r" (res) ); \
+            "movl %%" #reg ", %[res]" \
+            : [res] "=r" (res) \
+        ); \
-    return res; \
+        return res; \
     }
 #define GEN_WRITE_REG(reg) static inline void write_ ##reg (unative_t regn) \
     { \
+        asm volatile ( \
-    asm volatile ("movl %0, %%" #reg : : "r" (regn)); \
+            "movl %[regn], %%" #reg \
+            :: [regn] "r" (regn) \
-    }
+        ); \
+    }
 GEN_READ_REG(cr0)
 GEN_READ_REG(cr2)
 GEN_READ_REG(cr3)
 GEN_WRITE_REG(cr3)
+ *
  * Output byte to port
+ *
  * @param port Port to write to
  * @param val Value to write
+ *
  */
-static inline void outb(uint16_t port, uint8_t val)
+static inline void pio_write_8(ioport8_t *port, uint8_t val)
+{
+    asm volatile (
+        "outb %b[val], %w[port]\n"
-    asm volatile ("outb %b0, %w1\n" : : "a" (val), "d" (port) );
+        :: [val] "a" (val), [port] "d" (port)
+    );
+}
 /** Word to port
+ *
  * Output word to port
+ *
  * @param port Port to write to
  * @param val Value to write
+ *
  */
-static inline void outw(uint16_t port, uint16_t val)
+static inline void pio_write_16(ioport16_t *port, uint16_t val)
+{
+    asm volatile (
+        "outw %w[val], %w[port]\n"
-    asm volatile ("outw %w0, %w1\n" : : "a" (val), "d" (port) );
+        :: [val] "a" (val), [port] "d" (port)
+    );
+}
 /** Double word to port
+ *
  * Output double word to port
+ *
  * @param port Port to write to
  * @param val Value to write
+ *
  */
-static inline void outl(uint16_t port, uint32_t val)
+static inline void pio_write_32(ioport32_t *port, uint32_t val)
+{
+    asm volatile (
+        "outl %[val], %w[port]\n"
-    asm volatile ("outl %l0, %w1\n" : : "a" (val), "d" (port) );
+        :: [val] "a" (val), [port] "d" (port)
+    );
+}
 /** Byte from port
+ *
  * Get byte from port
+ *
  * @param port Port to read from
  * @return Value read
+ *
  */
-static inline uint8_t inb(uint16_t port)
+static inline uint8_t pio_read_8(ioport8_t *port)
+{
     uint8_t val;
+    asm volatile (
-    asm volatile ("inb %w1, %b0 \n" : "=a" (val) : "d" (port) );
+        "inb %w[port], %b[val]\n"
+        : [val] "=a" (val)
+        : [port] "d" (port)
+    );
     return val;
+}
 /** Word from port
+ *
  * Get word from port
+ *
  * @param port Port to read from
  * @return Value read
+ *
  */
-static inline uint16_t inw(uint16_t port)
+static inline uint16_t pio_read_16(ioport16_t *port)
+{
     uint16_t val;
+    asm volatile (
-    asm volatile ("inw %w1, %w0 \n" : "=a" (val) : "d" (port) );
+        "inw %w[port], %w[val]\n"
+        : [val] "=a" (val)
+        : [port] "d" (port)
+    );
     return val;
+}
 /** Double word from port
+ *
  * Get double word from port
+ *
  * @param port Port to read from
  * @return Value read
+ *
  */
-static inline uint32_t inl(uint16_t port)
+static inline uint32_t pio_read_32(ioport32_t *port)
+{
     uint32_t val;
+    asm volatile (
-    asm volatile ("inl %w1, %l0 \n" : "=a" (val) : "d" (port) );
+        "inl %w[port], %[val]\n"
+        : [val] "=a" (val)
+        : [port] "d" (port)
+    );
     return val;
+}
 /** Enable interrupts.
+ *
  * Enable interrupts and return previous
  * value of EFLAGS.
+ *
  * @return Old interrupt priority level.
+ *
  */
 static inline ipl_t interrupts_enable(void)
+{
     ipl_t v;
     asm volatile (
-        "pushf\n\t"
+        "pushf\n"
-        "popl %0\n\t"
+        "popl %[v]\n"
         "sti\n"
-        : "=r" (v)
+        : [v] "=r" (v)
     );
     return v;
+}
 /** Disable interrupts.
+ *
  * Disable interrupts and return previous
  * value of EFLAGS.
+ *
  * @return Old interrupt priority level.
+ *
  */
 static inline ipl_t interrupts_disable(void)
+{
     ipl_t v;
     asm volatile (
-        "pushf\n\t"
+        "pushf\n"
-        "popl %0\n\t"
+        "popl %[v]\n"
         "cli\n"
-        : "=r" (v)
+        : [v] "=r" (v)
     );
     return v;
+}
 /** Restore interrupt priority level.
+ *
  * Restore EFLAGS.
+ *
  * @param ipl Saved interrupt priority level.
+ *
  */
 static inline void interrupts_restore(ipl_t ipl)
+{
     asm volatile (
-        "pushl %0\n\t"
+        "pushl %[ipl]\n"
         "popf\n"
-        : : "r" (ipl)
+        :: [ipl] "r" (ipl)
     );
+}
 /** Return interrupt priority level.
+ *
  * @return EFLAFS.
+ *
  */
 static inline ipl_t interrupts_read(void)
+{
     ipl_t v;
     asm volatile (
-        "pushf\n\t"
+        "pushf\n"
-        "popl %0\n"
+        "popl %[v]\n"
-        : "=r" (v)
+        : [v] "=r" (v)
     );
     return v;
+}
+/** Write to MSR */
+static inline void write_msr(uint32_t msr, uint64_t value)
+{
+    asm volatile (
+        "wrmsr"
+        :: "c" (msr), "a" ((uint32_t) (value)),
+           "d" ((uint32_t) (value >> 32))
+    );
+}
+static inline uint64_t read_msr(uint32_t msr)
+{
+    uint32_t ax, dx;
+    asm volatile (
+        "rdmsr"
+        : "=a" (ax), "=d" (dx)
+        : "c" (msr)
+    );
+    return ((uint64_t) dx << 32) | ax;
+}
 /** Return base address of current stack
+ *
  * Return the base address of the current stack.
  * The stack is assumed to be STACK_SIZE bytes long.
  * The stack must start on page boundary.
+ *
  */
 static inline uintptr_t get_stack_base(void)
+{
     uintptr_t v;
     asm volatile (
-        "andl %%esp, %0\n"
+        "andl %%esp, %[v]\n"
-        : "=r" (v)
+        : [v] "=r" (v)
         : "0" (~(STACK_SIZE - 1))
     );
     return v;
+}
 /** Return current IP address */
 static inline uintptr_t * get_ip()
+{
     uintptr_t *ip;
     asm volatile (
-        "mov %%eip, %0"
+        "mov %%eip, %[ip]"
-        : "=r" (ip)
+        : [ip] "=r" (ip)
-        );
+    );
     return ip;
+}
 /** Invalidate TLB Entry.
+ *
  * @param addr Address on a page whose TLB entry is to be invalidated.
+ *
  */
 static inline void invlpg(uintptr_t addr)
+{
+    asm volatile (
+        "invlpg %[addr]\n"
-    asm volatile ("invlpg %0\n" :: "m" (*(unative_t *)addr));
+        :: [addr] "m" (*(unative_t *) addr)
+    );
+}
 /** Load GDTR register from memory.
+ *
  * @param gdtr_reg Address of memory from where to load GDTR.
+ *
  */
 static inline void gdtr_load(ptr_16_32_t *gdtr_reg)
+{
+    asm volatile (
+        "lgdtl %[gdtr_reg]\n"
-    asm volatile ("lgdtl %0\n" : : "m" (*gdtr_reg));
+        :: [gdtr_reg] "m" (*gdtr_reg)
+    );
+}
 /** Store GDTR register to memory.
+ *
  * @param gdtr_reg Address of memory to where to load GDTR.
+ *
  */
 static inline void gdtr_store(ptr_16_32_t *gdtr_reg)
+{
+    asm volatile (
+        "sgdtl %[gdtr_reg]\n"
-    asm volatile ("sgdtl %0\n" : : "m" (*gdtr_reg));
+        :: [gdtr_reg] "m" (*gdtr_reg)
+    );
+}
 /** Load IDTR register from memory.
+ *
  * @param idtr_reg Address of memory from where to load IDTR.
+ *
  */
 static inline void idtr_load(ptr_16_32_t *idtr_reg)
+{
+    asm volatile (
+        "lidtl %[idtr_reg]\n"
-    asm volatile ("lidtl %0\n" : : "m" (*idtr_reg));
+        :: [idtr_reg] "m" (*idtr_reg)
+    );
+}
 /** Load TR from descriptor table.
+ *
  * @param sel Selector specifying descriptor of TSS segment.
+ *
  */
 static inline void tr_load(uint16_t sel)
+{
+    asm volatile (
+        "ltr %[sel]"
-    asm volatile ("ltr %0" : : "r" (sel));
+        :: [sel] "r" (sel)
+    );
+}
 #endif
 /** @}

Subversion Repositories HelenOS

(root)/branches/dd/kernel/arch/ia32/include/asm.h – Rev 3022 → 4055