andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-22 16:16:16 +04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'OsTrain2018-g4' of github.com:oscourse-tsinghua/RustOS into lcy_issue1

Browse Source
This commit is contained in:
lcy1996 2018-10-30 12:46:01 +08:00
commit 2c3de7b222
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/src/arch/riscv32/compiler_rt.rs
View File

@ -56,7 +56,13 @@ unsafe fn __atomic_compare_exchange<T: PartialEq>(dst: *mut T, expected: *mut T,
let flags = interrupt::disable_and_store();
let val = read(dst);
let success = val == read(expected);
write(dst, if success {desired} else {val});
if success {
write(dst, desired);
write(expected, val);
} else {
write(expected, val);
}
interrupt::restore(flags);
success
}