Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
educg-net-14239-914332
OSKernel2022-Maturin-812
Commits
1cc99b9a
Commit
1cc99b9a
authored
2 years ago
by
Maturin
Browse files
Options
Download
Plain Diff
Merge branch 'dev' into static-task
update user base address to 0x80200000
parents
a9876f47
ed523680
static-task
No related merge requests found
Changes
31
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.gitignore
+1
-0
.gitignore
doc/tutor.md
+10
-1
doc/tutor.md
kernel/Cargo.lock
+37
-7
kernel/Cargo.lock
kernel/Cargo.toml
+3
-3
kernel/Cargo.toml
kernel/Makefile
+8
-1
kernel/Makefile
kernel/src/arch/riscv/boot/entry.S
+3
-1
kernel/src/arch/riscv/boot/entry.S
kernel/src/arch/riscv/boot/linker.ld
+1
-1
kernel/src/arch/riscv/boot/linker.ld
kernel/src/arch/riscv/mod.rs
+2
-1
kernel/src/arch/riscv/mod.rs
kernel/src/arch/riscv/sbi.rs
+10
-2
kernel/src/arch/riscv/sbi.rs
kernel/src/arch/riscv/stdout.rs
+11
-3
kernel/src/arch/riscv/stdout.rs
kernel/src/console.rs
+15
-2
kernel/src/console.rs
kernel/src/constants.rs
+1
-1
kernel/src/constants.rs
kernel/src/lang.rs
+2
-2
kernel/src/lang.rs
kernel/src/loader.rs
+3
-1
kernel/src/loader.rs
kernel/src/loaders/mod.rs
+2
-3
kernel/src/loaders/mod.rs
kernel/src/main.rs
+11
-4
kernel/src/main.rs
kernel/src/memory/allocator/frame.rs
+1
-1
kernel/src/memory/allocator/frame.rs
kernel/src/memory/areas/fixed.rs
+1
-1
kernel/src/memory/areas/fixed.rs
kernel/src/memory/areas/lazy.rs
+1
-1
kernel/src/memory/areas/lazy.rs
kernel/src/memory/areas/mod.rs
+1
-1
kernel/src/memory/areas/mod.rs
with
124 additions
and
37 deletions
+124
-37
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets