aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/gdt.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/core/gdt.c b/core/gdt.c
index 819262e..708e2c5 100644
--- a/core/gdt.c
+++ b/core/gdt.c
@@ -12,7 +12,9 @@
* more details.
*/
+#include <garmos/arch.h>
#include <garmos/gdt.h>
+#include <garmos/kernel.h>
#include <garmos/types.h>
struct gdt_sgmt {
@@ -33,11 +35,6 @@ enum gdt_sgmts {
struct gdt_sgmt gdt[GDT_SGMT_COUNT];
-struct gdtp {
- uint16_t limit;
- void *pointer;
-} __attribute__((packed));
-
struct gdtp gdtp = {
.limit = GDT_SGMT_COUNT * sizeof(*gdt) - 1,
.pointer = gdt,
@@ -69,9 +66,11 @@ static void gdt_sgmt_set(uint32_t base, uint32_t limit, uint8_t access,
void gdt_init(void)
{
+ ker_dbg("Initializing GDT ...");
+
gdt_sgmt_set(0, 0, 0, &gdt[GDT_SGMT_NULL]);
gdt_sgmt_set(0, 64 * 1024 * 1024, 0x9A, &gdt[GDT_SGMT_CODE]);
gdt_sgmt_set(0, 64 * 1024 * 1024, 0x92, &gdt[GDT_SGMT_NULL]);
- asm volatile("lgdt %0" : : "m" (gdtp));
+ gdtset(gdtp);
}