commit 981b0d817f1529c39a3930e93c4c3d1211ae66d7 · pci.express/frostium

+2 -3

components/ukernel/arch/aarch64/boot.zig

···

       2
       2
        
       const std = @import("std");

     

       3
       3
        
       const arch = @import("root.zig");

     

       4
       4
        
       const common = @import("common");

     

       5
       5
       -
       const console = @import("console");

     

       6
       5
        
       const log = std.log.scoped(.aarch64_init);

     

       7
       6
        
       

     

       8
       7
        
       pub const limine_requests = struct {

     
···

       22
       21
        
       pub fn bsp_init() callconv(.c) noreturn {

     

       23
       22
        
           if (limine_requests.framebuffer.response) |fb_response| {

     

       24
       23
        
               if (fb_response.framebuffer_count > 0) {

     

       25
       25
       -
                   const fb = console.Framebuffer.from_limine(fb_response.getFramebuffers()[0]);

     

       24
       24
       +
                   const fb = common.aux.Framebuffer.from_limine(fb_response.getFramebuffers()[0]);

     

       26
       25
        
                   common.init_data.framebuffer = fb;

     

       27
       26
        
                   @memset(fb.address[0..64], 0xFF);

     

       28
       27
        
               }

     
···

       83
       82
        
       fn initConsole() void {

     

       84
       83
        
           if (limine_requests.framebuffer.response) |fb_response| {

     

       85
       84
        
               if (fb_response.framebuffer_count > 0) {

     

       86
       86
       -
                   const fb = console.Framebuffer.from_limine(fb_response.getFramebuffers()[0]);

     

       85
       85
       +
                   const fb = common.aux.Framebuffer.from_limine(fb_response.getFramebuffers()[0]);

     

       87
       86
        
                   common.init_data.framebuffer = fb;

     

       88
       87
        
                   // At this point, log becomes usable

     

       89
       88
        
                   common.init_data.console = console.Console.from_font(fb, console.DefaultFont);

+42 -5

components/ukernel/arch/amd64/boot.zig

···

       3
       3
        
       const arch = @import("root.zig");

     

       4
       4
        
       const common = @import("common");

     

       5
       5
        
       const console = @import("console");

     

       6
       6
       +
       const flanterm = @import("flanterm");

     

       6
       7
        
       const log = std.log.scoped(.amd64_init);

     

       7
       8
        
       const Idt = arch.structures.Idt;

     

       8
       9
        
       const StandardGdt = arch.structures.gdt.StandardGdt;

     
···

       237
       238
        
       fn initConsole() void {

     

       238
       239
        
           if (limine_requests.framebuffer.response) |fb_response| {

     

       239
       240
        
               if (fb_response.framebuffer_count > 0) {

     

       240
       240
       -
                   const fb = console.Framebuffer.from_limine(fb_response.getFramebuffers()[0]);

     

       241
       241
       +
                   const fb = common.aux.Framebuffer.from_limine(fb_response.getFramebuffers()[0]);

     

       241
       242
        
                   common.init_data.framebuffer = fb;

     

       242
       242
       -
                   // At this point, log becomes usable

     

       243
       243
       -
                   common.init_data.console = console.Console.from_font(fb, console.DefaultFont);

     

       244
       244
       -
                   common.init_data.console.?.setColor(0x3bcf1d, 0);

     

       243
       243
       +
       

     

       244
       244
       +
                   common.init_data.console = flanterm.init(

     

       245
       245
       +
                       //malloc and free

     

       246
       246
       +
                       null,

     

       247
       247
       +
                       null,

     

       248
       248
       +
                       // fb info

     

       249
       249
       +
                       fb.address,

     

       250
       250
       +
                       fb.width,

     

       251
       251
       +
                       fb.height,

     

       252
       252
       +
                       fb.pitch,

     

       253
       253
       +
                       fb.red_mask_size,

     

       254
       254
       +
                       fb.red_mask_shift,

     

       255
       255
       +
                       fb.green_mask_size,

     

       256
       256
       +
                       fb.green_mask_shift,

     

       257
       257
       +
                       fb.blue_mask_size,

     

       258
       258
       +
                       fb.blue_mask_shift,

     

       259
       259
       +
                       // canvas

     

       260
       260
       +
                       null,

     

       261
       261
       +
                       // colors

     

       262
       262
       +
                       flanterm.ansi_colors,

     

       263
       263
       +
                       flanterm.bold_ansi_colors,

     

       264
       264
       +
                       // default bg and fg

     

       265
       265
       +
                       null,

     

       266
       266
       +
                       null,

     

       267
       267
       +
                       // default bright bg and fg

     

       268
       268
       +
                       null,

     

       269
       269
       +
                       null,

     

       270
       270
       +
                       // font

     

       271
       271
       +
                       null,

     

       272
       272
       +
                       // font width and height

     

       273
       273
       +
                       0,

     

       274
       274
       +
                       0,

     

       275
       275
       +
                       // font spacing

     

       276
       276
       +
                       1,

     

       277
       277
       +
                       // font scale x and y

     

       278
       278
       +
                       0,

     

       279
       279
       +
                       0,

     

       280
       280
       +
                       // margin

     

       281
       281
       +
                       0,

     

       282
       282
       +
                   );

     

       245
       283
        
               }

     

       246
       284
        
           }

     

       247
       285
        
       }

     
···

       311
       349
        
       }

     

       312
       350
        
       

     

       313
       351
        
       pub fn double_fault(stack_frame: *Idt.InterruptStackFrame, err_code: u64) callconv(.{ .x86_64_interrupt = .{} }) noreturn {

     

       314
       314
       -
           common.init_data.console.?.setColor(0xf40d17, 0);

     

       315
       352
        
           log.err("FATAL DOUBLE FAULT @ 0x{x:0>16}, code 0x{x}!!!!!!!!!!!", .{ stack_frame.instruction_pointer, err_code });

     

       316
       353
        
           log.err("dying...", .{});

     

       317
       354
        
           arch.instructions.die();

+1 -1

components/ukernel/arch/amd64/interrupts/apic.zig

···

       296
       296
        
       }

     

       297
       297
        
       

     

       298
       298
        
       pub fn periodic_handler(_: *arch.structures.Idt.InterruptStackFrame) callconv(.{ .x86_64_interrupt = .{} }) void {

     

       299
       299
       -
           log.warn("Got an ACPI timer interrupt!", .{});

     

       299
       299
       +
           log.warn("Got an APIC timer interrupt!", .{});

     

       300
       300
        
           singleton.setRegister(.eoi, 0);

     

       301
       301
        
       }

+10 -6

components/ukernel/build.zig

···

       63
       63
        
               .api_revision = 3,

     

       64
       64
        
           });

     

       65
       65
        
           const spinlock_dep = b.dependency("spinlock", .{});

     

       66
       66
       -
           const console_dep = b.dependency("console", .{});

     

       66
       66
       +
           const flanterm_dep = b.dependency("flanterm", .{});

     

       67
       67
        
       

     

       68
       68
        
           const limine_mod = limine_dep.module("limine");

     

       69
       69
       -
           const console_mod = console_dep.module("console");

     

       70
       69
        
           const spinlock_mod = spinlock_dep.module("spinlock");

     

       70
       70
       +
           const flanterm_mod = b.createModule(.{

     

       71
       71
       +
               .root_source_file = b.path("common/aux/flanterm.zig"),

     

       72
       72
       +
           });

     

       73
       73
       +
           flanterm_mod.addIncludePath(flanterm_dep.path("src"));

     

       74
       74
       +
           flanterm_mod.addCSourceFile(.{ .file = flanterm_dep.path("src/flanterm.c") });

     

       75
       75
       +
           flanterm_mod.addCSourceFile(.{ .file = flanterm_dep.path("src/flanterm_backends/fb.c") });

     

       71
       76
        
       

     

       72
       77
        
           const common_mod = b.createModule(.{

     

       73
       78
        
               .root_source_file = b.path("common/root.zig"),

     

       74
       79
        
           });

     

       75
       80
        
       

     

       76
       81
        
           arch_module.addImport("limine", limine_mod);

     

       77
       77
       -
           arch_module.addImport("console", console_mod);

     

       82
       82
       +
           arch_module.addImport("flanterm", flanterm_mod);

     

       78
       83
        
           arch_module.addImport("common", common_mod);

     

       79
       84
        
       

     

       80
       80
       -
           console_mod.addImport("limine", limine_mod);

     

       81
       81
       -
       

     

       82
       85
        
           common_mod.addImport("arch", arch_module);

     

       83
       83
       -
           common_mod.addImport("console", console_mod);

     

       84
       86
        
           common_mod.addImport("spinlock", spinlock_mod);

     

       87
       87
       +
           common_mod.addImport("flanterm", flanterm_mod);

     

       88
       88
       +
           common_mod.addImport("limine", limine_mod);

     

       85
       89
        
       

     

       86
       90
        
           const kernel = b.addExecutable(.{

     

       87
       91
        
               .name = "ukernel",

components/ukernel/build.zig.zon

···

       8
       8
        
               .spinlock = .{ .path = "deps/spinlock" },

     

       9
       9
        
               .console = .{ .path = "deps/console" },

     

       10
       10
        
               .build_helpers = .{ .path = "../build_helpers" },

     

       11
       11
       +
               .flanterm = .{

     

       12
       12
       +
                   .url = "git+https://codeberg.org/Mintsuki/Flanterm.git?ref=trunk#55d228ff16234513b0df0dd12de8bc58160fc196",

     

       13
       13
       +
                   .hash = "N-V-__8AAIPRAQD-ppISTB_g_r_WTCC2e2vDOaJYZc5uhy4w",

     

       14
       14
       +
               },

     

       11
       15
        
           },

     

       12
       16
        
           .paths = .{

     

       13
       17
        
               "build.zig",

-73

components/ukernel/common/aux.zig

···

       1
       1
       -
       const console = @import("console");

     

       2
       2
       -
       const common = @import("root.zig");

     

       3
       3
       -
       const mm = common.mm;

     

       4
       4
       -
       const std = @import("std");

     

       5
       5
       -
       const arch = @import("arch");

     

       6
       6
       -
       const spinlock = @import("spinlock");

     

       7
       7
       -
       

     

       8
       8
       -
       // Types

     

       9
       9
       -
       pub const HardwareDescription = union(enum) {

     

       10
       10
       -
           /// Physical address of ACPI RSDP

     

       11
       11
       -
           acpi_rsdp: usize,

     

       12
       12
       -
           /// Virtual pointer to DTB

     

       13
       13
       -
           dtb: *anyopaque,

     

       14
       14
       -
           none,

     

       15
       15
       -
       };

     

       16
       16
       -
       

     

       17
       17
       -
       pub const InitState = struct {

     

       18
       18
       -
           bootmem: mm.bootmem.BootPmm = .{},

     

       19
       19
       -
           console: ?console.Console = null,

     

       20
       20
       -
           framebuffer: ?console.Framebuffer = null,

     

       21
       21
       -
           hardware_description: HardwareDescription = .none,

     

       22
       22
       -
           root_task: []align(4096) u8 = undefined,

     

       23
       23
       -
           hhdm_slide: usize = 0,

     

       24
       24
       -
       };

     

       25
       25
       -
       

     

       26
       26
       -
       var stdout_lock: spinlock.Spinlock = .{};

     

       27
       27
       -
       

     

       28
       28
       -
       pub fn logFn(

     

       29
       29
       -
           comptime message_level: std.log.Level,

     

       30
       30
       -
           comptime scope: @TypeOf(.enum_literal),

     

       31
       31
       -
           comptime format: []const u8,

     

       32
       32
       -
           args: anytype,

     

       33
       33
       -
       ) void {

     

       34
       34
       -
           if (common.init_data.console == null) return;

     

       35
       35
       -
       

     

       36
       36
       -
           // Use the same naming as the default logger

     

       37
       37
       -
           const level, const color = switch (message_level) {

     

       38
       38
       -
               .debug => .{ "D", 0x3bcf1d },

     

       39
       39
       -
               .err => .{ "E", 0xff0000 },

     

       40
       40
       -
               .info => .{ "I", 0x00bbbb },

     

       41
       41
       -
               .warn => .{ "W", 0xfee409 },

     

       42
       42
       -
           };

     

       43
       43
       -
           // Use same format as default once again

     

       44
       44
       -
           const scope_text = switch (scope) {

     

       45
       45
       -
               .default => "",

     

       46
       46
       -
               else => "<" ++ @tagName(scope) ++ ">",

     

       47
       47
       -
           };

     

       48
       48
       -
           const prefix = std.fmt.comptimePrint("{s}{s}: ", .{ level, scope_text });

     

       49
       49
       -
       

     

       50
       50
       -
           {

     

       51
       51
       -
               stdout_lock.lock();

     

       52
       52
       -
               defer stdout_lock.unlock();

     

       53
       53
       -
       

     

       54
       54
       -
               const cons = &common.init_data.console.?;

     

       55
       55
       -
       

     

       56
       56
       -
               cons.setColor(color, 0);

     

       57
       57
       -
               cons.writer().print(prefix ++ format ++ "\n", args) catch return;

     

       58
       58
       -
           }

     

       59
       59
       -
       }

     

       60
       60
       -
       

     

       61
       61
       -
       pub fn panic(msg: []const u8, first_trace_addr: ?usize) noreturn {

     

       62
       62
       -
           _ = first_trace_addr;

     

       63
       63
       -
           const log = std.log.scoped(.panic);

     

       64
       64
       -
           common.init_data.console.?.setColor(0xff0000, 0);

     

       65
       65
       -
           log.err("PANIC: {s}", .{msg});

     

       66
       66
       -
           var it = std.debug.StackIterator.init(@returnAddress(), @frameAddress());

     

       67
       67
       -
           defer it.deinit();

     

       68
       68
       -
           while (it.next()) |addr| {

     

       69
       69
       -
               if (addr == 0) break;

     

       70
       70
       -
               log.err("Addr: 0x{x:0>16}", .{addr});

     

       71
       71
       -
           }

     

       72
       72
       -
           arch.instructions.die();

     

       73
       73
       -
       }

+54

components/ukernel/common/aux/flanterm.zig

···

       1
       1
       +
       pub const c = @cImport({

     

       2
       2
       +
           @cInclude("flanterm.h");

     

       3
       3
       +
           @cInclude("flanterm_backends/fb.h");

     

       4
       4
       +
       });

     

       5
       5
       +
       

     

       6
       6
       +
       pub const ctx = c.struct_flanterm_context;

     

       7
       7
       +
       

     

       8
       8
       +
       pub const init = c.flanterm_fb_init;

     

       9
       9
       +
       

     

       10
       10
       +
       pub const Color = enum(u8) {

     

       11
       11
       +
           black = 30,

     

       12
       12
       +
           red = 31,

     

       13
       13
       +
           green = 32,

     

       14
       14
       +
           yellow = 33,

     

       15
       15
       +
           blue = 34,

     

       16
       16
       +
           magenta = 35,

     

       17
       17
       +
           cyan = 36,

     

       18
       18
       +
           white = 37,

     

       19
       19
       +
           default = 39,

     

       20
       20
       +
           bright_black = 90,

     

       21
       21
       +
           bright_red = 91,

     

       22
       22
       +
           bright_green = 92,

     

       23
       23
       +
           bright_yellow = 93,

     

       24
       24
       +
           bright_blue = 94,

     

       25
       25
       +
           bright_magenta = 95,

     

       26
       26
       +
           bright_cyan = 96,

     

       27
       27
       +
           bright_white = 97,

     

       28
       28
       +
       };

     

       29
       29
       +
       

     

       30
       30
       +
       var ansi_colors_backing = [8]u32{

     

       31
       31
       +
           0x000000, // Black

     

       32
       32
       +
           0xff0000, // Red

     

       33
       33
       +
           0x37dd21, // Green

     

       34
       34
       +
           0xfee409, // Yellow

     

       35
       35
       +
           0x1460d2, // Blue

     

       36
       36
       +
           0xff005d, // Magenta

     

       37
       37
       +
           0x00bbbb, // Cyan

     

       38
       38
       +
           0xbbbbbb, // White

     

       39
       39
       +
       };

     

       40
       40
       +
       pub const ansi_colors: [*]u32 = @ptrCast(&ansi_colors_backing);

     

       41
       41
       +
       

     

       42
       42
       +
       var bold_ansi_colors_backing = [8]u32{

     

       43
       43
       +
           0x545454, // Black

     

       44
       44
       +
           0xf40d17, // Red

     

       45
       45
       +
           0x3bcf1d, // Green

     

       46
       46
       +
           0xecc809, // Yellow

     

       47
       47
       +
           0x5555ff, // Blue

     

       48
       48
       +
           0xff55ff, // Magenta

     

       49
       49
       +
           0x6ae3f9, // Cyan

     

       50
       50
       +
           0xffffff, // White

     

       51
       51
       +
       };

     

       52
       52
       +
       pub const bold_ansi_colors: [*]u32 = @ptrCast(&ansi_colors_backing);

     

       53
       53
       +
       

     

       54
       54
       +
       pub const esc_end = "\x1b[0m";

+108

components/ukernel/common/aux/root.zig

···

       1
       1
       +
       const console = @import("console");

     

       2
       2
       +
       const flanterm = @import("flanterm");

     

       3
       3
       +
       const common = @import("../root.zig");

     

       4
       4
       +
       const mm = common.mm;

     

       5
       5
       +
       const std = @import("std");

     

       6
       6
       +
       const arch = @import("arch");

     

       7
       7
       +
       const spinlock = @import("spinlock");

     

       8
       8
       +
       const limine = @import("limine");

     

       9
       9
       +
       

     

       10
       10
       +
       // Types

     

       11
       11
       +
       pub const HardwareDescription = union(enum) {

     

       12
       12
       +
           /// Physical address of ACPI RSDP

     

       13
       13
       +
           acpi_rsdp: usize,

     

       14
       14
       +
           /// Virtual pointer to DTB

     

       15
       15
       +
           dtb: *anyopaque,

     

       16
       16
       +
           none,

     

       17
       17
       +
       };

     

       18
       18
       +
       

     

       19
       19
       +
       pub const InitState = struct {

     

       20
       20
       +
           bootmem: mm.bootmem.BootPmm = .{},

     

       21
       21
       +
           console: ?*flanterm.ctx = null,

     

       22
       22
       +
           framebuffer: ?common.aux.Framebuffer = null,

     

       23
       23
       +
           hardware_description: HardwareDescription = .none,

     

       24
       24
       +
           root_task: []align(4096) u8 = undefined,

     

       25
       25
       +
           hhdm_slide: usize = 0,

     

       26
       26
       +
       };

     

       27
       27
       +
       

     

       28
       28
       +
       pub const Framebuffer = struct {

     

       29
       29
       +
           const Self = @This();

     

       30
       30
       +
           address: [*]u32,

     

       31
       31
       +
           width: u64,

     

       32
       32
       +
           height: u64,

     

       33
       33
       +
           pitch: u64,

     

       34
       34
       +
           bypp: u16,

     

       35
       35
       +
           red_mask_size: u8,

     

       36
       36
       +
           red_mask_shift: u8,

     

       37
       37
       +
           green_mask_size: u8,

     

       38
       38
       +
           green_mask_shift: u8,

     

       39
       39
       +
           blue_mask_size: u8,

     

       40
       40
       +
           blue_mask_shift: u8,

     

       41
       41
       +
       

     

       42
       42
       +
           pub fn from_limine(fb: *const limine.Framebuffer) Self {

     

       43
       43
       +
               return .{

     

       44
       44
       +
                   .address = @ptrCast(@alignCast(fb.address)),

     

       45
       45
       +
                   .width = fb.width,

     

       46
       46
       +
                   .height = fb.height,

     

       47
       47
       +
                   .pitch = fb.pitch,

     

       48
       48
       +
                   .red_mask_size = fb.red_mask_size,

     

       49
       49
       +
                   .red_mask_shift = fb.red_mask_shift,

     

       50
       50
       +
                   .green_mask_size = fb.green_mask_size,

     

       51
       51
       +
                   .green_mask_shift = fb.green_mask_shift,

     

       52
       52
       +
                   .blue_mask_size = fb.blue_mask_size,

     

       53
       53
       +
                   .blue_mask_shift = fb.blue_mask_shift,

     

       54
       54
       +
                   .bypp = fb.bpp / 8,

     

       55
       55
       +
               };

     

       56
       56
       +
           }

     

       57
       57
       +
       };

     

       58
       58
       +
       

     

       59
       59
       +
       var stdout_lock: spinlock.Spinlock = .{};

     

       60
       60
       +
       

     

       61
       61
       +
       pub fn logFn(

     

       62
       62
       +
           comptime message_level: std.log.Level,

     

       63
       63
       +
           comptime scope: @TypeOf(.enum_literal),

     

       64
       64
       +
           comptime format: []const u8,

     

       65
       65
       +
           args: anytype,

     

       66
       66
       +
       ) void {

     

       67
       67
       +
           if (common.init_data.console == null) return;

     

       68
       68
       +
       

     

       69
       69
       +
           // Use the same naming as the default logger

     

       70
       70
       +
           const level, const color: flanterm.Color = switch (message_level) {

     

       71
       71
       +
               .debug => .{ "D", .green },

     

       72
       72
       +
               .err => .{ "E", .red },

     

       73
       73
       +
               .info => .{ "I", .cyan },

     

       74
       74
       +
               .warn => .{ "W", .yellow },

     

       75
       75
       +
           };

     

       76
       76
       +
           // Use same format as default once again

     

       77
       77
       +
           const scope_text = switch (scope) {

     

       78
       78
       +
               .default => "",

     

       79
       79
       +
               else => "<" ++ @tagName(scope) ++ ">",

     

       80
       80
       +
           };

     

       81
       81
       +
           const prefix = std.fmt.comptimePrint("{s}{s}: ", .{ level, scope_text });

     

       82
       82
       +
       

     

       83
       83
       +
           {

     

       84
       84
       +
               const esc_seq = std.fmt.comptimePrint("\x1b[{}m", .{@intFromEnum(color)});

     

       85
       85
       +
               stdout_lock.lock();

     

       86
       86
       +
               defer stdout_lock.unlock();

     

       87
       87
       +
       

     

       88
       88
       +
               var backing_buf = std.mem.zeroes([512]u8);

     

       89
       89
       +
               const buf = std.fmt.bufPrint(backing_buf[0..], esc_seq ++ prefix ++ format ++ flanterm.esc_end ++ "\n", args) catch return;

     

       90
       90
       +
       

     

       91
       91
       +
               flanterm.c.flanterm_write(common.init_data.console, buf.ptr, buf.len);

     

       92
       92
       +
               // cons.setColor(color, 0);

     

       93
       93
       +
               // cons.writer().print(prefix ++ format ++ "\n", args) catch return;

     

       94
       94
       +
           }

     

       95
       95
       +
       }

     

       96
       96
       +
       

     

       97
       97
       +
       pub fn panic(msg: []const u8, first_trace_addr: ?usize) noreturn {

     

       98
       98
       +
           _ = first_trace_addr;

     

       99
       99
       +
           const log = std.log.scoped(.panic);

     

       100
       100
       +
           log.err("PANIC: {s}", .{msg});

     

       101
       101
       +
           var it = std.debug.StackIterator.init(@returnAddress(), @frameAddress());

     

       102
       102
       +
           defer it.deinit();

     

       103
       103
       +
           while (it.next()) |addr| {

     

       104
       104
       +
               if (addr == 0) break;

     

       105
       105
       +
               log.err("Addr: 0x{x:0>16}", .{addr});

     

       106
       106
       +
           }

     

       107
       107
       +
           arch.instructions.die();

     

       108
       108
       +
       }

+1 -1

components/ukernel/common/root.zig

···

       1
       1
       -
       pub const aux = @import("aux.zig");

     

       1
       1
       +
       pub const aux = @import("aux/root.zig");

     

       2
       2
        
       pub const mm = @import("mm/root.zig");

     

       3
       3
        
       pub const loadRootTask = loader.loadRootTask;

     

       4
       4
        
       const loader = @import("loader.zig");

-7

components/ukernel/deps/console/build.zig

···

       1
       1
       -
       const std = @import("std");

     

       2
       2
       -
       

     

       3
       3
       -
       pub fn build(b: *std.Build) void {

     

       4
       4
       -
           _ = b.addModule("console", .{

     

       5
       5
       -
               .root_source_file = b.path("console.zig"),

     

       6
       6
       -
           });

     

       7
       7
       -
       }

-18

components/ukernel/deps/console/build.zig.zon

···

       1
       1
       -
       .{

     

       2
       2
       -
           .name = .console,

     

       3
       3
       -
           .fingerprint = 0x3603cfb6f7920fba,

     

       4
       4
       -
           .version = "0.0.1",

     

       5
       5
       -
           .minimum_zig_version = "0.15.1",

     

       6
       6
       -
           .dependencies = .{

     

       7
       7
       -
               .limine = .{

     

       8
       8
       -
                   .path = "../limine-zig",

     

       9
       9
       -
               },

     

       10
       10
       -
           },

     

       11
       11
       -
           .paths = .{

     

       12
       12
       -
               "build.zig",

     

       13
       13
       -
               "build.zig.zon",

     

       14
       14
       -
               "console.zig",

     

       15
       15
       -
               "psf2.zig",

     

       16
       16
       -
               "fonts",

     

       17
       17
       -
           },

     

       18
       18
       -
       }

-195

components/ukernel/deps/console/console.zig

···

       1
       1
       -
       const limine = @import("limine");

     

       2
       2
       -
       const builtin = @import("builtin");

     

       3
       3
       -
       const psf2 = @import("psf2.zig");

     

       4
       4
       -
       pub const Font = psf2.Font;

     

       5
       5
       -
       const std = @import("std");

     

       6
       6
       -
       const fontdata = @embedFile("fonts/spleen-12x24.psf");

     

       7
       7
       -
       const are_we_le = builtin.cpu.arch.endian() == .little;

     

       8
       8
       -
       

     

       9
       9
       -
       pub const DefaultFont = Font.new(fontdata) catch unreachable;

     

       10
       10
       -
       

     

       11
       11
       -
       pub const Framebuffer = struct {

     

       12
       12
       -
           const Self = @This();

     

       13
       13
       -
           address: [*]u8,

     

       14
       14
       -
           width: u64,

     

       15
       15
       -
           height: u64,

     

       16
       16
       -
           pitch: u64,

     

       17
       17
       -
           bypp: u16,

     

       18
       18
       -
           red_mask_size: u8,

     

       19
       19
       -
           red_mask_shift: u8,

     

       20
       20
       -
           green_mask_size: u8,

     

       21
       21
       -
           green_mask_shift: u8,

     

       22
       22
       -
           blue_mask_size: u8,

     

       23
       23
       -
           blue_mask_shift: u8,

     

       24
       24
       -
       

     

       25
       25
       -
           pub fn from_limine(fb: *const limine.Framebuffer) Self {

     

       26
       26
       -
               return .{

     

       27
       27
       -
                   .address = @ptrCast(fb.address),

     

       28
       28
       -
                   .width = fb.width,

     

       29
       29
       -
                   .height = fb.height,

     

       30
       30
       -
                   .pitch = fb.pitch,

     

       31
       31
       -
                   .red_mask_size = fb.red_mask_size,

     

       32
       32
       -
                   .red_mask_shift = fb.red_mask_shift,

     

       33
       33
       -
                   .green_mask_size = fb.green_mask_size,

     

       34
       34
       -
                   .green_mask_shift = fb.green_mask_shift,

     

       35
       35
       -
                   .blue_mask_size = fb.blue_mask_size,

     

       36
       36
       -
                   .blue_mask_shift = fb.blue_mask_shift,

     

       37
       37
       -
                   .bypp = fb.bpp / 8,

     

       38
       38
       -
               };

     

       39
       39
       -
           }

     

       40
       40
       -
       };

     

       41
       41
       -
       

     

       42
       42
       -
       pub const Console = struct {

     

       43
       43
       -
           const Self = @This();

     

       44
       44
       -
           const Writer = std.io.GenericWriter(*Self, error{}, write);

     

       45
       45
       -
           // framebuffer data

     

       46
       46
       -
           fb: Framebuffer,

     

       47
       47
       -
           // font

     

       48
       48
       -
           font: psf2.Font,

     

       49
       49
       -
           // state data

     

       50
       50
       -
           current_x: u64 = 0,

     

       51
       51
       -
           current_y: u64 = 0,

     

       52
       52
       -
           fg_color: u32 = 0xFFFFFFFF,

     

       53
       53
       -
           bg_color: u32 = 0,

     

       54
       54
       -
       

     

       55
       55
       -
           pub fn from_font(fb: Framebuffer, font: psf2.Font) Self {

     

       56
       56
       -
               return .{

     

       57
       57
       -
                   .fb = fb,

     

       58
       58
       -
                   .font = font,

     

       59
       59
       -
               };

     

       60
       60
       -
           }

     

       61
       61
       -
       

     

       62
       62
       -
           // places a character at the given position

     

       63
       63
       -
           pub fn putchar(self: *const Self, ch: u8, cx: u64, cy: u64, fg_val: u32, bg_val: u32) void {

     

       64
       64
       -
               // convert colors to bytes

     

       65
       65
       -
               const fg_bytes: [4]u8 = @bitCast(if (are_we_le) fg_val else @byteSwap(fg_val));

     

       66
       66
       -
               const bg_bytes: [4]u8 = @bitCast(if (are_we_le) bg_val else @byteSwap(bg_val));

     

       67
       67
       -
               // initial calculations

     

       68
       68
       -
               const bytes_per_line = self.font.hdr.bytesPerLine();

     

       69
       69
       -
               const mask_shamt: u5 = @intCast(bytes_per_line * 8 - 1);

     

       70
       70
       -
               const mask_initial: u32 = @as(u32, 1) << mask_shamt;

     

       71
       71
       -
               const glyph = self.font.getGlyph(ch) catch return;

     

       72
       72
       -
       

     

       73
       73
       -
               // find the screen offset for the beignning of the character

     

       74
       74
       -
               // add pitch to go to next line...

     

       75
       75
       -
               var offset: u64 = (cy * self.font.hdr.height * self.fb.pitch) + (cx * (self.font.hdr.width + 0) * self.fb.bypp);

     

       76
       76
       -
               // run for every line

     

       77
       77
       -
               var y: u32 = 0;

     

       78
       78
       -
               var mask: u32 = 0;

     

       79
       79
       -
               while (y < self.font.hdr.height) : (y += 1) {

     

       80
       80
       -
                   // initialize the mask and the current line

     

       81
       81
       -
                   mask = mask_initial;

     

       82
       82
       -
       

     

       83
       83
       -
                   // get the current line

     

       84
       84
       -
                   const line_value: u32 = psf2.readIntTo32(glyph[y * bytes_per_line ..][0..bytes_per_line]);

     

       85
       85
       -
                   var line_offset: u64 = offset;

     

       86
       86
       -
                   var x: u32 = 0;

     

       87
       87
       -
                   while (x < self.font.hdr.width) : (x += 1) {

     

       88
       88
       -
                       // write the pixel value to the correct position of the screen...

     

       89
       89
       -
                       if (line_value & mask != 0) {

     

       90
       90
       -
                           @memcpy(self.fb.address[line_offset..][0..self.fb.bypp], fg_bytes[0..]);

     

       91
       91
       -
                       } else {

     

       92
       92
       -
                           @memcpy(self.fb.address[line_offset..][0..self.fb.bypp], bg_bytes[0..]);

     

       93
       93
       -
                       }

     

       94
       94
       -
                       line_offset += self.fb.bypp;

     

       95
       95
       -
                       mask >>= 1;

     

       96
       96
       -
                   }

     

       97
       97
       -
                   offset += self.fb.pitch;

     

       98
       98
       -
               }

     

       99
       99
       -
           }

     

       100
       100
       -
       

     

       101
       101
       -
           pub fn putc(self: *Self, ch: u8) void {

     

       102
       102
       -
               // input can be \r, \n, or printable.

     

       103
       103
       -
               // ignore \r, move down for \n, and print char normally

     

       104
       104
       -
               // if \n, check to see if we overrun then scroll

     

       105
       105
       -
               // if normal, see if we overrun the end and do newline

     

       106
       106
       -
               if (ch == '\r') return;

     

       107
       107
       -
               if (ch == '\n') {

     

       108
       108
       -
                   self.current_x = 0;

     

       109
       109
       -
                   self.current_y += 1;

     

       110
       110
       -
                   // go to top if we went below the bottom of the screen

     

       111
       111
       -
                   if (self.current_y >= self.maxCharsHeight()) {

     

       112
       112
       -
                       self.scrollUp(1);

     

       113
       113
       -
                       self.current_y = self.maxCharsHeight() - 1;

     

       114
       114
       -
                   }

     

       115
       115
       -
                   return;

     

       116
       116
       -
               }

     

       117
       117
       -
               self.putchar(ch, self.current_x, self.current_y, self.fg_color, self.bg_color);

     

       118
       118
       -
               self.current_x += 1;

     

       119
       119
       -
       

     

       120
       120
       -
               if (self.current_x < self.maxCharsWidth()) return;

     

       121
       121
       -
               self.current_x = 0;

     

       122
       122
       -
               self.current_y += 1;

     

       123
       123
       -
               if (self.current_y >= self.maxCharsHeight()) {

     

       124
       124
       -
                   self.scrollUp(1);

     

       125
       125
       -
                   self.current_y = self.maxCharsHeight() - 1;

     

       126
       126
       -
               }

     

       127
       127
       -
           }

     

       128
       128
       -
       

     

       129
       129
       -
           pub fn puts(self: *Self, msg: []const u8) void {

     

       130
       130
       -
               for (msg) |ch| {

     

       131
       131
       -
                   self.putc(ch);

     

       132
       132
       -
               }

     

       133
       133
       -
           }

     

       134
       134
       -
       

     

       135
       135
       -
           fn convertColor(self: *const Self, color: u32) u32 {

     

       136
       136
       -
               const mult: u32 = blk: {

     

       137
       137
       -
                   const width: u4 = @truncate(self.fb.red_mask_size);

     

       138
       138
       -
                   break :blk (@as(u32, 1) << width) - 1;

     

       139
       139
       -
               };

     

       140
       140
       -
               const div = 255;

     

       141
       141
       -
               const red: u32 = (color >> 16) & 0xFF;

     

       142
       142
       -
               const green: u32 = (color >> 8) & 0xFF;

     

       143
       143
       -
               const blue: u32 = color & 0xFF;

     

       144
       144
       -
       

     

       145
       145
       -
               const red_shift: u5 = @truncate(self.fb.red_mask_shift);

     

       146
       146
       -
               const green_shift: u5 = @truncate(self.fb.green_mask_shift);

     

       147
       147
       -
               const blue_shift: u5 = @truncate(self.fb.blue_mask_shift);

     

       148
       148
       -
       

     

       149
       149
       -
               return (((red * mult) / div) << red_shift) | (((green * mult) / div) << green_shift) | (((blue * mult) / div) << blue_shift);

     

       150
       150
       -
           }

     

       151
       151
       -
       

     

       152
       152
       -
           pub fn setColor(self: *Self, fg: u32, bg: u32) void {

     

       153
       153
       -
               self.fg_color = self.convertColor(fg);

     

       154
       154
       -
               self.bg_color = self.convertColor(bg);

     

       155
       155
       -
           }

     

       156
       156
       -
       

     

       157
       157
       -
           pub fn writer(self: *Self) Writer {

     

       158
       158
       -
               return .{ .context = self };

     

       159
       159
       -
           }

     

       160
       160
       -
       

     

       161
       161
       -
           pub fn write(self: *Self, buffer: []const u8) !usize {

     

       162
       162
       -
               self.puts(buffer);

     

       163
       163
       -
               return buffer.len;

     

       164
       164
       -
           }

     

       165
       165
       -
       

     

       166
       166
       -
           // scroll the lines of text, without doing anything else.

     

       167
       167
       -
           // erase the first line of text, and memcpy the second line and on up to the first

     

       168
       168
       -
           pub fn scrollUp(self: *Self, amount: u64) void {

     

       169
       169
       -
               const num_lines = self.maxCharsHeight();

     

       170
       170
       -
               const h = self.font.hdr.height;

     

       171
       171
       -
               if (amount > num_lines) return; // later just clear the entire screen

     

       172
       172
       -
               var i: u64 = amount;

     

       173
       173
       -
               while (i < num_lines) : (i += 1) {

     

       174
       174
       -
                   // for each run, erase the previous line and copy the current line up a line.

     

       175
       175
       -
                   // const curr_line = self.fb.address[i * h * self.fb.pitch .. (i + 1) * h * self.fb.pitch];

     

       176
       176
       -
                   const curr_line = self.fb.address[i * h * self.fb.pitch ..][0 .. h * self.fb.pitch];

     

       177
       177
       -
                   const prev_line = self.fb.address[(i - amount) * h * self.fb.pitch ..][0 .. h * self.fb.pitch];

     

       178
       178
       -
       

     

       179
       179
       -
                   @memset(prev_line, 0);

     

       180
       180
       -
                   @memcpy(prev_line, curr_line);

     

       181
       181
       -
               }

     

       182
       182
       -
               // finally, delete the last line (s)

     

       183
       183
       -
               // const last_line = self.fb.address[(num_lines - amount) * h * self.fb.pitch .. (num_lines) * h * self.fb.pitch];

     

       184
       184
       -
               const last_line = self.fb.address[(num_lines - amount) * h * self.fb.pitch ..][0 .. amount * h * self.fb.pitch];

     

       185
       185
       -
               @memset(last_line, 0);

     

       186
       186
       -
           }

     

       187
       187
       -
       

     

       188
       188
       -
           fn maxCharsWidth(self: *const Self) u64 {

     

       189
       189
       -
               return self.fb.width / (self.font.hdr.width + 0);

     

       190
       190
       -
           }

     

       191
       191
       -
       

     

       192
       192
       -
           fn maxCharsHeight(self: *const Self) u64 {

     

       193
       193
       -
               return self.fb.height / self.font.hdr.height;

     

       194
       194
       -
           }

     

       195
       195
       -
       };

-24

components/ukernel/deps/console/fonts/LICENSE.spleen

···

       1
       1
       -
       Copyright (c) 2018-2024, Frederic Cambus

     

       2
       2
       -
       All rights reserved.

     

       3
       3
       -
       

     

       4
       4
       -
       Redistribution and use in source and binary forms, with or without

     

       5
       5
       -
       modification, are permitted provided that the following conditions are met:

     

       6
       6
       -
       

     

       7
       7
       -
         * Redistributions of source code must retain the above copyright

     

       8
       8
       -
           notice, this list of conditions and the following disclaimer.

     

       9
       9
       -
       

     

       10
       10
       -
         * Redistributions in binary form must reproduce the above copyright

     

       11
       11
       -
           notice, this list of conditions and the following disclaimer in the

     

       12
       12
       -
           documentation and/or other materials provided with the distribution.

     

       13
       13
       -
       

     

       14
       14
       -
       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

     

       15
       15
       -
       AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

     

       16
       16
       -
       IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

     

       17
       17
       -
       ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS

     

       18
       18
       -
       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

     

       19
       19
       -
       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

     

       20
       20
       -
       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

     

       21
       21
       -
       INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

     

       22
       22
       -
       CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

     

       23
       23
       -
       ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

     

       24
       24
       -
       POSSIBILITY OF SUCH DAMAGE.

components/ukernel/deps/console/fonts/bold16x32.psf