originalmk/mkos32
1
0
Fork 0
mirror of https://github.com/originalmk/mkos32.git synced 2024-10-03 09:16:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back to flat segmentation model

Browse Source
This commit is contained in:
Maciej Krzyżanowski 2023-11-07 21:15:57 +01:00
parent ee09437fb1
commit 0f8bbb8b10
2 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
boot.s
View File

@ -51,17 +51,6 @@ mov $stack_top, %esp
/* Wywołanie kernela */ /* Wywołanie kernela */
call kernel_main call kernel_main
mov $0x10, %ax
mov %ax, %ds
mov %ax, %es
mov %ax, %fs
mov %ax, %gs
mov %ax, %ss
jmp $0x08,$cs_refresh
cs_refresh:
mov $0x4000, %esp
push $5
/* Wieczne oczekiwanie po zakończeniu kodu kernela */ /* Wieczne oczekiwanie po zakończeniu kodu kernela */
cli cli
1: hlt 1: hlt

47
kernel.c
View File

@ -187,12 +187,13 @@ void terminal_writenumpad(uint64_t number, int base, int pad_length)
number = rest; number = rest;
} }
} }
// Write pad_length - size of zeros // Write pad_length - size of zeros
// If padding won't be needed (number is longer than pad_legnth) // If padding won't be needed (number is longer than pad_legnth)
// then loop won't run at all // then loop won't run at all
while (pad_length > size) { while (pad_length > size)
numChars[31 - size++] = digits[0]; {
numChars[31 - size++] = digits[0];
} }
terminal_write(numChars + (32 - size), size); terminal_write(numChars + (32 - size), size);
@ -355,7 +356,7 @@ void apply_table(struct gdt_table table)
*dest_address = entry_encoded; *dest_address = entry_encoded;
} }
__asm__("lgdt (%0)" : : "r" (&table)); __asm__("lgdt (%0)": :"r"(&table));
} }
void print_texts() void print_texts()
@ -381,8 +382,8 @@ void print_texts()
size_t start_point; size_t start_point;
__asm__("mov $_start, %%eax": : :"eax"); __asm__("mov $_start, %%eax": : :"eax");
__asm__("mov %%eax, %0;": "=r"(start_point):); __asm__("mov %%eax, %0;": "=r"(start_point):);
terminal_writestring("\n\nPoczatek kernela:\n"); terminal_writestring("\n\nPoczatek kernela:\n");
terminal_writenum(start_point, 10); terminal_writenum(start_point, 10);
@ -396,40 +397,36 @@ void print_texts()
void gdt_setup() void gdt_setup()
{ {
struct gdt_entry kernel_code_entry = struct gdt_entry kernel_code_entry =
gdt_entry_create(0, 0x400, KERNEL_SEGMENT, CODE_SEGMENT); gdt_entry_create(0x0, 0x100000, KERNEL_SEGMENT, CODE_SEGMENT);
struct gdt_entry kernel_data_entry = struct gdt_entry kernel_data_entry =
gdt_entry_create(0x400, 0x400, KERNEL_SEGMENT, DATA_SEGMENT); gdt_entry_create(0x0, 0x100000, KERNEL_SEGMENT, DATA_SEGMENT);
struct gdt_entry user_code_entry = struct gdt_entry user_code_entry =
gdt_entry_create(0x800, 0x400, USER_SEGMENT, CODE_SEGMENT); gdt_entry_create(0x0, 0x100000, USER_SEGMENT, CODE_SEGMENT);
struct gdt_entry user_data_entry = struct gdt_entry user_data_entry =
gdt_entry_create(0xC00, 0x400, USER_SEGMENT, DATA_SEGMENT); gdt_entry_create(0x0, 0x100000, USER_SEGMENT, DATA_SEGMENT);
struct gdt_table gdt_table; struct gdt_table gdt_table;
gdt_table.size_in_bytes = 39; gdt_table.size_in_bytes = 39;
gdt_table.dest_pointer = (uint64_t*)0x400000; gdt_table.dest_pointer = (uint64_t *) 0x400000;
gdt_table.entries[0] = kernel_code_entry; gdt_table.entries[0] = kernel_code_entry;
gdt_table.entries[1] = kernel_data_entry; gdt_table.entries[1] = kernel_data_entry;
gdt_table.entries[2] = user_code_entry; gdt_table.entries[2] = user_code_entry;
gdt_table.entries[3] = user_data_entry; gdt_table.entries[3] = user_data_entry;
apply_table(gdt_table); apply_table(gdt_table);
terminal_writestring("GDT table applied\n"); terminal_writestring("GDT table applied\n");
__asm__ volatile( __asm__ volatile(
"mov $stack_bottom, %%esi;" "mov $0x10, %ax;"
"mov $0x500000, %%edi;" "mov %ax, %ds;"
"mov $16384, %%ecx;" "mov %ax, %es;"
"cld;" "mov %ax, %fs;"
"rep movsb;" "mov %ax, %gs;"
: "mov %ax, %ss;"
: "jmp $0x08,$csrefresh;"
:
"esi","edi","ecx"
); );
__asm__( __asm__ volatile("csrefresh:");
"xchg %bx, %bx"
);
} }
void kernel_main(void) void kernel_main(void)