obhq/obliteration
1
0
Fork 0
mirror of https://github.com/obhq/obliteration.git synced 2024-11-23 03:09:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Moves macros to top-level (#1070)

Browse Source
This commit is contained in:
Putta Khunchalee 2024-10-26 21:44:09 +07:00 committed by GitHub
parent 93894163b5
commit cb79f3a13a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -4,11 +4,11 @@ members = [
"arch/x86-64", "arch/x86-64",
"gui", "gui",
"kernel", "kernel",
"macros",
"src/fs", "src/fs",
"src/gmtx", "src/gmtx",
"src/kernel", "src/kernel",
"src/llt", "src/llt",
"src/macros",
"src/obconf", "src/obconf",
"src/param", "src/param",
"src/pfs", "src/pfs",

2
kernel/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
anstyle = { version = "1.0.8", default-features = false } anstyle = { version = "1.0.8", default-features = false }
bitfield-struct = "0.8.0" bitfield-struct = "0.8.0"
hashbrown = "0.14.5" hashbrown = "0.14.5"
macros = { path = "../src/macros" } macros = { path = "../macros" }
obconf = { path = "../src/obconf", features = ["virt"] } obconf = { path = "../src/obconf", features = ["virt"] }
spin = { version = "0.9.8", features = ["spin_mutex"], default-features = false } spin = { version = "0.9.8", features = ["spin_mutex"], default-features = false }
talc = { version = "4.4.1", default-features = false } talc = { version = "4.4.1", default-features = false }

6
kernel/src/x86_64.rs
View File

@ -128,7 +128,7 @@ pub unsafe fn setup_main_cpu() {
let mask = Rflags::new() let mask = Rflags::new()
.with_cf(true) .with_cf(true)
.with_tf(true) .with_tf(true)
.with_if(true) .with_if(true) // https://wiki.osdev.org/SWAPGS#Complications,_Part_2
.with_df(true) .with_df(true)
.with_nt(true) .with_nt(true)
.into_bits() .into_bits()
@ -192,9 +192,9 @@ global_asm!(
); );
// See Xfast_syscall on the PS4 for a reference. // See Xfast_syscall on the PS4 for a reference.
global_asm!("syscall_entry64:", "ud2"); global_asm!("syscall_entry64:", "swapgs", "ud2");
// See fast_syscall32 on the PS4 for a reference. // See Xfast_syscall32 on the PS4 for a reference.
global_asm!("syscall_entry32:", "ud2"); global_asm!("syscall_entry32:", "ud2");
/// Raw value of a Global Descriptor-Table Register. /// Raw value of a Global Descriptor-Table Register.

0
src/macros/Cargo.toml → macros/Cargo.toml
View File

0
src/macros/src/elf.rs → macros/src/elf.rs
View File

0
src/macros/src/enum_conversions.rs → macros/src/enum_conversions.rs
View File

0
src/macros/src/errno.rs → macros/src/errno.rs
View File

0
src/macros/src/lib.rs → macros/src/lib.rs
View File

0
src/macros/src/vpath.rs → macros/src/vpath.rs
View File

2
src/kernel/Cargo.toml
View File

@ -14,7 +14,7 @@ gmtx = { path = "../gmtx" }
iced-x86 = { version = "1.18", features = ["code_asm"] } iced-x86 = { version = "1.18", features = ["code_asm"] }
libc = "0.2" libc = "0.2"
llt = { path = "../llt" } llt = { path = "../llt" }
macros = { path = "../macros" } macros = { path = "../../macros" }
param = { path = "../param" } param = { path = "../param" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_yaml = "0.9" serde_yaml = "0.9"