Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make Atomic*::min/max work on armv5te #52586

Closed
wants to merge 2 commits into from
Closed

make Atomic*::min/max work on armv5te #52586

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19c0dfb
make Atomic*::min/max work on armv5te
llogiq Jul 21, 2018
96edb05
fix misplaced self
llogiq Jul 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions src/libcore/sync/atomic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1512,7 +1512,17 @@ assert!(max_foo == 42);
reason = "easier and faster min/max than writing manual CAS loop",
issue = "48655")]
pub fn fetch_max(&self, val: $int_type, order: Ordering) -> $int_type {
unsafe { $max_fn(self.v.get(), val, order) }
#[cfg(not(target_arch = "armv5te"))]
#[inline(always)]
fn inner(&self, val: $int_type, order: Ordering) -> $int_type {
unsafe { $max_fn(self.v.get(), val, order) }
}
#[cfg(target_arch = "arm5vte")]
#[inline(always)]
fn inner(&self, val: $int_type, order: Ordering) -> $int_type {
self.fetch_update(|v| Some(v.max(val)), order, order).unwrap()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to specially handle the order and derive correct orders for fetch_order here.

Namely, fetch_order of fetch_update does not permit AcqRel or Release as an ordering here, but the fetch_max permits all orderings.

}
inner(self, val, order)
}
}

Expand Down Expand Up @@ -1553,7 +1563,17 @@ assert_eq!(min_foo, 12);
reason = "easier and faster min/max than writing manual CAS loop",
issue = "48655")]
pub fn fetch_min(&self, val: $int_type, order: Ordering) -> $int_type {
unsafe { $min_fn(self.v.get(), val, order) }
#[cfg(not(target_arch = "armv5te"))]
#[inline(always)]
fn inner(a: &$atomic_type, val: $int_type, order: Ordering) -> $int_type {
unsafe { $min_fn(a.v.get(), val, order) }
}
#[cfg(target_arch = "arm5vte")]
#[inline(always)]
fn inner(a: &$atomic_type, val: $int_type, order: Ordering) -> $int_type {
a.fetch_update(|v| Some(v.min(val)), order, order).unwrap()
}
inner(self, val, order)
}
}

Expand Down Expand Up @@ -1869,6 +1889,7 @@ unsafe fn atomic_xor<T>(dst: *mut T, val: T, order: Ordering) -> T {
}
}

#[cfg(not(target_arch = "armv5te"))]
/// returns the max value (signed comparison)
#[inline]
unsafe fn atomic_max<T>(dst: *mut T, val: T, order: Ordering) -> T {
Expand All @@ -1882,6 +1903,7 @@ unsafe fn atomic_max<T>(dst: *mut T, val: T, order: Ordering) -> T {
}
}

#[cfg(not(target_arch = "armv5te"))]
/// returns the min value (signed comparison)
#[inline]
unsafe fn atomic_min<T>(dst: *mut T, val: T, order: Ordering) -> T {
Expand All @@ -1895,6 +1917,7 @@ unsafe fn atomic_min<T>(dst: *mut T, val: T, order: Ordering) -> T {
}
}

#[cfg(not(target_arch = "armv5te"))]
/// returns the max value (signed comparison)
#[inline]
unsafe fn atomic_umax<T>(dst: *mut T, val: T, order: Ordering) -> T {
Expand All @@ -1908,6 +1931,7 @@ unsafe fn atomic_umax<T>(dst: *mut T, val: T, order: Ordering) -> T {
}
}

#[cfg(not(target_arch = "armv5te"))]
/// returns the min value (signed comparison)
#[inline]
unsafe fn atomic_umin<T>(dst: *mut T, val: T, order: Ordering) -> T {
Expand Down