justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Add get_gsbase()

Browse Source
This commit is contained in:
Justin C. Miller
2019-03-13 22:49:20 -07:00
parent 49bdf47514
commit 97e8f2c69a
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/kernel/debug.h
View File

@@ -8,6 +8,7 @@ extern "C" {
uintptr_t get_rsp(); uintptr_t get_rsp();
uintptr_t get_rip(); uintptr_t get_rip();
uintptr_t get_frame(int frame); uintptr_t get_frame(int frame);
uintptr_t get_gsbase();
} }

5
src/kernel/debug.s
View File

@@ -8,6 +8,11 @@ get_rip:
pop rax ; do the same thing as 'ret', except with 'jmp' pop rax ; do the same thing as 'ret', except with 'jmp'
jmp rax ; with the return address still in rax jmp rax ; with the return address still in rax
global get_gsbase
get_gsbase:
rdgsbase rax
ret
global _halt global _halt
_halt: _halt:
hlt hlt

9
src/kernel/memory_bootstrap.cpp
View File

@@ -198,9 +198,12 @@ memory_initialize(uint16_t scratch_pages, const void *memory_map, size_t map_len
// make sure the options we want in CR4 are set // make sure the options we want in CR4 are set
uint64_t cr4; uint64_t cr4;
__asm__ __volatile__ ( "mov %%cr4, %0" : "=r" (cr4) ); __asm__ __volatile__ ( "mov %%cr4, %0" : "=r" (cr4) );
cr4 |= 0x00080; // Enable global pages cr4 |=
cr4 |= 0x00200; // Enable FXSAVE/FXRSTOR 0x000080 | // Enable global pages
cr4 |= 0x20000; // Enable PCIDs 0x000200 | // Enable FXSAVE/FXRSTOR
0x010000 | // Enable FSGSBASE
0x020000 | // Enable PCIDs
0;
__asm__ __volatile__ ( "mov %0, %%cr4" :: "r" (cr4) ); __asm__ __volatile__ ( "mov %0, %%cr4" :: "r" (cr4) );
// The bootloader reserved "scratch_pages" pages for page tables and // The bootloader reserved "scratch_pages" pages for page tables and