---

yaml
---
r: 30024
b: refs/heads/incoming
c: c47342e
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: dc107898b2524aef8854483480df7fcca7a7e7ce
+refs/heads/incoming: c47342e7c2271c32651725b0f026fb24822eb828
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/pipes.rs

@@ -243,39 +243,37 @@ fn entangle_buffer<T: send, Tstart: send>(
 #[abi = "rust-intrinsic"]
 #[doc(hidden)]
 extern mod rusti {
-    fn atomic_xchng(&dst: int, src: int) -> int;
-    fn atomic_xchng_acq(&dst: int, src: int) -> int;
-    fn atomic_xchng_rel(&dst: int, src: int) -> int;
+    fn atomic_xchg(dst: &mut int, src: int) -> int;
+    fn atomic_xchg_acq(dst: &mut int, src: int) -> int;
+    fn atomic_xchg_rel(dst: &mut int, src: int) -> int;
 
-    fn atomic_add_acq(&dst: int, src: int) -> int;
-    fn atomic_sub_rel(&dst: int, src: int) -> int;
+    fn atomic_xadd_acq(dst: &mut int, src: int) -> int;
+    fn atomic_xsub_rel(dst: &mut int, src: int) -> int;
 }
 
 // If I call the rusti versions directly from a polymorphic function,
 // I get link errors. This is a bug that needs investigated more.
 #[doc(hidden)]
 fn atomic_xchng_rel(dst: &mut int, src: int) -> int {
-    rusti::atomic_xchng_rel(*dst, src)
+    rusti::atomic_xchg_rel(dst, src)
 }
 
 #[doc(hidden)]
 fn atomic_add_acq(dst: &mut int, src: int) -> int {
-    rusti::atomic_add_acq(*dst, src)
+    rusti::atomic_xadd_acq(dst, src)
 }
 
 #[doc(hidden)]
 fn atomic_sub_rel(dst: &mut int, src: int) -> int {
-    rusti::atomic_sub_rel(*dst, src)
+    rusti::atomic_xsub_rel(dst, src)
 }
 
 #[doc(hidden)]
-fn swap_task(dst: &mut *rust_task, src: *rust_task) -> *rust_task {
+fn swap_task(+dst: &mut *rust_task, src: *rust_task) -> *rust_task {
     // It might be worth making both acquire and release versions of
     // this.
     unsafe {
-        reinterpret_cast(rusti::atomic_xchng(
-            *(ptr::mut_addr_of(*dst) as *mut int),
-            src as int))
+        transmute(rusti::atomic_xchg(transmute(dst), src as int))
     }
 }
 
@@ -309,20 +307,16 @@ fn wait_event(this: *rust_task) -> *libc::c_void {
 }
 
 #[doc(hidden)]
-fn swap_state_acq(dst: &mut state, src: state) -> state {
+fn swap_state_acq(+dst: &mut state, src: state) -> state {
     unsafe {
-        reinterpret_cast(rusti::atomic_xchng_acq(
-            *(ptr::mut_addr_of(*dst) as *mut int),
-            src as int))
+        transmute(rusti::atomic_xchg_acq(transmute(dst), src as int))
     }
 }
 
 #[doc(hidden)]
-fn swap_state_rel(dst: &mut state, src: state) -> state {
+fn swap_state_rel(+dst: &mut state, src: state) -> state {
     unsafe {
-        reinterpret_cast(rusti::atomic_xchng_rel(
-            *(ptr::mut_addr_of(*dst) as *mut int),
-            src as int))
+        transmute(rusti::atomic_xchg_rel(transmute(dst), src as int))
     }
 }