metaverse
/
kernel-dev
1
2
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加内核日志功能 #3

Merged
pointer-to-bios merged 17 commits from pointer-to-bios/metaverse-dev:main into main 2024-02-05 22:10:26 +08:00
Conversation 0 Commits 17 Files Changed 30 +2 -11
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 59ebdf8e73 - Show all commits

3
src/Makefile
View File

@ -33,7 +33,7 @@ ifdef release
endif endif
ifeq (${ARCH},x86_64) ifeq (${ARCH},x86_64)
RSCFLAGS := ${RSCFLAGS} -C target-feature=-sse,-avx RSCFLAGS := ${RSCFLAGS} -C target-feature=-sse
endif endif
RUSTLIB_PATH = ../rustlib/${ARCH}/lib RUSTLIB_PATH = ../rustlib/${ARCH}/lib
@ -54,6 +54,7 @@ metaverse.elf: kernel libk rust metaverse.lds
@echo -e "\e[1;33mld\e[0m \e[1;32m$@\e[0m \e[34m<--\e[0m \e[32m${SUBOBJS}\e[0m" @echo -e "\e[1;33mld\e[0m \e[1;32m$@\e[0m \e[34m<--\e[0m \e[32m${SUBOBJS}\e[0m"
@ld -T metaverse.lds -Map=metaverse.map -unresolved-symbols=ignore-all -o $@ ${SUBOBJS} ${RUST_LIBS} \ @ld -T metaverse.lds -Map=metaverse.map -unresolved-symbols=ignore-all -o $@ ${SUBOBJS} ${RUST_LIBS} \
2>&1 | "${SOURCE}/colorize" "warning:=yellow" "error:=red" "ld=lyellow" 2>&1 | "${SOURCE}/colorize" "warning:=yellow" "error:=red" "ld=lyellow"
@strip $@
.PHONY: kernel libk all clear postproc rust .PHONY: kernel libk all clear postproc rust

4
src/kernel/arch/x86_64/entry.s
View File

@ -39,10 +39,6 @@ multiboot2_header:
dd 8 dd 8
multiboot2_header_end: multiboot2_header_end:
section .kstack
kstack:
resb 0x1000000 - 0x400000
section .kend section .kend
global kend global kend
kend: kend:

6
src/metaverse.lds
View File

@ -17,12 +17,6 @@ SECTIONS {
{ {
*(.cpumeta) *(.cpumeta)
} }
. = 4M;
..kstack :
{
kstack = .;
*(.kstack)
}
. = 16M; . = 16M;
.text : .text :
{ {