marco/vulcanos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing bugs...

Browse Source
This commit is contained in:
ice-bit
2019-09-24 12:39:05 +02:00
parent 9b5bf087b5
commit a378ca4061
8 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/cpu/Makefile
View File

@@ -1,8 +1,14 @@
OBJS = multiboot.asm.o kernel_loader.asm.o ports.asm.o gdt.asm.o idt.asm.o interrupts.asm.o
OBJS = multiboot.asm.o kernel_loader.asm.o ports.asm.o \
gdt.asm.o idt.asm.o interrupts.asm.o assert.o
ASM = nasm
ASMFLAGS = -f elf
CC = i686-elf-gcc # cross-compiler
CFLAGS = -m32 -fno-stack-protector -ffreestanding -Wall -Wextra -Werror -g -c
all: $(OBJS)
%.asm.o: %.asm
$(ASM) $(ASMFLAGS) $< -o $@
$(ASM) $(ASMFLAGS) $< -o $@
%.o: %.c
$(CC) $(CFLAGS) $< -o $@

24
kernel/cpu/assert.c
View File

@@ -4,13 +4,13 @@
extern void panic(const char *message, const char *file, uint32_t line) {
asm volatile("cli"); // Disable interrupts
kprint("PANIC(");
kprint(message);
kprint(") at ");
kprint(file);
kprint(":");
kprint((uint8_t*)"PANIC(");
kprint((uint8_t*)message);
kprint((uint8_t*)") at ");
kprint((uint8_t*)file);
kprint((uint8_t*)":");
kprint_dec(line);
kprint("\n");
kprint((uint8_t*)"\n");
// Now hang on for ever
for(;;);
}
@@ -19,13 +19,13 @@ extern void panic(const char *message, const char *file, uint32_t line) {
extern void panic_assert(const char *file, uint32_t line, const char *desc) {
asm volatile("cli"); // Disable interrupts
kprint("ASSERTION-FAILED(");
kprint(desc);
kprint(") at ");
kprint(file);
kprint(":");
kprint((uint8_t*)"ASSERTION-FAILED(");
kprint((uint8_t*)desc);
kprint((uint8_t*)") at ");
kprint((uint8_t*)file);
kprint((uint8_t*)":");
kprint_dec(line);
kprint("\n");
kprint((uint8_t*)"\n");
// Now hang on forever
for(;;);
}