Update files

This commit is contained in:
Alex 2022-10-10 23:31:46 +03:00
parent 4b6683823f
commit 32a17c5e63
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
20 changed files with 21 additions and 21 deletions

View File

@ -1,11 +1,11 @@
#include <interrupts.hpp> #include <interrupts.hpp>
#if defined(__amd64__) #if defined(__amd64__)
#include "../arch/amd64/cpu/gdt.hpp" #include "../Architecture/amd64/cpu/gdt.hpp"
#include "../arch/amd64/cpu/idt.hpp" #include "../Architecture/amd64/cpu/idt.hpp"
#elif defined(__i386__) #elif defined(__i386__)
#include "../arch/i686/cpu/gdt.hpp" #include "../Architecture/i686/cpu/gdt.hpp"
#include "../arch/i686/cpu/idt.hpp" #include "../Architecture/i686/cpu/idt.hpp"
#elif defined(__aarch64__) #elif defined(__aarch64__)
#endif #endif

View File

@ -5,7 +5,7 @@
#include <debug.h> #include <debug.h>
#if defined(__amd64__) #if defined(__amd64__)
#include "../arch/amd64/acpi.hpp" #include "../Architecture/amd64/acpi.hpp"
namespace Power namespace Power
{ {

View File

@ -19,4 +19,4 @@ It is responsible for printing text to the screen.
Contains the CPU management code. Contains the CPU management code.
It is responsible for initializing the GDT and IDT. It is responsible for initializing the GDT and IDT.
More code related is in the `arch` directory. More code related is in the `Architecture` directory.

View File

@ -19,20 +19,20 @@ GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD)
BMP_SOURCES = $(shell find ./ -type f -name '*.bmp') BMP_SOURCES = $(shell find ./ -type f -name '*.bmp')
PSF_SOURCES = $(shell find ./ -type f -name '*.psf') PSF_SOURCES = $(shell find ./ -type f -name '*.psf')
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
ASM_SOURCES = $(shell find ./ -type f -name '*.asm' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") ASM_SOURCES = $(shell find ./ -type f -name '*.asm' -not -path "./Architecture/i686/*" -not -path "./Architecture/aarch64/*")
S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./Architecture/i686/*" -not -path "./Architecture/aarch64/*")
C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./Architecture/i686/*" -not -path "./Architecture/aarch64/*")
CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./Architecture/i686/*" -not -path "./Architecture/aarch64/*")
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i686)
ASM_SOURCES = $(shell find ./ -type f -name '*.asm' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") ASM_SOURCES = $(shell find ./ -type f -name '*.asm' -not -path "./Architecture/amd64/*" -not -path "./Architecture/aarch64/*")
S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./Architecture/amd64/*" -not -path "./Architecture/aarch64/*")
C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./Architecture/amd64/*" -not -path "./Architecture/aarch64/*")
CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./Architecture/amd64/*" -not -path "./Architecture/aarch64/*")
else ifeq ($(OSARCH), aarch64) else ifeq ($(OSARCH), aarch64)
ASM_SOURCES = $(shell find ./ -type f -name '*.asm' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") ASM_SOURCES = $(shell find ./ -type f -name '*.asm' -not -path "./Architecture/amd64/*" -not -path "./Architecture/i686/*")
S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./Architecture/amd64/*" -not -path "./Architecture/i686/*")
C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./Architecture/amd64/*" -not -path "./Architecture/i686/*")
CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./Architecture/amd64/*" -not -path "./Architecture/i686/*")
endif endif
HEADERS = $(sort $(dir $(wildcard ./include/*))) HEADERS = $(sort $(dir $(wildcard ./include/*)))
OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o)
@ -58,7 +58,7 @@ CFLAGS += -fno-pic -fno-pie -mno-80387 -mno-mmx -mno-3dnow \
-march=x86-64 -pipe \ -march=x86-64 -pipe \
-mcmodel=kernel -msoft-float -fno-builtin -mcmodel=kernel -msoft-float -fno-builtin
CFLAG_STACK_PROTECTOR := -fstack-protector-all CFLAG_STACK_PROTECTOR := -fstack-protector-all
LDFLAGS += -Tarch/amd64/linker.ld \ LDFLAGS += -TArchitecture/amd64/linker.ld \
-fno-pic -fno-pie \ -fno-pic -fno-pie \
-Wl,-static,--no-dynamic-linker,-ztext \ -Wl,-static,--no-dynamic-linker,-ztext \
-nostdlib -nodefaultlibs -nolibc \ -nostdlib -nodefaultlibs -nolibc \
@ -71,7 +71,7 @@ CFLAGS += -fno-pic -fno-pie -mno-80387 -mno-mmx -mno-3dnow \
-mno-red-zone -mno-sse -mno-sse2 \ -mno-red-zone -mno-sse -mno-sse2 \
-march=i686 -pipe -msoft-float -fno-builtin -fpermissive -march=i686 -pipe -msoft-float -fno-builtin -fpermissive
CFLAG_STACK_PROTECTOR := -fstack-protector-all CFLAG_STACK_PROTECTOR := -fstack-protector-all
LDFLAGS += -Tarch/i686/linker.ld \ LDFLAGS += -TArchitecture/i686/linker.ld \
-fno-pic -fno-pie \ -fno-pic -fno-pie \
-Wl,-static,--no-dynamic-linker,-ztext \ -Wl,-static,--no-dynamic-linker,-ztext \
-nostdlib -nodefaultlibs -nolibc \ -nostdlib -nodefaultlibs -nolibc \
@ -82,7 +82,7 @@ else ifeq ($(OSARCH), aarch64)
CFLAGS += -pipe -fno-builtin -fPIC -mgeneral-regs-only CFLAGS += -pipe -fno-builtin -fPIC -mgeneral-regs-only
CFLAG_STACK_PROTECTOR := -fstack-protector-all CFLAG_STACK_PROTECTOR := -fstack-protector-all
LDFLAGS += -Tarch/aarch64/linker.ld -fPIC LDFLAGS += -TArchitecture/aarch64/linker.ld -fPIC
endif endif