diff options
| author | trimill <trimill@trimillxyz.org> | 2024-02-03 15:32:43 -0500 |
|---|---|---|
| committer | trimill <trimill@trimillxyz.org> | 2024-02-03 15:32:43 -0500 |
| commit | ac431b0050dee304e834605d240df5174ee1f626 (patch) | |
| tree | 0d130201fb274c55caa6785b0a986e949d57260e | |
| parent | alloc on write paging, -O3 compile works, 'volatile' is the story of my life (diff) | |
| download | corn-ac431b0050dee304e834605d240df5174ee1f626.tar.gz corn-ac431b0050dee304e834605d240df5174ee1f626.tar.bz2 corn-ac431b0050dee304e834605d240df5174ee1f626.zip | |
fix problem
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/arch/amd64/cpu/backtrace.c | 4 | ||||
| -rw-r--r-- | src/arch/amd64/shim.c | 1 | ||||
| -rw-r--r-- | src/kmain.c | 3 |
4 files changed, 4 insertions, 8 deletions
@@ -6,9 +6,9 @@ CC=cc LD=ld AS=nasm -CFLAGS += -std=c2x -ffreestanding -lgcc -isystem include +CFLAGS += -std=c2x -ffreestanding -lgcc -isystem include -pipe CFLAGS += -Wall -Wextra -pedantic -CFLAGS += -O3 -pipe -g -fno-stack-protector +CFLAGS += -O2 -g -fno-stack-protector -fno-omit-frame-pointer CFLAGS += -DPAGE_SIZE=4096 LDFLAGS += -nmagic --no-warn-rwx-segments -nostdlib diff --git a/src/arch/amd64/cpu/backtrace.c b/src/arch/amd64/cpu/backtrace.c index b1d2a2c..d687641 100644 --- a/src/arch/amd64/cpu/backtrace.c +++ b/src/arch/amd64/cpu/backtrace.c @@ -36,9 +36,9 @@ void log_backtrace() { void log_backtrace_ex(void *ip, void *bp) { struct stackframe *frame = bp; kputs("Stack trace:\n"); - kprintf(" %#lx\n", (size_t)ip); + kprintf(" 0x%p\n", ip); while (frame) { - kprintf(" %#lx\n", (size_t)frame->rip); + kprintf(" 0x%p\n", frame->rip); frame = frame->rbp; } diff --git a/src/arch/amd64/shim.c b/src/arch/amd64/shim.c index b055fed..c1c3368 100644 --- a/src/arch/amd64/shim.c +++ b/src/arch/amd64/shim.c @@ -14,7 +14,6 @@ static struct boot_info boot_info; void *amd64_shim(long mboot_magic, volatile void *mboot_data_ptr) { serial_init(); paging_init(); - serial_out_str("aaaa\n"); pic_remap(); idt_init(); diff --git a/src/kmain.c b/src/kmain.c index 6b3c94b..ce8016d 100644 --- a/src/kmain.c +++ b/src/kmain.c @@ -2,9 +2,6 @@ #include <acpi.h> #include <memory.h> #include <lib.h> -#include <serial.h> -#include <shim.h> -#include <panic.h> #include <pci.h> #include <screen.h> |