锯齿螈完成

Merge remote-tracking branch 'origin/ch3-coop' into ch3-coop
Revert "添加两个mac上的开发工具"
4 changed files with 4 additions and 4 deletions
--- a/ch3-coop/os/Makefile
+++ b/ch3-coop/os/Makefile
@ -4,7 +4,7 @@ MODE := release
 KERNEL_ELF := target/$(TARGET)/$(MODE)/os
 KERNEL_BIN := $(KERNEL_ELF).bin
 SYMBOL_MAP := target/system.map
-QEMU_CMD_PATH := ../../tools/qemu-system-riscv64
+QEMU_CMD_PATH := /Users/zhangxinyu/Downloads/qemu-7.0.0/build/qemu-system-riscv64
 QEMU_PID = $(shell ps aux | grep "[q]emu-system' | awk '{print $$2}")
 OBJDUMP := rust-objdump --arch-name=riscv64
 OBJCOPY := rust-objcopy --binary-architecture=riscv64
--- a/ch3-coop/user/src/syscall.rs
+++ b/ch3-coop/user/src/syscall.rs
@ -29,7 +29,7 @@ pub fn sys_exit(exit_code: i32) -> isize {
    syscall(SYSCALL_EXIT, [exit_code as usize, 0, 0])
 }

-pub fn sys_yield() {
-    syscall(SYSCALL_YIELD, [0, 0, 0]);
-}
+// pub fn sys_yield() {
+//     syscall(SYSCALL_YIELD, [0, 0, 0]);
+// }

--- a/tools/qemu-system-riscv64
+++ b/tools/qemu-system-riscv64
--- a/tools/riscv64-unknown-elf-gdb
+++ b/tools/riscv64-unknown-elf-gdb
Author	SHA1	Message	Date
zhangxinyu	c2cfebbf6c	锯齿螈完成	2 years ago
zhangxinyu	2113cb2ad9	Merge remote-tracking branch 'origin/ch3-coop' into ch3-coop	2 years ago
zhangxinyu	345c343d2f	Revert "添加两个mac上的开发工具" This reverts commit `40906323d2`.	2 years ago
zhangxinyu	5529f545f2	Merge remote-tracking branch 'origin/ch3-coop' into ch3-coop	2 years ago
zhangxinyu	43befe3b94	Revert "添加两个mac上的开发工具, 多道程序的放置与加载和运行完成" This reverts commit `aa8e42c7c4`.	2 years ago
zhangxinyu	e064fe1b07	Revert "添加两个mac上的开发工具, 多道程序的放置与加载和运行完成" This reverts commit `aa8e42c7c4`.	2 years ago
zhangxinyu	2a38f96b98	Revert "开始实现task context 所以, 现在编译出可以主动让出cpu的用户应用" This reverts commit `9b6bfc7c87`.	2 years ago
zhangxinyu	27973ef2ea	Merge remote-tracking branch 'origin/ch3-coop' into ch3-coop	2 years ago
zhangxinyu	aa8e42c7c4	添加两个mac上的开发工具, 多道程序的放置与加载和运行完成	2 years ago
zhangxinyu	9b6bfc7c87	开始实现task context 所以, 现在编译出可以主动让出cpu的用户应用	2 years ago