diff options
| -rw-r--r-- | Kernel/TSS.h | 23 | ||||
| -rw-r--r-- | Kernel/Thread.h | 1 | ||||
| -rw-r--r-- | Kernel/i386.h | 20 |
3 files changed, 20 insertions, 24 deletions
diff --git a/Kernel/TSS.h b/Kernel/TSS.h deleted file mode 100644 index f3e370439e..0000000000 --- a/Kernel/TSS.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include <AK/Types.h> - -struct [[gnu::packed]] TSS32 { - word backlink, __blh; - dword esp0; - word ss0, __ss0h; - dword esp1; - word ss1, __ss1h; - dword esp2; - word ss2, __ss2h; - dword cr3, eip, eflags; - dword eax,ecx,edx,ebx,esp,ebp,esi,edi; - word es, __esh; - word cs, __csh; - word ss, __ssh; - word ds, __dsh; - word fs, __fsh; - word gs, __gsh; - word ldt, __ldth; - word trace, iomapbase; -}; diff --git a/Kernel/Thread.h b/Kernel/Thread.h index 98c3d8b4b9..8fe9a12a7e 100644 --- a/Kernel/Thread.h +++ b/Kernel/Thread.h @@ -1,7 +1,6 @@ #pragma once #include <Kernel/i386.h> -#include <Kernel/TSS.h> #include <Kernel/KResult.h> #include <Kernel/LinearAddress.h> #include <Kernel/UnixTypes.h> diff --git a/Kernel/i386.h b/Kernel/i386.h index 379fac0d71..c770d45286 100644 --- a/Kernel/i386.h +++ b/Kernel/i386.h @@ -6,6 +6,26 @@ #define PAGE_SIZE 4096 #define PAGE_MASK 0xfffff000 +struct [[gnu::packed]] TSS32 { + word backlink, __blh; + dword esp0; + word ss0, __ss0h; + dword esp1; + word ss1, __ss1h; + dword esp2; + word ss2, __ss2h; + dword cr3, eip, eflags; + dword eax,ecx,edx,ebx,esp,ebp,esi,edi; + word es, __esh; + word cs, __csh; + word ss, __ssh; + word ds, __dsh; + word fs, __fsh; + word gs, __gsh; + word ldt, __ldth; + word trace, iomapbase; +}; + union [[gnu::packed]] Descriptor { struct { word limit_lo; |