Merge branch 'master' of github.com:Kbz-8/42_KFS

Kbz-8 · Jul 20, 2024 · a902877 · a902877
2 parents d8f30b4 + 687e8ec
commit a902877
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ Build/
 *.a
 *.exe
 zig-out/
+.gdb_*
diff --git a/Makefile b/Makefile
@@ -1,11 +1,14 @@
 all :
 	@zig build
 
+debug:
+	@zig build -Ddebug=true
+
 run : fclean
 	@zig build run
 
 run-debug : fclean
-	@zig build run-debug
+	@zig build run-debug -Ddebug=true
 
 clean:
 

diff --git a/build.zig b/build.zig
@@ -2,19 +2,20 @@ const std = @import("std");
 
 pub fn build(b: *std.Build) void
 {
+    const debug_symbols = b.option(bool, "debug", "Add debug symbols") orelse false;
+
     const kernel = b.addExecutable(.{
         .name = "kernel.elf",
         .root_source_file = .{ .src_path = .{ .owner = b, .sub_path = "sources/kernel/kmain.zig" } },
-            .target = b.resolveTargetQuery(.{
+        .target = b.resolveTargetQuery(.{
             .cpu_arch = .x86,
             .abi = .none,
             .os_tag = .freestanding,
         }),
         .optimize = .Debug,
-        // .strip = true,
+        .strip = !debug_symbols,
         .code_model = .kernel,
         .pic = false,
-        .error_tracing = false,
     });
     kernel.setLinkerScriptPath(.{ .src_path = .{ .owner = b, .sub_path = "linker.ld" } });
 

diff --git a/sources/drivers/index.zig b/sources/drivers/index.zig
@@ -19,6 +19,6 @@ pub fn initDrivers() void
 pub fn shutdownDrivers() void
 {
     @setCold(true);
-    kernel.logs.klog("[Drivers Manager] unloading drivers...");
-    kernel.logs.klog("[Drivers Manager] unloaded all drivers");
+    kernel.logs.klogln("[Drivers Manager] unloading drivers...");
+    kernel.logs.klogln("[Drivers Manager] unloaded all drivers");
 }
diff --git a/sources/drivers/vga/vga.zig b/sources/drivers/vga/vga.zig
@@ -173,6 +173,7 @@ pub fn init(title : []const u8, title_color : u8, navbar_color : u8, triggered_c
     updateCursor();
     updateNavbar();
     kernel.logs.klogln("[VGA Driver] loaded");
+    kernel.stk.stackTrace(42);
 }
 
 fn putEntry(c: u8, color: u8, x: usize, y: usize) void

diff --git a/sources/kernel/arch/x86/boot.zig b/sources/kernel/arch/x86/boot.zig
@@ -27,6 +27,7 @@ export fn _start() align(16) linksection(".text.boot") callconv(.Naked) noreturn
     asm volatile
     (
         \\ movl %[stk], %esp
+        \\ xor %ebp, %ebp
         \\ call kmain
         :
         : [stk] "{ecx}" (@intFromPtr(&kernel_stack) + @sizeOf(@TypeOf(kernel_stack))),

diff --git a/sources/kernel/kmain.zig b/sources/kernel/kmain.zig
@@ -18,6 +18,7 @@ const libk = @import("libk");
 
 pub const logs = @import("log.zig");
 pub const kpanic = @import("panic.zig").kpanic;
+pub const stk = @import("stack_trace.zig");
 
 pub const arch = if(!is_test) switch(builtin.cpu.arch)
 {

diff --git a/sources/kernel/panic.zig b/sources/kernel/panic.zig
@@ -1,6 +1,7 @@
 const vga = @import("drivers").vga;
 const arch = @import("kmain.zig").arch;
 const logs = @import("log.zig");
+const stk = @import("stack_trace.zig");
 
 pub fn kpanic(message: []const u8) noreturn
 {
@@ -9,6 +10,7 @@ pub fn kpanic(message: []const u8) noreturn
     vga.setColor(vga.Color.WHITE, vga.Color.RED);
     vga.clear(vga.Color.RED);
     vga.putString(logs.getLogBuffer());
+    stk.stackTrace(42);
     vga.putString("\nkernel panic : ");
     vga.putString(message);
     vga.putString("\n[cannot recover, freezing the system]");

diff --git a/sources/kernel/stack_trace.zig b/sources/kernel/stack_trace.zig
@@ -0,0 +1,27 @@
+const libk = @import("libk");
+
+const StackFrame = packed struct
+{
+    esp: ?*StackFrame,
+    eip: u32
+};
+
+pub fn stackTrace(max_frame_stack: usize) void
+{
+    var stk: ?*StackFrame = null;
+    asm volatile
+    (
+        \\ movl %ebp, %eax
+        : [stk] "={eax}" (stk)
+        :
+        : "memory"
+    );
+    libk.io.kputs("================= Stack Trace ================= \n");
+    var frame: usize = 0;
+    while(stk.?.esp != null and frame < max_frame_stack) : (frame += 1)
+    {
+        libk.io.kprintf("fn 0x{} {}()\n", .{ stk.?.eip, "??" });
+        stk = stk.?.esp;
+    }
+    libk.io.kputs("=============== End Stack Trace =============== \n");
+}
diff --git a/sources/libk/io/out.zig b/sources/libk/io/out.zig
@@ -9,6 +9,7 @@ pub fn kputs(message: []const u8) void
 const ArgTypes = enum
 {
     Int,
+    Bool,
     Float,
     Char,
     String,
@@ -41,7 +42,7 @@ pub fn kprintf(comptime fmt: []const u8, args: anytype) void
                         if(args[arg_idx] > 0 and args[arg_idx] < 256)
                             vga.putChar(args[arg_idx])
                         else
-                            putNb(args[arg_idx]);
+                            kputNb(args[arg_idx]);
                     }
                     else if(@typeInfo(@TypeOf(args[arg_idx])) == .Array and @typeInfo(@TypeOf(args[arg_idx])).Array.child == u8)
                         kputs(args[arg_idx])
@@ -59,15 +60,29 @@ pub fn kprintf(comptime fmt: []const u8, args: anytype) void
                     else switch(@TypeOf(args[arg_idx]))
                     {
                         i8, u8, => vga.putChar(args[arg_idx]),
-                        i16, u16, i32, u32, i64, u64, isize, usize => putNb(args[arg_idx]),
+                        i16, u16, i32, u32, i64, u64, isize, usize => kputNb(args[arg_idx]),
                         f16, f32, f64, comptime_float => {},
+                        bool =>
+                        {
+                            if(args[arg_idx])
+                                kputs("true")
+                            else
+                                kputs("false");
+                        },
                         else => @compileError("could not manage auto detected type : " ++ @typeName(@TypeOf(args[arg_idx])) ++ "; please add type identifier between brackets"),
                     }
                 }
                 switch(arg_type)
                 {
+                    .Bool =>
+                    {
+                        if(args[arg_idx])
+                            kputs("true")
+                        else
+                            kputs("false");
+                    },
                     .Char => vga.putChar(args[arg_idx]),
-                    .Int => putNb(args[arg_idx]),
+                    .Int => kputNb(args[arg_idx]),
                     .Float => {},
                     .String => kputs(args[arg_idx]),
                     .Pointer => { kputs("0x"); kputs(string.toStringBase(@intFromPtr(args[arg_idx]), 16)); },
@@ -84,6 +99,7 @@ pub fn kprintf(comptime fmt: []const u8, args: anytype) void
             {
                 switch(c)
                 {
+                    'b' => arg_type = .Bool,
                     'c' => arg_type = .Char,
                     'i' => arg_type = .Int,
                     'f' => arg_type = .Float,
@@ -105,7 +121,7 @@ pub fn kprintf(comptime fmt: []const u8, args: anytype) void
     }
 }
 
-pub fn putNb(nbr: i64) void
+pub fn kputNb(nbr: i64) void
 {
     if(nbr <= -2147483648)
         vga.putString("-2147483648")
@@ -114,11 +130,11 @@ pub fn putNb(nbr: i64) void
     else if(nbr < 0)
     {
         vga.putChar('-');
-        putNb(-nbr);
+        kputNb(-nbr);
     }
     else if(nbr >= 10)
     {
-        putNb(@divFloor(nbr, 10));
+        kputNb(@divFloor(nbr, 10));
         vga.putChar(@intCast(@mod(nbr, 10) + @as(u8, 48)));
     }
     else