Skip to content

Commit e44f469

Browse files
Added bin file loading.
1 parent d44e6a7 commit e44f469

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ all:
33
@cp -v \
44
source/wing_kernel.elf \
55
source/boot/limine.cfg \
6-
source/boot/libFrostedWM.so \
6+
source/boot/libFrostedWM.bin \
77
limine/limine-bios.sys \
88
limine/limine-bios-pxe.bin \
99
limine/limine-bios-cd.bin \

source/boot/limine.cfg

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# The kernel path on the bootable file.
22
${WING_KERNEL}=boot:///wing_kernel.elf
3-
${FDM}=boot:///libFrostedWM.so
3+
${FDM}=boot:///libFrostedWM.bin
4+
${FDMold}=boot:///libFrostedWM.so
45

56
# Timeout in seconds that Limine will use before automatically booting.
67
TIMEOUT=2
@@ -20,6 +21,7 @@ TERM_FONT=boot:///iso.f16
2021
COMMENT=This mode randomize the memory location where the kernel is loaded. Architecture: ${ARCH}
2122
PROTOCOL=limine
2223

24+
# MODULE_PATH=${FDMold}
2325
MODULE_PATH=${FDM}
2426

2527
# Path to the kernel to boot. boot:/// represents the partition on which limine.cfg is located.
@@ -33,6 +35,7 @@ TERM_FONT=boot:///iso.f16
3335
# Disable KASLR (it is enabled by default for relocatable kernels)
3436
KASLR=no
3537

38+
# MODULE_PATH=${FDMold}
3639
MODULE_PATH=${FDM}
3740

3841
KERNEL_PATH=${WING_KERNEL}

source/kernel/C/kernel.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,9 @@ void main(void) {
389389

390390
int failed_attempts = 0;
391391

392+
int (*execute_binary)() = (int (*)())module_request.response->modules[1]->address;
393+
// int status_code = execute_binary();
394+
392395
// glCreateContext();
393396
// glCreateContextCustom(front_buffer, framebuffer->width, framebuffer->height);
394397
// glClearColor(0, 0, 0, 0xff);

0 commit comments

Comments
 (0)