Soo much changes, I don't even know what I did, it was quite long

Frost-Wing · Apr 29, 2024 · c4854e4 · c4854e4
1 parent 960abe2
commit c4854e4
Show file tree

Hide file tree

Showing 115 changed files with 33 additions and 35 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.gitmodules b/.gitmodules
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/Doxyfile b/Doxyfile
diff --git a/FW.png b/FW.png
diff --git a/FW100.png b/FW100.png
diff --git a/LICENSE b/LICENSE
diff --git a/Makefile b/Makefile
diff --git a/disk.txt b/disk.txt
diff --git a/doxygen-index.md b/doxygen-index.md
diff --git a/firmware/uefi/64.bin b/firmware/uefi/64.bin
diff --git a/init_ramdisk.tar b/init_ramdisk.tar
diff --git a/keys/public_key.pem b/keys/public_key.pem
diff --git a/readme.md b/readme.md
diff --git a/source/Makefile b/source/Makefile
diff --git a/source/boot/Vera.sfn b/source/boot/Vera.sfn
diff --git a/source/boot/folder.tga b/source/boot/folder.tga
diff --git a/source/boot/init_ramdisk.tar b/source/boot/init_ramdisk.tar
diff --git a/source/boot/iso.f16 b/source/boot/iso.f16
diff --git a/source/boot/limine.cfg b/source/boot/limine.cfg
diff --git a/source/boot/mouse.tga b/source/boot/mouse.tga
diff --git a/source/boot/wallpaper.tga b/source/boot/wallpaper.tga
diff --git a/source/desktop-manager/Makefile b/source/desktop-manager/Makefile
@@ -1,5 +1,6 @@
 CPPFLAGS = \
     -w \
+    -g \
     -std=gnu99 \
     -ffreestanding \
     -fno-stack-protector \

diff --git a/source/desktop-manager/dm_main.cpp b/source/desktop-manager/dm_main.cpp
@@ -42,7 +42,5 @@ void send_alive_msg(){
 int dw_main(kernel_data* data){
     send_alive_msg();
 
-    data->print("hello from desktop-manager!");
-
     return 0; // status code
 }
diff --git a/source/desktop-manager/fonts/ssfn.h b/source/desktop-manager/fonts/ssfn.h
diff --git a/source/desktop-manager/tools/signature.py b/source/desktop-manager/tools/signature.py
@@ -46,9 +46,9 @@ def append_header(file_path, architecture, file_size):
         architecture (int): Architecture information (32 or 64 bits).
         file_size (int): Size of the file in bytes.
     """
-    signature = b'FWDE' # stands for Frost Wing Deployed Executable
+    signature = bytes([0xCD, 0x31]) + b'FWDE' # stands for Frost Wing Deployed Executable
     architecture_byte = struct.pack('B', architecture)  # 'B' format code packs an unsigned char (1 byte)
-    size_byte = struct.pack('B', 0x69)  # 'B' format code packs an unsigned char (1 byte)
+    size_byte = struct.pack('h', file_size)  # 'i' format code packs an signed integer (4 bytes)
 
     endian = check_endian(file_path) # 0 = error; 1 = little; 2 = big
 

diff --git a/source/desktop-manager/x86_64-dm-linker.ld b/source/desktop-manager/x86_64-dm-linker.ld
diff --git a/source/drivers/audio/pc-speaker.c b/source/drivers/audio/pc-speaker.c
diff --git a/source/drivers/networking/ethernet/RTL/8139.c b/source/drivers/networking/ethernet/RTL/8139.c
diff --git a/source/drivers/serial.c b/source/drivers/serial.c
diff --git a/source/includes/C++/vector b/source/includes/C++/vector
diff --git a/source/includes/acpi-shutdown.h b/source/includes/acpi-shutdown.h
diff --git a/source/includes/acpi.h b/source/includes/acpi.h
diff --git a/source/includes/ahci.h b/source/includes/ahci.h
diff --git a/source/includes/algorithms/hashing.h b/source/includes/algorithms/hashing.h
diff --git a/source/includes/archive/tarball.h b/source/includes/archive/tarball.h
diff --git a/source/includes/basics.h b/source/includes/basics.h
diff --git a/source/includes/cc-asm.h b/source/includes/cc-asm.h
diff --git a/source/includes/cpuid2.h b/source/includes/cpuid2.h
diff --git a/source/includes/debugger.h b/source/includes/debugger.h
diff --git a/source/includes/drivers/pc-speaker.h b/source/includes/drivers/pc-speaker.h
diff --git a/source/includes/drivers/rtl8139.h b/source/includes/drivers/rtl8139.h
diff --git a/source/includes/drivers/serial.h b/source/includes/drivers/serial.h
diff --git a/source/includes/executables/elf.h b/source/includes/executables/elf.h
diff --git a/source/includes/executables/fwde.h b/source/includes/executables/fwde.h
@@ -11,11 +11,12 @@
 #include <basics.h>
 #include <stdbool.h>
 #include <graphics.h>
+#include <isr.h>
 
 typedef struct {
-    char signature[4]; // FWDE
+    char signature[5]; // 0xCD + 0x31 + FWDE
     int8 architecture; // 1 = 64 bits; 2 = 32 bits; 3 = 16 bits; 4 = 8 bits
-    int8 raw_size; // size of just the executable part and not the header
+    int16 raw_size; // size of just the executable part and not the header
     int8 endian; // 0 = error; 1 = little; 2 = big
 } fwde_header;
 
@@ -28,5 +29,7 @@ typedef struct
     void (*print)(cstring msg);
 } kernel_data ;
 
+typedef void(*entry_function)(kernel_data*);
 
+void process_IFL(InterruptFrame* frame);
 void execute_fwde(int64* addr, kernel_data* data);
diff --git a/source/includes/fb.h b/source/includes/fb.h
diff --git a/source/includes/flanterm/flanterm.h b/source/includes/flanterm/flanterm.h
diff --git a/source/includes/graphics.h b/source/includes/graphics.h
diff --git a/source/includes/heap.h b/source/includes/heap.h
diff --git a/source/includes/idt.h b/source/includes/idt.h
diff --git a/source/includes/image/targa.h b/source/includes/image/targa.h
diff --git a/source/includes/isr.h b/source/includes/isr.h
diff --git a/source/includes/kernel.h b/source/includes/kernel.h
diff --git a/source/includes/keyboard.h b/source/includes/keyboard.h
diff --git a/source/includes/limine.h b/source/includes/limine.h
diff --git a/source/includes/linkedlist.h b/source/includes/linkedlist.h
diff --git a/source/includes/math/fpu.h b/source/includes/math/fpu.h
diff --git a/source/includes/meltdown.h b/source/includes/meltdown.h
diff --git a/source/includes/memory2.h b/source/includes/memory2.h
diff --git a/source/includes/opengl/gl.h b/source/includes/opengl/gl.h
diff --git a/source/includes/opengl/glbackend.h b/source/includes/opengl/glbackend.h
diff --git a/source/includes/opengl/glcontext.h b/source/includes/opengl/glcontext.h
diff --git a/source/includes/opengl/glmat.h b/source/includes/opengl/glmat.h
diff --git a/source/includes/opengl/glvec.h b/source/includes/opengl/glvec.h
diff --git a/source/includes/paging.h b/source/includes/paging.h
diff --git a/source/includes/pci.h b/source/includes/pci.h
diff --git a/source/includes/pit.h b/source/includes/pit.h
diff --git a/source/includes/ps2-mouse.h b/source/includes/ps2-mouse.h
diff --git a/source/includes/secure-boot.h b/source/includes/secure-boot.h
diff --git a/source/includes/sse.h b/source/includes/sse.h
diff --git a/source/includes/strings2.h b/source/includes/strings2.h
diff --git a/source/includes/syscalls.h b/source/includes/syscalls.h
diff --git a/source/includes/unifont.h b/source/includes/unifont.h
diff --git a/source/includes/versions.h b/source/includes/versions.h
diff --git a/source/kernel/C/acpi-shutdown.c b/source/kernel/C/acpi-shutdown.c
diff --git a/source/kernel/C/acpi.c b/source/kernel/C/acpi.c
diff --git a/source/kernel/C/ahci.c b/source/kernel/C/ahci.c
diff --git a/source/kernel/C/algorithms/hashing.c b/source/kernel/C/algorithms/hashing.c
diff --git a/source/kernel/C/archive/tarball.c b/source/kernel/C/archive/tarball.c
diff --git a/source/kernel/C/cc-asm.c b/source/kernel/C/cc-asm.c
diff --git a/source/kernel/C/cpuid.c b/source/kernel/C/cpuid.c
diff --git a/source/kernel/C/debugger.c b/source/kernel/C/debugger.c
diff --git a/source/kernel/C/executables/elf.c b/source/kernel/C/executables/elf.c
diff --git a/source/kernel/C/executables/fwde.c b/source/kernel/C/executables/fwde.c
@@ -12,16 +12,24 @@
 #include <executables/fwde.h>
 
 bool verify_signature(char* signature){
-    if(signature[0] == 'F' &&
-       signature[1] == 'W' &&
-       signature[2] == 'D' &&
-       signature[3] == 'E'){
+    char interrupt_opcode = 0xCD;
+    if(signature[0] == interrupt_opcode &&
+       signature[1] == '1' &&
+       signature[2] == 'F' &&
+       signature[3] == 'W' &&
+       signature[4] == 'D' &&
+       signature[5] == 'E'){
         return true;
     }
     else
         return false;
 }
 
+void process_IFL(InterruptFrame* frame){ // process Invalid FWDE Loading
+    meltdown_screen("Frost Wing Deployed executable was not executed the way it should have!", __FILE__, __LINE__, 0xbadf1e, 0x0, 0xFfe);
+    hcf2();
+}
+
 void execute_fwde(int64* addr, kernel_data* data){
     info("Verifying the FrostWing deployed executable!", __FILE__);
 
@@ -36,24 +44,22 @@ void execute_fwde(int64* addr, kernel_data* data){
         return;
     }
 
-    if(header->endian != 1 && header->endian != 2){
+    if(*(&(header->endian)+1) != 1 && *(&(header->endian)+1) != 2){
         error("Undetermined endian executable! Abort.", __FILE__);
+        printf("Endian value = 0x%x", header->endian);
         return;
     }
 
     if(header->architecture == 1){ // 64 bits
         local += sizeof(fwde_header);
-        // if(*(local + header->raw_size) == 0){
-        //     info("Valid executable! and ready for execution!", __FILE__);
-        // }
         info("Starting executing the FrostWing deployed executable...", __FILE__);
 
-        typedef void(*EntryFunction)(kernel_data*);
-        EntryFunction execute_binary = (EntryFunction)local;
-
-        info("Function is ready!", __FILE__);
+        entry_function execute_binary = (entry_function)local;
 
+        info("Function is ready! executing it..", __FILE__);
+        print("=========================================================\n");
         execute_binary(data);
+        print("=========================================================\n");
     }else{
         error("Unsupported architecture!", __FILE__);
         return;

diff --git a/source/kernel/C/fb.c b/source/kernel/C/fb.c
diff --git a/source/kernel/C/flanterm/flanterm.c b/source/kernel/C/flanterm/flanterm.c
diff --git a/source/kernel/C/heap.c b/source/kernel/C/heap.c
diff --git a/source/kernel/C/image/targa.c b/source/kernel/C/image/targa.c
diff --git a/source/kernel/C/interrupts/idt.c b/source/kernel/C/interrupts/idt.c
@@ -4,6 +4,7 @@
 #include <ps2-mouse.h>
 #include <pit.h>
 #include <syscalls.h>
+#include <executables/fwde.h>
 
 extern void* isr_stub_table[];
 extern void* irq_stub_table[];
@@ -66,6 +67,7 @@ void initIdt()
     registerInterruptHandler(0x20, process_pit);
     registerInterruptHandler(0x2C, process_mouse);
     registerInterruptHandler(0x21, process_keyboard);
+    registerInterruptHandler(0x31, process_IFL);
     registerInterruptHandler(0x80, syscalls_handler);
 
     for (uint8_t i = 0; i < 32; i++) 

diff --git a/source/kernel/C/interrupts/interrupt-x86_64.asm b/source/kernel/C/interrupts/interrupt-x86_64.asm
diff --git a/source/kernel/C/interrupts/isr.c b/source/kernel/C/interrupts/isr.c
diff --git a/source/kernel/C/kernel.c b/source/kernel/C/kernel.c
@@ -328,19 +328,7 @@ void main(void) {
     initIdt();
 
     init_hashing();
-
-    // gdt_init();
-
-    // ~ Negative numbers test
-    int test_var = 50;
-    // test_var = -test_var;
-    // if(test_var == -50){
-    //     done("Works!", __FILE__);
-    // }
-
-    // printf("%d", test_var);
-    printf("%X", test_var);
-
+
     // "OpenGL" context creation/destroying and triangle/line drawing test code (actual opengl-like implementations coming soon(tm))
     // glCreateContext();
     // glDrawLine((uvec2){0, 0}, (uvec2){10, 30}, 0xffbaddad);

diff --git a/source/kernel/C/linkedlist.c b/source/kernel/C/linkedlist.c
diff --git a/source/kernel/C/logger.c b/source/kernel/C/logger.c
@@ -23,7 +23,7 @@ static const char caps_hex_digits[] = "0123456789ABCDEF";
  * @param file The file name where the warning occurred.
  */
 void warn(cstring message, cstring file) {
-    cstring warn_message = yellow_color "[Warning] → " reset_color;
+    cstring warn_message = yellow_color "[***] → " reset_color;
     print(warn_message);
     print(message);
     print(" at " blue_color);
@@ -46,7 +46,7 @@ void warn(cstring message, cstring file) {
  * @param file The file name where the error occurred.
  */
 void error(cstring message, cstring file) {
-    cstring err_message = red_color "[Error] → " reset_color;
+    cstring err_message = red_color "[***] → " reset_color;
     print(err_message);
     print(message);
     print(" at " blue_color);
@@ -69,7 +69,7 @@ void error(cstring message, cstring file) {
  * @param file The file name where the information is coming from.
  */
 void info(cstring message, cstring file) {
-    cstring info_message = blue_color "[Info] → " reset_color;
+    cstring info_message = blue_color "[***] → " reset_color;
     print(info_message);
     print(message);
     print(" at " blue_color);
@@ -92,7 +92,7 @@ void info(cstring message, cstring file) {
  * @param file The file name associated with the success.
  */
 void done(cstring message, cstring file) {
-    cstring done_message = green_color "[Success] → " reset_color;
+    cstring done_message = green_color "[***] → " reset_color;
     print(done_message);
     print(message);
     print(" at " blue_color);

diff --git a/source/kernel/C/math/fpu.c b/source/kernel/C/math/fpu.c
diff --git a/source/kernel/C/meltdown.c b/source/kernel/C/meltdown.c
diff --git a/source/kernel/C/memory.c b/source/kernel/C/memory.c
diff --git a/source/kernel/C/opengl/glbackend.c b/source/kernel/C/opengl/glbackend.c
diff --git a/source/kernel/C/opengl/glcontext.c b/source/kernel/C/opengl/glcontext.c
diff --git a/source/kernel/C/opengl/glmat.c b/source/kernel/C/opengl/glmat.c
diff --git a/source/kernel/C/paging.c b/source/kernel/C/paging.c
diff --git a/source/kernel/C/pci.c b/source/kernel/C/pci.c
diff --git a/source/kernel/C/pit.c b/source/kernel/C/pit.c
diff --git a/source/kernel/C/rtc.c b/source/kernel/C/rtc.c
diff --git a/source/kernel/C/secure-boot.c b/source/kernel/C/secure-boot.c
diff --git a/source/kernel/C/sse.c b/source/kernel/C/sse.c
diff --git a/source/kernel/C/strings.c b/source/kernel/C/strings.c
diff --git a/source/kernel/C/syscalls.c b/source/kernel/C/syscalls.c
diff --git a/source/kernel/C/user-input/keyboard.c b/source/kernel/C/user-input/keyboard.c
diff --git a/source/kernel/C/user-input/ps2-mouse.c b/source/kernel/C/user-input/ps2-mouse.c
diff --git a/source/linker/aarch32.ld b/source/linker/aarch32.ld
diff --git a/source/linker/aarch64.ld b/source/linker/aarch64.ld
diff --git a/source/linker/riscv64.ld b/source/linker/riscv64.ld
diff --git a/source/linker/x86_64.ld b/source/linker/x86_64.ld