b

Signed-off-by: TalonFloof <[email protected]>

kobold/build.zig

@@ -147,7 +147,7 @@ pub fn build(b: *std.Build) void {
                 personality.root_module.code_model = .medium;
             }
             personality.root_module.addImport("perlib", perlibMod);
-            b.getInstallStep().dependOn(addInstallObjectFile(b, personality, entry.name));
+            //b.getInstallStep().dependOn(addInstallObjectFile(b, personality, entry.name));
         }
     }
 

kobold/hal/hal.zig

@@ -48,7 +48,7 @@ pub export fn HALInitialize(stackTop: usize, dtb: *allowzero anyopaque) callconv
 pub fn HALOops(s: []const u8) void {
     const oldInt = arch.intControl(false);
     std.log.err("oops (hart 0x{x}) {s}", .{ arch.getHart().hartID, s });
-    debug.PrintBacktrace(0);
+    debug.PrintBacktrace(@returnAddress());
     debug.EnterDebugger();
     _ = arch.intControl(oldInt);
 }

kobold/hal/x86_64/mem.zig

@@ -20,6 +20,8 @@ pub fn init() void {
                 highestAddress = end;
             }
             physmem.Free(entry.base + 0xffff8000_00000000, entry.length);
+        } else if (entry.kind == .bootloader_reclaimable or entry.kind == .kernel_and_modules or entry.kind == .acpi_reclaimable) {
+            physmem.reservedMem += entry.length;
         }
     }
     std.log.info("PFN Information Coverage Range 0x{x:0>16}-0x{x:0>16} ({} entries)", .{ lowestAddress, highestAddress, (highestAddress - lowestAddress) / 4096 });

kobold/hal/x86_64/timer.zig

@@ -46,7 +46,7 @@ pub fn init() void {
                 hpetAddr[2] = 1;
 
                 const hz = 1000000000000000.0 / @as(f64, @floatFromInt(clock));
-                const interval = @as(usize, @intFromFloat(apic.hpetTicksPer100NS * 10000.0 * 1000.0));
+                const interval = @as(usize, @intFromFloat(apic.hpetTicksPer100NS * 10000.0 * 100.0));
                 timer_log.info("HPET @ {d} MHz for APIC Timer Calibration", .{hz / 1000 / 1000});
                 apic.write(0x320, 0x10000);
                 apic.write(0x3e0, 0xb);
@@ -80,7 +80,9 @@ pub fn init() void {
                 const count = 0xffffffff - apic.read(0x390);
                 ticksPerSecond = @intFromFloat(@as(f64, @floatFromInt(count)) * freq);
             }
-            timer_log.info("{} APIC Ticks/s", .{ticksPerSecond});
+            const rawTicks = ticksPerSecond;
+            ticksPerSecond = (ticksPerSecond / 100000) * 100000;
+            timer_log.info("~{} APIC Ticks/s ({} Raw Ticks)", .{ ticksPerSecond, rawTicks });
         }
     }
     apic.write(0x3e0, 0xb);

kobold/kernel/physmem.zig

@@ -111,8 +111,14 @@ var freeCache: FreeCache = .{};
 
 var firstFree: ?*FreeHeader = null;
 
+pub var freeMem: usize = 0;
+pub var usedMem: usize = 0;
+pub var reservedMem: usize = 0;
+
 fn allocate(size: usize, align_: usize) ?*anyopaque {
     const newSize = size + align_;
+    freeMem -= size;
+    usedMem += size;
 
     var cursor = firstFree;
     while (cursor) |node| {
@@ -153,18 +159,23 @@ fn allocate(size: usize, align_: usize) ?*anyopaque {
         }
         cursor = next;
     }
+    freeMem += size;
+    usedMem -= size;
     return null;
 }
 
 pub fn Allocate(size: usize, align_: usize) ?*anyopaque {
     lock.acquire();
-    const a = allocate(size, align_);
+    const s = hal.AlignUp(usize, size, 16);
+    const a = allocate(s, align_);
     lock.release();
     return a;
 }
 
-pub fn Free(address: usize, size: usize) void {
+pub fn Free(address: usize, s: usize) void {
     lock.acquire();
+    const size = hal.AlignUp(usize, s, 16);
+    freeMem += size;
     const end = address + size;
     var cursor = firstFree;
     var prev: ?*FreeHeader = null;
@@ -234,13 +245,11 @@ pub fn PrintMap(cmd: []const u8, iter: *std.mem.SplitIterator(u8, .sequence)) vo
     _ = cmd;
     _ = iter;
     var cursor = firstFree;
-    var freeSpace: usize = 0;
     while (cursor) |node| {
         std.log.debug("0x{x}-0x{x} Free\n", .{ node.start, node.end - 1 });
-        freeSpace += node.end - node.start;
         cursor = node.next;
     }
-    std.log.debug(" {} KiB Free\n", .{freeSpace / 1024});
+    std.log.debug(" {} KiB Used\n {} KiB System Reserved\n {} KiB Free\n {} KiB Total\n", .{ usedMem / 1024, reservedMem / 1024, freeMem / 1024, (usedMem + reservedMem + freeMem) / 1024 });
 }
 
 pub fn DebugInit() void {

kobold/kernel/port.zig

@@ -1,6 +1,7 @@
 const std = @import("std");
 
 pub const Message = struct {
+    sourceTID: usize = 0,
     memBase: usize = 0,
     memSize: usize = 0,
     bufSize: usize = 0,

scripts/generateDebugFile.py

@@ -1,8 +1,8 @@
 from sys import stdin
 import sys
 
-files = {}
-curFile = ""
+files = {"kernel": []}
+curFile = "kernel"
 symbolCount = 0
 
 for line in stdin: