mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
kernel: begin re-porting xous to baremetal
Only 68 errors to fix! Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
49083081c3
commit
fb6d42be55
4 changed files with 77 additions and 54 deletions
|
|
@ -18,3 +18,6 @@ rustflags = [
|
||||||
"-C", "linker-plugin-lto",
|
"-C", "linker-plugin-lto",
|
||||||
"-C", "force-frame-pointers=no",
|
"-C", "force-frame-pointers=no",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[build]
|
||||||
|
target = "riscv32imac-unknown-none-elf"
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ pub mod syscall;
|
||||||
pub use process::Context;
|
pub use process::Context;
|
||||||
|
|
||||||
pub fn current_pid() -> PID {
|
pub fn current_pid() -> PID {
|
||||||
satp::read().asid() as PID
|
PID::new(satp::read().asid() as _).unwrap()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn init() {
|
pub fn init() {
|
||||||
|
|
@ -21,6 +21,9 @@ pub fn init() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn idle() {
|
/// Put the core to sleep until an interrupt hits. Returns `true`
|
||||||
|
/// to indicate the kernel should not exit.
|
||||||
|
pub fn idle() -> bool {
|
||||||
unsafe { riscv::asm::wfi() };
|
unsafe { riscv::asm::wfi() };
|
||||||
|
true
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,9 @@
|
||||||
use core::mem;
|
use core::mem;
|
||||||
static mut PROCESS: *mut Process = 0xff80_1000 as *mut Process;
|
static mut PROCESS: *mut Process = 0xff80_1000 as *mut Process;
|
||||||
pub const MAX_CONTEXT: ThreadID = 31;
|
pub const MAX_THREAD: TID = 31;
|
||||||
use crate::arch::mem::PAGE_SIZE;
|
use crate::arch::mem::PAGE_SIZE;
|
||||||
use crate::services::ProcessInner;
|
use crate::services::ProcessInner;
|
||||||
use xous;
|
use xous::{ProcessInit, ProcessKey, ThreadInit, PID, TID};
|
||||||
use xous::ThreadID;
|
|
||||||
|
|
||||||
use crate::args::KernelArguments;
|
use crate::args::KernelArguments;
|
||||||
const DEFAULT_STACK_SIZE: usize = 131072;
|
const DEFAULT_STACK_SIZE: usize = 131072;
|
||||||
|
|
@ -17,11 +16,6 @@ pub const RETURN_FROM_ISR: usize = 0xff80_2000;
|
||||||
pub const EXIT_THREAD: usize = 0xff80_3000;
|
pub const EXIT_THREAD: usize = 0xff80_3000;
|
||||||
pub const IRQ_CONTEXT: usize = 1;
|
pub const IRQ_CONTEXT: usize = 1;
|
||||||
|
|
||||||
pub type ContextInit = (
|
|
||||||
usize, /* entrypoint */
|
|
||||||
usize, /* stack */
|
|
||||||
usize, /* stack size */
|
|
||||||
);
|
|
||||||
|
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
#[cfg(baremetal)]
|
#[cfg(baremetal)]
|
||||||
|
|
@ -48,22 +42,22 @@ pub struct Process {
|
||||||
|
|
||||||
/// The index into the `contexts` list. This must never be 0. The interrupt
|
/// The index into the `contexts` list. This must never be 0. The interrupt
|
||||||
/// handler writes to this field, so it must not be moved.
|
/// handler writes to this field, so it must not be moved.
|
||||||
context_nr: ThreadID,
|
context_nr: TID,
|
||||||
|
|
||||||
_hash: [usize; 8],
|
_hash: [usize; 8],
|
||||||
|
|
||||||
/// Global parameters used by the operating system
|
/// Global parameters used by the operating system
|
||||||
pub inner: ProcessInner,
|
pub inner: ProcessInner,
|
||||||
|
|
||||||
/// The interrupt handler will save the current process to this Context when
|
/// The interrupt handler will save the current process to this Thread when
|
||||||
/// the trap handler is entered.
|
/// the trap handler is entered.
|
||||||
contexts: [Context; MAX_CONTEXT],
|
contexts: [Thread; MAX_THREAD],
|
||||||
}
|
}
|
||||||
|
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
#[derive(Copy, Clone, Debug, Default)]
|
#[derive(Copy, Clone, Debug, Default)]
|
||||||
/// Everything required to keep track of a single thread of execution.
|
/// Everything required to keep track of a single thread of execution.
|
||||||
pub struct Context {
|
pub struct Thread {
|
||||||
/// Storage for all RISC-V registers, minus $zero
|
/// Storage for all RISC-V registers, minus $zero
|
||||||
pub registers: [usize; 31],
|
pub registers: [usize; 31],
|
||||||
|
|
||||||
|
|
@ -74,20 +68,43 @@ pub struct Context {
|
||||||
pub sepc: usize,
|
pub sepc: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct ContextInit {
|
|
||||||
entrypoint: usize,
|
|
||||||
stack: usize,
|
|
||||||
context: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Process {
|
impl Process {
|
||||||
pub fn current_context(&mut self) -> &mut Context {
|
|
||||||
|
/// Calls the provided function with the current inner process state.
|
||||||
|
pub fn with_inner<F, R>(f: F) -> R
|
||||||
|
where
|
||||||
|
F: FnOnce(&ProcessInner) -> R,
|
||||||
|
{
|
||||||
|
todo!();
|
||||||
|
// PROCESS_TABLE.with(|pt| {
|
||||||
|
// let process_table = pt.borrow();
|
||||||
|
// let current = &process_table.table[process_table.current.get() as usize - 1]
|
||||||
|
// .as_ref()
|
||||||
|
// .unwrap();
|
||||||
|
// f(¤t.inner)
|
||||||
|
// })
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn with_inner_mut<F, R>(f: F) -> R
|
||||||
|
where
|
||||||
|
F: FnOnce(&mut ProcessInner) -> R,
|
||||||
|
{
|
||||||
|
todo!();
|
||||||
|
// PROCESS_TABLE.with(|pt| {
|
||||||
|
// let mut process_table = pt.borrow_mut();
|
||||||
|
// let current_pid_idx = process_table.current.get() as usize - 1;
|
||||||
|
// let current = &mut process_table.table[current_pid_idx].as_mut().unwrap();
|
||||||
|
// f(&mut current.inner)
|
||||||
|
// })
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn current_thread(&mut self) -> &mut Thread {
|
||||||
assert!(self.context_nr != 0, "context number was 0");
|
assert!(self.context_nr != 0, "context number was 0");
|
||||||
&mut self.contexts[self.context_nr - 1]
|
&mut self.contexts[self.context_nr - 1]
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Set the current context number.
|
/// Set the current context number.
|
||||||
pub fn set_context(&mut self, context: ThreadID) {
|
pub fn set_thread(&mut self, context: TID) {
|
||||||
assert!(
|
assert!(
|
||||||
context > 0 && context <= self.contexts.len(),
|
context > 0 && context <= self.contexts.len(),
|
||||||
"attempt to switch to an invalid context {}",
|
"attempt to switch to an invalid context {}",
|
||||||
|
|
@ -96,7 +113,7 @@ impl Process {
|
||||||
self.context_nr = context;
|
self.context_nr = context;
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn context(&mut self, context_nr: ThreadID) -> &mut Context {
|
pub fn context(&mut self, context_nr: TID) -> &mut Thread {
|
||||||
assert!(
|
assert!(
|
||||||
context_nr > 0 && context_nr <= self.contexts.len(),
|
context_nr > 0 && context_nr <= self.contexts.len(),
|
||||||
"attempt to retrieve an invalid context {}",
|
"attempt to retrieve an invalid context {}",
|
||||||
|
|
@ -105,16 +122,16 @@ impl Process {
|
||||||
&mut self.contexts[context_nr - 1]
|
&mut self.contexts[context_nr - 1]
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn find_free_context_nr(&self) -> Option<ThreadID> {
|
pub fn find_free_context_nr(&self) -> Option<TID> {
|
||||||
for (index, context) in self.contexts.iter().enumerate() {
|
for (index, context) in self.contexts.iter().enumerate() {
|
||||||
if index != 0 && context.sepc == 0 {
|
if index != 0 && context.sepc == 0 {
|
||||||
return Some(index as ThreadID + 1);
|
return Some(index as TID + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_context_result(&mut self, context_nr: ThreadID, result: xous::Result) {
|
pub fn set_context_result(&mut self, context_nr: TID, result: xous::Result) {
|
||||||
let vals = unsafe { mem::transmute::<_, [usize; 8]>(result) };
|
let vals = unsafe { mem::transmute::<_, [usize; 8]>(result) };
|
||||||
let context = self.context(context_nr);
|
let context = self.context(context_nr);
|
||||||
for (idx, reg) in vals.iter().enumerate() {
|
for (idx, reg) in vals.iter().enumerate() {
|
||||||
|
|
@ -148,7 +165,7 @@ impl Process {
|
||||||
*context = Default::default();
|
*context = Default::default();
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut context = self.current_context();
|
let mut context = self.current_thread();
|
||||||
|
|
||||||
context.registers = Default::default();
|
context.registers = Default::default();
|
||||||
context.sepc = entrypoint;
|
context.sepc = entrypoint;
|
||||||
|
|
@ -158,37 +175,37 @@ impl Process {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Context {
|
impl Thread {
|
||||||
/// The current stack pointer for this context
|
/// The current stack pointer for this context
|
||||||
pub fn stack_pointer(&self) -> usize {
|
pub fn stack_pointer(&self) -> usize {
|
||||||
self.registers[1]
|
self.registers[1]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct ProcessHandle<'a> {
|
// pub struct ProcessHandle<'a> {
|
||||||
process: &'a mut Process,
|
// process: &'a mut Process,
|
||||||
}
|
// }
|
||||||
|
|
||||||
/// Wraps the MemoryManager in a safe mutex. Because of this, accesses
|
// /// Wraps the MemoryManager in a safe mutex. Because of this, accesses
|
||||||
/// to the Memory Manager should only be made during interrupt contexts.
|
// /// to the Memory Manager should only be made during interrupt contexts.
|
||||||
impl<'a> ProcessHandle<'a> {
|
// impl<'a> ProcessHandle<'a> {
|
||||||
/// Get the singleton Process.
|
// /// Get the singleton Process.
|
||||||
pub fn get() -> ProcessHandle<'a> {
|
// pub fn get() -> ProcessHandle<'a> {
|
||||||
ProcessHandle {
|
// ProcessHandle {
|
||||||
process: unsafe { &mut *PROCESS },
|
// process: unsafe { &mut *PROCESS },
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
use core::ops::{Deref, DerefMut};
|
// use core::ops::{Deref, DerefMut};
|
||||||
impl Deref for ProcessHandle<'_> {
|
// impl Deref for ProcessHandle<'_> {
|
||||||
type Target = Process;
|
// type Target = Process;
|
||||||
fn deref(&self) -> &Process {
|
// fn deref(&self) -> &Process {
|
||||||
&*self.process
|
// &*self.process
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
impl DerefMut for ProcessHandle<'_> {
|
// impl DerefMut for ProcessHandle<'_> {
|
||||||
fn deref_mut(&mut self) -> &mut Process {
|
// fn deref_mut(&mut self) -> &mut Process {
|
||||||
&mut *self.process
|
// &mut *self.process
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ extern crate bitflags;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
mod debug;
|
mod debug;
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(all(test, not(baremetal)))]
|
||||||
mod test;
|
mod test;
|
||||||
|
|
||||||
mod arch;
|
mod arch;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue