compiles

arch/x86_64/include/bits/irq.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <x86_64/defs.h>
-
-static inline bool arch_irq_get_state() {
-    uint64_t flags;
-    asm volatile("pushf; pop %0" : "=r"(flags)::"memory");
-    return flags & RFLAGS_IF;
-}
-
-static inline void arch_irq_set_state(bool state) {
-    if (state)
-        asm volatile("sti");
-    else
-        asm volatile("cli");
-}
-
-static inline void arch_irq_wait() {
-    asm volatile("hlt");
-}

arch/x86_64/include/bits/mem.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#include <stddef.h>
-#include <stdint.h>
-#include <zinnia/types.h>
-
-static inline size_t arch_mem_page_size() {
-    return 1 << 12;
-}
-
-static inline size_t arch_mem_page_bits() {
-    return 12;
-}
-
-static inline size_t arch_mem_level_bits() {
-    return 9;
-}
-
-static inline size_t arch_mem_num_levels() {
-    return 4;
-}
-
-static inline uintptr_t arch_mem_hhdm_addr() {
-    return 0xFFFF'8000'0000'0000;
-}
-
-static inline uintptr_t arch_vm_pfndb_addr() {
-    return 0xFFFF'A000'0000'0000;
-}
-
-static inline uintptr_t arch_mem_mapping_addr() {
-    return 0xFFFF'C000'0000'0000;
-}

arch/x86_64/include/bits/percpu.h

@@ -1,16 +1,10 @@
 #pragma once
 
+#include <zinnia/irq.h>
 #include <stddef.h>
 #include <x86_64/apic.h>
 #include <x86_64/gdt.h>
 #include <x86_64/tss.h>
-#include <zinnia/irq.h>
-
-static inline struct percpu* arch_percpu_get() {
-    struct percpu* result;
-    asm volatile("mov %0, gs:0" : "=r"(result)::"memory");
-    return result;
-}
 
 struct arch_percpu {
     struct gdt gdt;
@@ -22,6 +16,3 @@ struct arch_percpu {
     void (*fpu_restore)(const void*);
     bool can_smap;
 };
-
-void arch_percpu_bsp_init();
-void arch_percpu_init();

arch/x86_64/include/bits/sched.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <bits/types.h>
 #include <stdint.h>
 
 struct arch_task_context {
@@ -39,10 +38,8 @@ struct arch_context {
 #define ARCH_CTX_A0   rdi
 #define ARCH_CTX_A1   rsi
 #define ARCH_CTX_A2   rdx
-#define ARCH_CTX_A3   r9
+#define ARCH_CTX_A3   r10
 #define ARCH_CTX_A4   r8
-#define ARCH_CTX_A5   r10
-#define ARCH_CTX_A6   r12
-#define ARCH_CTX_A7   r13
+#define ARCH_CTX_A5   r9
 #define ARCH_CTX_RET0 rax
 #define ARCH_CTX_RET1 rdx

arch/x86_64/include/bits/types.h

@@ -3,4 +3,4 @@
 #include <stdint.h>
 
 typedef uint64_t phys_t;
-typedef uint64_t reg_t;
+typedef uint64_t virt_t;

arch/x86_64/include/x86_64/apic.h

@@ -1,12 +1,11 @@
 #pragma once
 
 #include <stdint.h>
-#include <zinnia/mmio.h>
 
 struct local_apic {
     uint32_t id;
     uint32_t ticks_per_10ms;
-    struct mmio_view xapic_regs;
+    void* xapic_regs;
 };
 
 enum apic_delivery_mode {
@@ -38,19 +37,21 @@ enum apic_trigger_mode {
     APIC_TRIGGER_LEVEL = 1,
 };
 
-constexpr mmio_reg32 APIC_REG_ID = {.offset = 0x20};
-constexpr mmio_reg32 APIC_REG_TPR = {.offset = 0x80};
-constexpr mmio_reg32 APIC_REG_EOI = {.offset = 0xB0};
-constexpr mmio_reg32 APIC_REG_LDR = {.offset = 0xD0};
-constexpr mmio_reg32 APIC_REG_DFR = {.offset = 0xE0};
-constexpr mmio_reg32 APIC_REG_SIVR = {.offset = 0xF0};
-constexpr mmio_reg32 APIC_REG_ESR = {.offset = 0x280};
-constexpr mmio_reg32 APIC_REG_ICR = {.offset = 0x300};
-constexpr mmio_reg32 APIC_REG_ICR_HI = {.offset = 0x310};
-constexpr mmio_reg32 APIC_REG_LVT_TR = {.offset = 0x320};
-constexpr mmio_reg32 APIC_REG_ICR_TIMER = {.offset = 0x380};
-constexpr mmio_reg32 APIC_REG_CCR = {.offset = 0x390};
-constexpr mmio_reg32 APIC_REG_DCR = {.offset = 0x3E0};
+enum apic_regs {
+    APIC_REG_ID = 0x20,
+    APIC_REG_TPR = 0x80,
+    APIC_REG_EOI = 0xB0,
+    APIC_REG_LDR = 0xD0,
+    APIC_REG_DFR = 0xE0,
+    APIC_REG_SIVR = 0xF0,
+    APIC_REG_ESR = 0x280,
+    APIC_REG_ICR = 0x300,
+    APIC_REG_ICR_HI = 0x310,
+    APIC_REG_LVT_TR = 0x320,
+    APIC_REG_ICR_TIMER = 0x380,
+    APIC_REG_CCR = 0x390,
+    APIC_REG_DCR = 0x3E0,
+};
 
 void lapic_init(struct local_apic* lapic);
 void lapic_eoi(struct local_apic* lapic);

arch/x86_64/include/x86_64/defs.h

@@ -194,8 +194,8 @@
 #define MSR_GS_BASE        (0xC0000101)
 #define MSR_KERNEL_GS_BASE (0xC0000102)
 
-#define CPL_USER   (0b11)
-#define CPL_KERNEL (0b00)
+#define CPL_USER   (0x3)
+#define CPL_KERNEL (0x0)
 
 #define IDT_PF          (0xE)
 #define IDT_IPI_RESCHED (0xFF)