freya/corn
1
0
Fork 0
mirror of https://git.stationery.faith/corn/corn.git synced 2024-11-24 12:22:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix problem

Browse source
This commit is contained in:
trimill 2024-02-03 15:32:43 -05:00
parent 8e74123683
commit ac431b0050
No known key found for this signature in database
GPG key ID: 4F77A16E17E10BCB
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -6,9 +6,9 @@ CC=cc
LD=ld LD=ld
AS=nasm AS=nasm
CFLAGS += -std=c2x -ffreestanding -lgcc -isystem include CFLAGS += -std=c2x -ffreestanding -lgcc -isystem include -pipe
CFLAGS += -Wall -Wextra -pedantic 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 CFLAGS += -DPAGE_SIZE=4096
LDFLAGS += -nmagic --no-warn-rwx-segments -nostdlib LDFLAGS += -nmagic --no-warn-rwx-segments -nostdlib

4
src/arch/amd64/cpu/backtrace.c
View file

@ -36,9 +36,9 @@ void log_backtrace() {
void log_backtrace_ex(void *ip, void *bp) { void log_backtrace_ex(void *ip, void *bp) {
struct stackframe *frame = bp; struct stackframe *frame = bp;
kputs("Stack trace:\n"); kputs("Stack trace:\n");
kprintf(" %#lx\n", (size_t)ip); kprintf(" 0x%p\n", ip);
while (frame) { while (frame) {
kprintf(" %#lx\n", (size_t)frame->rip); kprintf(" 0x%p\n", frame->rip);
frame = frame->rbp; frame = frame->rbp;
} }

1
src/arch/amd64/shim.c
View file

@ -14,7 +14,6 @@ static struct boot_info boot_info;
void *amd64_shim(long mboot_magic, volatile void *mboot_data_ptr) { void *amd64_shim(long mboot_magic, volatile void *mboot_data_ptr) {
serial_init(); serial_init();
paging_init(); paging_init();
serial_out_str("aaaa\n");
pic_remap(); pic_remap();
idt_init(); idt_init();

3
src/kmain.c
View file

@ -2,9 +2,6 @@
#include <acpi.h> #include <acpi.h>
#include <memory.h> #include <memory.h>
#include <lib.h> #include <lib.h>
#include <serial.h>
#include <shim.h>
#include <panic.h>
#include <pci.h> #include <pci.h>
#include <screen.h> #include <screen.h>