Skip to content

Commit

Permalink
tiny eeny weeny tidy up
Browse files Browse the repository at this point in the history
  • Loading branch information
oculometric committed May 6, 2024
1 parent 92f0b89 commit a9437b4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/include/interrupts.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,6 @@ inline void acknowledgePICInterrupt(uint8_t irq)

#ifdef INTERRUPTS_INNER

extern uint8_t microISRTable;
extern uint32_t microISRTable;

#endif

0 comments on commit a9437b4

Please sign in to comment.