tailix/kernel
1
0
Fork 0
mirror of https://github.com/tailix/kernel.git synced 2024-10-30 12:03:52 -04:00
Code Releases Activity

C preprocessor with NASM sources

Browse source
This commit is contained in:
Braiden Vasco 2017-11-02 16:01:00 +00:00
parent 47c6eca209
commit 465febe9a6
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/Makefile
View file

@ -3,7 +3,7 @@ CCPREFIX = i686-elf-
AS = $(CCPREFIX)as
CC = $(CCPREFIX)gcc
OBJS = boot.s.o main.c.o logger.c.o console.c.o gdt.c.o idt.c.o isr.c.o isr.asm.o multiboot.c.o protected.asm.o
OBJS = boot.s.o main.c.o logger.c.o console.c.o gdt.c.o idt.c.o isr.c.o isr.asm.o multiboot.c.o protected.asm.cpp.o
all: kernel
@ -22,3 +22,9 @@ kernel: $(OBJS)
%.asm.o: %.asm
nasm -felf -o $@ $<
%.asm.cpp.o: %.asm.cpp
nasm -felf -o $@ $<
%.asm.cpp: %.asm
cpp -P $< $@

6
arch/protected.asm
View file

@ -1,3 +1,5 @@
#include "config.h"
[GLOBAL gdt_flush]
[GLOBAL idt_flush]
@ -5,13 +7,13 @@ gdt_flush:
mov eax, [esp+4]
lgdt [eax]
mov ax, 0x10
mov ax, GDT_KERNEL_DS_SELECTOR
mov ds, ax
mov es, ax
mov fs, ax
mov gs, ax
mov ss, ax
jmp 0x08:.flush
jmp GDT_KERNEL_CS_SELECTOR:.flush
.flush:
ret