andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-26 09:53:28 +04:00
Code Issues Projects Releases Wiki Activity
1,596 Commits 6 Branches 1 Tag 15 MiB
b8b961b4ee
Commit Graph

1020 Commits

Author SHA1 Message Date
gjz010
da8699c44e
Merge branch 'dev' into shared-library 2019-06-09 19:32:00 +08:00
gjz010
7ad8c6a6d2 Shared library done in a formal way (using auxv). Now kernel loads both loader and program. 
Known issues: not compatible with musl's reclaim_gaps (crash on __malloc_donate). Removing reclaim makes hello world work.
 2019-06-09 19:25:43 +08:00
Jiajie Chen
5ecdb4e656 Change release to mode in Makefile 2019-06-08 22:36:41 +08:00
gjz010
7b8252eb1b Basic loadable kernel module support, with a module template written in Rust. 
Under aarch64 and x86_64, hello_rust can be built and loaded by `/busybox insmod hello_rust.ko`.
 2019-06-07 20:59:51 +08:00
gjz010
da028c1f10 Added virtual memory support for aarch64 and x86_64. 
1. Memory mapping at KSEG2_START(0xffff_fe80_0000_0000) will now be visible to all processes.
   This feature is required by Loadable Kernel Module when mapping kernel module into memory.
2. Wrapping PageTableImpl::active() into ManuallyDrop, so that no extra "mem::forget" is required.
3. Added PageTableImpl::kernel_table(). This function is the same as active() on x86_64, but not the same on aarch64.
 2019-06-07 15:57:18 +08:00
Jiajie Chen
8e5e798d78 Do not print to graphci console unless graphic=console on aarch64 2019-06-03 09:47:57 +08:00
Jiajie Chen
d8ea224283 Fix mgba merge 2019-06-03 09:46:27 +08:00
Jiajie Chen
a42d4b4d26 Merge branch 'mgba' into dev 2019-06-03 09:44:28 +08:00
Jiajie Chen
c8b0014c5f Remove u-boot support 2019-06-03 09:36:01 +08:00
Jiajie Chen
8b06314828 Format code and update debug code 2019-06-03 09:33:02 +08:00
Jiajie Chen
33513ded94 Merge remote-tracking branch 'sdcard/geminilab' into sdcard 2019-06-03 09:27:21 +08:00
NagiNikaido
730f5d94a6 write() check passed. a minor bug fixed. 2019-05-30 17:06:13 +08:00
NagiNikaido
e20a2ca8e2 Now we can parse the partion entries. Yeeeeaaahh! 2019-05-30 14:57:20 +08:00
NagiNikaido
a3f8601d18 HUGE SUCCESS! Now we can fetch the first section of an SD card. 
the bug of SCR fixed.
 2019-05-30 01:49:44 +08:00
BenjaminPMLovegood
cb682392f4 add emmc option for qemu 2019-05-29 18:38:59 +08:00
NagiNikaido
6a00cf602b tons of bugs fixed. moved sd_get_base_clock_hz() to mailbox 2019-05-29 18:32:43 +08:00
NagiNikaido
4b543a189f debug info added. 2019-05-27 18:39:20 +08:00
NagiNikaido
3535faccd9 Merge branch 'dev' of https://github.com/rcore-os/rCore into rcore-os-dev 2019-05-27 16:34:29 +08:00
PanQL
e8c38d748f
Merge pull request #54 from rcore-os/dev 
Fix check_and_clone_cstr null check
 2019-05-25 22:14:41 +08:00
PanQL
376ca53f3a
Merge branch 'mgba' into dev 2019-05-25 21:21:02 +08:00
PanQL
7df015842d some about ioctl fb info 2019-05-25 21:08:43 +08:00
Yuhao Zhou
a708ee401d Fix syscall in thinpad. 2019-05-25 20:05:27 +08:00
Yuhao Zhou
2b96462da3 Fix malta const. 2019-05-25 18:04:54 +08:00
BenjaminPMLovegood
d2f583a948 wrap init 2019-05-25 17:57:02 +08:00
Yuhao Zhou
65b121e55e Merge remote-tracking branch 'origin/dev' 2019-05-25 14:51:45 +08:00
Yuhao Zhou
0938a0cb58 Update malta consts. 2019-05-25 14:33:52 +08:00
BenjaminPMLovegood
335f4701eb modified 2019-05-25 14:28:55 +08:00
Jiajie Chen
35e909d96b Fix check_and_clone_cstr null check 2019-05-25 13:51:21 +08:00
Jiajie Chen
cd49ee5093 Fix x86_64 fb depth 2019-05-25 11:39:42 +08:00
Jiajie Chen
235005608d Do not hardcode fb addr in Vga 2019-05-25 08:29:54 +08:00
Jiajie Chen
30f94238b8 Yeild when polling for EAGAIN 2019-05-25 07:48:49 +08:00
Jiajie Chen
dcfb02c514 Add EAGAIN for nonblocking io and poll for file in read_at() 2019-05-24 20:53:13 +08:00
Jiajie Chen
22946c699d Allow ahci port init to fail 2019-05-24 19:21:48 +08:00
Jiajie Chen
0be1b1e56b Support 32bit MSI Addr 2019-05-24 16:45:28 +08:00
Jiajie Chen
e2bb86aa54 Get screen info from bootloader for vga 2019-05-24 16:20:25 +08:00
Jiajie Chen
aefbecb127 Merge remote-tracking branch 'origin/mgba' into dev 2019-05-24 15:21:07 +08:00
Jiajie Chen
e9c0bcadf7 Add graphic=console option and fix vga on x86_64 2019-05-24 15:20:39 +08:00
PanQL
fcc8fb4b2d
Merge branch 'mgba' into dev 2019-05-24 11:34:28 +08:00
PanQL
3b6d94efae simple ioctl for fb is reachable 2019-05-24 09:33:03 +08:00
Jiajie Chen
e22cfd9b30 Fix compilation for u540 2019-05-24 09:22:49 +08:00
Jiajie Chen
0971181473 Fix compilation for rv32 2019-05-24 09:09:35 +08:00
Jiajie Chen
c5acdb67e6 Fix compilation for merge and update vga buffer address 2019-05-24 08:57:21 +08:00
Jiajie Chen
53bb55b971 Merge remote-tracking branch 'origin/dev' into dev 2019-05-24 08:42:33 +08:00
Jiajie Chen
f410aef5bc Merge branch 'mipsel' into dev 2019-05-24 08:39:29 +08:00
Jiajie Chen
51c463e120 Remove non-AHCI pci id 2019-05-24 08:28:47 +08:00
Jiajie Chen
51868e1616 Eliminate some warnings 2019-05-23 23:31:36 +08:00
Jiajie Chen
d1d7fe44a7 Fix condvar race(maybe) 2019-05-23 23:21:02 +08:00
Jiajie Chen
f10421bf83 Revert "x86_64: enable interrupt during syscall. set TSS.sp0 through gs." 
This reverts commit 72efa797e5.
 2019-05-23 23:13:47 +08:00
PanQL
9740983b2d
Merge branch 'mgba' into dev 2019-05-23 21:11:13 +08:00
PanQL
a6f211cef5 fix mmap for framebuffer 2019-05-23 20:59:04 +08:00
WangRunji
1a377ca7c3 x86_64: update bootloader. fix on real machine 2019-05-23 16:46:00 +08:00
WangRunji
9dec0bbda5 simplify copy_from_user 2019-05-23 13:06:39 +08:00
Jiajie Chen
8b07e7d31c Fix extra parentheses 2019-05-23 08:20:00 +08:00
Harry Chen
3658e265a8 Update device tree file and add stub for SYS_RT_SIGQUEUE 
Signed-off-by: Harry Chen <i@harrychen.xyz>
 2019-05-23 02:19:42 +08:00
Harry Chen
0614e2b1aa Merge branch 'dev' into mipsel 
Signed-off-by: Harry Chen <i@harrychen.xyz>
 2019-05-22 23:38:21 +08:00
Jiajie Chen
6f5414c531 Split router ports into different ifaces 2019-05-22 18:25:51 +08:00
Jiajie Chen
20da06add5 Fix rcore router for linear mapping 2019-05-22 14:37:59 +08:00
Jiajie Chen
c67f00d7ca Use MaybeUninit for uninitialized 2019-05-22 14:23:04 +08:00
equation314
e63f11d199 console: support \t 2019-05-21 00:59:59 +08:00
equation314
97539dd760 aarch64: speed up page table map/unmap 
1. update crate aarch64, call tlb_invalidate() instead of tlb_invalidate_all() in MapperFlush::flush().
2. reduce user stack size to 1MiB.
 2019-05-21 00:46:12 +08:00
equation314
52251b2adb aarch64: refactor to linear mapping 
TODO:
* `map`, `unmap` is significantly slower than other archs
* set segment permissions for kernel page table in bootloader
 2019-05-20 21:51:53 +08:00
PanQL
f8c88baeea nonblock stdin for mgba keyboard support 2019-05-20 10:28:27 +08:00
BenjaminPMLovegood
469e866dca Merge branch 'geminilab' of github.com:GeminiLab/rCore into geminilab 2019-05-20 03:14:51 +08:00
BenjaminPMLovegood
e9588086be sd_init 2019-05-20 03:14:37 +08:00
NagiNikaido
62654b99f9 SEND_SCR done & bug fixed. 2019-05-20 00:22:53 +08:00
PanQL
f9734b6134 mmap support for mgba's partical redraw 2019-05-19 17:09:05 +08:00
PanQL
545d9d301c use copy_from_slice to speed up 2019-05-17 00:53:23 +08:00
Jiajie Chen
3cdd3231d8 Update enlarge heap and drivers provider 2019-05-16 08:47:22 +08:00
Jiajie Chen
41da379593 Use new check_and_clone_cstr{,array} 2019-05-16 00:49:46 +08:00
Jiajie Chen
14a01cf3fc Implement fixup for mipsel and small fixes 2019-05-16 00:28:29 +08:00
Jiajie Chen
6344f80a9b Support efault fixup for riscv 2019-05-15 23:12:06 +08:00
Jiajie Chen
92a9674f66 Implement efault detection by fixup 2019-05-15 22:45:09 +08:00
Harry Chen
fbca9a6e3a Add conditional compilation for mipsel, fix heap size for thinpad 
Signed-off-by: Harry Chen <i@harrychen.xyz>
 2019-05-14 00:21:04 +08:00
Harry Chen
22d29a6257 Revert "Revert "Fix trapframe."" 
This reverts commit 6a83de7846.
 2019-05-14 00:11:25 +08:00
Harry Chen
6544093dc6 Revert "Revert "Save/restore FP registers when context switching (broken mipsel arch)"" 
This reverts commit b8f4ee2ce8.
 2019-05-14 00:11:22 +08:00
Harry Chen
b8f4ee2ce8 Revert "Save/restore FP registers when context switching (broken mipsel arch)" 
This reverts commit d261b4e0b3.
 2019-05-13 23:53:52 +08:00
Harry Chen
6a83de7846 Revert "Fix trapframe." 
This reverts commit 297c9d453d.
 2019-05-13 23:53:47 +08:00
Yuhao Zhou
297c9d453d Fix trapframe. 2019-05-13 22:20:52 +08:00
Harry Chen
d261b4e0b3 Save/restore FP registers when context switching (broken mipsel arch) 
Signed-off-by: Harry Chen <i@harrychen.xyz>
 2019-05-13 21:18:25 +08:00
PanQL
9e4a3f9662 create virtual vga file, now can draw fb on user state 2019-05-13 20:57:03 +08:00
NagiNikaido
8c3323c4d4 mutex added. 2019-05-13 13:47:33 +08:00
NagiNikaido
edf9cf1225 nearly done. it seems that the architecture is not applausible. rust sucks. 2019-05-13 05:04:18 +08:00
Yuhao Zhou
6add7002fd Update consts for MIPS.malta 2019-05-12 22:56:34 +08:00
Harry Chen
9203a612f8 Merge branch 'dev' into mipsel 2019-05-12 22:41:51 +08:00
Jiajie Chen
deba6e9204 Fix phys_to_virt 2019-05-12 15:32:30 +08:00
Jiajie Chen
221304d78a Use phys_to_virt and virt_to_phys to replace the use of KERNEL_OFFSET 2019-05-12 15:28:42 +08:00
Jiajie Chen
28652ef685 Fix rv mask 2019-05-12 07:14:30 +08:00
Jiajie Chen
ba8f9370ba Remove rv48 support, for it has no use and it's easy to add back when necessary 2019-05-12 01:46:55 +08:00
Jiajie Chen
5afd84e5d3 Finish rv64 with sv39 support 2019-05-12 01:44:49 +08:00
PanQL
9ac8f1b887 some work for console-vga(1024*7683) adaption 2019-05-12 01:43:02 +08:00
Jiajie Chen
26e47fc36f [WIP] Initial rv64 sv39 support 2019-05-12 01:11:53 +08:00
Jiajie Chen
0d801eceb5 [WIP] Fix rv32 serial interrupt 2019-05-11 23:12:05 +08:00
Jiajie Chen
f6a54c398d [WIP] rv32 can enter userland now 2019-05-11 23:10:19 +08:00
Jiajie Chen
cf6a7746f4 [WIP] update rv32 linear mapping 2019-05-11 22:50:41 +08:00
Yuhao Zhou
c1d139598c Merge remote-tracking branch 'origin/dev' into mipsel 2019-05-11 18:24:20 +08:00
Jiajie Chen
d66df43ec0 [WIP] rv32 linear mapping 2019-05-11 12:21:58 +08:00
WangRunji
c8262f936f fix paging for mips 2019-05-11 12:00:39 +08:00
WangRunji
cd22273ef9 refactor to linear mapping for x86_64 2019-05-11 01:06:44 +08:00
Jiajie Chen
8149793b9a Fix typo in mips paging 2019-05-10 17:34:18 +08:00
Harry Chen
75b67fa575 Replace \n to \r\n in serial driver 
Signed-off-by: Harry Chen <i@harrychen.xyz>
 2019-05-10 17:25:49 +08:00
PanQL
66b783de21 should not be so rude 2019-05-10 14:56:14 +08:00
WangRunji
6e5b3e2515 fix broken pipe status. rustc works now! 2019-05-10 12:28:37 +08:00
Jiajie Chen
6bb11a5433 Reset router tx/rx fifo and fix tx length 2019-05-10 08:10:03 +08:00
WangRunji
fbd2aef916 fix page table racing by adding a global mutex 2019-05-10 00:11:09 +08:00
WangRunji
ba8d08d733 fix Process dropping by making proc.parent a weak reference 2019-05-09 23:56:39 +08:00
WangRunji
9df9d01e68 impl deadlock detection 2019-05-09 22:27:44 +08:00
WangRunji
d28f54ce32 show tid on log 2019-05-09 21:33:26 +08:00
PanQL
a0fc201695 set up vga 320x200 2019-05-09 21:16:25 +08:00
Jiajie Chen
2653069a43 Implement tx for router driver 2019-05-09 17:54:10 +08:00
Jiajie Chen
5932372750 Initial rcore router device support 2019-05-09 17:08:28 +08:00
Harry Chen
324b64c2ed Merge remote-tracking branch 'rcore/dev' into dev 2019-05-09 10:24:12 +08:00
Harry Chen
887a207c8b Run cargo fmt 
Signed-off-by: Harry Chen <i@harrychen.xyz>
 2019-05-09 10:12:19 +08:00
Harry Chen
5b53e86c41 Merge remote-tracking branch 'origin/dev' into mipsel 2019-05-09 10:05:32 +08:00
WangRunji
75919dce41 x86_64: simplify IPI 2019-05-08 23:07:58 +08:00
Jiajie Chen
2adbc4dcd9 Format code and use rust/sh for rocket chip shell 2019-05-08 20:54:18 +08:00
gjz010
c88c0193d4 x86_64: impl IPI and remote flush tlb 
Signed-off-by: WangRunji <wangrunji0408@163.com>
 2019-05-08 19:36:10 +08:00
Jiajie Chen
e3595dd0f5 Implement sys_copy_file_range and use it for sendfile 2019-05-08 19:23:07 +08:00
chyyuu
ccc7eea114 add ioctl request id: FIONBIO (no real action, just return Ok(0)). p.s. for rustc 2019-05-08 19:08:04 +08:00
chyyuu
d9d21a3db1 fix bug: sys_futex should not check timeout parameter for musl libc 1.1.22 2019-05-08 16:39:34 +08:00
chyyuu
252449a198 Merge branch 'dev' of github.com:rcore-os/rCore into dev 2019-05-08 13:18:35 +08:00
chyyuu
2fa3338b4f add unimplemented syscall SYS_MEMNARRIER from musl-1.1.22 with pthread OPs 2019-05-08 13:18:04 +08:00
chyyuu
537eecaf5e fix bug: the values of CloneFlags 2019-05-08 13:16:00 +08:00
Jiajie Chen
2e599b0bab Fix Rocket Chip serial interrupt 2019-05-08 11:02:23 +08:00
Yuhao Zhou
77ba66a0a3 Update page table. 2019-05-08 05:41:01 +08:00
Yuhao Zhou
cc5bb8a81f Fix alignment issue in TrapFrame. 2019-05-08 00:31:44 +08:00
equation314
2fb09109bb Fix wrong display in console driver 2019-05-08 00:04:41 +08:00
equation314
03a8b3e449 aarch64: disable FP/SIMD registers again, update crates 2019-05-07 22:37:53 +08:00
Harry Chen
c59cbe0dbc Fix stack alignment problem for MIPS N32 ABI, and fix alignment problem in CharAttribute 
Signed-off-by: Harry Chen <i@harrychen.xyz>
 2019-05-07 19:50:48 +08:00
Harry Chen
378daa6c9b Fix bugs in Console, repr(C) is TOO EVILgit add src/! 
Signed-off-by: Harry Chen <i@harrychen.xyz>
 2019-05-07 17:23:54 +08:00
Jiajie Chen
2f2cbb81ac Embed rocket chip dtb in code 2019-05-07 08:40:43 +08:00
Yuhao Zhou
59c1746491 Update default shell. 2019-05-07 00:47:10 +08:00
equation314
bfe03b8ea0 aarch64: fix vm clone fault in fork 2019-05-06 23:30:01 +08:00
Jiajie Chen
35079e4193 Bump buddy system allocator 2019-05-06 12:15:21 +08:00
Jiajie Chen
056c2c5a36 Fix thinpad shell 2019-05-06 11:38:53 +08:00
Jiajie Chen
af5c6ee237 Fix compilation on thinpad 2019-05-06 11:35:43 +08:00
Jiajie Chen
073108e0f8 Fix compilation on mipsel 2019-05-06 11:03:31 +08:00
Jiajie Chen
b2777032c8 Merge remote-tracking branch 'origin/mipsel' into dev 2019-05-06 10:58:27 +08:00
Harry Chen
e94fe1564e Init console on ThinPad, seems not wworking properly 
Signed-off-by: Harry Chen <i@harrychen.xyz>
 2019-05-06 10:48:27 +08:00
BenjaminPMLovegood
dbf4928c77 finish some functions 2019-05-06 01:21:48 +08:00
NagiNikaido
7c36581002 timeout_wait done 2019-05-06 00:08:50 +08:00
BenjaminPMLovegood
6520a1e5c7 . 2019-05-05 23:49:01 +08:00
NagiNikaido
dc4875c3b3 sd_cmd const done. 2019-05-05 23:38:51 +08:00
BenjaminPMLovegood
aad5175dbd added consts 2019-05-05 22:59:09 +08:00
NagiNikaido
613102287f struct emmc to be filled. 2019-05-05 22:38:25 +08:00
NagiNikaido
24e3163067 todo-list for emmc.rs 2019-05-05 17:52:18 +08:00
BenjaminPMLovegood
682f772eb8 begin translation 2019-05-05 17:44:03 +08:00
WangRunji
d10e17eb06 fix rv64 stack pointer alignment 2019-05-05 15:30:28 +08:00
BenjaminPMLovegood
8ecefc519f remove some unknown codes and update user submodule 2019-05-05 03:45:01 +08:00
BenjaminPMLovegood
5be9ae7775 Merge branch 'dev' into geminilab 2019-05-05 03:40:18 +08:00
BenjaminPMLovegood
f9bdcc7cd9 add emmc file. waiting for merging main repo. 2019-05-05 03:21:07 +08:00