diff options
| author | Kimapr <kimapr@mail.ru> | 2023-12-21 13:09:53 +0500 |
|---|---|---|
| committer | Lizzy Fleckenstein <lizzy@vlhl.dev> | 2023-12-21 09:16:20 +0100 |
| commit | 43a856b5d40ceb570af7755d9f1222093a48aa64 (patch) | |
| tree | 7469e90c968290a49e884881a4699a22bac27d45 | |
| parent | 5b61e495721fe414e43cc52298987f02c9bce24c (diff) | |
| download | cuddles-43a856b5d40ceb570af7755d9f1222093a48aa64.tar.xz | |
move SSE init code to init, add -mgeneral-regs-only to init.c and pic.c
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | stage3/init.c | 12 | ||||
| -rw-r--r-- | stage3/main.c | 12 |
3 files changed, 16 insertions, 12 deletions
@@ -66,6 +66,10 @@ stage3/%.o: stage3/%.asm stage3/interrupts.o: stage3/interrupts.c gcc $(CFLAGS) -mgeneral-regs-only -c $< -o $@ +stage3/pic.o: stage3/pic.c + gcc $(CFLAGS) -mgeneral-regs-only -c $< -o $@ +stage3/init.o: stage3/init.c + gcc $(CFLAGS) -mgeneral-regs-only -c $< -o $@ stage3/%.o: stage3/%.c gcc $(CFLAGS) -c $< -o $@ diff --git a/stage3/init.c b/stage3/init.c index e913fee..2e26e19 100644 --- a/stage3/init.c +++ b/stage3/init.c @@ -1,6 +1,18 @@ +#include "def.h" void kmain(); void init() { + // enable SSE. long mode demands it is present + u64 cr0; + asm volatile("mov %%cr0, %0 \n":"=r"(cr0)); + asm volatile("mov %0, %%cr0"::"r"((cr0 & ~(1 << 2)) | (1 << 1))); + + u64 cr4; + asm volatile("mov %%cr4, %0":"=r"(cr4)); + asm volatile("mov %0, %%cr4"::"r"(cr4 | (1 << 9) | (1 << 10))); + + u16 fpu_cw = 0x37a; + asm volatile("fldcw %0"::"m"(fpu_cw)); kmain(); } diff --git a/stage3/main.c b/stage3/main.c index a7212b9..a03dc5d 100644 --- a/stage3/main.c +++ b/stage3/main.c @@ -125,18 +125,6 @@ void kmain() print_num_pad(features, 2, 32, '0'); print(S("\n")); - // enable SSE. long mode demands it is present - u64 cr0; - asm volatile("mov %%cr0, %0 \n":"=r"(cr0)); - asm volatile("mov %0, %%cr0"::"r"((cr0 & ~(1 << 2)) | (1 << 1))); - - u64 cr4; - asm volatile("mov %%cr4, %0":"=r"(cr4)); - asm volatile("mov %0, %%cr4"::"r"(cr4 | (1 << 9) | (1 << 10))); - - u16 fpu_cw = 0x37a; - asm volatile("fldcw %0"::"m"(fpu_cw)); - interrupts_init(); pic_init(); thread_init(); |