From 32a17c5e63ce372408b627ae6f527c35df0d30ae Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 10 Oct 2022 23:31:46 +0300 Subject: [PATCH] Update files --- {arch => Architecture}/aarch64/boot.S | 0 {arch => Architecture}/aarch64/linker.ld | 0 ...AdvancedConfigurationandPowerInterface.cpp | 0 .../DifferentiatedSystemDescriptionTable.cpp | 0 {arch => Architecture}/amd64/Limine.c | 0 .../amd64/MultipleAPICDescriptionTable.cpp | 0 {arch => Architecture}/amd64/acpi.hpp | 0 .../amd64/cpu/GlobalDescriptorTable.cpp | 0 .../amd64/cpu/InterruptDescriptorTable.cpp | 0 {arch => Architecture}/amd64/cpu/gdt.hpp | 0 {arch => Architecture}/amd64/cpu/idt.hpp | 0 {arch => Architecture}/amd64/linker.ld | 0 .../i686/ArithmeticOperations.c | 0 {arch => Architecture}/i686/cpu/gdt.hpp | 0 {arch => Architecture}/i686/cpu/idt.hpp | 0 {arch => Architecture}/i686/linker.ld | 0 Core/Interrupts/IntManager.cpp | 8 ++--- Core/Power.cpp | 2 +- Core/README.md | 2 +- Makefile | 30 +++++++++---------- 20 files changed, 21 insertions(+), 21 deletions(-) rename {arch => Architecture}/aarch64/boot.S (100%) rename {arch => Architecture}/aarch64/linker.ld (100%) rename {arch => Architecture}/amd64/AdvancedConfigurationandPowerInterface.cpp (100%) rename {arch => Architecture}/amd64/DifferentiatedSystemDescriptionTable.cpp (100%) rename {arch => Architecture}/amd64/Limine.c (100%) rename {arch => Architecture}/amd64/MultipleAPICDescriptionTable.cpp (100%) rename {arch => Architecture}/amd64/acpi.hpp (100%) rename {arch => Architecture}/amd64/cpu/GlobalDescriptorTable.cpp (100%) rename {arch => Architecture}/amd64/cpu/InterruptDescriptorTable.cpp (100%) rename {arch => Architecture}/amd64/cpu/gdt.hpp (100%) rename {arch => Architecture}/amd64/cpu/idt.hpp (100%) rename {arch => Architecture}/amd64/linker.ld (100%) rename {arch => Architecture}/i686/ArithmeticOperations.c (100%) rename {arch => Architecture}/i686/cpu/gdt.hpp (100%) rename {arch => Architecture}/i686/cpu/idt.hpp (100%) rename {arch => Architecture}/i686/linker.ld (100%) diff --git a/arch/aarch64/boot.S b/Architecture/aarch64/boot.S similarity index 100% rename from arch/aarch64/boot.S rename to Architecture/aarch64/boot.S diff --git a/arch/aarch64/linker.ld b/Architecture/aarch64/linker.ld similarity index 100% rename from arch/aarch64/linker.ld rename to Architecture/aarch64/linker.ld diff --git a/arch/amd64/AdvancedConfigurationandPowerInterface.cpp b/Architecture/amd64/AdvancedConfigurationandPowerInterface.cpp similarity index 100% rename from arch/amd64/AdvancedConfigurationandPowerInterface.cpp rename to Architecture/amd64/AdvancedConfigurationandPowerInterface.cpp diff --git a/arch/amd64/DifferentiatedSystemDescriptionTable.cpp b/Architecture/amd64/DifferentiatedSystemDescriptionTable.cpp similarity index 100% rename from arch/amd64/DifferentiatedSystemDescriptionTable.cpp rename to Architecture/amd64/DifferentiatedSystemDescriptionTable.cpp diff --git a/arch/amd64/Limine.c b/Architecture/amd64/Limine.c similarity index 100% rename from arch/amd64/Limine.c rename to Architecture/amd64/Limine.c diff --git a/arch/amd64/MultipleAPICDescriptionTable.cpp b/Architecture/amd64/MultipleAPICDescriptionTable.cpp similarity index 100% rename from arch/amd64/MultipleAPICDescriptionTable.cpp rename to Architecture/amd64/MultipleAPICDescriptionTable.cpp diff --git a/arch/amd64/acpi.hpp b/Architecture/amd64/acpi.hpp similarity index 100% rename from arch/amd64/acpi.hpp rename to Architecture/amd64/acpi.hpp diff --git a/arch/amd64/cpu/GlobalDescriptorTable.cpp b/Architecture/amd64/cpu/GlobalDescriptorTable.cpp similarity index 100% rename from arch/amd64/cpu/GlobalDescriptorTable.cpp rename to Architecture/amd64/cpu/GlobalDescriptorTable.cpp diff --git a/arch/amd64/cpu/InterruptDescriptorTable.cpp b/Architecture/amd64/cpu/InterruptDescriptorTable.cpp similarity index 100% rename from arch/amd64/cpu/InterruptDescriptorTable.cpp rename to Architecture/amd64/cpu/InterruptDescriptorTable.cpp diff --git a/arch/amd64/cpu/gdt.hpp b/Architecture/amd64/cpu/gdt.hpp similarity index 100% rename from arch/amd64/cpu/gdt.hpp rename to Architecture/amd64/cpu/gdt.hpp diff --git a/arch/amd64/cpu/idt.hpp b/Architecture/amd64/cpu/idt.hpp similarity index 100% rename from arch/amd64/cpu/idt.hpp rename to Architecture/amd64/cpu/idt.hpp diff --git a/arch/amd64/linker.ld b/Architecture/amd64/linker.ld similarity index 100% rename from arch/amd64/linker.ld rename to Architecture/amd64/linker.ld diff --git a/arch/i686/ArithmeticOperations.c b/Architecture/i686/ArithmeticOperations.c similarity index 100% rename from arch/i686/ArithmeticOperations.c rename to Architecture/i686/ArithmeticOperations.c diff --git a/arch/i686/cpu/gdt.hpp b/Architecture/i686/cpu/gdt.hpp similarity index 100% rename from arch/i686/cpu/gdt.hpp rename to Architecture/i686/cpu/gdt.hpp diff --git a/arch/i686/cpu/idt.hpp b/Architecture/i686/cpu/idt.hpp similarity index 100% rename from arch/i686/cpu/idt.hpp rename to Architecture/i686/cpu/idt.hpp diff --git a/arch/i686/linker.ld b/Architecture/i686/linker.ld similarity index 100% rename from arch/i686/linker.ld rename to Architecture/i686/linker.ld diff --git a/Core/Interrupts/IntManager.cpp b/Core/Interrupts/IntManager.cpp index 5305481..edaf471 100644 --- a/Core/Interrupts/IntManager.cpp +++ b/Core/Interrupts/IntManager.cpp @@ -1,11 +1,11 @@ #include #if defined(__amd64__) -#include "../arch/amd64/cpu/gdt.hpp" -#include "../arch/amd64/cpu/idt.hpp" +#include "../Architecture/amd64/cpu/gdt.hpp" +#include "../Architecture/amd64/cpu/idt.hpp" #elif defined(__i386__) -#include "../arch/i686/cpu/gdt.hpp" -#include "../arch/i686/cpu/idt.hpp" +#include "../Architecture/i686/cpu/gdt.hpp" +#include "../Architecture/i686/cpu/idt.hpp" #elif defined(__aarch64__) #endif diff --git a/Core/Power.cpp b/Core/Power.cpp index 6204cb5..f34b1fb 100644 --- a/Core/Power.cpp +++ b/Core/Power.cpp @@ -5,7 +5,7 @@ #include #if defined(__amd64__) -#include "../arch/amd64/acpi.hpp" +#include "../Architecture/amd64/acpi.hpp" namespace Power { diff --git a/Core/README.md b/Core/README.md index 7d3b7b3..a2ef85f 100644 --- a/Core/README.md +++ b/Core/README.md @@ -19,4 +19,4 @@ It is responsible for printing text to the screen. Contains the CPU management code. 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. diff --git a/Makefile b/Makefile index d7798a7..234bb0b 100644 --- a/Makefile +++ b/Makefile @@ -19,20 +19,20 @@ GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) BMP_SOURCES = $(shell find ./ -type f -name '*.bmp') PSF_SOURCES = $(shell find ./ -type f -name '*.psf') ifeq ($(OSARCH), amd64) -ASM_SOURCES = $(shell find ./ -type f -name '*.asm' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -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 "./Architecture/i686/*" -not -path "./Architecture/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 "./Architecture/i686/*" -not -path "./Architecture/aarch64/*") else ifeq ($(OSARCH), i686) -ASM_SOURCES = $(shell find ./ -type f -name '*.asm' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -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 "./Architecture/amd64/*" -not -path "./Architecture/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 "./Architecture/amd64/*" -not -path "./Architecture/aarch64/*") else ifeq ($(OSARCH), aarch64) -ASM_SOURCES = $(shell find ./ -type f -name '*.asm' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -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 "./Architecture/amd64/*" -not -path "./Architecture/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 "./Architecture/amd64/*" -not -path "./Architecture/i686/*") endif 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) @@ -58,7 +58,7 @@ CFLAGS += -fno-pic -fno-pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe \ -mcmodel=kernel -msoft-float -fno-builtin CFLAG_STACK_PROTECTOR := -fstack-protector-all -LDFLAGS += -Tarch/amd64/linker.ld \ +LDFLAGS += -TArchitecture/amd64/linker.ld \ -fno-pic -fno-pie \ -Wl,-static,--no-dynamic-linker,-ztext \ -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 \ -march=i686 -pipe -msoft-float -fno-builtin -fpermissive CFLAG_STACK_PROTECTOR := -fstack-protector-all -LDFLAGS += -Tarch/i686/linker.ld \ +LDFLAGS += -TArchitecture/i686/linker.ld \ -fno-pic -fno-pie \ -Wl,-static,--no-dynamic-linker,-ztext \ -nostdlib -nodefaultlibs -nolibc \ @@ -82,7 +82,7 @@ else ifeq ($(OSARCH), aarch64) CFLAGS += -pipe -fno-builtin -fPIC -mgeneral-regs-only CFLAG_STACK_PROTECTOR := -fstack-protector-all -LDFLAGS += -Tarch/aarch64/linker.ld -fPIC +LDFLAGS += -TArchitecture/aarch64/linker.ld -fPIC endif