Compare commits

..

No commits in common. "1b5337080020767bb9296a681a005d85e30f5576" and "867d45fe5cfef098244ec3990b02faefd3015a39" have entirely different histories.

7 changed files with 8 additions and 138 deletions

94
Cargo.lock generated
View File

@ -8,61 +8,27 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bit_field"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "2.8.0" version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
[[package]]
name = "conquer-once"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c6d3a9775a69f6d1fe2cc888999b67ed30257d3da4d2af91984e722f2ec918a"
dependencies = [
"conquer-util",
]
[[package]]
name = "conquer-util"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e763eef8846b13b380f37dfecda401770b0ca4e56e95170237bd7c25c7db3582"
[[package]] [[package]]
name = "flagset" name = "flagset"
version = "0.4.6" version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3ea1ec5f8307826a5b71094dd91fc04d4ae75d5709b20ad351c7fb4815c86ec" checksum = "b3ea1ec5f8307826a5b71094dd91fc04d4ae75d5709b20ad351c7fb4815c86ec"
[[package]]
name = "font8x8"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "875488b8711a968268c7cf5d139578713097ca4635a76044e8fe8eedf831d07e"
[[package]] [[package]]
name = "gila" name = "gila"
version = "0.1.1" version = "0.1.0"
dependencies = [ dependencies = [
"flagset", "flagset",
"lazy_static", "lazy_static",
"limine", "limine",
"spin", "spin",
"talc", "talc",
"vga",
] ]
[[package]] [[package]]
@ -80,7 +46,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ca87cab008b8efeebdbe037cd4d1438037d48c5cb6fed939ffa5aa06315a321" checksum = "9ca87cab008b8efeebdbe037cd4d1438037d48c5cb6fed939ffa5aa06315a321"
dependencies = [ dependencies = [
"bitflags 2.8.0", "bitflags",
] ]
[[package]] [[package]]
@ -93,21 +59,6 @@ dependencies = [
"scopeguard", "scopeguard",
] ]
[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]]
name = "rustversion"
version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
[[package]] [[package]]
name = "scopeguard" name = "scopeguard"
version = "1.2.0" version = "1.2.0"
@ -123,15 +74,6 @@ dependencies = [
"lock_api", "lock_api",
] ]
[[package]]
name = "spinning_top"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b9eb1a2f4c41445a3a0ff9abc5221c5fcd28e1f13cd7c0397706f9ac938ddb0"
dependencies = [
"lock_api",
]
[[package]] [[package]]
name = "talc" name = "talc"
version = "4.4.2" version = "4.4.2"
@ -140,35 +82,3 @@ checksum = "3fcad3be1cfe36eb7d716a04791eba36a197da9d9b6ea1e28e64ac569da3701d"
dependencies = [ dependencies = [
"lock_api", "lock_api",
] ]
[[package]]
name = "vga"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5dd163a9cf938e0406e1ee29e3b71ac7d8f5ffe6c1321fe74797ebef1299bc6"
dependencies = [
"bitflags 1.3.2",
"conquer-once",
"font8x8",
"num-traits",
"spinning_top",
"x86_64",
]
[[package]]
name = "volatile"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "442887c63f2c839b346c192d047a7c87e73d0689c9157b00b53dcc27dd5ea793"
[[package]]
name = "x86_64"
version = "0.14.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c101112411baafbb4bf8d33e4c4a80ab5b02d74d2612331c61e8192fc9710491"
dependencies = [
"bit_field",
"bitflags 2.8.0",
"rustversion",
"volatile",
]

View File

@ -1,6 +1,6 @@
[package] [package]
name = "gila" name = "gila"
version = "0.1.1" version = "0.1.0"
edition = "2024" edition = "2024"
[dependencies] [dependencies]
@ -9,7 +9,6 @@ lazy_static = { version = "1.5.0", features = ["spin_no_std"] }
limine = "0.3.1" limine = "0.3.1"
spin = "0.9.8" spin = "0.9.8"
talc = "4.4.2" talc = "4.4.2"
vga = "0.2.9"
[[bin]] [[bin]]
name = "gila" name = "gila"

View File

@ -1,5 +1,5 @@
# Gila v0.1.1 - a Rust Microkernel # Gila v0.1.0 - a Rust Microkernel
Gila is a Rust microkernel OS, inspired by the Xinu embedded OS. It will Gila is a Rust microkernel OS, inspired by the Xinu embedded OS. It will
hopefully be capable of multitasking some day. I do not intend for Gila to hopefully be capable of multitasking some day. I do not intend for Gila to
@ -16,7 +16,6 @@ Licensed under the GNU Public License v3. See [LICENSE](LICENSE) for details.
## Navigating ## Navigating
- [boot.rs](src/boot.rs): Handles bootloader handoff. Gila uses Limine. Other bootloaders are NOT supported. - [boot.rs](src/boot.rs): Handles bootloader handoff. Gila uses Limine. Other bootloaders are NOT supported.
- [display.rs](src/display.rs): Handles text-mode display via the VGA buffer.
- [lib.rs](src/lib.rs): Glue to make all files accessible from [main.rs](src/main.rs). - [lib.rs](src/lib.rs): Glue to make all files accessible from [main.rs](src/main.rs).
- [main.rs](src/main.rs): The entry point that gets called by the bootloader. - [main.rs](src/main.rs): The entry point that gets called by the bootloader.
- [memory.rs](src/memory.rs): Types relating to memory regions and allocation. - [memory.rs](src/memory.rs): Types relating to memory regions and allocation.

View File

@ -1,6 +1,5 @@
#![allow(dead_code)] #![allow(dead_code)]
use limine::{request::SmpRequest, BaseRevision}; use limine::BaseRevision;
pub static BASE_REVISION: BaseRevision = limine::BaseRevision::new(); static BASE: BaseRevision = limine::BaseRevision::new();
pub static SMP_REQUEST: SmpRequest = limine::request::SmpRequest::new();

View File

@ -1,28 +0,0 @@
use vga;
pub use vga::writers::TextWriter;
struct TextDisplay {
writer: vga::writers::Text80x25,
column: usize,
row: usize,
}
impl TextDisplay {
pub const fn new() -> Self {
TextDisplay {
writer: vga::writers::Text80x25::new(),
column: 0,
row: 0,
}
}
pub fn writeline(text: &str, colors: vga::colors::TextModeColor) {
}
pub fn write(text: &str, colors: vga::colors::TextModeColor) {
}
}
pub static TEXT_DISPLAY: TextDisplay = TextDisplay::new();

View File

@ -10,6 +10,4 @@ pub mod panic;
/// Boot services, handled by the Limine boot protocol. /// Boot services, handled by the Limine boot protocol.
pub mod boot; pub mod boot;
/// Resources accessible from many parts of the code. /// Resources accessible from many parts of the code.
pub mod resources; pub mod resources;
/// Display facilities.
pub mod display;

View File

@ -5,18 +5,11 @@
#![allow(dead_code)] #![allow(dead_code)]
#![allow(unused_imports)] #![allow(unused_imports)]
use gila::boot::*;
use gila::process; use gila::process;
use gila::memory; use gila::memory;
use gila::panic; use gila::panic;
use gila::boot;
use gila::display::{self, TextWriter};
#[unsafe(no_mangle)] #[unsafe(no_mangle)]
pub extern "C" fn main() { pub extern "C" fn main() {
assert!(BASE_REVISION.is_supported());
let _smp_response = SMP_REQUEST.get_response();
} }