diff --git a/Cargo.toml b/Cargo.toml index 8d6f168..d1ccc0a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,14 +5,14 @@ edition = "2021" [dependencies] bitflags = "2.5.0" -ps4k = { path = "ps4k" } +korbis = { path = "korbis" } x86_64 = { version = "0.15.1", features = ["instructions"], default-features = false } [target.'cfg(fw = "1100")'.dependencies] -ps4k-1100 = { path = "ps4k-1100" } +korbis-1100 = { path = "korbis-1100" } [profile.release] opt-level = "z" [workspace] -members = ["ps4k", "ps4k-1100", "ps4k-macros"] +members = ["korbis", "korbis-1100", "korbis-macros"] diff --git a/ps4k-1100/Cargo.toml b/korbis-1100/Cargo.toml similarity index 61% rename from ps4k-1100/Cargo.toml rename to korbis-1100/Cargo.toml index 7f71490..e102484 100644 --- a/ps4k-1100/Cargo.toml +++ b/korbis-1100/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "ps4k-1100" +name = "korbis-1100" version = "0.1.0" edition = "2021" links = "orbiskernel" [dependencies] -ps4k = { path = "../ps4k" } +korbis = { path = "../korbis" } diff --git a/ps4k-1100/build.rs b/korbis-1100/build.rs similarity index 100% rename from ps4k-1100/build.rs rename to korbis-1100/build.rs diff --git a/ps4k-1100/src/lib.rs b/korbis-1100/src/lib.rs similarity index 93% rename from ps4k-1100/src/lib.rs rename to korbis-1100/src/lib.rs index 59ecbc8..a50b1e9 100644 --- a/ps4k-1100/src/lib.rs +++ b/korbis-1100/src/lib.rs @@ -2,7 +2,7 @@ use self::thread::Thread; use core::ffi::{c_char, c_int}; -use ps4k::offset; +use korbis::offset; mod thread; @@ -11,7 +11,7 @@ pub struct Kernel { elf: &'static [u8], } -impl ps4k::Kernel for Kernel { +impl korbis::Kernel for Kernel { type Thread = Thread; unsafe fn new(base: *const u8) -> Self { diff --git a/ps4k-1100/src/thread.rs b/korbis-1100/src/thread.rs similarity index 60% rename from ps4k-1100/src/thread.rs rename to korbis-1100/src/thread.rs index a51447e..9fd243e 100644 --- a/ps4k-1100/src/thread.rs +++ b/korbis-1100/src/thread.rs @@ -1,11 +1,11 @@ -/// Implementation of [`ps4k::thread::Thread`] for 11.00. +/// Implementation of [`korbis::thread::Thread`] for 11.00. #[repr(C)] pub struct Thread { pad: [u8; 0x398], ret: [usize; 2], // td_retval } -impl ps4k::thread::Thread for Thread { +impl korbis::thread::Thread for Thread { fn ret(&self, i: usize) -> usize { self.ret[i] } diff --git a/ps4k-macros/Cargo.toml b/korbis-macros/Cargo.toml similarity index 88% rename from ps4k-macros/Cargo.toml rename to korbis-macros/Cargo.toml index 346f46d..c963416 100644 --- a/ps4k-macros/Cargo.toml +++ b/korbis-macros/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ps4k-macros" +name = "korbis-macros" version = "0.1.0" edition = "2021" diff --git a/ps4k-macros/src/lib.rs b/korbis-macros/src/lib.rs similarity index 100% rename from ps4k-macros/src/lib.rs rename to korbis-macros/src/lib.rs diff --git a/ps4k-macros/src/offset.rs b/korbis-macros/src/offset.rs similarity index 100% rename from ps4k-macros/src/offset.rs rename to korbis-macros/src/offset.rs diff --git a/korbis/Cargo.toml b/korbis/Cargo.toml new file mode 100644 index 0000000..ebafd70 --- /dev/null +++ b/korbis/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "korbis" +version = "0.1.0" +edition = "2021" + +[dependencies] +korbis-macros = { path = "../korbis-macros" } diff --git a/ps4k/src/elf/mod.rs b/korbis/src/elf/mod.rs similarity index 100% rename from ps4k/src/elf/mod.rs rename to korbis/src/elf/mod.rs diff --git a/ps4k/src/lib.rs b/korbis/src/lib.rs similarity index 99% rename from ps4k/src/lib.rs rename to korbis/src/lib.rs index 64741a5..81b1e9e 100644 --- a/ps4k/src/lib.rs +++ b/korbis/src/lib.rs @@ -4,7 +4,7 @@ use self::elf::ProgramType; use self::thread::Thread; use core::ffi::{c_char, c_int}; -pub use ps4k_macros::*; +pub use korbis_macros::*; pub mod elf; pub mod thread; diff --git a/ps4k/src/thread/mod.rs b/korbis/src/thread/mod.rs similarity index 100% rename from ps4k/src/thread/mod.rs rename to korbis/src/thread/mod.rs diff --git a/ps4k/Cargo.toml b/ps4k/Cargo.toml deleted file mode 100644 index 5c7adca..0000000 --- a/ps4k/Cargo.toml +++ /dev/null @@ -1,7 +0,0 @@ -[package] -name = "ps4k" -version = "0.1.0" -edition = "2021" - -[dependencies] -ps4k-macros = { path = "../ps4k-macros" } diff --git a/src/main.rs b/src/main.rs index 9afba8c..8127939 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,7 +7,7 @@ use core::cmp::min; use core::ffi::c_int; use core::mem::{size_of_val, zeroed}; use core::panic::PanicInfo; -use ps4k::Kernel; +use korbis::Kernel; use x86_64::registers::model_specific::LStar; mod method; @@ -163,7 +163,7 @@ fn notify(method: &impl DumpMethod, msg: impl AsRef<[u8]>) { #[cfg(fw = "1100")] unsafe fn init(base: *const u8) -> impl Kernel { - ps4k_1100::Kernel::new(base) + korbis_1100::Kernel::new(base) } #[panic_handler] diff --git a/src/syscall.rs b/src/syscall.rs index 23baa7e..85683f0 100644 --- a/src/syscall.rs +++ b/src/syscall.rs @@ -2,8 +2,8 @@ use crate::method::{DumpMethod, OpenFlags, OwnedFd}; use core::ffi::{c_int, c_void, CStr}; use core::mem::transmute; use core::num::NonZeroI32; -use ps4k::thread::Thread; -use ps4k::Kernel; +use korbis::thread::Thread; +use korbis::Kernel; use x86_64::registers::control::Cr0; /// Implementation of [`DumpMethod`] using syscalls.