diff options
| author | Amlal El Mahrouss <113760121+Amlal-ElMahrouss@users.noreply.github.com> | 2024-03-21 21:02:39 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <113760121+Amlal-ElMahrouss@users.noreply.github.com> | 2024-03-21 21:02:39 +0100 |
| commit | 61043fc07eadf31fa5c9c0e59dbc3f84ad1700a5 (patch) | |
| tree | e53aba9b269da08a6da6d30297dc90475ab012e8 | |
| parent | b4963da50dd24d15ed780eee7d01bda4efe486ea (diff) | |
Meta: Rework filesystem structure.
Signed-off-by: Amlal El Mahrouss <113760121+Amlal-ElMahrouss@users.noreply.github.com>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .vscode/c_cpp_properties.json | 4 | ||||
| -rw-r--r-- | .vscode/tasks.json | 2 | ||||
| -rw-r--r-- | Private/External/XIFF.h | 41 | ||||
| -rw-r--r-- | Private/Frontend/Compiler/.gitignore | 20 | ||||
| -rw-r--r-- | Private/Frontend/Compiler/Apps/.gitkeep (renamed from Private/Frontend/Compiler/bin/.gitkeep) | 0 | ||||
| -rw-r--r-- | Private/Frontend/Compiler/Tests/.gitkeep (renamed from Private/Frontend/Compiler/test/.gitkeep) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/.gitignore | 62 | ||||
| -rw-r--r-- | Private/Toolchain/Apps/.gitkeep (renamed from Private/Toolchain/bin/.gitkeep) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/Apps/Source/16bit_amd64.s (renamed from Private/Toolchain/bin/Source/16bit_amd64.s) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/Apps/Source/amd64_to_ae.s (renamed from Private/Toolchain/bin/Source/amd64_to_ae.s) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/Apps/Source/hello_amd64.masm (renamed from Private/Toolchain/bin/Source/hello_amd64.masm) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/Apps/Source/hello_inc.64x (renamed from Private/Toolchain/bin/Source/hello_inc.64x) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/Apps/Source/hello_world.32x (renamed from Private/Toolchain/bin/Source/hello_world.32x) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/Apps/Source/hello_world.64x (renamed from Private/Toolchain/bin/Source/hello_world.64x) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/Apps/Source/hello_world.cc (renamed from Private/Toolchain/bin/Source/hello_world.cc) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/Apps/Source/hello_world.cxx (renamed from Private/Toolchain/bin/Source/hello_world.cxx) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/Apps/Source/hello_world.s (renamed from Private/Toolchain/bin/Source/hello_world.s) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/Apps/Source/preprocessor.64x (renamed from Private/Toolchain/bin/Source/preprocessor.64x) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/Apps/Source/preprocessor.64x.pp (renamed from Private/Toolchain/bin/Source/preprocessor.64x.pp) | 0 | ||||
| -rw-r--r-- | Private/Toolchain/bin/README.txt | 2 | ||||
| -rw-r--r-- | Private/Toolchain/makefile | 26 |
22 files changed, 58 insertions, 101 deletions
@@ -58,7 +58,7 @@ replay_pid* *.cdfs -Drivers/bin/Tests/*.masm +Drivers/Apps/Tests/*.masm .vs diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 6dbde33..02ddeba 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -6,7 +6,7 @@ "${workspaceFolder}/Private/**" ], "defines": [], - "compilerPath": "/usr/bin/clang", + "compilerPath": "/usr/Apps/clang", "cStandard": "c17", "cppStandard": "c++20", "intelliSenseMode": "macos-clang-arm64" @@ -17,7 +17,7 @@ "${workspaceFolder}/Private/**" ], "defines": [], - "compilerPath": "C:/cygwin64/bin/g++.exe", + "compilerPath": "C:/cygwin64/Apps/g++.exe", "cStandard": "c17", "cppStandard": "c++20", "intelliSenseMode": "windows-clang-x64" diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 4ede37a..cb7a33f 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -3,7 +3,7 @@ { "type": "cppbuild", "label": "C/C++: clang build active file", - "command": "/usr/bin/clang", + "command": "/usr/Apps/clang", "args": [ "-fcolor-diagnostics", "-fansi-escape-codes", diff --git a/Private/External/XIFF.h b/Private/External/XIFF.h deleted file mode 100644 index 59fe388..0000000 --- a/Private/External/XIFF.h +++ /dev/null @@ -1,41 +0,0 @@ -/** =========================================== - (C) Mahrouss Logic - ===========================================*/ - -#pragma once - -/** --------------------------------------------------- - - * THIS FILE CONTAINS CODE FOR THE eXtended Information File Format. - * XIFF is used to make setup programs/audio/video files. - -------------------------------------------------------- */ - -/*** - * @brief Generic XIFF header - * Used by XIFF based containers. - */ - -struct __attribute__((packed)) XiffHeader { - unsigned char mag[4]; // XIFF string (includes \0) - unsigned int size; // overall size of header (XiffHeader) in bytes - unsigned int format_type; // format type. generic - unsigned char specific_mag[4]; // The sub header magic - unsigned int specific_size; // length of the format data - unsigned int specific_format_type; // format type. generic -}; - -/* video file */ -#define kXIFFVideo "XVFF" - -/* audio file */ -#define kXIFFAudio "XAFF" - -/* install buddy program. */ -#define kXIFFInstaller "XnFF" - -/* generic container */ -#define kXIFFGeneric "XIFF" - -/* binary with metadata. */ -#define kXIFFFlatBinary "XEFF" diff --git a/Private/Frontend/Compiler/.gitignore b/Private/Frontend/Compiler/.gitignore index a2e1573..ba4320e 100644 --- a/Private/Frontend/Compiler/.gitignore +++ b/Private/Frontend/Compiler/.gitignore @@ -1,13 +1,13 @@ -bin/elf2pef -bin/ld -bin/cpp -bin/cc -bin/masm -bin/mkcdfs -bin/ccplus -bin/cppfront -bin/cc -bin/bpp +Apps/elf2pef +Apps/ld +Apps/cpp +Apps/cc +Apps/masm +Apps/mkcdfs +Apps/ccplus +Apps/cppfront +Apps/cc +Apps/bpp test/*.cc test/*.64x *.c.pp diff --git a/Private/Frontend/Compiler/bin/.gitkeep b/Private/Frontend/Compiler/Apps/.gitkeep index e69de29..e69de29 100644 --- a/Private/Frontend/Compiler/bin/.gitkeep +++ b/Private/Frontend/Compiler/Apps/.gitkeep diff --git a/Private/Frontend/Compiler/test/.gitkeep b/Private/Frontend/Compiler/Tests/.gitkeep index e69de29..e69de29 100644 --- a/Private/Frontend/Compiler/test/.gitkeep +++ b/Private/Frontend/Compiler/Tests/.gitkeep diff --git a/Private/Toolchain/.gitignore b/Private/Toolchain/.gitignore index 1ea0357..7bb537d 100644 --- a/Private/Toolchain/.gitignore +++ b/Private/Toolchain/.gitignore @@ -1,35 +1,35 @@ -bin/ld -bin/mld -bin/cpp -bin/bpp -bin/cc -bin/masm -bin/64ld -bin/32ld -bin/64asm -bin/mkcdfs -bin/ccplus -bin/link -bin/x86_64-ccplus -bin/x86_64-pef-ccplus -bin/cppfront -bin/cc -bin/i64asm +Apps/ld +Apps/mld +Apps/cpp +Apps/bpp +Apps/cc +Apps/masm +Apps/64ld +Apps/32ld +Apps/64asm +Apps/mkcdfs +Apps/ccplus +Apps/link +Apps/x86_64-ccplus +Apps/x86_64-pef-ccplus +Apps/cppfront +Apps/cc +Apps/i64asm -bin/Assembly.* +Apps/Assembly.* -bin/SourceUnitTest/*.c.pp -bin/SourceUnitTest/*.c -bin/SourceUnitTest/*.cc -bin/SourceUnitTest/*.cc.pp -bin/SourceUnitTest/*.cc.pp -bin/SourceUnitTest/*.cc -bin/SourceUnitTest/*.cpp.pp -bin/SourceUnitTest/*.cpp -bin/SourceUnitTest/*.cxx.pp -bin/SourceUnitTest/*.cxx -bin/SourceUnitTest/*.masm -bin/SourceUnitTest/*.h -bin/SourceUnitTest/*.64x +Apps/SourceUnitTest/*.c.pp +Apps/SourceUnitTest/*.c +Apps/SourceUnitTest/*.cc +Apps/SourceUnitTest/*.cc.pp +Apps/SourceUnitTest/*.cc.pp +Apps/SourceUnitTest/*.cc +Apps/SourceUnitTest/*.cpp.pp +Apps/SourceUnitTest/*.cpp +Apps/SourceUnitTest/*.cxx.pp +Apps/SourceUnitTest/*.cxx +Apps/SourceUnitTest/*.masm +Apps/SourceUnitTest/*.h +Apps/SourceUnitTest/*.64x *.cxx.pp
\ No newline at end of file diff --git a/Private/Toolchain/bin/.gitkeep b/Private/Toolchain/Apps/.gitkeep index e69de29..e69de29 100644 --- a/Private/Toolchain/bin/.gitkeep +++ b/Private/Toolchain/Apps/.gitkeep diff --git a/Private/Toolchain/bin/Source/16bit_amd64.s b/Private/Toolchain/Apps/Source/16bit_amd64.s index a22248b..a22248b 100644 --- a/Private/Toolchain/bin/Source/16bit_amd64.s +++ b/Private/Toolchain/Apps/Source/16bit_amd64.s diff --git a/Private/Toolchain/bin/Source/amd64_to_ae.s b/Private/Toolchain/Apps/Source/amd64_to_ae.s index 6b5de94..6b5de94 100644 --- a/Private/Toolchain/bin/Source/amd64_to_ae.s +++ b/Private/Toolchain/Apps/Source/amd64_to_ae.s diff --git a/Private/Toolchain/bin/Source/hello_amd64.masm b/Private/Toolchain/Apps/Source/hello_amd64.masm index 0178ad4..0178ad4 100644 --- a/Private/Toolchain/bin/Source/hello_amd64.masm +++ b/Private/Toolchain/Apps/Source/hello_amd64.masm diff --git a/Private/Toolchain/bin/Source/hello_inc.64x b/Private/Toolchain/Apps/Source/hello_inc.64x index edd9b58..edd9b58 100644 --- a/Private/Toolchain/bin/Source/hello_inc.64x +++ b/Private/Toolchain/Apps/Source/hello_inc.64x diff --git a/Private/Toolchain/bin/Source/hello_world.32x b/Private/Toolchain/Apps/Source/hello_world.32x index e8c7d31..e8c7d31 100644 --- a/Private/Toolchain/bin/Source/hello_world.32x +++ b/Private/Toolchain/Apps/Source/hello_world.32x diff --git a/Private/Toolchain/bin/Source/hello_world.64x b/Private/Toolchain/Apps/Source/hello_world.64x index c218bee..c218bee 100644 --- a/Private/Toolchain/bin/Source/hello_world.64x +++ b/Private/Toolchain/Apps/Source/hello_world.64x diff --git a/Private/Toolchain/bin/Source/hello_world.cc b/Private/Toolchain/Apps/Source/hello_world.cc index 8a179b4..8a179b4 100644 --- a/Private/Toolchain/bin/Source/hello_world.cc +++ b/Private/Toolchain/Apps/Source/hello_world.cc diff --git a/Private/Toolchain/bin/Source/hello_world.cxx b/Private/Toolchain/Apps/Source/hello_world.cxx index 829dfc8..829dfc8 100644 --- a/Private/Toolchain/bin/Source/hello_world.cxx +++ b/Private/Toolchain/Apps/Source/hello_world.cxx diff --git a/Private/Toolchain/bin/Source/hello_world.s b/Private/Toolchain/Apps/Source/hello_world.s index 1833695..1833695 100644 --- a/Private/Toolchain/bin/Source/hello_world.s +++ b/Private/Toolchain/Apps/Source/hello_world.s diff --git a/Private/Toolchain/bin/Source/preprocessor.64x b/Private/Toolchain/Apps/Source/preprocessor.64x index 2f7a404..2f7a404 100644 --- a/Private/Toolchain/bin/Source/preprocessor.64x +++ b/Private/Toolchain/Apps/Source/preprocessor.64x diff --git a/Private/Toolchain/bin/Source/preprocessor.64x.pp b/Private/Toolchain/Apps/Source/preprocessor.64x.pp index face9bf..face9bf 100644 --- a/Private/Toolchain/bin/Source/preprocessor.64x.pp +++ b/Private/Toolchain/Apps/Source/preprocessor.64x.pp diff --git a/Private/Toolchain/bin/README.txt b/Private/Toolchain/bin/README.txt deleted file mode 100644 index 3b12775..0000000 --- a/Private/Toolchain/bin/README.txt +++ /dev/null @@ -1,2 +0,0 @@ -The C compilers (ccplus, cc) are work in progress. - - Amlal
\ No newline at end of file diff --git a/Private/Toolchain/makefile b/Private/Toolchain/makefile index e48e496..3733365 100644 --- a/Private/Toolchain/makefile +++ b/Private/Toolchain/makefile @@ -16,28 +16,28 @@ LINK_CC=x86_64-w64-mingw32-g++ -std=c++20 endif LINK_SRC=link.cc -LINK_OUTPUT=bin/link.exe -LINK_ALT_OUTPUT=bin/64link.exe -LINK_ALT_3_OUTPUT=bin/i64link.exe -LINK_ALT_2_OUTPUT=bin/32link.exe +LINK_OUTPUT=Apps/link.exe +LINK_ALT_OUTPUT=Apps/64link.exe +LINK_ALT_3_OUTPUT=Apps/i64link.exe +LINK_ALT_2_OUTPUT=Apps/32link.exe PP_SRC=bpp.cc -PP_OUTPUT=bin/bpp.exe +PP_OUTPUT=Apps/bpp.exe # C Compiler CC_SRC=cc.cc ../CompilerKit/StdKit/*.cc ../CompilerKit/AsmKit/*.cc -CC_OUTPUT=bin/cc.exe +CC_OUTPUT=Apps/cc.exe # C++ Compiler CXX_SRC=ccplus.cc ../CompilerKit/StdKit/*.cc ../CompilerKit/AsmKit/*.cc -CXX_OUTPUT=bin/ccplus.exe +CXX_OUTPUT=Apps/ccplus.exe # Assembler ASM_SRC=64asm.cc ../CompilerKit/StdKit/*.cc ../CompilerKit/AsmKit/*.cc -ASM_OUTPUT=bin/64asm.exe +ASM_OUTPUT=Apps/64asm.exe IASM_SRC=i64asm.cc ../CompilerKit/StdKit/*.cc ../CompilerKit/AsmKit/*.cc -IASM_OUTPUT=bin/i64asm.exe +IASM_OUTPUT=Apps/i64asm.exe .PHONY: all all: @@ -69,9 +69,9 @@ help: .PHONY: clean clean: - rm bin/$(MKCDFS_OUTPUT) - rm bin/$(CC_OUTPUT) - rm bin/$(PP_OUTPUT) - rm bin/$(LINK_OUTPUT) + rm Apps/$(MKCDFS_OUTPUT) + rm Apps/$(CC_OUTPUT) + rm Apps/$(PP_OUTPUT) + rm Apps/$(LINK_OUTPUT) # Last rev 8-1-24 |
