From f89e3cb12cbd5b65286aa995c6502f65bc607651 Mon Sep 17 00:00:00 2001 From: Max Wash Date: Thu, 19 Feb 2026 18:57:53 +0000 Subject: [PATCH] kernel: adjust formatting --- arch/x86_64/e820.c | 13 ++++++++++--- arch/x86_64/irqvec.S | 44 ++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/arch/x86_64/e820.c b/arch/x86_64/e820.c index 1a29228..6392662 100644 --- a/arch/x86_64/e820.c +++ b/arch/x86_64/e820.c @@ -36,7 +36,9 @@ void e820_scan(multiboot_memory_map_t *mmap, size_t len) } printk("e820: [mem 0x%016llx-0x%016llx] %s", - entry->addr, entry->addr + entry->len - 1, type); + entry->addr, + entry->addr + entry->len - 1, + type); memblock_add(entry->addr, entry->len); @@ -53,7 +55,12 @@ void e820_scan(multiboot_memory_map_t *mmap, size_t len) char str_mem_total[64], str_mem_reserved[64]; data_size_to_string(mem_total, str_mem_total, sizeof str_mem_total); - data_size_to_string(mem_reserved, str_mem_reserved, sizeof str_mem_reserved); + data_size_to_string( + mem_reserved, + str_mem_reserved, + sizeof str_mem_reserved); - printk("e820: total memory: %s, hw reserved: %s", str_mem_total, str_mem_reserved); + printk("e820: total memory: %s, hw reserved: %s", + str_mem_total, + str_mem_reserved); } diff --git a/arch/x86_64/irqvec.S b/arch/x86_64/irqvec.S index 473e6f6..74bd02b 100644 --- a/arch/x86_64/irqvec.S +++ b/arch/x86_64/irqvec.S @@ -332,80 +332,80 @@ IRQ 223, 255 isr_common_stub: PUSH_REGS - + mov %rsp, %rdi call isr_dispatch - + POP_REGS add $16, %rsp iretq - + .global irq_common_stub .type irq_common_stub, @function irq_common_stub: PUSH_REGS - + mov %rsp, %rdi call irq_dispatch - + POP_REGS add $16, %rsp iretq - + .global syscall_gate .type syscall_gate, @function - + .extern syscall_dispatch .type syscall_dispatch, @function - + syscall_gate: swapgs movq %rsp, %gs:20 # GS+20 = rsp2 in the current TSS block (user stack storage) movq %gs:4, %rsp # GS+4 = rsp0 in the current TSS block (per-thread kstack) - - # start building a pf_cpu_context + + # start building a ml_cpu_context pushq $0x1b pushq %gs:20 push %r11 push $0x23 push %rcx - + pushq $0 pushq $0x80 - + PUSH_REGS - + mov %rsp, %rdi - + # switch back to user gs while in syscall_dispatch. Interrupts are enabled in syscall_dispatch, # and if the task gets pre-empted, the incoming task will expect %gs to have its usermode value. swapgs - + call syscall_dispatch - + POP_REGS - + add $16, %rsp pop %rcx add $8, %rsp pop %r11 add $16, %rsp - + swapgs movq %gs:20, %rsp # GS+20 = rsp2 in the current TSS block swapgs - + # back to usermode sysretq - + .global pf_faultptr .type pf_faultptr, @function pf_faultptr: mov %cr2, %rax ret - - + +