andrey/rCore-Tutorial-v3
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore-Tutorial-v3.git synced 2024-11-26 11:23:37 +04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ch8' of github.com:rcore-os/rCore-Tutorial-v3 into ch8

Browse Source
This commit is contained in:
Yu Chen 2022-04-24 13:00:00 +08:00
commit 02a3880e34
7 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,6 +5,7 @@ os/src/link_app.S
os/src/linker.ld os/src/linker.ld
os/last-* os/last-*
os/Cargo.lock os/Cargo.lock
os/.gdb_history
user/target/* user/target/*
user/.idea/* user/.idea/*
user/Cargo.lock user/Cargo.lock

5
easy-fs/Cargo.toml
View File

@ -8,4 +8,7 @@ edition = "2018"
[dependencies] [dependencies]
spin = "0.7.0" spin = "0.7.0"
lazy_static = { version = "1.4.0", features = ["spin_no_std"] } lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
[profile.release]
debug = true

5
os/Cargo.toml
View File

@ -20,4 +20,7 @@ easy-fs = { path = "../easy-fs" }
[features] [features]
board_qemu = [] board_qemu = []
board_k210 = [] board_k210 = []
[profile.release]
debug = true

14
os/Makefile
View File

@ -14,6 +14,11 @@ SBI ?= rustsbi
BOOTLOADER := ../bootloader/$(SBI)-$(BOARD).bin BOOTLOADER := ../bootloader/$(SBI)-$(BOARD).bin
K210_BOOTLOADER_SIZE := 131072 K210_BOOTLOADER_SIZE := 131072
# Building mode argument
ifeq ($(MODE), release)
MODE_ARG := --release
endif
# KERNEL ENTRY # KERNEL ENTRY
ifeq ($(BOARD), qemu) ifeq ($(BOARD), qemu)
KERNEL_ENTRY_PA := 0x80200000 KERNEL_ENTRY_PA := 0x80200000
@ -106,4 +111,11 @@ debug: build
tmux split-window -h "riscv64-unknown-elf-gdb -ex 'file $(KERNEL_ELF)' -ex 'set arch riscv:rv64' -ex 'target remote localhost:1234'" && \ tmux split-window -h "riscv64-unknown-elf-gdb -ex 'file $(KERNEL_ELF)' -ex 'set arch riscv:rv64' -ex 'target remote localhost:1234'" && \
tmux -2 attach-session -d tmux -2 attach-session -d
.PHONY: build env kernel clean disasm disasm-vim run-inner switch-check fs-img
gdbserver: build
@qemu-system-riscv64 -machine virt -nographic -bios $(BOOTLOADER) -device loader,file=$(KERNEL_BIN),addr=$(KERNEL_ENTRY_PA) -s -S
gdbclient:
@riscv64-unknown-elf-gdb -ex 'file $(KERNEL_ELF)' -ex 'set arch riscv:rv64' -ex 'target remote localhost:1234'
.PHONY: build env kernel clean disasm disasm-vim run-inner switch-check fs-img gdbserver gdbclient

2
rust-toolchain
View File

@ -1 +1 @@
nightly-2022-01-19 nightly-2022-04-11

3
user/Cargo.toml
View File

@ -10,3 +10,6 @@ edition = "2018"
buddy_system_allocator = "0.6" buddy_system_allocator = "0.6"
bitflags = "1.2.1" bitflags = "1.2.1"
riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] } riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] }
[profile.release]
debug = true

22
user/src/bin/early_exit.rs Normal file
View File

@ -0,0 +1,22 @@
#![no_std]
#![no_main]
#[macro_use]
extern crate user_lib;
extern crate alloc;
use user_lib::{thread_create, exit};
use alloc::vec::Vec;
pub fn thread_a() -> ! {
for i in 0..1000 { print!("{}", i); }
exit(1)
}
#[no_mangle]
pub fn main() -> i32 {
thread_create(thread_a as usize, 0);
println!("main thread exited.");
exit(0)
}