commit e02057b7b261fb1f84edc2365789a2a12cfb5a03 · pci.express/frostium

+3 -4

build.zig.zon

···

       14
       14
        
                   .path = "components/build_helpers",

     

       15
       15
        
               },

     

       16
       16
        
               .limine_binary = .{

     

       17
       17
       -
                   .url = "git+https://codeberg.org/Limine/Limine?ref=v9.x-binary#acf1e35c4685dba7ef271013db375a727c340ff7",

     

       18
       18
       -
                   .hash = "N-V-__8AAOkzSACT_9p6kmSSly1l008erzXuG39Z6r54B_y0",

     

       19
       19
       -
                   // Codeberg is always down so better to leave it not lazy

     

       20
       20
       -
                   // .lazy = true,

     

       17
       17
       +
                   .url = "git+https://codeberg.org/Limine/Limine?ref=v10.x-binary#648e33afd153bdbf780ba123e45997428796395d",

     

       18
       18
       +
                   .hash = "N-V-__8AAJ8bSADxAGaebgaAbkAR2kqOBy52rXAL0oCumn0t",

     

       19
       19
       +
                   .lazy = true,

     

       21
       20
        
               },

     

       22
       21
        
               .edk2_binary = .{

     

       23
       22
        
                   .url = "git+https://github.com/retrage/edk2-nightly#23068f498687bf64f2b8f80fbcf11e82d987fd9b",

+2 -2

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

···

       243
       243
        
               //     .priority_class = 0,

     

       244
       244
        
               //     .priority_sub_class = 0,

     

       245
       245
        
               // });

     

       246
       246
       -
               arch.interrupts.idt.add_handler(.{ .interrupt = 0xFF }, u64, spurious_interrupt_handler, 3, 0);

     

       247
       247
       -
               arch.interrupts.idt.add_handler(.{ .interrupt = 48 }, u64, timer_handler, 3, 0);

     

       246
       246
       +
               arch.interrupts.idt.add_handler(.{ .interrupt = 0xFF }, u64, spurious_interrupt_handler, 0, 0);

     

       247
       247
       +
               arch.interrupts.idt.add_handler(.{ .interrupt = 48 }, u64, timer_handler, 0, 0);

     

       248
       248
        
       

     

       249
       249
        
               // Calibrate against the TSC

     

       250
       250
        
               calibrateTimer();

+1 -1

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

···

       285
       285
        
           // Set every IDT entry to the corresponding ActualHandler

     

       286
       286
        
           for (0..entry_count) |i| {

     

       287
       287
        
               const actual_handler = @intFromPtr(actual_handlers[i]);

     

       288
       288
       -
               interrupt_descriptor_table[i] = Entry.init(actual_handler, 3, 0);

     

       288
       288
       +
               interrupt_descriptor_table[i] = Entry.init(actual_handler, 0, 0);

     

       289
       289
        
           }

     

       290
       290
        
           // Now, set every defined handler to the default one

     

       291
       291
        
           @memset(&defined_handlers, arch.interrupts.unhandled_interrupt);

+1 -1

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

···

       53
       53
        
           wait();

     

       54
       54
        
       

     

       55
       55
        
           // Set up a spurious IRQ7 handler

     

       56
       56
       -
           arch.interrupts.idt.add_handler(.{ .interrupt = 32 + 7 }, u64, spurious_handler, 3, 0);

     

       56
       56
       +
           arch.interrupts.idt.add_handler(.{ .interrupt = 32 + 7 }, u64, spurious_handler, 0, 0);

     

       57
       57
        
       }

     

       58
       58
        
       

     

       59
       59
        
       inline fn wait() void {

+4 -3

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

···

       75
       75
        
       }

     

       76
       76
        
       

     

       77
       77
        
       pub fn general_protection_fault(stack_frame: *idt.InterruptFrame(idt.SelectorErrorCode)) callconv(idt.CallConv) void {

     

       78
       78
       +
           arch.interrupts.disable();

     

       78
       79
        
           std.log.warn("General Protection Fault @ 0x{x}", .{stack_frame.rip});

     

       79
       80
        
       

     

       80
       81
        
           const target = stack_frame.error_code.parse();

     
···

       116
       117
        
           // Set up the IDT and associated vectors

     

       117
       118
        
           idt.init();

     

       118
       119
        
           idt.add_handler(.{ .exception = .breakpoint }, u64, arch.interrupts.breakpoint, 3, 0);

     

       119
       119
       -
           idt.add_handler(.{ .exception = .double_fault }, u64, arch.interrupts.double_fault, 3, 0);

     

       120
       120
       -
           idt.add_handler(.{ .exception = .general_protection_fault }, idt.SelectorErrorCode, arch.interrupts.general_protection_fault, 3, 0);

     

       121
       121
       -
           idt.add_handler(.{ .exception = .page_fault }, u64, arch.mm.paging.page_fault_handler, 3, 0);

     

       120
       120
       +
           idt.add_handler(.{ .exception = .double_fault }, u64, arch.interrupts.double_fault, 0, 0);

     

       121
       121
       +
           idt.add_handler(.{ .exception = .general_protection_fault }, idt.SelectorErrorCode, arch.interrupts.general_protection_fault, 0, 0);

     

       122
       122
       +
           idt.add_handler(.{ .exception = .page_fault }, u64, arch.mm.paging.page_fault_handler, 0, 0);

     

       122
       123
        
           // Set up the 8254's (we need 8259 timer to calibrate tsc)

     

       123
       124
        
           pic.init();

     

       124
       125
        
           // Calibrate the TSC against the 8259

+1 -1

components/ukernel/build.zig.zon

···

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

     

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

     

       11
       11
        
               .Queue = .{

     

       12
       12
       -
                   .url = "git+https://tangled.sh/@sydney.blue/Queue.zig?ref=dev#6c0760e8a233c1d59554a40a87f0ef293a9697f3",

     

       12
       12
       +
                   .url = "git+https://tangled.org/@sydney.blue/Queue.zig?ref=dev#6c0760e8a233c1d59554a40a87f0ef293a9697f3",

     

       13
       13
        
                   .hash = "Queue-0.0.0-upnEfhEPAADNV4Dvs3DVCRSnOh-BrhgsRR6scaE2qTIa",

     

       14
       14
        
               },

     

       15
       15
        
           },