From 607b82ed6ceed066859d50265dc337d26a48bbeb Mon Sep 17 00:00:00 2001 From: Matheus Date: Sun, 24 Jul 2022 18:09:25 -0300 Subject: [PATCH] change pointers used in function calls change from void* to cls_t* as it makes more sense to be this way --- src/arch/x86_64/cls.c | 6 +++--- src/arch/x86_64/include/arch/cls.h | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/arch/x86_64/cls.c b/src/arch/x86_64/cls.c index 802b9d1c..973dd496 100644 --- a/src/arch/x86_64/cls.c +++ b/src/arch/x86_64/cls.c @@ -5,12 +5,12 @@ cls_t bspcls; -void arch_setcls(void* addr){ +void arch_setcls(cls_t* addr){ wrmsr(MSR_GSBASE, (uint64_t)addr); } -void* arch_getcls(){ - return (void*)rdmsr(MSR_GSBASE); +cls_t* arch_getcls(){ + return (cls_t*)rdmsr(MSR_GSBASE); } void bsp_setcls(){ diff --git a/src/arch/x86_64/include/arch/cls.h b/src/arch/x86_64/include/arch/cls.h index 09433e71..a4266997 100644 --- a/src/arch/x86_64/include/arch/cls.h +++ b/src/arch/x86_64/include/arch/cls.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include // cpu level storage // this will be pointed to by GS and will contain per cpu info @@ -14,11 +14,12 @@ typedef struct{ gdt_t gdt; ist_t ist; arch_regserror *laststate; + vmm_context *context; } cls_t; void bsp_setcls(); -void arch_setcls(void* addr); -void* arch_getcls(); +void arch_setcls(cls_t* addr); +cls_t* arch_getcls(); static cls_t __seg_gs *cls = 0;