Saved state of timer handle working

Author: pbalduino

Makefile

@@ -167,14 +167,21 @@ run:
 	qemu-system-x86_64 -smp cpus=1,maxcpus=2,sockets=1,dies=1,clusters=1,cores=2 -vga std -no-reboot --no-shutdown -M q35 -m size=2G,maxmem=2G -hda menios.hdd -serial file:com1.log -monitor stdio -d int -M hpet=on -usb -machine q35 -rtc base=utc,clock=host
 
 .PHONY: test
-test:
+test: docker
 	@set -eux
 
 ifeq ($(OS_NAME),linux)
 	@echo "Testing inside Linux"
 
 	for file in $(shell find -L test -type f -name 'test_*.c'); do \
-		gcc -DMENIOS_NO_DEBUG -I./include $$file test/unity.c src/kernel/mem/kmalloc.c -o "$$file".bin ; \
+		gcc -DMENIOS_NO_DEBUG -I./include \
+			$$file \
+			test/unity.c \
+			src/kernel/console/vprintk.c \
+			src/kernel/mem/kmalloc.c \
+			src/libc/itoa.c \
+			src/libc/string.c \
+			-o "$$file".bin ; \
 		echo "Testing $(.c:.bin=$$file)" ; \
 		"$$file".bin ; \
 		rm "$$file".bin ; \

include/kernel/acpi.h

@@ -7,15 +7,15 @@
 extern "C" {
 #endif
 
-typedef struct {
+typedef struct acpi_rsdp_t {
  char     signature[8];
  uint8_t  checksum;
  char     oemid[6];
  uint8_t  revision;
  uint32_t rsdt_address;
 } acpi_rsdp_t;
 
-typedef struct {
+typedef struct acpi_xsdp_t {
   char     signature[8];
   uint8_t  checksum;
   char     oemid[6];
@@ -27,7 +27,7 @@ typedef struct {
   uint8_t  reserved[3];
 } acpi_xsdp_t;
 
-typedef struct {
+typedef struct acpi_sdt_header_t {
   char     signature[4];
   uint32_t length;
   uint8_t  revision;
@@ -37,18 +37,37 @@ typedef struct {
   uint32_t oem_revision;
   uint32_t creator_id;
   uint32_t creator_revision;
-} acpi_sdt_header_t;
+} __attribute__((packed)) acpi_sdt_header_t;
 
-typedef struct {
+typedef struct acpi_rsdt_t {
   acpi_sdt_header_t header;
   uint32_t* sdt;
 } acpi_rsdt_t;
 
-typedef struct {
+typedef struct acpi_xsdt_t {
   acpi_sdt_header_t header;
   uint64_t* sdt;
 } acpi_xsdt_t;
 
+typedef uint8_t acpi_address_space_t;
+
+#define ACPI_SYSTEM_MEMORY 0
+#define ACPI_SYSTEM_IO     1
+
+#define ACPI_ACCESS_SIZE_UNDEFINED 0
+#define ACPI_ACCESS_SIZE_BYTE      1
+#define ACPI_ACCESS_SIZE_WORD      2
+#define ACPI_ACCESS_SIZE_DWORD     3
+#define ACPI_ACCESS_SIZE_QWORD     4
+
+typedef struct acpi_address_t {
+  uint8_t     space_id;
+  uint8_t     register_bit_width;
+  uint8_t     register_bit_offset;
+  uint8_t     access_size;
+  phys_addr_t address;
+} acpi_address_t;
+
 int acpi_init();
 int acpi_shutdown();
 

include/kernel/console.h

@@ -2,7 +2,7 @@
 #define MENIOS_INCLUDE_KERNEL_CONSOLE_H
 
 #include <stdarg.h>
-#include <stdint.h>
+#include <types.h>
 
 #define FLAG_LEFT  0x01 // The '-' flag
 #define FLAG_SIGN  0x02 // The '+' flag
@@ -22,4 +22,8 @@ uint16_t get_cursor_position();
 void gotoxy(uint32_t x, uint32_t y);
 void get_cursor_pos(screen_pos_t* pos);
 
+int vprintk(char *str, const char *format, ...);
+int vsprintk(char* str, const char* format, va_list args);
+int vsnprintk(char *str, size_t, const char* format, va_list args);
+
 #endif

include/kernel/hpet.h

@@ -7,6 +7,8 @@ extern "C" {
 
 #include <types.h>
 
+#include <kernel/acpi.h>
+
 #define HPET_BASE_ADDRESS 0xF1000000
 #define HPET_REG_CAPABILITIES 0x00
 #define HPET_REG_CONFIGURATION 0x10
@@ -31,10 +33,22 @@ extern "C" {
 #define HPET_REG_TIMER5_COMPARATOR 0x1A8
 #define HPET_REG_TIMER5_COUNTER 0x1B0
 
-#define HPET_OK 0
+#define HPET_OK     0
 #define HPET_ERROR -1
+
+#define HPET_GCR_OFFSET 0x10
+
 typedef int hpet_status_t;
 
+typedef struct hpet_table_t {
+  acpi_sdt_header_t header;  // Standard ACPI header
+  uint32_t          event_timer_block_id;
+  acpi_address_t    address;  // Contains the base address of HPET
+  uint8_t           hpet_number;
+  uint16_t          minimum_tick;
+  uint8_t           page_protection;
+} __attribute__((packed)) hpet_table_t;
+
 hpet_status_t hpet_timer_init();
 
 #ifdef __cplusplus

include/kernel/idt.h

@@ -38,7 +38,7 @@ typedef struct  __attribute__((packed)) {
   uint64_t offset;       // Base address of the IDT
 } idt_pointer_t;
 
-typedef struct {
+typedef struct idt_exception_t {
     uint64_t r15;
     uint64_t r14;
     uint64_t r13;

include/kernel/pmm.h

@@ -117,8 +117,8 @@ typedef struct pml4_map_t {
 
 typedef pml4_map_t* pml4_map_p;
 
-uintptr_t read_cr2();
-uintptr_t read_cr3();
+uintptr_t   read_cr2();
+phys_addr_t read_cr3();
 
 void debug_heap();
 void pmm_init();
@@ -135,4 +135,6 @@ phys_addr_t virtual_to_physical(virt_addr_t virtual_address);
 
 void set_page_used(phys_addr_t physical_address);
 
+virt_addr_t get_kernel_offset();
+
 #endif

include/kernel/proc.h

@@ -10,30 +10,94 @@ extern "C" {
 #define PROC_KERNEL 0
 #define PROC_MAX   16
 
-#define PROC_STATE_IDLE    0
-#define PROC_STATE_RUNNING 1
+/*
+                               DISPATCH                                   
+                              +------------+                              
+                              |            |                              
++------------+     +----------+-+       +--v---------+EXIT  +------------+
+| NEW        +-----> READY      |       | RUNNING    +------> TERMINATED |
++------------+     +--^-------^-+       +--+-------+-+      +------------+
+                      |       |            |       |                      
+                      |       |            |       |                      
+                      |       +------------+       |                      
+                      |        INTERRUPT           |                      
+                      |                            |                      
+         I/O COMPLETED|       +------------+       |I/O WAIT              
+                      +-------+ WAITING    <-------+                      
+                              +------------+                              
+ */
+
+#define PROC_STATE_NEW        0
+#define PROC_STATE_READY      1
+#define PROC_STATE_RUNNING    2
+#define PROC_STATE_WAITING    3
+#define PROC_STATE_TERMINATED 7
 
 #define PROC_PRIO_NORMAL 3
 
 #define PROC_PARENT_NONE 0
 
 #define RLIMIT_DATA (4 * 1024 * 1024)
 
-typedef struct {
-    uintptr_t brk;
-    uintptr_t heap;
-    char*     name;
-    int       parent_pid;
-    int       pid;
-    uint8_t   priority;
-    uint8_t   state;
+#define PROC_STACK_SIZE 1024
+
+typedef struct cpu_state_t {
+  uint64_t rax;
+  uint64_t rbx;
+  uint64_t rcx;
+  uint64_t rdx;
+  uint64_t rsi;
+  uint64_t rdi;
+  uint64_t rbp;
+  uint64_t rsp;
+  uint64_t r8;
+  uint64_t r9;
+  uint64_t r10;
+  uint64_t r11;
+  uint64_t r12;
+  uint64_t r13;
+  uint64_t r14;
+  uint64_t r15;
+  // phys_addr_t cr3;
+  uint64_t rip;   
+  uint64_t cs;    
+  uint64_t rflags;
+  uint64_t ss;    
+} __attribute__((packed)) cpu_state_t;
+
+typedef cpu_state_t* cpu_state_p;
+
+typedef uint8_t proc_state_t;
+
+typedef struct proc_info_t proc_info_t;
+typedef proc_info_t* proc_info_p;
+
+typedef struct proc_info_t {
+  proc_info_p  parent;
+  proc_info_p* children;
+  uint32_t     children_count;
+  uint32_t     pid;
+  char         name[32];
+  uintptr_t    brk;
+  uintptr_t    heap;
+  uintptr_t*   stack;
+  proc_state_t state;
+  uint8_t      priority;
+  cpu_state_t* cpu_state;
+  void(*entrypoint)(void*);
+  void*        arguments;
+  proc_info_p  next;
 } proc_info_t;
 
 typedef proc_info_t* proc_info_p;
 
 extern proc_info_p procs[PROC_MAX];
 extern proc_info_p current;
 
+void init_scheduler();
+void proc_create(proc_info_p proc, void (*entrypoint)(void *), void* arg);
+void proc_execute(proc_info_p proc);
+
 #ifdef __cplusplus
 }
 #endif

include/kernel/thread.h

@@ -0,0 +1,20 @@
+#ifndef MENIOS_INCLUDE_KERNEL_THREAD_H
+#define MENIOS_INCLUDE_KERNEL_THREAD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct kthread_t {
+
+} kthread_t;
+
+// typedef void *(*entrypoint)(void *) kthread_handler_t;
+
+int kthread_create(kthread_t* thread, void (*entrypoint)(void *), void* arg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //MENIOS_INCLUDE_KERNEL_THREAD_H

include/kernel/timer.h

@@ -12,8 +12,12 @@ void timer_eoi();
 
 uint64_t unix_time();
 
+void show_clock(void*);
+
+void register_timer_callback(void (*cb)(void*));
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif // MENIOS_INCLUDE_KERNEL_TIMER_H
+#endif // MENIOS_INCLUDE_KERNEL_TIMER_H

include/kernel/tsc.h

@@ -0,0 +1,18 @@
+#ifndef MENIOS_INCLUDE_KERNEL_TSC_H
+#define MENIOS_INCLUDE_KERNEL_TSC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <types.h>
+
+void init_tsc();
+
+uint64_t read_tsc(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // MENIOS_INCLUDE_KERNEL_TSC_H