summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAmlal EL Mahrouss <amlal@softwarelabs.com>2024-06-09 19:57:20 +0200
committerAmlal EL Mahrouss <amlal@softwarelabs.com>2024-06-09 19:57:20 +0200
commit0aebad569eef2989e32d9825ce52708371685ff9 (patch)
tree29faa339ef63d65f02cbb8c549dd6f5f047a4f68
parent54ace477f90b5bd17ddd7c5d11c2e319f19555bd (diff)
MHR-21: Finish C++ compiler.
Signed-off-by: Amlal EL Mahrouss <amlal@softwarelabs.com>
-rw-r--r--.vscode/c_cpp_properties.json4
-rw-r--r--Comm/AsmKit/AsmKit.hpp (renamed from Common/AsmKit/AsmKit.hpp)6
-rw-r--r--Comm/AsmKit/CPU/32x0.hpp (renamed from Common/AsmKit/CPU/32x0.hpp)2
-rw-r--r--Comm/AsmKit/CPU/64x0.hpp (renamed from Common/AsmKit/CPU/64x0.hpp)2
-rw-r--r--Comm/AsmKit/CPU/amd64.hpp (renamed from Common/AsmKit/CPU/amd64.hpp)2
-rw-r--r--Comm/AsmKit/CPU/ppc.hpp (renamed from Common/AsmKit/CPU/ppc.hpp)0
-rw-r--r--Comm/CompilerKit.hpp (renamed from Common/CompilerKit.hpp)0
-rw-r--r--Comm/Defines.hpp (renamed from Common/Defines.hpp)0
-rw-r--r--Comm/ParserKit.hpp (renamed from Common/ParserKit.hpp)2
-rw-r--r--Comm/Public/SDK/CRT/__mpcc_alloca.hxx (renamed from Common/Public/SDK/CRT/__mpcc_alloca.hxx)0
-rw-r--r--Comm/Public/SDK/CRT/__mpcc_defines.hxx (renamed from Common/Public/SDK/CRT/__mpcc_defines.hxx)0
-rw-r--r--Comm/Public/SDK/CRT/__mpcc_exception.hxx (renamed from Common/Public/SDK/CRT/__mpcc_exception.hxx)0
-rw-r--r--Comm/Public/SDK/CRT/__mpcc_hint.hxx (renamed from Common/Public/SDK/CRT/__mpcc_hint.hxx)0
-rw-r--r--Comm/Public/SDK/CRT/__mpcc_malloc.hxx (renamed from Common/Public/SDK/CRT/__mpcc_malloc.hxx)0
-rw-r--r--Comm/Public/SDK/CRT/__mpcc_power.inc (renamed from Common/Public/SDK/CRT/__mpcc_power.inc)0
-rw-r--r--Comm/StdKit/AE.hpp (renamed from Common/StdKit/AE.hpp)2
-rw-r--r--Comm/StdKit/ELF.hpp (renamed from Common/StdKit/ELF.hpp)0
-rw-r--r--Comm/StdKit/ErrorID.hpp (renamed from Common/StdKit/ErrorID.hpp)4
-rw-r--r--Comm/StdKit/ErrorOr.hpp (renamed from Common/StdKit/ErrorOr.hpp)4
-rw-r--r--Comm/StdKit/PEF.hpp (renamed from Common/StdKit/PEF.hpp)2
-rw-r--r--Comm/StdKit/Ref.hpp (renamed from Common/StdKit/Ref.hpp)0
-rw-r--r--Comm/StdKit/String.hpp (renamed from Common/StdKit/String.hpp)4
-rw-r--r--Comm/StdKit/XCOFF.hxx (renamed from Common/StdKit/XCOFF.hxx)2
-rw-r--r--Comm/UUID.hpp (renamed from Common/UUID.hpp)0
-rw-r--r--Comm/Version.hxx (renamed from Common/Version.hxx)0
-rw-r--r--Doc/Inside 64x0.pdf (renamed from docs/Inside 64x0.pdf)bin64675 -> 64675 bytes
-rw-r--r--Doc/asm-specs.txt (renamed from docs/asm-specs.txt)0
-rw-r--r--Doc/havp.txt (renamed from docs/havp.txt)0
-rw-r--r--Doc/notice.txt (renamed from docs/notice.txt)0
-rw-r--r--Doc/vnrp.txt (renamed from docs/vnrp.txt)0
-rw-r--r--Sources/32asm.cc8
-rw-r--r--Sources/64asm.cc8
-rw-r--r--Sources/64x0-cc.cc6
-rw-r--r--Sources/AssemblyFactory.cc4
-rw-r--r--Sources/Detail/asmutils.hxx4
-rw-r--r--Sources/Detail/compilerutils.hxx4
-rw-r--r--Sources/String.cc2
-rw-r--r--Sources/bpp.cc4
-rw-r--r--Sources/coff2ae.cc6
-rw-r--r--Sources/cplusplus.cc4
-rw-r--r--Sources/elf2ae.cc6
-rw-r--r--Sources/i64asm.cc8
-rw-r--r--Sources/link.cc12
-rw-r--r--Sources/power-cc.cc6
-rw-r--r--Sources/ppcasm.cc12
-rw-r--r--posix.make2
-rw-r--r--win64.make2
47 files changed, 67 insertions, 67 deletions
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 0aad778..696e195 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -3,7 +3,7 @@
{
"name": "Macintosh (CLang)",
"includePath": [
- "${workspaceFolder}/Common/**",
+ "${workspaceFolder}/Comm/**",
"${workspaceFolder}/Sources/Detail/**",
"${workspaceFolder}/**"
],
@@ -16,7 +16,7 @@
{
"name": "Windows (Cygwin)",
"includePath": [
- "${workspaceFolder}/Common/**",
+ "${workspaceFolder}/Comm/**",
"${workspaceFolder}/Sources/Detail/**",
"${workspaceFolder}/**"
],
diff --git a/Common/AsmKit/AsmKit.hpp b/Comm/AsmKit/AsmKit.hpp
index 020ca5c..1801130 100644
--- a/Common/AsmKit/AsmKit.hpp
+++ b/Comm/AsmKit/AsmKit.hpp
@@ -6,9 +6,9 @@
#pragma once
-#include <Common/CompilerKit.hpp>
-#include <Common/Defines.hpp>
-#include <Common/StdKit/String.hpp>
+#include <Comm/CompilerKit.hpp>
+#include <Comm/Defines.hpp>
+#include <Comm/StdKit/String.hpp>
namespace CompilerKit
{
diff --git a/Common/AsmKit/CPU/32x0.hpp b/Comm/AsmKit/CPU/32x0.hpp
index fe03336..0013752 100644
--- a/Common/AsmKit/CPU/32x0.hpp
+++ b/Comm/AsmKit/CPU/32x0.hpp
@@ -6,7 +6,7 @@
#pragma once
-#include <Common/Defines.hpp>
+#include <Comm/Defines.hpp>
// @brief 32x0 support.
// @file CPU/32x0.hpp
diff --git a/Common/AsmKit/CPU/64x0.hpp b/Comm/AsmKit/CPU/64x0.hpp
index b28866f..e2e03c8 100644
--- a/Common/AsmKit/CPU/64x0.hpp
+++ b/Comm/AsmKit/CPU/64x0.hpp
@@ -6,7 +6,7 @@
#pragma once
-#include <Common/Defines.hpp>
+#include <Comm/Defines.hpp>
#include <vector>
// @brief 64x0 support.
diff --git a/Common/AsmKit/CPU/amd64.hpp b/Comm/AsmKit/CPU/amd64.hpp
index 507602c..d461574 100644
--- a/Common/AsmKit/CPU/amd64.hpp
+++ b/Comm/AsmKit/CPU/amd64.hpp
@@ -6,7 +6,7 @@
#pragma once
-#include <Common/Defines.hpp>
+#include <Comm/Defines.hpp>
// @brief AMD64 support.
// @file CPU/amd64.hpp
diff --git a/Common/AsmKit/CPU/ppc.hpp b/Comm/AsmKit/CPU/ppc.hpp
index c4265da..c4265da 100644
--- a/Common/AsmKit/CPU/ppc.hpp
+++ b/Comm/AsmKit/CPU/ppc.hpp
diff --git a/Common/CompilerKit.hpp b/Comm/CompilerKit.hpp
index b9de089..b9de089 100644
--- a/Common/CompilerKit.hpp
+++ b/Comm/CompilerKit.hpp
diff --git a/Common/Defines.hpp b/Comm/Defines.hpp
index d76620c..d76620c 100644
--- a/Common/Defines.hpp
+++ b/Comm/Defines.hpp
diff --git a/Common/ParserKit.hpp b/Comm/ParserKit.hpp
index 6e15c75..9109d32 100644
--- a/Common/ParserKit.hpp
+++ b/Comm/ParserKit.hpp
@@ -6,7 +6,7 @@
#pragma once
-#include <Common/AsmKit/AsmKit.hpp>
+#include <Comm/AsmKit/AsmKit.hpp>
#include <vector>
namespace ParserKit
diff --git a/Common/Public/SDK/CRT/__mpcc_alloca.hxx b/Comm/Public/SDK/CRT/__mpcc_alloca.hxx
index a1c638e..a1c638e 100644
--- a/Common/Public/SDK/CRT/__mpcc_alloca.hxx
+++ b/Comm/Public/SDK/CRT/__mpcc_alloca.hxx
diff --git a/Common/Public/SDK/CRT/__mpcc_defines.hxx b/Comm/Public/SDK/CRT/__mpcc_defines.hxx
index 5560410..5560410 100644
--- a/Common/Public/SDK/CRT/__mpcc_defines.hxx
+++ b/Comm/Public/SDK/CRT/__mpcc_defines.hxx
diff --git a/Common/Public/SDK/CRT/__mpcc_exception.hxx b/Comm/Public/SDK/CRT/__mpcc_exception.hxx
index 9366102..9366102 100644
--- a/Common/Public/SDK/CRT/__mpcc_exception.hxx
+++ b/Comm/Public/SDK/CRT/__mpcc_exception.hxx
diff --git a/Common/Public/SDK/CRT/__mpcc_hint.hxx b/Comm/Public/SDK/CRT/__mpcc_hint.hxx
index ee14711..ee14711 100644
--- a/Common/Public/SDK/CRT/__mpcc_hint.hxx
+++ b/Comm/Public/SDK/CRT/__mpcc_hint.hxx
diff --git a/Common/Public/SDK/CRT/__mpcc_malloc.hxx b/Comm/Public/SDK/CRT/__mpcc_malloc.hxx
index 2731868..2731868 100644
--- a/Common/Public/SDK/CRT/__mpcc_malloc.hxx
+++ b/Comm/Public/SDK/CRT/__mpcc_malloc.hxx
diff --git a/Common/Public/SDK/CRT/__mpcc_power.inc b/Comm/Public/SDK/CRT/__mpcc_power.inc
index 9e4928c..9e4928c 100644
--- a/Common/Public/SDK/CRT/__mpcc_power.inc
+++ b/Comm/Public/SDK/CRT/__mpcc_power.inc
diff --git a/Common/StdKit/AE.hpp b/Comm/StdKit/AE.hpp
index 9c4ac1a..505ed77 100644
--- a/Common/StdKit/AE.hpp
+++ b/Comm/StdKit/AE.hpp
@@ -9,7 +9,7 @@
#pragma once
-#include <Common/Defines.hpp>
+#include <Comm/Defines.hpp>
#define kAEMag0 'A'
#define kAEMag1 'E'
diff --git a/Common/StdKit/ELF.hpp b/Comm/StdKit/ELF.hpp
index 4f0d0ae..4f0d0ae 100644
--- a/Common/StdKit/ELF.hpp
+++ b/Comm/StdKit/ELF.hpp
diff --git a/Common/StdKit/ErrorID.hpp b/Comm/StdKit/ErrorID.hpp
index 9f12ab2..bea70ae 100644
--- a/Common/StdKit/ErrorID.hpp
+++ b/Comm/StdKit/ErrorID.hpp
@@ -9,8 +9,8 @@
#pragma once
-#include <Common/Defines.hpp>
-#include <Common/StdKit/ErrorOr.hpp>
+#include <Comm/Defines.hpp>
+#include <Comm/StdKit/ErrorOr.hpp>
#define MPCC_EXEC_ERROR -30
#define MPCC_FILE_NOT_FOUND -31
diff --git a/Common/StdKit/ErrorOr.hpp b/Comm/StdKit/ErrorOr.hpp
index cf35b26..0125f82 100644
--- a/Common/StdKit/ErrorOr.hpp
+++ b/Comm/StdKit/ErrorOr.hpp
@@ -9,8 +9,8 @@
#pragma once
-#include <Common/Defines.hpp>
-#include <Common/StdKit/Ref.hpp>
+#include <Comm/Defines.hpp>
+#include <Comm/StdKit/Ref.hpp>
namespace CompilerKit
{
diff --git a/Common/StdKit/PEF.hpp b/Comm/StdKit/PEF.hpp
index 9fcc554..e790d6a 100644
--- a/Common/StdKit/PEF.hpp
+++ b/Comm/StdKit/PEF.hpp
@@ -6,7 +6,7 @@
#pragma once
-#include <Common/Defines.hpp>
+#include <Comm/Defines.hpp>
// @file PEF.hpp
// @brief Preferred Executable Format
diff --git a/Common/StdKit/Ref.hpp b/Comm/StdKit/Ref.hpp
index f4a11c0..f4a11c0 100644
--- a/Common/StdKit/Ref.hpp
+++ b/Comm/StdKit/Ref.hpp
diff --git a/Common/StdKit/String.hpp b/Comm/StdKit/String.hpp
index a05a31c..c6589cc 100644
--- a/Common/StdKit/String.hpp
+++ b/Comm/StdKit/String.hpp
@@ -9,8 +9,8 @@
#pragma once
-#include <Common/Defines.hpp>
-#include <Common/StdKit/ErrorOr.hpp>
+#include <Comm/Defines.hpp>
+#include <Comm/StdKit/ErrorOr.hpp>
namespace CompilerKit
{
diff --git a/Common/StdKit/XCOFF.hxx b/Comm/StdKit/XCOFF.hxx
index a26b591..fee1888 100644
--- a/Common/StdKit/XCOFF.hxx
+++ b/Comm/StdKit/XCOFF.hxx
@@ -14,7 +14,7 @@
#ifndef __XCOFF__
#define __XCOFF__
-#include <Common/Defines.hpp>
+#include <Comm/Defines.hpp>
#define kXCOFF64Magic 0x01F7
diff --git a/Common/UUID.hpp b/Comm/UUID.hpp
index 00b153b..00b153b 100644
--- a/Common/UUID.hpp
+++ b/Comm/UUID.hpp
diff --git a/Common/Version.hxx b/Comm/Version.hxx
index 377a688..377a688 100644
--- a/Common/Version.hxx
+++ b/Comm/Version.hxx
diff --git a/docs/Inside 64x0.pdf b/Doc/Inside 64x0.pdf
index bcd6782..bcd6782 100644
--- a/docs/Inside 64x0.pdf
+++ b/Doc/Inside 64x0.pdf
Binary files differ
diff --git a/docs/asm-specs.txt b/Doc/asm-specs.txt
index a0c42bf..a0c42bf 100644
--- a/docs/asm-specs.txt
+++ b/Doc/asm-specs.txt
diff --git a/docs/havp.txt b/Doc/havp.txt
index 12fcec5..12fcec5 100644
--- a/docs/havp.txt
+++ b/Doc/havp.txt
diff --git a/docs/notice.txt b/Doc/notice.txt
index 23691da..23691da 100644
--- a/docs/notice.txt
+++ b/Doc/notice.txt
diff --git a/docs/vnrp.txt b/Doc/vnrp.txt
index e17b494..e17b494 100644
--- a/docs/vnrp.txt
+++ b/Doc/vnrp.txt
diff --git a/Sources/32asm.cc b/Sources/32asm.cc
index 82d23e6..a3e2cbb 100644
--- a/Sources/32asm.cc
+++ b/Sources/32asm.cc
@@ -19,10 +19,10 @@
#define __ASM_NEED_32x0__ 1
-#include <Common/AsmKit/CPU/32x0.hpp>
-#include <Common/ParserKit.hpp>
-#include <Common/StdKit/AE.hpp>
-#include <Common/StdKit/PEF.hpp>
+#include <Comm/AsmKit/CPU/32x0.hpp>
+#include <Comm/ParserKit.hpp>
+#include <Comm/StdKit/AE.hpp>
+#include <Comm/StdKit/PEF.hpp>
#include <filesystem>
#include <fstream>
#include <iostream>
diff --git a/Sources/64asm.cc b/Sources/64asm.cc
index 6287b3e..baa6ef4 100644
--- a/Sources/64asm.cc
+++ b/Sources/64asm.cc
@@ -19,10 +19,10 @@
#define __ASM_NEED_64x0__ 1
-#include <Common/AsmKit/CPU/64x0.hpp>
-#include <Common/ParserKit.hpp>
-#include <Common/StdKit/AE.hpp>
-#include <Common/StdKit/PEF.hpp>
+#include <Comm/AsmKit/CPU/64x0.hpp>
+#include <Comm/ParserKit.hpp>
+#include <Comm/StdKit/AE.hpp>
+#include <Comm/StdKit/PEF.hpp>
#include <algorithm>
#include <filesystem>
#include <fstream>
diff --git a/Sources/64x0-cc.cc b/Sources/64x0-cc.cc
index 36f56a8..75a9b10 100644
--- a/Sources/64x0-cc.cc
+++ b/Sources/64x0-cc.cc
@@ -10,9 +10,9 @@
/// BUGS: ?
/// TODO:
-#include <Common/AsmKit/CPU/64x0.hpp>
-#include <Common/ParserKit.hpp>
-#include <Common/UUID.hpp>
+#include <Comm/AsmKit/CPU/64x0.hpp>
+#include <Comm/ParserKit.hpp>
+#include <Comm/UUID.hpp>
#include <cstdio>
#include <filesystem>
#include <fstream>
diff --git a/Sources/AssemblyFactory.cc b/Sources/AssemblyFactory.cc
index 1952f54..61399a4 100644
--- a/Sources/AssemblyFactory.cc
+++ b/Sources/AssemblyFactory.cc
@@ -4,8 +4,8 @@
------------------------------------------- */
-#include <Common/AsmKit/AsmKit.hpp>
-#include <Common/StdKit/ErrorID.hpp>
+#include <Comm/AsmKit/AsmKit.hpp>
+#include <Comm/StdKit/ErrorID.hpp>
/**
* @file AssemblyFactory.cxx
diff --git a/Sources/Detail/asmutils.hxx b/Sources/Detail/asmutils.hxx
index f6fdb41..240835e 100644
--- a/Sources/Detail/asmutils.hxx
+++ b/Sources/Detail/asmutils.hxx
@@ -6,8 +6,8 @@
#pragma once
-#include <Common/AsmKit/AsmKit.hpp>
-#include <Common/ParserKit.hpp>
+#include <Comm/AsmKit/AsmKit.hpp>
+#include <Comm/ParserKit.hpp>
using namespace CompilerKit;
diff --git a/Sources/Detail/compilerutils.hxx b/Sources/Detail/compilerutils.hxx
index 9ddd3a2..acadde2 100644
--- a/Sources/Detail/compilerutils.hxx
+++ b/Sources/Detail/compilerutils.hxx
@@ -6,8 +6,8 @@
#pragma once
-#include <Common/AsmKit/AsmKit.hpp>
-#include <Common/ParserKit.hpp>
+#include <Comm/AsmKit/AsmKit.hpp>
+#include <Comm/ParserKit.hpp>
#define kZero64Section ".zero64"
#define kCode64Section ".code64"
diff --git a/Sources/String.cc b/Sources/String.cc
index 38bd444..ece3ecf 100644
--- a/Sources/String.cc
+++ b/Sources/String.cc
@@ -18,7 +18,7 @@
*
*/
-#include <Common/StdKit/String.hpp>
+#include <Comm/StdKit/String.hpp>
#include <utility>
namespace CompilerKit {
diff --git a/Sources/bpp.cc b/Sources/bpp.cc
index aa0b72a..f523597 100644
--- a/Sources/bpp.cc
+++ b/Sources/bpp.cc
@@ -9,8 +9,8 @@
/// BUGS: 0
-#include <Common/ParserKit.hpp>
-#include <Common/StdKit/ErrorID.hpp>
+#include <Comm/ParserKit.hpp>
+#include <Comm/StdKit/ErrorID.hpp>
#include <algorithm>
#include <filesystem>
#include <fstream>
diff --git a/Sources/coff2ae.cc b/Sources/coff2ae.cc
index 349d543..2986375 100644
--- a/Sources/coff2ae.cc
+++ b/Sources/coff2ae.cc
@@ -4,9 +4,9 @@
------------------------------------------- */
-#include <Common/ParserKit.hpp>
-#include <Common/StdKit/AE.hpp>
-#include <Common/StdKit/PEF.hpp>
+#include <Comm/ParserKit.hpp>
+#include <Comm/StdKit/AE.hpp>
+#include <Comm/StdKit/PEF.hpp>
#include <filesystem>
#include <fstream>
#include <iostream>
diff --git a/Sources/cplusplus.cc b/Sources/cplusplus.cc
index 97b6a82..9323d31 100644
--- a/Sources/cplusplus.cc
+++ b/Sources/cplusplus.cc
@@ -16,8 +16,8 @@
#define kSplashCxx() \
kPrintF(kWhite "%s\n", "SoftwareLabs C++ Compiler, Copyright SoftwareLabs.")
-#include <Common/AsmKit/CPU/amd64.hpp>
-#include <Common/ParserKit.hpp>
+#include <Comm/AsmKit/CPU/amd64.hpp>
+#include <Comm/ParserKit.hpp>
#include <cstdio>
#include <filesystem>
#include <fstream>
diff --git a/Sources/elf2ae.cc b/Sources/elf2ae.cc
index a451a0a..ada2830 100644
--- a/Sources/elf2ae.cc
+++ b/Sources/elf2ae.cc
@@ -4,9 +4,9 @@
------------------------------------------- */
-#include <Common/ParserKit.hpp>
-#include <Common/StdKit/AE.hpp>
-#include <Common/StdKit/PEF.hpp>
+#include <Comm/ParserKit.hpp>
+#include <Comm/StdKit/AE.hpp>
+#include <Comm/StdKit/PEF.hpp>
#include <filesystem>
#include <fstream>
#include <iostream>
diff --git a/Sources/i64asm.cc b/Sources/i64asm.cc
index 391c63f..26269f4 100644
--- a/Sources/i64asm.cc
+++ b/Sources/i64asm.cc
@@ -27,10 +27,10 @@
#define kAssemblerPragmaSymStr "#"
#define kAssemblerPragmaSym '#'
-#include <Common/AsmKit/CPU/amd64.hpp>
-#include <Common/ParserKit.hpp>
-#include <Common/StdKit/AE.hpp>
-#include <Common/StdKit/PEF.hpp>
+#include <Comm/AsmKit/CPU/amd64.hpp>
+#include <Comm/ParserKit.hpp>
+#include <Comm/StdKit/AE.hpp>
+#include <Comm/StdKit/PEF.hpp>
#include <algorithm>
#include <cstdlib>
#include <filesystem>
diff --git a/Sources/link.cc b/Sources/link.cc
index e0a49cf..6ed2db5 100644
--- a/Sources/link.cc
+++ b/Sources/link.cc
@@ -13,23 +13,23 @@
/// note: Do not look up for anything with .code64/.data64/.zero64!
/// It will be loaded when program will start up!
-#include <Common/StdKit/ErrorID.hpp>
+#include <Comm/StdKit/ErrorID.hpp>
//! Assembler Kit
-#include <Common/AsmKit/AsmKit.hpp>
+#include <Comm/AsmKit/AsmKit.hpp>
//! Preferred Executable Format
-#include <Common/StdKit/PEF.hpp>
-#include <Common/UUID.hpp>
+#include <Comm/StdKit/PEF.hpp>
+#include <Comm/UUID.hpp>
#include <filesystem>
#include <random>
#include <vector>
//! Dist version
-#include <Common/Version.hxx>
+#include <Comm/Version.hxx>
//! Advanced Executable Object Format
-#include <Common/StdKit/AE.hpp>
+#include <Comm/StdKit/AE.hpp>
//! C++ I/O headers.
#include <fstream>
diff --git a/Sources/power-cc.cc b/Sources/power-cc.cc
index ad99611..d008296 100644
--- a/Sources/power-cc.cc
+++ b/Sources/power-cc.cc
@@ -7,9 +7,9 @@
* ========================================================
*/
-#include <Common/AsmKit/CPU/ppc.hpp>
-#include <Common/ParserKit.hpp>
-#include <Common/UUID.hpp>
+#include <Comm/AsmKit/CPU/ppc.hpp>
+#include <Comm/ParserKit.hpp>
+#include <Comm/UUID.hpp>
#include <cstdio>
#include <filesystem>
#include <fstream>
diff --git a/Sources/ppcasm.cc b/Sources/ppcasm.cc
index 89de014..1edeaaa 100644
--- a/Sources/ppcasm.cc
+++ b/Sources/ppcasm.cc
@@ -17,12 +17,12 @@
#define __ASM_NEED_PPC__ 1
-#include <Common/StdKit/ErrorID.hpp>
-#include <Common/AsmKit/CPU/ppc.hpp>
-#include <Common/ParserKit.hpp>
-#include <Common/StdKit/AE.hpp>
-#include <Common/StdKit/PEF.hpp>
-#include <Common/Version.hxx>
+#include <Comm/StdKit/ErrorID.hpp>
+#include <Comm/AsmKit/CPU/ppc.hpp>
+#include <Comm/ParserKit.hpp>
+#include <Comm/StdKit/AE.hpp>
+#include <Comm/StdKit/PEF.hpp>
+#include <Comm/Version.hxx>
#include <algorithm>
#include <filesystem>
#include <fstream>
diff --git a/posix.make b/posix.make
index 119457d..be1abb8 100644
--- a/posix.make
+++ b/posix.make
@@ -7,7 +7,7 @@
# ========================================================
#
-COMMON_INC=-I./Common -I./ -I./Sources/Detail
+COMMON_INC=-I./Comm -I./ -I./Sources/Detail
LINK_CC=clang++ -std=c++20
LINK_SRC=Sources/link.cc
LINK_OUTPUT=Output/link.exec
diff --git a/win64.make b/win64.make
index 0315371..a345da0 100644
--- a/win64.make
+++ b/win64.make
@@ -7,7 +7,7 @@
# ========================================================
#
-COMMON_INC=-I./Common -I./ -I./Sources/Detail
+COMMON_INC=-I./Comm -I./ -I./Sources/Detail
LINK_CC=clang++ -std=c++20 -Xlinker -s
LINK_SRC=Sources/link.cc
LINK_OUTPUT=Output/link.exe