add `ucore-i386-pic.img` user programs. reorganize imgs.

kernel/Cargo.toml

@@ -58,7 +58,7 @@ minimum-image-size = 0      # The minimum output file size (in MiB)
 # (the "{}" will be replaced with the path to the bootable disk image)
 run-command = ["qemu-system-x86_64",
     "-drive", "format=raw,file={}",
-    "-drive", "format=raw,file=../user/ucore32.img,media=disk,cache=writeback",
+    "-drive", "format=raw,file=../user/img/ucore-i386-pic.img,media=disk,cache=writeback",
     "-serial", "mon:stdio",
     "-device", "isa-debug-exit",
     "-smp", "4"

kernel/Makefile

@@ -30,7 +30,7 @@ bootimage := target/$(target)/bootimage.bin
 user_bin_path := ../user/target/$(arch)-ucore/debug
 user_bins := $(patsubst $(user_bin_path)/%.d, $(user_bin_path)/%, $(wildcard $(user_bin_path)/*.d))
 user_obj := build/$(arch)/user.o
-SFSIMG := ../user/ucore32.img
+SFSIMG := ../user/img/ucore-i386-pic.img
 
 ### qemu options ###
 ifeq ($(arch), x86_64)

kernel/src/fs.rs

@@ -18,7 +18,7 @@ global_asm!(r#"
     .global _user_img_start
     .global _user_img_end
 _user_img_start:
-    .incbin "../user/user-riscv.img"
+    .incbin "../user/img/ucore-rv32.img"
 _user_img_end:
 "#);