x86 IDT cleanup

Author: primis

src/arch/x86/idt.c

@@ -12,7 +12,7 @@
 extern void idt_flush(uint32_t);
 extern int init_irq();
 
-#define NUM_TRAP_STRS 22 	    // x86 has 20 hardware traps
+#define NUM_TRAP_STRS 22 	    // x86 has 22 hardware traps
 #define NUM_HANDLERS 256        // Max handlers x86 allows
 #define MAX_HANDLERS_PER_INT 4  // Number of software handlers per interrupt
 
@@ -135,7 +135,7 @@ static void set_idt_entry(uint8_t n, uint32_t base, uint16_t sel, uint8_t flags)
 static int init_idt()
 {
     uint32_t i, delta, base;
-    
+
     delta = (uint32_t)isr1 - (uint32_t)isr0;
 
     idt_ptr.limit   = sizeof(idt_entry_t) * 256 - 1;
@@ -216,10 +216,10 @@ void interrupt_handler(x86_regs_t *regs)
     char buf[64];
 
     // We use a small hack. Seeing int code of 0xDEADBEEF means actual int code
-    // Is in the error code 
+    // Is in the error code
     if(num == 0xDEADBEEF)
     {
-        num = regs->error_code; 
+        num = regs->error_code;
     }
 
     if (num_handlers[num]) {

src/arch/x86/include/ports.h

@@ -1,13 +1,13 @@
 /*
- * (c) 2022 Apollo Project Developers
+ * (c) 2024 Apollo Project Developers
  * For terms, see LICENSE
  * ports.c - x86 I/O databus commends
  */
 
 #include <stdint.h>
 #include <sys/resource.h>
 #include <errno.h>
-#include "include/ports.h"
+#include <arch/x86/regs.h>
 
 void iowait(void)
 {
@@ -57,7 +57,7 @@ static void io_read_32(uint16_t port, void* data)
     *(uint32_t*)data = ret;
 }
 
-static int resource_io_data_op(void *src, resource_t *r, resource_type_t off, 
+static int resource_io_data_op(void *src, resource_t *r, resource_type_t off,
     size_t n, int read)
 {
     int width;
@@ -129,15 +129,15 @@ static int resource_io_data_op(void *src, resource_t *r, resource_type_t off,
                 io_op(r->start, (src + i));
             }
             break;
-            
+
         case RESOURCE_IO_INDEXED: /* Write to the indexing port, then data */
             for(i = 0; i < n; i++)
             {
-                uint8_t index = (off + i); 
+                uint8_t index = (off + i);
                 if(r->flags & RESOURCE_IO_SLOW)
                 {
                     iowait();
-                }      
+                }
                 io_write_8(r->start, &index);
                 io_op(r->end, (src + i));
             }

src/arch/x86/ports.c

@@ -9,8 +9,6 @@
 #include <string.h>
 #include <arch/x86/regs.h>
 
-#include "include/ports.h"
-
 #ifdef DEBUG_vmm
 # define dbg(args...) printf("vmm: " args)
 #else

src/arch/x86/vmm.c

@@ -4,18 +4,18 @@
 
 #define weak __attribute__((__weak__))
 
-int resource_io_write(void *src, resource_t *r, 
+int resource_io_write(void *src, resource_t *r,
 resource_type_t off, size_t n) weak;
-int resource_io_write(void *src, resource_t *r, resource_type_t off, size_t n) 
+int resource_io_write(void *src, resource_t *r, resource_type_t off, size_t n)
 {
-    return -1; 
+    return -ENOTSUPP;
 }
 
-int resource_io_read(void *dest, resource_t *r, 
+int resource_io_read(void *dest, resource_t *r,
 resource_type_t off, size_t n) weak;
 int resource_io_read(void *dest, resource_t *r, resource_type_t off, size_t n)
 {
-    return -1;
+    return -ENOTSUPP;
 }
 
 static void resource_mem_read_8(void *buf, void *reg)
@@ -74,7 +74,7 @@ static void resource_mem_write_64(void *reg, void *buf)
     *(dest) = *(src);
 }
 
-static int resource_mem_write(void *buf, resource_t *r, resource_type_t off, 
+static int resource_mem_write(void *buf, resource_t *r, resource_type_t off,
 size_t n)
 {
     size_t i, width = 1;
@@ -112,7 +112,8 @@ size_t n)
     return 0;
 }
 
-static int resource_mem_read(void *buf, resource_t *r, resource_type_t off, size_t n)
+static int resource_mem_read(void *buf, resource_t *r, resource_type_t off,
+size_t n)
 {
     size_t i, width = 1;
     void(*io_op)(void *, void *);
@@ -138,7 +139,7 @@ static int resource_mem_read(void *buf, resource_t *r, resource_type_t off, size
         default:
             return -EIO;
     }
-    
+
     off *= width;
     off += r->start;
 
@@ -151,7 +152,7 @@ static int resource_mem_read(void *buf, resource_t *r, resource_type_t off, size
 
 /**
  * @brief Perform a data write to a resource.
- * 
+ *
  * @param dest Buffer which contains data to write
  * @param r Resource to write to
  * @param off Offset from start of resource to start writing to
@@ -172,13 +173,13 @@ int resource_write(void *src, resource_t *r, resource_type_t off, size_t n)
         case RESOURCE_IO:
             return resource_io_write(src, r, off, n);
     }
-    
+
     return -ENOTSUPP;
 }
 
 /**
  * @brief Perform a data read of a resource.
- * 
+ *
  * @param dest Buffer to store read results
  * @param r Resource to read from
  * @param off Offset from start of resource to start reading from
@@ -191,7 +192,7 @@ int resource_read(void *dest, resource_t *r, resource_type_t off, size_t n)
     {
         return -EINVAL;
     }
-    
+
     switch (r->flags & RESOURCE_TYPE)
     {
         case RESOURCE_MEM:
@@ -205,7 +206,7 @@ int resource_read(void *dest, resource_t *r, resource_type_t off, size_t n)
 
 /**
  * @brief Register a resource with a parent node
- * 
+ *
  * @param r The resource to register
  * @param parent The parent resource to add this to.
  */
@@ -216,7 +217,7 @@ void resource_register(resource_t *r, resource_t *parent)
     {
         return; // Not linking this resource to a parent, end early
     }
-    
+
     r->parent = parent;
 
     if(parent->child == NULL)
@@ -227,19 +228,19 @@ void resource_register(resource_t *r, resource_t *parent)
     next = parent->child;
     while(next->sibling != NULL)
     {
-        next = next->sibling;   // Iterate through children until the youngest 
+        next = next->sibling;   // Iterate through children until the youngest
     }
     next->sibling = r;          // Become new youngest sibling
 }
 
 /**
  * @brief Find a resource by it's name
- * 
+ *
  * @todo Add recursive search
- * 
+ *
  * @param name The name of the resource to find
  * @param parent The parent node to search against
- * @return resource_t* NULL on failure, else the resource requested 
+ * @return resource_t* NULL on failure, else the resource requested
  */
 resource_t *resource_find(const char *name, resource_t *parent)
 {

src/core/resource.c

@@ -1,16 +1,25 @@
 /*
- * (c) 2018 Apollo Project Developers
+ * (c) 2024 Apollo Project Developers
  * <arch/x86/regs.h> -  Register definitions
  */
 
 #ifndef __ARCH_X86_REGS_H
 #define __ARCH_X86_REGS_H
 
+#include <stdint.h>
+
 typedef struct regs {
   uint32_t ds;
   uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax;
   uint32_t interrupt_num, error_code;
   uint32_t eip, cs, eflags, useresp, ss;
 } x86_regs_t;
 
+uint32_t read_cr0();
+uint32_t read_cr2();
+uint32_t read_cr3();
+void write_cr0(uint32_t);
+void write_cr2(uint32_t);
+void write_cr3(uint32_t);
+
 #endif