Update files

This commit is contained in:
Alex 2022-10-03 02:31:48 +03:00
parent 725538defe
commit 432096fc25
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
9 changed files with 97 additions and 13 deletions

1
.gitignore vendored
View File

@ -6,6 +6,7 @@ tools/*
!tools/*.cpp !tools/*.cpp
!tools/*.cfg !tools/*.cfg
doxygen-doc doxygen-doc
initrd.tar.gz
*.log *.log
*.img *.img
*.iso *.iso

20
.vscode/c_boilerplates.code-snippets vendored Normal file
View File

@ -0,0 +1,20 @@
{
"Fennix Kernel Header": {
"scope": "c",
"prefix": [
"head",
],
"body": [
"#ifndef __FENNIX_KERNEL_${2:header}_H__",
"#define __FENNIX_KERNEL_${2:header}_H__",
"",
"#include <types.h>",
"",
"$0",
"",
"#endif // !__FENNIX_KERNEL_${2:header}_H__",
""
],
"description": "Create kernel header."
}
}

39
.vscode/c_cpp_properties.json vendored Normal file
View File

@ -0,0 +1,39 @@
{
"configurations": [
{
"name": "Linux",
"includePath": [
"${workspaceFolder}/include/**"
],
"defines": [
"KERNEL_NAME=\"Fennix\"",
"KERNEL_VERSION=\"1.0\"",
"GIT_COMMIT=\"0000000000000000000000000000000000000000\"",
"GIT_COMMIT_SHORT=\"0000000\""
],
"compilerPath": "/usr/bin/gcc",
"cStandard": "c17",
"cppStandard": "c++20",
"intelliSenseMode": "gcc-x64",
"configurationProvider": "ms-vscode.makefile-tools",
"compilerArgs": [
"-fno-rtti",
"-fexceptions",
"-fno-pic",
"-fno-pie",
"-mno-80387",
"-mno-mmx",
"-mno-3dnow",
"-mno-red-zone",
"-mno-sse",
"-mno-sse2",
"-march=nehalem",
"-pipe",
"-mcmodel=kernel",
"-msoft-float",
"-fno-builtin"
]
}
],
"version": 4
}

26
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,26 @@
{
"C_Cpp.errorSquiggles": "Enabled",
"C_Cpp.autocompleteAddParentheses": true,
"C_Cpp.codeAnalysis.clangTidy.enabled": true,
"C_Cpp.clang_format_style": "Visual Studio",
"C_Cpp.default.intelliSenseMode": "gcc-x64",
"C_Cpp.default.cStandard": "c17",
"C_Cpp.default.cppStandard": "c++20",
"C_Cpp.intelliSenseMemoryLimit": 16384,
"editor.smoothScrolling": true,
"editor.cursorSmoothCaretAnimation": true,
"files.watcherExclude": {
"**/tools/binutils-gdb/**": true,
"**/tools/build-binutilsamd64/**": true,
"**/tools/build-binutilsarm64/**": true,
"**/tools/build-binutilsi686/**": true,
"**/tools/build-gccamd64/**": true,
"**/tools/build-gccarm64/**": true,
"**/tools/build-gcci686/**": true,
"**/tools/cross/**": true,
"**/tools/gcc/**": true,
"**/tools/limine/**": true,
"**/tools/qemu/**": true,
"**/doxygen-doc/**": true,
}
}

View File

@ -5,9 +5,6 @@
} }
], ],
"settings": { "settings": {
"debug.allowBreakpointsEverywhere": true, "debug.allowBreakpointsEverywhere": true
"files.associations": {
"ostream": "cpp"
}
} }
} }

View File

@ -105,7 +105,7 @@ build_userspace:
build_image: build_image:
mkdir -p iso_tmp_data mkdir -p iso_tmp_data
tar cf initrd.tar.gz -C Initrd/ ./ --format=ustar tar cf initrd.tar.gz -C initrd/ ./ --format=ustar
cp Kernel/kernel.fsys initrd.tar.gz \ cp Kernel/kernel.fsys initrd.tar.gz \
iso_tmp_data/ iso_tmp_data/
ifeq ($(BOOTLOADER), lynx) ifeq ($(BOOTLOADER), lynx)

View File

@ -2,10 +2,11 @@ TIMEOUT=0
INTERFACE_BRANDING=Fennix INTERFACE_BRANDING=Fennix
:Fennix (Limine) :Fennix (Limine)
# DO NOT EDIT! # DO NOT EDIT!
COMMENT=Boot Fennix using Limine protocol COMMENT=Boot Fennix using Limine protocol
RESOLUTION=1280x720 PROTOCOL=limine
PROTOCOL=limine KERNEL_CMDLINE=debug
KERNEL_CMDLINE=debug KERNEL_PATH=boot:///kernel.fsys
KERNEL_PATH=boot:///kernel.fsys
MODULE_PATH=boot:///initrd.tar.gz MODULE_PATH=boot:///initrd.tar.gz
MODULE_CMDLINE=initrd

View File

@ -79,6 +79,7 @@
If you want to build different architecture, use other QEMU binary or change kernel name you can find in <code class="panel">Makefile.conf</code> file.<br> If you want to build different architecture, use other QEMU binary or change kernel name you can find in <code class="panel">Makefile.conf</code> file.<br>
<hr color="#292929"> <hr color="#292929">
<code class="panel">DEBUG</code> &#x2022; If it's set to <code class="panel">1</code>, the kernel will be compiled in debug mode.<br> <code class="panel">DEBUG</code> &#x2022; If it's set to <code class="panel">1</code>, the kernel will be compiled in debug mode.<br>
<code class="panel">TESTING</code> &#x2022; Enable unit testing.<br>
<code class="panel">OSNAME</code> &#x2022; The name of the kernel. This can be anything.<br> <code class="panel">OSNAME</code> &#x2022; The name of the kernel. This can be anything.<br>
<code class="panel">OSARCH</code> &#x2022; The architecture of the kernel. Supported values are: <code class="panel">amd64</code> <code class="panel">i686</code> <code class="panel">aarch64</code>.<br> <code class="panel">OSARCH</code> &#x2022; The architecture of the kernel. Supported values are: <code class="panel">amd64</code> <code class="panel">i686</code> <code class="panel">aarch64</code>.<br>
<code class="panel">KERNEL_VERSION</code> &#x2022; The version of the kernel. This can be anything.<br> <code class="panel">KERNEL_VERSION</code> &#x2022; The version of the kernel. This can be anything.<br>
@ -87,7 +88,6 @@
<code class="panel">COMPILER_PATH</code> &#x2022; The path of the cross compiler. If you want to use your own cross compiler, change it to the path of the compiler.<br> <code class="panel">COMPILER_PATH</code> &#x2022; The path of the cross compiler. If you want to use your own cross compiler, change it to the path of the compiler.<br>
<code class="panel">LIMINE_FOLDER</code> &#x2022; The path of the Limine bootloader.<br> <code class="panel">LIMINE_FOLDER</code> &#x2022; The path of the Limine bootloader.<br>
<code class="panel">QEMU_PATH</code> &#x2022; Qemu path. If you want to use the one you have installed in your system, change it to /usr/bin/qemu-system- (do not include x86_64 or i386, it will be added automatically)<br> <code class="panel">QEMU_PATH</code> &#x2022; Qemu path. If you want to use the one you have installed in your system, change it to /usr/bin/qemu-system- (do not include x86_64 or i386, it will be added automatically)<br>
<code class="panel">UNIT_TESTS</code> &#x2022; Enable unit testing.<br>
That's all you can change in this file.<br> That's all you can change in this file.<br>
</div> </div>