Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-29 15:57:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rewrite tss

Browse Source
This commit is contained in:
Alex 2022-11-07 01:41:47 +02:00
parent 664cea41a5
commit 5624b82b0f
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Architecture/amd64/cpu/GlobalDescriptorTable.cpp
View File

@ -73,14 +73,7 @@ namespace GlobalDescriptorTable
.BaseHigh = 0x0}, .BaseHigh = 0x0},
// tss // tss
{.Length = 0x0, {}};
.Low = 0x0,
.Middle = 0x0,
.Flags1 = 0b10001001,
.Flags2 = 0b00000000,
.High = 0x0,
.Upper32 = 0x0,
.Reserved = 0x0}};
static GlobalDescriptorTableEntries GDTEntries[MAX_CPU]; static GlobalDescriptorTableEntries GDTEntries[MAX_CPU];
GlobalDescriptorTableDescriptor gdt[MAX_CPU]; GlobalDescriptorTableDescriptor gdt[MAX_CPU];
@ -123,13 +116,15 @@ namespace GlobalDescriptorTable
CPUStackPointer[Core] = KernelAllocator.RequestPages(TO_PAGES(STACK_SIZE)); CPUStackPointer[Core] = KernelAllocator.RequestPages(TO_PAGES(STACK_SIZE));
uint64_t Base = (uint64_t)&tss[Core]; uint64_t Base = (uint64_t)&tss[Core];
gdt[Core].Entries->TaskStateSegment.Length = Base + sizeof(tss[0]); uint64_t Limit = Base + sizeof(TaskStateSegment);
gdt[Core].Entries->TaskStateSegment.Low = (uint16_t)(Base & 0xFFFF); gdt[Core].Entries->TaskStateSegment.Length = Limit & 0xFFFF;
gdt[Core].Entries->TaskStateSegment.Middle = (uint8_t)((Base >> 16) & 0xFF); gdt[Core].Entries->TaskStateSegment.BaseLow = Base & 0xFFFF;
gdt[Core].Entries->TaskStateSegment.High = (uint8_t)((Base >> 24) & 0xFF); gdt[Core].Entries->TaskStateSegment.BaseMiddle = (Base >> 16) & 0xFF;
gdt[Core].Entries->TaskStateSegment.Upper32 = (uint32_t)((Base >> 32) & 0xFFFFFFFF); gdt[Core].Entries->TaskStateSegment.BaseHigh = (Base >> 24) & 0xFF;
gdt[Core].Entries->TaskStateSegment.Flags1 = 0b10001001; gdt[Core].Entries->TaskStateSegment.BaseUpper = (Base >> 32) & 0xFFFFFFFF;
gdt[Core].Entries->TaskStateSegment.Flags2 = 0b00000000; gdt[Core].Entries->TaskStateSegment.Flags = {.A = 1, .RW = 0, .DC = 0, .E = 1, .S = 0, .DPL = 0, .P = 1};
gdt[Core].Entries->TaskStateSegment.Granularity = (0 << 4) | ((Limit >> 16) & 0xF);
tss[Core].IOMapBaseAddressOffset = sizeof(TaskStateSegment); tss[Core].IOMapBaseAddressOffset = sizeof(TaskStateSegment);
tss[Core].StackPointer[0] = (uint64_t)CPUStackPointer[Core] + STACK_SIZE; tss[Core].StackPointer[0] = (uint64_t)CPUStackPointer[Core] + STACK_SIZE;
tss[Core].InterruptStackTable[0] = (uint64_t)KernelAllocator.RequestPages(TO_PAGES(STACK_SIZE)) + STACK_SIZE; tss[Core].InterruptStackTable[0] = (uint64_t)KernelAllocator.RequestPages(TO_PAGES(STACK_SIZE)) + STACK_SIZE;

14
Architecture/amd64/cpu/gdt.hpp
View File

@ -74,13 +74,15 @@ namespace GlobalDescriptorTable
typedef struct _TaskStateSegmentEntry typedef struct _TaskStateSegmentEntry
{ {
/* LOW */
uint16_t Length; uint16_t Length;
uint16_t Low; uint16_t BaseLow;
uint8_t Middle; uint8_t BaseMiddle;
uint8_t Flags1; GlobalDescriptorTableAccess Flags;
uint8_t Flags2; uint8_t Granularity;
uint8_t High; uint8_t BaseHigh;
uint32_t Upper32; /* HIGH */
uint32_t BaseUpper;
uint32_t Reserved; uint32_t Reserved;
} __attribute__((packed)) TaskStateSegmentEntry; } __attribute__((packed)) TaskStateSegmentEntry;