31 Commits

Author	SHA1	Message	Date
equation314	aa5bd3041b	Merge branch 'master' into arch-aarch64	2018-12-20 23:07:16 +08:00
equation314	b0915b102a	aarch64/fb: add new rust user program fantastic_text	2018-12-20 17:38:04 +08:00
WangRunji	fbf59396b2	use 'ucore_*.img' by default	2018-12-15 20:04:22 +08:00
equation314	d5a6eb2020	user: fix build error	2018-12-03 12:30:03 +08:00
Wang Runji	3f2beab52d	Merge branch 'master' into user-img	2018-12-02 22:39:59 +08:00
WangRunji	e7039945c1	move user img, remove useless files	2018-12-02 21:18:37 +08:00
equation314	710b6d1a28	user: update Makefiles	2018-12-02 19:51:52 +08:00
equation314	e86229cb71	user: user rust programs are runnable	2018-12-02 19:44:05 +08:00
WangRunji	2afe8c731e	Merge remote-tracking branch 'equation314/arch-aarch64' into dev ... # Conflicts: # crate/memory/src/memory_set.rs # kernel/Cargo.lock # kernel/src/arch/aarch64/interrupt/handler.rs # kernel/src/arch/aarch64/interrupt/mod.rs # kernel/src/arch/aarch64/memory.rs # kernel/src/arch/aarch64/mod.rs # kernel/src/arch/aarch64/paging.rs # kernel/src/consts.rs # kernel/src/fs.rs # kernel/src/lib.rs # kernel/src/memory.rs # kernel/src/process/context.rs # tools/riscv-pk/.gitignore # tools/riscv-pk/LICENSE # tools/riscv-pk/Makefile.in # tools/riscv-pk/README.md # tools/riscv-pk/aclocal.m4 # tools/riscv-pk/bbl/bbl.ac # tools/riscv-pk/bbl/bbl.c # tools/riscv-pk/bbl/bbl.h # tools/riscv-pk/bbl/bbl.lds # tools/riscv-pk/bbl/bbl.mk.in # tools/riscv-pk/bbl/logo.c # tools/riscv-pk/bbl/payload.S # tools/riscv-pk/bbl/raw_logo.S # tools/riscv-pk/bbl/riscv_logo.txt # tools/riscv-pk/config.h.in # tools/riscv-pk/configure # tools/riscv-pk/configure.ac # tools/riscv-pk/dummy_payload/dummy_entry.S # tools/riscv-pk/dummy_payload/dummy_payload.lds # tools/riscv-pk/dummy_payload/dummy_payload.mk.in # tools/riscv-pk/machine/atomic.h # tools/riscv-pk/machine/bits.h # tools/riscv-pk/machine/disabled_hart_mask.h # tools/riscv-pk/machine/emulation.c # tools/riscv-pk/machine/emulation.h # tools/riscv-pk/machine/encoding.h # tools/riscv-pk/machine/fdt.c # tools/riscv-pk/machine/fdt.h # tools/riscv-pk/machine/finisher.c # tools/riscv-pk/machine/finisher.h # tools/riscv-pk/machine/flush_icache.c # tools/riscv-pk/machine/htif.c # tools/riscv-pk/machine/htif.h # tools/riscv-pk/machine/machine.ac # tools/riscv-pk/machine/machine.mk.in # tools/riscv-pk/machine/mcall.h # tools/riscv-pk/machine/mentry.S # tools/riscv-pk/machine/minit.c # tools/riscv-pk/machine/misaligned_ldst.c # tools/riscv-pk/machine/mtrap.c # tools/riscv-pk/machine/mtrap.h # tools/riscv-pk/machine/muldiv_emulation.c # tools/riscv-pk/machine/uart.c # tools/riscv-pk/machine/uart.h # tools/riscv-pk/machine/uart16550.c # tools/riscv-pk/machine/uart16550.h # tools/riscv-pk/machine/unprivileged_memory.h # tools/riscv-pk/machine/vm.h # tools/riscv-pk/scripts/config.guess # tools/riscv-pk/scripts/config.sub # tools/riscv-pk/scripts/install.sh # tools/riscv-pk/scripts/mk-install-dirs.sh # tools/riscv-pk/scripts/vcs-version.sh # tools/riscv-pk/util/snprintf.c # tools/riscv-pk/util/string.c # tools/riscv-pk/util/util.mk.in	2018-12-02 00:27:10 +08:00
equation314	5a83d6a20f	aarch64: add user program SFS image	2018-12-01 20:12:54 +08:00
WangRunji	210854971d	add travis for macOS	2018-12-01 19:14:51 +08:00
equation314	94bc8353f7	user: create SFS image in Makefile	2018-11-29 12:49:58 +08:00
WangRunji	46f0e85230	add ucore-i386-pic.img user programs. reorganize imgs.	2018-11-22 18:06:39 +08:00
WangRunji	4034a473bd	update user crate to 2018 edition. add travis for user	2018-11-20 21:35:18 +08:00
WangRunji	2daf8c188d	Merge remote-tracking branch 'equation314/arch-aarch64' into dev ... # Conflicts: # .gitignore # kernel/Cargo.lock # kernel/Cargo.toml # kernel/Makefile # kernel/riscv32-blog_os.json # kernel/src/consts.rs # kernel/src/fs.rs # kernel/src/lib.rs # kernel/src/process/context.rs # kernel/src/process/mod.rs	2018-11-20 00:15:19 +08:00
WangRunji	205f90a264	Merge branch 'dev' into g4-merge ... # Conflicts: # crate/memory/src/cow.rs # crate/memory/src/memory_set.rs # crate/memory/src/paging/mod.rs # crate/memory/src/swap/mod.rs # crate/process/src/lib.rs # crate/process/src/process_manager.rs # crate/process/src/processor.rs # crate/process/src/thread.rs # crate/riscv # kernel/Cargo.lock # kernel/src/arch/riscv32/compiler_rt.rs # kernel/src/arch/riscv32/consts.rs # kernel/src/arch/riscv32/context.rs # kernel/src/arch/riscv32/interrupt.rs # kernel/src/arch/riscv32/memory.rs # kernel/src/arch/riscv32/mod.rs # kernel/src/arch/riscv32/paging.rs # kernel/src/arch/x86_64/driver/ide.rs # kernel/src/arch/x86_64/interrupt/handler.rs # kernel/src/arch/x86_64/mod.rs # kernel/src/console.rs # kernel/src/consts.rs # kernel/src/fs.rs # kernel/src/lib.rs # kernel/src/memory.rs # kernel/src/process/context.rs # kernel/src/process/mod.rs # kernel/src/syscall.rs # kernel/src/trap.rs	2018-11-16 18:58:29 +08:00
equation314	9fc13c8ebb	aarch64: implement syscall	2018-11-07 01:05:55 +08:00
WangRunji	7229b49eb8	Use rust-lld for RV32. Remove riscv git submodule.	2018-10-30 13:30:20 +08:00
lcy1996	4e0b510895	Finish comment for ristv boot.	2018-10-04 13:23:32 +08:00
WangRunji	b61a2c9dd2	Fix user project for new toolchain	2018-08-05 10:41:51 +08:00
WangRunji	b88648ff44	Fit for newest Rust nightly. x86_64 ok, riscv32 broken.	2018-08-04 16:20:25 +08:00
WangRunji	6b0556e135	Add Cargo.lock	2018-07-15 16:43:43 +08:00
WangRunji	69bc5caa81	Fix syscall return value, args. Pass hello.	2018-07-14 18:42:58 +08:00
WangRunji	c768ec3e1e	Recover fs for RV32. Add user-riscv.img ... Now load user programs from SFS data linked at kernel.	2018-07-14 17:41:45 +08:00
WangRunji	ee80a3eeb7	Fix compile user for RV32	2018-07-14 00:39:49 +08:00
WangRunji	935bcb3e15	Change user sub-project structure	2018-07-13 22:17:24 +08:00
WangRunji	f819a702c7	User programs Rust workspace. Compile OK for x86_64.	2018-07-13 15:12:35 +08:00
WangRunji	2867ae60b6	Add ucore & xv6-x86_64 user program img file.	2018-05-21 22:49:22 +08:00
WangRunji	731d6319e4	Can load user programs from sfs.img (hard linked).	2018-05-18 11:49:27 +08:00
WangRunji	8c64b2abb2	uCore 32bit user program is runnable!	2018-05-17 21:06:13 +08:00
WangRunji	8ce3173c3d	Link a user program from xv6-x86_64 in. Add elf crate.	2018-04-28 10:40:31 +08:00