alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2025-01-12 01:51:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

correct which way round locked and unlocked is

Browse source
This commit is contained in:
Corwin Kuiper 2021-06-24 01:02:55 +01:00
parent 1318e7eca4
commit 47b02d29cf
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
agb/src/interrupt.rs
View file

@ -263,8 +263,8 @@ fn test_vblank_interrupt_handler(gba: &mut crate::Gba) {
#[derive(Clone, Copy, PartialEq, Eq, Debug)] #[derive(Clone, Copy, PartialEq, Eq, Debug)]
enum MutexState { enum MutexState {
Locked, Unlocked,
Unlocked(bool), Locked(bool),
} }
pub struct Mutex<T> { pub struct Mutex<T> {
@ -281,10 +281,10 @@ impl<T> Mutex<T> {
INTERRUPTS_ENABLED.set(0); INTERRUPTS_ENABLED.set(0);
assert_eq!( assert_eq!(
unsafe { *self.state.get() }, unsafe { *self.state.get() },
MutexState::Locked, MutexState::Unlocked,
"mutex must be unlocked to be able to lock it" "mutex must be unlocked to be able to lock it"
); );
unsafe { *self.state.get() = MutexState::Unlocked(state != 0) }; unsafe { *self.state.get() = MutexState::Locked(state != 0) };
MutexRef { MutexRef {
internal: &self.internal, internal: &self.internal,
state: &self.state, state: &self.state,
@ -293,7 +293,7 @@ impl<T> Mutex<T> {
pub fn new(val: T) -> Self { pub fn new(val: T) -> Self {
Mutex { Mutex {
internal: UnsafeCell::new(val), internal: UnsafeCell::new(val),
state: UnsafeCell::new(MutexState::Locked), state: UnsafeCell::new(MutexState::Unlocked),
} }
} }
} }
@ -308,10 +308,10 @@ impl<'a, T> Drop for MutexRef<'a, T> {
unsafe { unsafe {
let state = &mut *self.state.get(); let state = &mut *self.state.get();
let prev_state = *state; let prev_state = *state;
*state = MutexState::Locked; *state = MutexState::Unlocked;
match prev_state { match prev_state {
MutexState::Unlocked(b) => INTERRUPTS_ENABLED.set(b as u16), MutexState::Locked(b) => INTERRUPTS_ENABLED.set(b as u16),
MutexState::Locked => {} MutexState::Unlocked => {}
} }
} }
} }