mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
kernel: fix process exception handling state
Correctly handle transitions to and from exception handling. Previously, the thread ID was incorrectly set such that the exception handler became a valid thread. This has been adjusted so that the exception handler is no longer considered a thread, and all other threads will cease scheduling during this process. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
63dc07d633
commit
24dd538a5c
1 changed files with 7 additions and 3 deletions
|
|
@ -647,7 +647,7 @@ impl SystemServices {
|
||||||
ProcessState::Debug(x) if x & (1 << tid) == 0 => ProcessState::Debug(x | (1 << tid)),
|
ProcessState::Debug(x) if x & (1 << tid) == 0 => ProcessState::Debug(x | (1 << tid)),
|
||||||
ProcessState::Exception(ready_threads)
|
ProcessState::Exception(ready_threads)
|
||||||
| ProcessState::BlockedException(ready_threads) => {
|
| ProcessState::BlockedException(ready_threads) => {
|
||||||
ProcessState::Exception(ready_threads | (1 << tid))
|
ProcessState::Exception(ready_threads)
|
||||||
}
|
}
|
||||||
other => panic!(
|
other => panic!(
|
||||||
"PID {} was not in a state to wake thread {}: {:?}",
|
"PID {} was not in a state to wake thread {}: {:?}",
|
||||||
|
|
@ -2205,10 +2205,12 @@ impl SystemServices {
|
||||||
let process = self.get_process_mut(pid).ok()?;
|
let process = self.get_process_mut(pid).ok()?;
|
||||||
let handler = process.exception_handler?;
|
let handler = process.exception_handler?;
|
||||||
process.state = match process.state {
|
process.state = match process.state {
|
||||||
ProcessState::Running(x) => ProcessState::Exception(x),
|
ProcessState::Running(x) => ProcessState::Exception(x | 1<<process.current_thread),
|
||||||
ProcessState::Ready(x) => ProcessState::Exception(x),
|
ProcessState::Ready(x) => ProcessState::Exception(x),
|
||||||
_ => return None,
|
_ => return None,
|
||||||
};
|
};
|
||||||
|
process.previous_thread = process.current_thread;
|
||||||
|
process.current_thread = crate::arch::process::EXCEPTION_TID;
|
||||||
// Activate the current context
|
// Activate the current context
|
||||||
let mut arch_process = ArchProcess::current();
|
let mut arch_process = ArchProcess::current();
|
||||||
arch_process
|
arch_process
|
||||||
|
|
@ -2226,7 +2228,9 @@ impl SystemServices {
|
||||||
) -> Result<(), xous_kernel::Result> {
|
) -> Result<(), xous_kernel::Result> {
|
||||||
let process = self.get_process_mut(pid)?;
|
let process = self.get_process_mut(pid)?;
|
||||||
if let ProcessState::Exception(threads) = process.state {
|
if let ProcessState::Exception(threads) = process.state {
|
||||||
process.state = ProcessState::Running(threads);
|
assert!(threads & (1 << process.previous_thread) != 0);
|
||||||
|
process.state = ProcessState::Running(threads & !(1 << process.previous_thread));
|
||||||
|
process.current_thread = process.previous_thread;
|
||||||
ArchProcess::current().set_tid(process.current_thread)?;
|
ArchProcess::current().set_tid(process.current_thread)?;
|
||||||
} else {
|
} else {
|
||||||
return Err(xous_kernel::Error::ThreadNotAvailable.into());
|
return Err(xous_kernel::Error::ThreadNotAvailable.into());
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue