user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

std: Make the generic atomics take unsafe pointers

Browse source 
These mutate values behind references that are Freeze, which is not
allowed.
This commit is contained in:
Brian Anderson 2014-02-24 18:20:52 -08:00 • committed by Alex Crichton
parent f3fef9a649
commit eb25c42fc8
5 changed files with 157 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/test/auxiliary/cci_intrinsic.rs
View file

@ -10,26 +10,12 @@
pub mod rusti {
extern "rust-intrinsic" {
pub fn atomic_cxchg<T>(dst: &T, old: T, src: T) -> T;
pub fn atomic_cxchg_acq<T>(dst: &T, old: T, src: T) -> T;
pub fn atomic_cxchg_rel<T>(dst: &T, old: T, src: T) -> T;
pub fn atomic_xchg<T>(dst: &T, src: T) -> T;
pub fn atomic_xchg_acq<T>(dst: &T, src: T) -> T;
pub fn atomic_xchg_rel<T>(dst: &T, src: T) -> T;
pub fn atomic_xadd<T>(dst: &T, src: T) -> T;
pub fn atomic_xadd_acq<T>(dst: &T, src: T) -> T;
pub fn atomic_xadd_rel<T>(dst: &T, src: T) -> T;
pub fn atomic_xsub<T>(dst: &T, src: T) -> T;
pub fn atomic_xsub_acq<T>(dst: &T, src: T) -> T;
pub fn atomic_xsub_rel<T>(dst: &T, src: T) -> T;
pub fn atomic_xchg<T>(dst: *mut T, src: T) -> T;
}
}
#[inline(always)]
pub fn atomic_xchg(dst: &mut int, src: int) -> int {
pub fn atomic_xchg(dst: *mut int, src: int) -> int {
unsafe {
rusti::atomic_xchg(dst, src)
}

64
src/test/run-pass/intrinsic-atomics.rs
View file

@ -10,27 +10,27 @@
mod rusti {
extern "rust-intrinsic" {
pub fn atomic_cxchg<T>(dst: &T, old: T, src: T) -> T;
pub fn atomic_cxchg_acq<T>(dst: &T, old: T, src: T) -> T;
pub fn atomic_cxchg_rel<T>(dst: &T, old: T, src: T) -> T;
pub fn atomic_cxchg<T>(dst: *mut T, old: T, src: T) -> T;
pub fn atomic_cxchg_acq<T>(dst: *mut T, old: T, src: T) -> T;
pub fn atomic_cxchg_rel<T>(dst: *mut T, old: T, src: T) -> T;
pub fn atomic_load<T>(src: &T) -> T;
pub fn atomic_load_acq<T>(src: &T) -> T;
pub fn atomic_load<T>(src: *T) -> T;
pub fn atomic_load_acq<T>(src: *T) -> T;
pub fn atomic_store<T>(dst: &T, val: T);
pub fn atomic_store_rel<T>(dst: &T, val: T);
pub fn atomic_store<T>(dst: *mut T, val: T);
pub fn atomic_store_rel<T>(dst: *mut T, val: T);
pub fn atomic_xchg<T>(dst: &T, src: T) -> T;
pub fn atomic_xchg_acq<T>(dst: &T, src: T) -> T;
pub fn atomic_xchg_rel<T>(dst: &T, src: T) -> T;
pub fn atomic_xchg<T>(dst: *mut T, src: T) -> T;
pub fn atomic_xchg_acq<T>(dst: *mut T, src: T) -> T;
pub fn atomic_xchg_rel<T>(dst: *mut T, src: T) -> T;
pub fn atomic_xadd<T>(dst: &T, src: T) -> T;
pub fn atomic_xadd_acq<T>(dst: &T, src: T) -> T;
pub fn atomic_xadd_rel<T>(dst: &T, src: T) -> T;
pub fn atomic_xadd<T>(dst: *mut T, src: T) -> T;
pub fn atomic_xadd_acq<T>(dst: *mut T, src: T) -> T;
pub fn atomic_xadd_rel<T>(dst: *mut T, src: T) -> T;
pub fn atomic_xsub<T>(dst: &T, src: T) -> T;
pub fn atomic_xsub_acq<T>(dst: &T, src: T) -> T;
pub fn atomic_xsub_rel<T>(dst: &T, src: T) -> T;
pub fn atomic_xsub<T>(dst: *mut T, src: T) -> T;
pub fn atomic_xsub_acq<T>(dst: *mut T, src: T) -> T;
pub fn atomic_xsub_rel<T>(dst: *mut T, src: T) -> T;
}
}
@ -38,41 +38,41 @@ pub fn main() {
unsafe {
let mut x = ~1;
assert_eq!(rusti::atomic_load(x), 1);
assert_eq!(rusti::atomic_load(&*x), 1);
*x = 5;
assert_eq!(rusti::atomic_load_acq(x), 5);
assert_eq!(rusti::atomic_load_acq(&*x), 5);
rusti::atomic_store(x,3);
rusti::atomic_store(&mut *x,3);
assert_eq!(*x, 3);
rusti::atomic_store_rel(x,1);
rusti::atomic_store_rel(&mut *x,1);
assert_eq!(*x, 1);
assert_eq!(rusti::atomic_cxchg(x, 1, 2), 1);
assert_eq!(rusti::atomic_cxchg(&mut *x, 1, 2), 1);
assert_eq!(*x, 2);
assert_eq!(rusti::atomic_cxchg_acq(x, 1, 3), 2);
assert_eq!(rusti::atomic_cxchg_acq(&mut *x, 1, 3), 2);
assert_eq!(*x, 2);
assert_eq!(rusti::atomic_cxchg_rel(x, 2, 1), 2);
assert_eq!(rusti::atomic_cxchg_rel(&mut *x, 2, 1), 2);
assert_eq!(*x, 1);
assert_eq!(rusti::atomic_xchg(x, 0), 1);
assert_eq!(rusti::atomic_xchg(&mut *x, 0), 1);
assert_eq!(*x, 0);
assert_eq!(rusti::atomic_xchg_acq(x, 1), 0);
assert_eq!(rusti::atomic_xchg_acq(&mut *x, 1), 0);
assert_eq!(*x, 1);
assert_eq!(rusti::atomic_xchg_rel(x, 0), 1);
assert_eq!(rusti::atomic_xchg_rel(&mut *x, 0), 1);
assert_eq!(*x, 0);
assert_eq!(rusti::atomic_xadd(x, 1), 0);
assert_eq!(rusti::atomic_xadd_acq(x, 1), 1);
assert_eq!(rusti::atomic_xadd_rel(x, 1), 2);
assert_eq!(rusti::atomic_xadd(&mut *x, 1), 0);
assert_eq!(rusti::atomic_xadd_acq(&mut *x, 1), 1);
assert_eq!(rusti::atomic_xadd_rel(&mut *x, 1), 2);
assert_eq!(*x, 3);
assert_eq!(rusti::atomic_xsub(x, 1), 3);
assert_eq!(rusti::atomic_xsub_acq(x, 1), 2);
assert_eq!(rusti::atomic_xsub_rel(x, 1), 1);
assert_eq!(rusti::atomic_xsub(&mut *x, 1), 3);
assert_eq!(rusti::atomic_xsub_acq(&mut *x, 1), 2);
assert_eq!(rusti::atomic_xsub_rel(&mut *x, 1), 1);
assert_eq!(*x, 0);
}
}