os-k-team/os-k
os-k-team/os-k
1
0
Fork 0
mirror of https://gitlab.os-k.eu/os-k-team/os-k.git synced 2023-08-25 14:03:10 +02:00
Code Releases Activity

cpu => ke

Browse Source
This commit is contained in:
Julian Barathieu 2019-05-14 13:17:24 +02:00
parent 1f83c92da0
commit 78622a134d
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -91,8 +91,8 @@ LibCDep=$(patsubst %.c,$(KOBJDIR)/%.d,$(LibCSources))
LibCObj += $(KOBJDIR)/libc/atoi.o $(KOBJDIR)/libc/itoa.o
# Kernel sources
KernSources = kernel/cpu/cpuid.c \
kernel/cpu/idt.c kernel/init/init.c \
KernSources = kernel/ke/cpuid.c \
kernel/ke/idt.c kernel/init/init.c \
kernel/init/table.c kernel/io/cursor.c \
kernel/ke/log.c kernel/io/vga.c \
kernel/ke/panic.c kernel/mm/map.c \
@ -152,10 +152,10 @@ $(KOBJDIR)/libc/mem.o: $(KALEIDDIR)/libc/mem.c | $(KOBJDIR)
## KERNEL MAKEFILE ----------------------------------------------------------- #
-include $(KernDep)
$(KOBJDIR)/kernel/cpu/idt.o: $(KALEIDDIR)/kernel/cpu/idt.c \
$(KALEIDDIR)/kernel/cpu/isr.asm | $(KOBJDIR)
$(KOBJDIR)/kernel/ke/idt.o: $(KALEIDDIR)/kernel/ke/idt.c \
$(KALEIDDIR)/kernel/ke/isr.asm | $(KOBJDIR)
@mkdir -p $(shell dirname $@)
@$(ASM) $(ASMFLAGS) $(KALEIDDIR)/kernel/cpu/isr.asm -o $@.1
@$(ASM) $(ASMFLAGS) $(KALEIDDIR)/kernel/ke/isr.asm -o $@.1
@$(KCC) $< -o $@.2
@$(LD) $(LDFLAGS) -r $@.1 $@.2 -o $@
@rm -f $@.1 $@.2
@ -170,10 +170,10 @@ $(KOBJDIR)/kernel/mm/gdt.o: $(KALEIDDIR)/kernel/mm/gdt.c \
@rm -f $@.1 $@.2
@echo ${CL2}[$@] ${CL}Compiled.${CL3}
$(KOBJDIR)/kernel/cpu/cpuid.o: $(KALEIDDIR)/kernel/cpu/cpuid.c \
$(KALEIDDIR)/kernel/cpu/cpuf.asm | $(KOBJDIR)
$(KOBJDIR)/kernel/ke/cpuid.o: $(KALEIDDIR)/kernel/ke/cpuid.c \
$(KALEIDDIR)/kernel/ke/cpuf.asm | $(KOBJDIR)
@mkdir -p $(shell dirname $@)
@$(ASM) $(ASMFLAGS) $(KALEIDDIR)/kernel/cpu/cpuf.asm -o $@.1
@$(ASM) $(ASMFLAGS) $(KALEIDDIR)/kernel/ke/cpuf.asm -o $@.1
@$(KCC) $< -o $@.2
@$(LD) $(LDFLAGS) -r $@.1 $@.2 -o $@
@rm -f $@.1 $@.2

2
kaleid/kernel/cpu/cpuf.asm → kaleid/kernel/ke/cpuf.asm
View File

@ -24,5 +24,5 @@
[BITS 64]
%include "kaleid/kernel/cpu/cpuf.inc"
%include "kaleid/kernel/ke/cpuf.inc"

0
kaleid/kernel/cpu/cpuf.inc → kaleid/kernel/ke/cpuf.inc
View File

0
kaleid/kernel/cpu/cpuid.c → kaleid/kernel/ke/cpuid.c
View File

0
kaleid/kernel/cpu/idt.c → kaleid/kernel/ke/idt.c
View File

2
kaleid/kernel/cpu/isr.asm → kaleid/kernel/ke/isr.asm
View File

@ -24,7 +24,7 @@
[BITS 64]
%include "kaleid/kernel/cpu/cpuf.inc"
%include "kaleid/kernel/ke/cpuf.inc"
global KeLoadIDT
global divideByZero