Modified PANIC function

kernel/libc/Makefile

@@ -1,7 +1,8 @@
-OBJS = stdio.o string.o assert.o time.o
+OBJS = stdio.o string.o panic.o time.o
+VER := $(shell git rev-parse --short HEAD)
 
 CC = i686-elf-gcc # cross-compiler
-CFLAGS = -m32 -fno-stack-protector -ffreestanding -Wall -Wextra -Werror -g -c
+CFLAGS = -DVULCAN_VERSION=$(VER) -m32 -fno-stack-protector -ffreestanding -Wall -Wextra -Werror -g -c
 
 
 all:${OBJS}

kernel/libc/assert.c

@@ -1,31 +0,0 @@
-#include "assert.h"
-
-// We panic when we find a critical error, this function is called by assert macro
-extern void panic(const char *message, const char *file, uint32_t line) {
-    asm volatile("cli"); // Disable interrupts
-
-    kprint((uint8_t*)"PANIC(");
-    kprint((uint8_t*)message);
-    kprint((uint8_t*)") at ");
-    kprint((uint8_t*)file);
-    kprint((uint8_t*)":");
-    kprint_dec(line);
-    kprint((uint8_t*)"\n");
-    // Now hang on for ever
-    for(;;);
-}
-
-// Check for assertion failed, this function call by assert macro
-extern void panic_assert(const char *file, uint32_t line, const char *desc) {
-    asm volatile("cli"); // Disable interrupts
-
-    kprint((uint8_t*)"ASSERTION-FAILED(");
-    kprint((uint8_t*)desc);
-    kprint((uint8_t*)") at ");
-    kprint((uint8_t*)file);
-    kprint((uint8_t*)":");
-    kprint_dec(line);
-    kprint((uint8_t*)"\n");
-    // Now hang on forever
-    for(;;);
-}

kernel/libc/panic.c

@@ -0,0 +1,51 @@
+#include "panic.h"
+#include "../drivers/cpuid.h"
+#include "../libc/stdio.h"
+#include "../libc/string.h"
+
+#define KINFO printf("["); printf_color(" I ", LIGHT_RED, BLACK); printf("]: ");
+#define STRINGIZE(x) #x
+#define STRINGIZE_VALUE_OF(x) STRINGIZE(x)
+
+
+// We panic when we find a critical error, this function is called by assert macro
+extern void panic(const char *message, const char *file, uint32_t line) {
+    uint8_t version[64];
+#ifdef VULCAN_VERSION
+    strcpy(version, (uint8_t*)STRINGIZE_VALUE_OF(VULCAN_VERSION));
+#else
+    #error "-DVULCAN_VERSION flag not set"
+#endif
+    printf_color("=============================================\n", LIGHT_MAGENTA, BLACK);
+    printf_color("          .:: KERNEL PANIC ::.  \n", LIGHT_RED, BLACK);
+    printf_color("Reason: ", LIGHT_BROWN, BLACK);
+    printf("'%s' at '%s':%d\n", message, file, line);
+    KINFO
+    printf_color("Disabling interrupts\n", LIGHT_GREEN, BLACK);
+    asm volatile("cli"); // Disable interrupts
+    KINFO
+    printf_color("Dropping you into an endless loop\n", LIGHT_GREEN, BLACK);
+    KINFO
+    printf_color("Your are on your own now...good luck.\n", LIGHT_GREEN, BLACK);
+    KINFO
+    printf_color("VulcanOS version: ", LIGHT_GREEN, BLACK);
+    printf_color((char*)version, LIGHT_CYAN, BLACK);
+    printf_color("\n\t\t (c) 2019-2021 Marco Cetica", LIGHT_BROWN, BLACK);
+    printf_color("\n=============================================\n", LIGHT_MAGENTA, BLACK);
+    for(;;);
+}
+
+// Check for assertion failed, this function is called by assert macro
+extern void panic_assert(const char *file, uint32_t line, const char *desc) {
+    asm volatile("cli"); // Disable interrupts
+
+    kprint((uint8_t*)"ASSERTION-FAILED(");
+    kprint((uint8_t*)desc);
+    kprint((uint8_t*)") at ");
+    kprint((uint8_t*)file);
+    kprint((uint8_t*)":");
+    kprint_dec(line);
+    kprint((uint8_t*)"\n");
+    // Now hang on forever
+    for(;;);
+}

kernel/libc/panic.h

@@ -5,12 +5,11 @@
  *       Released under GPLv3         *
  * https://github.com/ice-bit/iceOS   *
  ***************************************/
-#ifndef ASSERT_H
-#define ASSERT_H
+#ifndef PANIC_H
+#define PANIC_H
 
 #include <stdint.h>
 #include "../drivers/tty.h"
-// These functions are used for error checking
 
 #define PANIC(msg) panic(msg, __FILE__, __LINE__);
 #define ASSERT(b) ((b) ? (void)0 : panic_assert(__FILE__, __LINE__, #b))