:: commit c913a7ccf4ee550a0c6d5d66961c18424da07a53

diff --git a/limine.bin b/limine.bin
index 041a0a16..fb18ec6b 100644
Binary files a/limine.bin and b/limine.bin differ
diff --git a/stage2/drivers/vga_textmode.c b/stage2/drivers/vga_textmode.c
index 6165cc84..4271ff80 100644
--- a/stage2/drivers/vga_textmode.c
+++ b/stage2/drivers/vga_textmode.c
@@ -66,8 +66,8 @@ void text_disable_cursor(void) {
 // VGA cursor code taken from: https://wiki.osdev.org/Text_Mode_Cursor
 
 void init_vga_textmode(int *_rows, int *_cols) {
-    port_out_b(0x3d4, 0x0a);
-    port_out_b(0x3d5, 0x20);
+    outb(0x3d4, 0x0a);
+    outb(0x3d5, 0x20);
     text_clear(true);
 
     *_rows = VD_ROWS;
diff --git a/stage2/lib/print.c b/stage2/lib/print.c
index 418fc8ed..630e634e 100644
--- a/stage2/lib/print.c
+++ b/stage2/lib/print.c
@@ -172,6 +172,6 @@ out:
 
 #ifdef E9_OUTPUT
     for (size_t i = 0; i < print_buf_i; i++)
-        port_out_b(0xe9, print_buf[i]);
+        outb(0xe9, print_buf[i]);
 #endif
 }
diff --git a/stage2/sys/cpu.h b/stage2/sys/cpu.h
index 732ab4f3..4fe988d1 100644
--- a/stage2/sys/cpu.h
+++ b/stage2/sys/cpu.h
@@ -10,68 +10,68 @@
 #define DWORD_PTR(PTR) (*((uint32_t *)(PTR)))
 #define QWORD_PTR(PTR) (*((uint64_t *)(PTR)))
 
-static inline void port_out_b(uint16_t port, uint8_t value) {
-    asm volatile ("out dx, al"  : : "a" (value), "d" (port) : "memory");
+static inline void outb(uint16_t port, uint8_t value) {
+    asm volatile ("out %1, al"  : : "a" (value), "Nd" (port) : "memory");
 }
 
-static inline void port_out_w(uint16_t port, uint16_t value) {
-    asm volatile ("out dx, ax"  : : "a" (value), "d" (port) : "memory");
+static inline void outw(uint16_t port, uint16_t value) {
+    asm volatile ("out %1, ax"  : : "a" (value), "Nd" (port) : "memory");
 }
 
-static inline void port_out_d(uint16_t port, uint32_t value) {
-    asm volatile ("out dx, eax" : : "a" (value), "d" (port) : "memory");
+static inline void outd(uint16_t port, uint32_t value) {
+    asm volatile ("out %1, eax" : : "a" (value), "Nd" (port) : "memory");
 }
 
-static inline uint8_t port_in_b(uint16_t port) {
+static inline uint8_t inb(uint16_t port) {
     uint8_t value;
-    asm volatile ("in al, dx"  : "=a" (value) : "d" (port) : "memory");
+    asm volatile ("in al, %1"  : "=a" (value) : "Nd" (port) : "memory");
     return value;
 }
 
-static inline uint16_t port_in_w(uint16_t port) {
+static inline uint16_t inw(uint16_t port) {
     uint16_t value;
-    asm volatile ("in ax, dx"  : "=a" (value) : "d" (port) : "memory");
+    asm volatile ("in ax, %1"  : "=a" (value) : "Nd" (port) : "memory");
     return value;
 }
 
-static inline uint32_t port_in_d(uint16_t port) {
+static inline uint32_t ind(uint16_t port) {
     uint32_t value;
-    asm volatile ("in eax, dx" : "=a" (value) : "d" (port) : "memory");
+    asm volatile ("in eax, %1" : "=a" (value) : "Nd" (port) : "memory");
     return value;
 }
 
 static inline void mmoutb(void *addr, uint8_t value) {
     asm volatile (
-        "mov %0, %1\n\t"
-        : "=m"(BYTE_PTR(addr))
-        : "r"(value)
+        "mov %0, %1"
+        : "=m" (BYTE_PTR(addr))
+        : "g"  (value)
         : "memory"
     );
 }
 
 static inline void mmoutw(void *addr, uint16_t value) {
     asm volatile (
-        "mov %0, %1\n\t"
-        : "=m"(WORD_PTR(addr))
-        : "r"(value)
+        "mov %0, %1"
+        : "=m" (WORD_PTR(addr))
+        : "g"  (value)
         : "memory"
     );
 }
 
 static inline void mmoutd(void *addr, uint32_t value) {
     asm volatile (
-        "mov %0, %1\n\t"
-        : "=m"(DWORD_PTR(addr))
-        : "r"(value)
+        "mov %0, %1"
+        : "=m" (DWORD_PTR(addr))
+        : "g"  (value)
         : "memory"
     );
 }
 
 static inline void mmoutq(void *addr, uint64_t value) {
     asm volatile (
-        "mov %0, %1\n\t"
-        : "=m"(QWORD_PTR(addr))
-        : "r"(value)
+        "mov %0, %1"
+        : "=m" (QWORD_PTR(addr))
+        : "g"  (value)
         : "memory"
     );
 }
@@ -79,9 +79,9 @@ static inline void mmoutq(void *addr, uint64_t value) {
 static inline uint8_t mminb(void *addr) {
     uint8_t ret;
     asm volatile (
-        "mov %0, %1\n\t"
-        : "=r"(ret)
-        : "m"(BYTE_PTR(addr))
+        "mov %0, %1"
+        : "=r" (ret)
+        : "g"  (BYTE_PTR(addr))
         : "memory"
     );
     return ret;
@@ -90,9 +90,9 @@ static inline uint8_t mminb(void *addr) {
 static inline uint16_t mminw(void *addr) {
     uint16_t ret;
     asm volatile (
-        "mov %0, %1\n\t"
-        : "=r"(ret)
-        : "m"(WORD_PTR(addr))
+        "mov %0, %1"
+        : "=r" (ret)
+        : "g"  (WORD_PTR(addr))
         : "memory"
     );
     return ret;
@@ -101,9 +101,9 @@ static inline uint16_t mminw(void *addr) {
 static inline uint32_t mmind(void *addr) {
     uint32_t ret;
     asm volatile (
-        "mov %0, %1\n\t"
-        : "=r"(ret)
-        : "m"(DWORD_PTR(addr))
+        "mov %0, %1"
+        : "=r" (ret)
+        : "g"  (DWORD_PTR(addr))
         : "memory"
     );
     return ret;
@@ -112,9 +112,9 @@ static inline uint32_t mmind(void *addr) {
 static inline uint64_t mminq(void *addr) {
     uint64_t ret;
     asm volatile (
-        "mov %0, %1\n\t"
-        : "=r"(ret)
-        : "m"(QWORD_PTR(addr))
+        "mov %0, %1"
+        : "=r" (ret)
+        : "g"  (QWORD_PTR(addr))
         : "memory"
     );
     return ret;
@@ -139,12 +139,12 @@ static inline void wrmsr(uint32_t msr, uint64_t value) {
 }
 
 #define write_cr(reg, val) ({ \
-    asm volatile ("mov cr" reg ", %0" : : "r" (val)); \
+    asm volatile ("mov cr" reg ", %0" :: "r" (val) : "memory"); \
 })
 
 #define read_cr(reg) ({ \
     size_t cr; \
-    asm volatile ("mov %0, cr" reg : "=r" (cr)); \
+    asm volatile ("mov %0, cr" reg : "=r" (cr) :: "memory"); \
     cr; \
 })
 
@@ -154,7 +154,7 @@ static inline void wrmsr(uint32_t msr, uint64_t value) {
         "lock xadd %1, %0;" \
         : "+r" (ret) \
         : "m" (*(var)) \
-        : "memory", "cc" \
+        : "memory" \
     ); \
     ret; \
 })
diff --git a/stage2/sys/pic.c b/stage2/sys/pic.c
index d95e55e9..f8ee32d9 100644
--- a/stage2/sys/pic.c
+++ b/stage2/sys/pic.c
@@ -6,10 +6,10 @@
 
 void pic_eoi(int irq) {
     if (irq >= 8) {
-        port_out_b(0xa0, 0x20);
+        outb(0xa0, 0x20);
     }
 
-    port_out_b(0x20, 0x20);
+    outb(0x20, 0x20);
 }
 
 // Flush all potentially pending IRQs
@@ -30,14 +30,14 @@ void pic_set_mask(int line, bool status) {
     }
 
     if (!status)
-        value = port_in_b(port) & ~((uint8_t)1 << line);
+        value = inb(port) & ~((uint8_t)1 << line);
     else
-        value = port_in_b(port) | ((uint8_t)1 << line);
+        value = inb(port) | ((uint8_t)1 << line);
 
-    port_out_b(port, value);
+    outb(port, value);
 }
 
 void pic_mask_all(void) {
-    port_out_b(0xa1, 0xff);
-    port_out_b(0x21, 0xff);
+    outb(0xa1, 0xff);
+    outb(0x21, 0xff);
 }
diff --git a/stage2/sys/smp.c b/stage2/sys/smp.c
index 9257db88..6a98b845 100644
--- a/stage2/sys/smp.c
+++ b/stage2/sys/smp.c
@@ -44,7 +44,7 @@ struct gdtr {
 
 static void delay(uint32_t cycles) {
     for (uint32_t i = 0; i < cycles; i++)
-        port_in_b(0x80);
+        inb(0x80);
 }
 
 void     smp_trampoline(void);