修复内核错误无法输出

Author: xiaoyi1212

src/x86_64/core/error_handle.c

@@ -12,26 +12,27 @@ extern void double_fault_asm(); // df_asm.S
 ticketlock error_lock;
 
 void print_register(interrupt_frame_t *frame) {
-    printe("ss: 0x%p ", frame->ss);
-    printe("cs: 0x%p ", frame->cs);
-    printe("rsp: 0x%p \n", frame->rsp);
-    printe("rip: 0x%p ", frame->rip);
-    printe("rflags: 0x%p ", frame->rflags);
-    printe("cr3: 0x%p \n", get_cr3());
+    printk("ss: 0x%p ", frame->ss);
+    printk("cs: 0x%p ", frame->cs);
+    printk("rsp: 0x%p \n", frame->rsp);
+    printk("rip: 0x%p ", frame->rip);
+    printk("rflags: 0x%p ", frame->rflags);
+    printk("cr3: 0x%p \n", get_cr3());
 }
 
 void print_task_info(pcb_t pcb) {
     if (pcb == NULL)
-        printe("Current process PID: 0 (Kernel) CPU%d\n", get_current_cpuid());
+        printk("Current process PID: 0 (Kernel) CPU%d\n", get_current_cpuid());
     else
-        printe("Current process PID: %d (%s) CPU%d\n", pcb->pid, pcb->name, get_current_cpuid());
+        printk("Current process PID: %d (%s) CPU%d\n", pcb->pid, pcb->name, get_current_cpuid());
 }
 
 void kernel_error(const char *msg, uint64_t code, interrupt_frame_t *frame) {
     close_interrupt;
+    init_print_lock();
     ticket_lock(&error_lock);
     logkf("Kernel Error: %s:0x%x\n", msg, code);
-    printe("\033[31m:3 Your CP_Kernel ran into a problem.\nERROR CODE >(%s:0x%x)<\033[0m\n", msg,
+    printk("\033[31m:3 Your CP_Kernel ran into a problem.\nERROR CODE >(%s:0x%x)<\033[0m\n", msg,
            code);
     print_task_info(get_current_task());
     print_register(frame);

src/x86_64/core/mem/page.c

@@ -23,6 +23,7 @@ static bool is_huge_page(page_table_entry_t *entry) {
 
 __IRQHANDLER static void page_fault_handle(interrupt_frame_t *frame, uint64_t error_code) {
     close_interrupt;
+    init_print_lock();
     disable_scheduler();
     switch_page_directory(get_kernel_pagedir());
     uint64_t faulting_address;
@@ -31,8 +32,8 @@ __IRQHANDLER static void page_fault_handle(interrupt_frame_t *frame, uint64_t er
     if (get_current_task() != NULL) {
         logkf("Current process PID: %d (%s)\n", get_current_task()->pid, get_current_task()->name);
     }
-    printe("\n");
-    printe(
+    printk("\n");
+    printk(
         "\033[31m:3 Your CP_Kernel ran into a problem.\nERROR CODE >(PageFault%s:0x%p)<\033[0m\n",
         !(error_code & 0x1) ? "NotPresent"
         : error_code & 0x2  ? "WriteError"

src/x86_64/driver/pci/pcnet.c

@@ -1,15 +1,14 @@
 #include "pcnet.h"
-#include "acpi.h"
 #include "io.h"
 #include "isr.h"
 #include "kprint.h"
 #include "pci.h"
 #include "pcie.h"
 
 void pcnet_setup() {
-    pcie_device_t *device = pcie_find_class(0x10220000);
+    pcie_device_t *device = pcie_find_class(0x020000);
     if (device == NULL) {
-        pci_device_t pci_device = pci_find_class(0x10220000);
+        pci_device_t pci_device = pci_find_class(0x020000);
         if (pci_device == NULL) return;
         uint32_t conf  = pci_read_command_status(pci_device);
         conf          |= PCI_COMMAND_MEMORY;

src/x86_64/include/kprint.h

@@ -59,13 +59,7 @@ void color_printk(size_t fcolor, size_t bcolor, const char *fmt, ...);
 
 #define printk(...) color_printk(WHITE, BLACK, __VA_ARGS__)
 
-/**
- * 中断专用输出
- * warning: 该函数会强行解开打印锁并越过原子缓冲队列直接向终端打印, 谨慎使用
- * @param fmt
- * @param ...
- */
-void printe(const char *fmt, ...);
+void init_print_lock();
 
 /**
  * 内核模块用链接输出

src/x86_64/utils/kprint.c

@@ -17,16 +17,8 @@ void add_color(char *dest, uint32_t color, int is_background) {
     strcat(dest, "m");
 }
 
-void printe(const char *fmt, ...) {
-    ticket_unlock(&print_lock);
-    ticket_lock(&print_lock);
-    char    buf[4096] = {0};
-    va_list args;
-    va_start(args, fmt);
-    stbsp_vsprintf(buf, fmt, args);
-    va_end(args);
-    terminal_process(buf);
-    ticket_unlock(&print_lock);
+void init_print_lock() {
+    ticket_init(&print_lock);
 }
 
 void color_printk(size_t fcolor, size_t bcolor, const char *fmt, ...) {