重构内存分配器、增加中断支持、整理rust运行时环境 #4

Merged
pointer-to-bios merged 39 commits from downstream into main 2024-04-11 00:36:14 +08:00
4 changed files with 11 additions and 2 deletions
Showing only changes of commit 5dc9de8195 - Show all commits

7
scripts/magicgen Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/python
import time
curtime = str(int(time.time() * 1000))
print(curtime)

View File

@ -2,7 +2,7 @@
ARCH := $(shell uname -m) ARCH := $(shell uname -m)
PWD := $(shell pwd) PWD := $(shell pwd)
SOURCE := ${PWD}/scripts SOURCE := ${PWD}/../scripts
ifeq (${ARCH},x86_64) ifeq (${ARCH},x86_64)
ASM = nasm ASM = nasm
ASMFLAGS = -f elf64 ASMFLAGS = -f elf64
@ -12,7 +12,7 @@ ifdef release
release = 1 release = 1
endif endif
ALLOCATOR_MAGIC = $(shell doas hwclock | sha512sum | head -c 128 | md5sum | head -c 8) ALLOCATOR_MAGIC = $(shell "${SOURCE}/magicgen" | sha512sum | head -c 128 | md5sum | head -c 8)
SUBOBJS = kernel/kernel.o libk/libk.o rust.o SUBOBJS = kernel/kernel.o libk/libk.o rust.o
@ -58,6 +58,8 @@ metaverse.elf: kernel libk rust metaverse.lds
.PHONY: kernel libk all clear postproc rust .PHONY: kernel libk all clear postproc rust
all: postproc metaverse.elf all: postproc metaverse.elf
@echo -e "Build \e[1;32msucceeded\e[0m."
@echo -e "Build ID \e[1;31m$(shell "${SOURCE}/magicgen"|sha512sum|head -c 128|md5sum|head -c 8)\e[0m."
postproc: postproc:
@echo -n -e "\e[36m" @echo -n -e "\e[36m"