From c4f8ef91f18d854a4ede7a94e95b2eab898d6963 Mon Sep 17 00:00:00 2001 From: Jon Santmyer Date: Sun, 10 Aug 2025 15:40:19 -0400 Subject: working usermode objdir iteration --- include/arch/x86_64/object.h | 12 ++++++++---- include/arch/x86_64/page.h | 8 +++++++- include/arch/x86_64/syscall.h | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 include/arch/x86_64/syscall.h (limited to 'include/arch/x86_64') diff --git a/include/arch/x86_64/object.h b/include/arch/x86_64/object.h index 8d5af33..6512049 100644 --- a/include/arch/x86_64/object.h +++ b/include/arch/x86_64/object.h @@ -3,15 +3,18 @@ #include +#ifndef KERNEL_STACKBYTES +#define KERNEL_STACKBYTES 4096 +#endif + typedef struct jove_InitData { uint8_t log_object; - uint8_t untyped_data_dir; - uint8_t processor_dir; + uint16_t untyped_data_dir; + uint16_t processor_dir; uint8_t pm_object; //Page mapping object. - uint8_t initrd_dir; //Init ramdisk files directory. + uint16_t initrd_dir; //Init ramdisk files directory. uint8_t tcb_object; - uint8_t kernel_stack_object; uint8_t message_object; uintptr_t message_object_address; } init_data_t; @@ -21,6 +24,7 @@ typedef struct jove_ThreadControlBlock void *stack; uintptr_t sp, ksp; void *pml4; + uint8_t kstack[KERNEL_STACKBYTES]; } tcb_t; #endif diff --git a/include/arch/x86_64/page.h b/include/arch/x86_64/page.h index 99bc691..4460720 100644 --- a/include/arch/x86_64/page.h +++ b/include/arch/x86_64/page.h @@ -4,6 +4,11 @@ #include #include "include/object.h" +#define PAGE_PRESENT (1ULL << 0) +#define PAGE_RW (1ULL << 1) +#define PAGE_US (1ULL << 2) +#define PAGE_XD (1ULL << 63) + typedef union jove_PageMapLevelEntry { struct { @@ -16,7 +21,7 @@ typedef union jove_PageMapLevelEntry uint8_t d : 1; /* Dirty */ uint8_t ps_pat : 1; uint8_t g : 1; /* Global */ - uint8_t _r0 : 2; + uint8_t osflg : 2; uint8_t r : 1; uint64_t paddr : 35; uint8_t _r1; @@ -35,6 +40,7 @@ uintptr_t vmem_ident_tophys(void *vptr); void *vmem_phys_tovirt(uintptr_t pptr); void *pmle_get_page(pmle_t entry); +uint8_t pmle_level(pmle_t entry); int untyped_retype_page(objdir_entry_t *untyped_entry, void **dest_ptr); diff --git a/include/arch/x86_64/syscall.h b/include/arch/x86_64/syscall.h new file mode 100644 index 0000000..2d5060e --- /dev/null +++ b/include/arch/x86_64/syscall.h @@ -0,0 +1,18 @@ +#ifndef _JOVE_ARCH_x86_64_SYSCALL_H +#define _JOVE_ARCH_x86_64_SYSCALL_H 1 + +/**@ENUM mapping invokes*/ +enum +{ + /*[target path][u8 funcid]*/ + INVOKE_MAPPING_RELEASE = 0, + /*[target path][u8 funcid][u16 pmli][dest path]*/ + INVOKE_MAPPING_GET, + /*[target path][u8 funcid][u16 pmli][untyped path][u64 flags]*/ + INVOKE_MAPPING_MAP, + /*[target path][u8 funcid][u16 pmli][mapped path]*/ + INVOKE_MAPPING_UNMAP +}; + + +#endif -- cgit v1.2.1