Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
See what's new at GitLab
4
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
ObsidianOS
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ObsidianOS
ObsidianOS
Commits
3beca331
Commit
3beca331
authored
Jun 20, 2020
by
Nifou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ObsidianOS v0.0.1 is released!
parent
931b705a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
13 deletions
+8
-13
kernel/Cargo.lock
kernel/Cargo.lock
+1
-1
kernel/Cargo.toml
kernel/Cargo.toml
+1
-1
kernel/src/lib.rs
kernel/src/lib.rs
+2
-10
kernel/src/syscall/misc.rs
kernel/src/syscall/misc.rs
+1
-1
mk/ci.sh
mk/ci.sh
+3
-0
No files found.
kernel/Cargo.lock
View file @
3beca331
...
...
@@ -82,7 +82,7 @@ dependencies = [
[[package]]
name = "obsidianos-kernel"
version = "0.0.
0
"
version = "0.0.
1
"
dependencies = [
"bit_field 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
kernel/Cargo.toml
View file @
3beca331
[package]
name
=
"obsidianos-kernel"
version
=
"0.0.
0
"
version
=
"0.0.
1
"
authors
=
[
"Nifou <nfouquet@mailfence.com>"
]
edition
=
"2018"
...
...
kernel/src/lib.rs
View file @
3beca331
...
...
@@ -157,15 +157,11 @@ pub extern "C" fn kmain(info_addr: usize) {
.expect
(
"Memory map tag required"
)
.memory_areas
();
let
elf_sections_tag
=
boot_info
.elf_sections_tag
()
.expect
(
"cannot get elf sections tag"
);
let
multiboot_start
=
boot_info
.start_address
()
as
u64
;
let
multiboot_end
=
boot_info
.end_address
()
as
u64
;
println!
(
"Initialize components..."
);
init
(
areas
,
elf_sections_tag
,
multiboot_start
,
multiboot_end
);
init
(
areas
,
multiboot_start
,
multiboot_end
);
println!
(
"Run tests"
);
serial
::
test_serial
();
...
...
@@ -190,11 +186,7 @@ pub extern "C" fn kmain(info_addr: usize) {
.expect
(
"file not found"
)
);
println!
(
"Test ELF loading"
);
let
binary
=
initfs
::
INITFS
.get_binary_file
(
String
::
from
(
"/bin/hello"
))
.expect
(
"file not found"
);
elf
::
load
(
binary
);
elf
::
load
(
String
::
from
(
"/bin/hello"
));
println!
(
"Tests passed!"
);
exit_qemu
(
QemuExitCode
::
Success
);
...
...
kernel/src/syscall/misc.rs
View file @
3beca331
...
...
@@ -30,7 +30,7 @@ impl<'a> Syscall<'a> {
match
code
{
ARCH_SET_FS
=>
{
unsafe
{
x86
::
msr
::
wrmsr
(
x86
::
msr
::
IA32_FS_BASE
,
addr
as
u64
);
}
FsBase
::
write
(
VirtAddr
::
new
(
addr
as
u64
));
},
_
=>
(),
}
...
...
mk/ci.sh
View file @
3beca331
...
...
@@ -53,6 +53,9 @@ rustup component add rust-src
cargo
install
xargo
xargo
--version
# Add the musl target
rustup target add x86_64-unknown-linux-musl
# Run tests
make test_ci
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment