From a9437b4eceda0074acdf4f5bc294be90166da554 Mon Sep 17 00:00:00 2001 From: oculometric Date: Tue, 7 May 2024 00:58:26 +0100 Subject: [PATCH] tiny eeny weeny tidy up --- Makefile | 10 ++++++---- README.md | 7 +++---- src/include/interrupts.h | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index c175b5d..43c9939 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,12 @@ AS := nasm CC := $(PREFIX)g++ LD := $(PREFIX)ld -AS_FLAGS := -f elf -g -CC_FLAGS := -ffreestanding -m32 -g -masm=intel -Wall -Wextra -Wpedantic -Wno-unused-parameter -mno-red-zone -std=c++20 -fno-exceptions -fno-ident -fno-asynchronous-unwind-tables -O0 # -s -LD_FLAGS := -T linker.ld -g #-s +AS_FLAGS := -f elf +CC_FLAGS := -ffreestanding -m32 -masm=intel -Wall -Wextra -Wpedantic -Wno-unused-parameter -mno-red-zone -std=c++20 -fno-exceptions -fno-ident -fno-asynchronous-unwind-tables -O3 -s +LD_FLAGS := -T linker.ld -s + +# -g flag enables debug symbols +# -s strips all unecessary shit BIN = bin SRC = src @@ -61,7 +64,6 @@ $(OBJ_DIR)/%.bin: $(BL_DIR)/%.asm $(OBJ_DIR) $(BINRES_DIR)/%.o: $(BINRES_DIR)/% $(BINRES_DIR) @echo "Copying resource" $< @$(PREFIX)objcopy -I binary -O elf32-i386 -B i386 $< $@ - @echo _binary_$(subst /,_,$(subst .,_,$(patsubst %.o,%,$@)))_start=_res_$(subst .,_,$(patsubst $(BINRES_DIR)/%,%,$<))_start @$(PREFIX)objcopy -I binary -O elf32-i386 -B i386 $< $@ \ --redefine-sym _binary_$(subst /,_,$(subst .,_,$(patsubst %.o,%,$@)))_start=_res_$(subst .,_,$(patsubst $(BINRES_DIR)/%,%,$<))_start \ --redefine-sym _binary_$(subst /,_,$(subst .,_,$(patsubst %.o,%,$@)))_end=_res_$(subst .,_,$(patsubst $(BINRES_DIR)/%,%,$<))_end \ diff --git a/README.md b/README.md index 91d4130..c999700 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ as of writing this, i've written a reasonably okayish (if not very portable) *bo - [x] text rendering - [x] text view UI panel - [x] 3D wireframe rendering panel able to read 3D model files +- [ ] rewrite and abstract graphics API - [ ] virtual/abstract file systems - [ ] reading from disk, reading into virtual filesystem - [ ] update build system to be able to build proper filesystem images @@ -36,11 +37,9 @@ as of writing this, i've written a reasonably okayish (if not very portable) *bo - [x] write interrupt handler wrapper - [x] write interrupt handlers - [x] write PIC reprogramming code - - [ ] code for talking to the keyboard + - [x] code for talking to the keyboard - [ ] code for talking to timers -- [ ] exception handling (needs interrupts) - - [ ] convert unecessarry panics into throws - - [ ] definitely separate the kernel from 'programs' +- [ ] definitely separate the kernel from 'programs' - [ ] proper memory management - [ ] better allocation algorithm - [ ] paging/virtual memory diff --git a/src/include/interrupts.h b/src/include/interrupts.h index 5daef82..dafbea5 100644 --- a/src/include/interrupts.h +++ b/src/include/interrupts.h @@ -173,6 +173,6 @@ inline void acknowledgePICInterrupt(uint8_t irq) #ifdef INTERRUPTS_INNER -extern uint8_t microISRTable; +extern uint32_t microISRTable; #endif \ No newline at end of file