Merge pull request #119 from assembler-0/Development

Many fixes

Author: assembler-0

kernel/core/Kernel.c

@@ -805,8 +805,8 @@ void KernelMainHigherHalf(void) {
     PrintKernelSuccess("System: Initializing interrupts...\n");
 
 #ifdef VF_CONFIG_SNOOZE_ON_BOOT
+	ClearScreen();
     Unsnooze();
-    ClearScreen();
 #endif
 
     sti();

kernel/etc/Shell.c

@@ -131,7 +131,9 @@ void ArpRequestTestProcess() {
     packet.arp.target_ip[3] = 1;
 
     uint32_t packet_size = sizeof(EthernetHeader) + sizeof(ArpPacket);
+	PrintKernel("Sending packet(s) for RTL8139");
     Rtl8139_SendPacket(&packet, packet_size);
+	PrintKernel("Sending packet(s) for E1000");
     E1000_SendPacket(&packet, packet_size);
 }
 
@@ -1123,7 +1125,6 @@ static void PcBeepHandler(const char * args) {
     KernelFree(size_str);
 }
 
-
 static const ShellCommand commands[] = {
     {"help", HelpHandler},
     {"ps", PSHandler},
@@ -1215,6 +1216,7 @@ void ShellInit(void) {
 
 void ShellProcess(void) {
     PrintKernelSuccess("System: VoidFrame Shell v0.0.2-development1 ('help' for list of commands)\n");
+    ExecuteCommand("help");
     while (1) {
         if (HasInput()) {
             const char c = GetChar();
@@ -1240,4 +1242,4 @@ void ShellProcess(void) {
             MLFQYield();
         }
     }
-}
+}

kernel/sched/MLFQ.c

@@ -1519,7 +1519,6 @@ static void Astra(void) {
     if (VfsCreateFile(astra_path) != 0) PANIC("Failed to create Astra process info file");
 
     PrintKernelSuccess("Astra: Astra active.\n");
-
     uint64_t last_check = 0;
 
     uint64_t last_integrity_scan = 0;
@@ -1605,27 +1604,21 @@ static void Astra(void) {
         }
 #endif
 
-        if (LIKELY(VfsIsFile(astra_path))) {
-            if (current_tick % 1000 == 0) {
-                char buff[1] = {0};
-                int rd = VfsReadFile(astra_path, buff, sizeof(buff));
-                if (rd > 0) {
-                    switch (buff[0]) {
-                        case 'p': PANIC("Astra: CRITICAL: Manual panic triggered via ProcINFO\n"); break;
-                        case 't': threat_level += 10; break; // for fun
-                        case 'k': ASTerminate(current->pid, "ProcINFO"); break;
-                        case 'a': CreateSecureProcess(Astra, PROC_PRIV_SYSTEM, PROC_FLAG_CORE); break;
-                        default: break;
-                    }
-                    int del_rc = VfsDelete(astra_path, false);
-                    int cr_rc  = VfsCreateFile(astra_path);
-                    if (del_rc != 0 || (cr_rc != 0 && !VfsIsFile(astra_path))) {
-                        PrintKernelWarning("Astra: ProcINFO reset failed\n");
-                    }
-                }
+        if (current_tick % 250 == 0) {
+            char buff[1] = {0};
+            if (VfsReadFile(astra_path, buff, sizeof(buff)) == -1) PANIC("Failed to read Astra process info file");
+            switch (buff[0]) {
+                case 'p': PANIC("Astra: CRITICAL: Manual panic triggered via ProcINFO\n"); break;
+                case 't': threat_level += 10; break; // for fun
+                case 'k': ASTerminate(current->pid, "ProcINFO"); break;
+                case 'a': CreateSecureProcess(Astra, PROC_PRIV_SYSTEM, PROC_FLAG_CORE); break;
+                default: break;
+            }
+            int del_rc = VfsDelete(astra_path, false);
+            int cr_rc  = VfsCreateFile(astra_path);
+            if (del_rc != 0 || (cr_rc != 0 && !VfsIsFile(astra_path))) {
+                PANIC("Astra: ProcINFO reset failed\n");
             }
-        } else {
-            (void)VfsCreateFile(astra_path);
         }
 
         // 1. Token integrity verification
@@ -1957,4 +1950,4 @@ void MLFQGetProcessStats(uint32_t pid, uint32_t* cpu_time, uint32_t* io_ops, uin
     if (io_ops) *io_ops = proc->io_operations;
     if (preemptions) *preemptions = proc->preemption_count;
     ReadUnlock(&process_table_rwlock, pid);
-}
+}

meson.build

@@ -188,9 +188,9 @@ vf_config_flags =  [
     '-DVF_CONFIG_USE_DYNAMOX',
     '-DVF_CONFIG_USE_ASTRA',
     '-DVF_CONFIG_USE_CERBERUS',
-    '-DVF_CONFIG_CERBERUS_VFS_LOGGING',
+#    '-DVF_CONFIG_CERBERUS_VFS_LOGGING',
     '-DVF_CONFIG_CERBERUS_THREAT_REPORTING',
-    #'-DVF_CONFIG_CERBERUS_STACK_PROTECTION',
+#    '-DVF_CONFIG_CERBERUS_STACK_PROTECTION',
     '-DVF_CONFIG_SCHED_MLFQ',
     '-DVF_CONFIG_PROCINFO_AUTO_CLEANUP',
     #'-DVF_CONFIG_PANIC_OVERRIDE',

mm/MemOps.c

@@ -237,4 +237,4 @@ int FastMemcmp(const void* ptr1, const void* ptr2, uint64_t size) {
         size--;
     }
     return 0;
-}
+}

ports/6502/6502.cpp

@@ -1,4 +1,4 @@
-// #include "Console.h"
+#include "Console.h"
 
 // Helper types
 using Byte = unsigned char;
@@ -349,7 +349,7 @@ struct CPU {
                 case INS_NOP: { Cycles--; } break;
 
                 default: {
-                    // PrintKernelF("Instruction not handled: %d\n", static_cast<int>(Instruction));
+                    PrintKernelF("Instruction not handled: %d\n", static_cast<int>(Instruction));
                     Cycles = 0; // Stop execution
                 } break;
             }
@@ -390,10 +390,10 @@ extern "C" void Entry6502(const char * args){
     // PC already set by reset vector
     // Execute for a number of cycles
     cpu.Execute(50, mem);
-    // PrintKernelF("A: %d\n", static_cast<int>(cpu.A));
-    // PrintKernelF("X: %d\n", static_cast<int>(cpu.X));
-    // PrintKernelF("Value at 0x10: %d\n", static_cast<int>(mem[0x10]));
-    // PrintKernelF("Zero Flag: %d\n", static_cast<int>(cpu.Z));
-    // PrintKernelF("PC: %d\n", cpu.PC);
-    // PrintKernelSuccess("6502 emulation complete.\n");
-}
+    PrintKernelF("A: %d\n", static_cast<int>(cpu.A));
+    PrintKernelF("X: %d\n", static_cast<int>(cpu.X));
+    PrintKernelF("Value at 0x10: %d\n", static_cast<int>(mem[0x10]));
+    PrintKernelF("Zero Flag: %d\n", static_cast<int>(cpu.Z));
+    PrintKernelF("PC: %d\n", cpu.PC);
+    PrintKernelSuccess("6502 emulation complete.\n");
+}