enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-28 15:34:31 +00:00
Code Issues Actions Releases Wiki Activity

kernel: Fix boot on i386
Some checks failed
CodeQL Advanced / Analyze (${{ matrix.language }}) (manual, c-cpp) (push) Has been cancelled
Details
Deploy Documentation / Deploy Documentation to GitHub Pages (push) Has been cancelled
Details
Build OS / Build Cross-Compiler & Toolchain (push) Has been cancelled
Details
Build OS / Build amd64 (push) Has been cancelled
Details
Build OS / Build i386 (push) Has been cancelled
Details
Build OS / Build aarch64 (push) Has been cancelled
Details

Browse Source 
Signed-off-by: EnderIce2 <enderice2@protonmail.com>
This commit is contained in:
EnderIce2 2025-01-07 17:58:51 +02:00
parent 2bb997597e
commit 61b1e95629
No known key found for this signature in database
GPG Key ID: 2EE20AF089811A5A
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Kernel/arch/i386/bootstrap/Multiboot/headers/header1.s
View File

@ -15,13 +15,24 @@
along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>. along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
*/ */
.intel_syntax noprefix
.code32 .code32
.extern Multiboot_start
.section .multiboot, "a" .section .multiboot, "a"
.align 4 .align 4
MULTIBOOT_HEADER: MULTIBOOT_HEADER:
.long 0x1BADB002 .long 0x1BADB002
.long 1 << 0 | 1 << 1 .long 0x1 | 0x2 | 0x4
.long -(0x1BADB002 + (1 << 0 | 1 << 1)) .long -(0x1BADB002 + (0x1 | 0x2 | 0x4))
/* KLUDGE */
.long 0
.long 0
.long 0
.long 0
.long 0
/* VIDEO MODE */
.long 0
.long 0
.long 0
.long 0

3
Kernel/arch/i386/bootstrap/Multiboot/headers/header2.s
View File

@ -15,8 +15,6 @@
along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>. along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
*/ */
.intel_syntax noprefix
.code32 .code32
.extern Multiboot_start .extern Multiboot_start
@ -91,3 +89,4 @@ EndTag_Start:
.long EndTag_End - EndTag_Start .long EndTag_End - EndTag_Start
EndTag_End: EndTag_End:
MULTIBOOT2_HEADER_END: MULTIBOOT2_HEADER_END:
nop

4
Kernel/kernel.cpp
View File

@ -365,8 +365,12 @@ EXTERNC __no_stack_protector NIF void Entry(BootInfo *Info)
* memory management to be initialized first. * memory management to be initialized first.
*/ */
TestMemoryAllocation(); TestMemoryAllocation();
#if defined(__amd64__)
Test_stl(); Test_stl();
#else
#warning "FIXME: Test_stl() is not implemented for other architectures"
#endif #endif
#endif // DEBUG
EnableProfiler = true; EnableProfiler = true;
Main(); Main();
} }