| 38,8 → 38,6 |
|---|
| #define IDT_ITEMS 64 |
| #define GDT_ITEMS 7 |
| |
| #define VESA_INIT_SEGMENT 0x8000 |
| |
| #define NULL_DES 0 |
| #define KTEXT_DES 1 |
| #define KDATA_DES 2 |
| 52,14 → 50,15 |
|---|
| |
| #define VESA_INIT_SEGMENT 0x8000 |
| #define VESA_INIT_DES 7 |
| #define KTEXT32_DES KTEXT_DES |
| |
| #undef GDT_ITEMS |
| #define GDT_ITEMS 8 |
| |
| #endif /* CONFIG_FB */ |
| |
| #define gdtselector(des) ((des) << 3) |
| |
| #define selector(des) ((des) << 3) |
| |
| #define PL_KERNEL 0 |
| #define PL_USER 3 |
| |
| 67,8 → 66,8 |
|---|
| #define AR_DATA (2 << 3) |
| #define AR_CODE (3 << 3) |
| #define AR_WRITABLE (1 << 1) |
| #define AR_INTERRUPT (0xe) |
| #define AR_TSS (0x9) |
| #define AR_INTERRUPT (0x0e) |
| #define AR_TSS (0x09) |
| |
| #define DPL_KERNEL (PL_KERNEL << 5) |
| #define DPL_USER (PL_USER << 5) |
| 83,13 → 82,12 |
|---|
| #include <arch/types.h> |
| #include <arch/context.h> |
| |
| struct ptr_16_32 { |
| typedef struct { |
| uint16_t limit; |
| uint32_t base; |
| } __attribute__ ((packed)); |
| typedef struct ptr_16_32 ptr_16_32_t; |
| } __attribute__ ((packed)) ptr_16_32_t; |
| |
| struct descriptor { |
| typedef struct { |
| unsigned limit_0_15: 16; |
| unsigned base_0_15: 16; |
| unsigned base_16_23: 8; |
| 100,19 → 98,17 |
|---|
| unsigned special: 1; |
| unsigned granularity : 1; |
| unsigned base_24_31: 8; |
| } __attribute__ ((packed)); |
| typedef struct descriptor descriptor_t; |
| } __attribute__ ((packed)) descriptor_t; |
| |
| struct idescriptor { |
| typedef struct { |
| unsigned offset_0_15: 16; |
| unsigned selector: 16; |
| unsigned unused: 8; |
| unsigned access: 8; |
| unsigned offset_16_31: 16; |
| } __attribute__ ((packed)); |
| typedef struct idescriptor idescriptor_t; |
| } __attribute__ ((packed)) idescriptor_t; |
| |
| struct tss { |
| typedef struct { |
| uint16_t link; |
| unsigned : 16; |
| uint32_t esp0; |
| 152,13 → 148,12 |
|---|
| unsigned : 16; |
| uint16_t iomap_base; |
| uint8_t iomap[TSS_IOMAP_SIZE]; |
| } __attribute__ ((packed)); |
| typedef struct tss tss_t; |
| } __attribute__ ((packed)) tss_t; |
| |
| extern ptr_16_32_t gdtr; |
| extern ptr_16_32_t bootstrap_gdtr; |
| extern ptr_16_32_t protected_ap_gdtr; |
| extern struct tss *tss_p; |
| extern tss_t *tss_p; |
| |
| extern descriptor_t gdt[]; |
| |