Skip to content

Commit a82924b

Browse files
solsonsolson
authored
Merge pull request rust-lang#152 from oli-obk/intrinsics
Intrinsics and overflow
2 parents 0ca0676 + 257ac58 commit a82924b

File tree

6 files changed

+232
-55
lines changed

6 files changed

+232
-55
lines changed

‎src/operator.rs

+2-18
Original file line numberDiff line numberDiff line change
@@ -178,25 +178,9 @@ pub fn binary_op<'tcx>(
178178

179179
// These ops can have an RHS with a different numeric type.
180180
if bin_op == Shl || bin_op == Shr {
181-
// These are the maximum values a bitshift RHS could possibly have. For example, u16
182-
// can be bitshifted by 0..16, so masking with 0b1111 (16 - 1) will ensure we are in
183-
// that range.
184-
let type_bits: u32 = match left_kind {
185-
I8 | U8 => 8,
186-
I16 | U16 => 16,
187-
I32 | U32 => 32,
188-
I64 | U64 => 64,
189-
I128 | U128 => 128,
190-
_ => bug!("bad MIR: bitshift lhs is not integral"),
191-
};
192-
193-
// Cast to `u32` because `overflowing_sh{l,r}` only take `u32`, then apply the bitmask
194-
// to ensure it's within the valid shift value range.
195-
let masked_shift_width = (r as u32) & (type_bits - 1);
196-
197181
return match bin_op {
198-
Shl => int_shift!(left_kind, overflowing_shl, l, masked_shift_width),
199-
Shr => int_shift!(left_kind, overflowing_shr, l, masked_shift_width),
182+
Shl => int_shift!(left_kind, overflowing_shl, l, r as u32),
183+
Shr => int_shift!(left_kind, overflowing_shr, l, r as u32),
200184
_ => bug!("it has already been checked that this is a shift op"),
201185
};
202186
}

‎src/terminator/intrinsic.rs

+82-37
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
7878
// we are inherently singlethreaded and singlecored, this is a nop
7979
}
8080

81-
"atomic_xchg" => {
81+
_ if intrinsic_name.starts_with("atomic_xchg") => {
8282
let ty = substs.type_at(0);
8383
let ptr = arg_vals[0].read_ptr(&self.memory)?;
8484
let change = self.value_to_primval(arg_vals[1], ty)?;
@@ -92,8 +92,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
9292
self.write_primval(Lvalue::from_ptr(ptr), change, ty)?;
9393
}
9494

95-
"atomic_cxchg_relaxed" |
96-
"atomic_cxchg" => {
95+
_ if intrinsic_name.starts_with("atomic_cxchg") => {
9796
let ty = substs.type_at(0);
9897
let ptr = arg_vals[0].read_ptr(&self.memory)?;
9998
let expect_old = self.value_to_primval(arg_vals[1], ty)?;
@@ -111,8 +110,11 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
111110
self.write_primval(Lvalue::from_ptr(ptr), change, ty)?;
112111
}
113112

114-
"atomic_xadd" |
115-
"atomic_xadd_relaxed" => {
113+
"atomic_or" | "atomic_or_acq" | "atomic_or_rel" | "atomic_or_acqrel" | "atomic_or_relaxed" |
114+
"atomic_xor" | "atomic_xor_acq" | "atomic_xor_rel" | "atomic_xor_acqrel" | "atomic_xor_relaxed" |
115+
"atomic_and" | "atomic_and_acq" | "atomic_and_rel" | "atomic_and_acqrel" | "atomic_and_relaxed" |
116+
"atomic_xadd" | "atomic_xadd_acq" | "atomic_xadd_rel" | "atomic_xadd_acqrel" | "atomic_xadd_relaxed" |
117+
"atomic_xsub" | "atomic_xsub_acq" | "atomic_xsub_rel" | "atomic_xsub_acqrel" | "atomic_xsub_relaxed" => {
116118
let ty = substs.type_at(0);
117119
let ptr = arg_vals[0].read_ptr(&self.memory)?;
118120
let change = self.value_to_primval(arg_vals[1], ty)?;
@@ -124,27 +126,18 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
124126
};
125127
self.write_primval(dest, old, ty)?;
126128
let kind = self.ty_to_primval_kind(ty)?;
127-
// FIXME: what do atomics do on overflow?
128-
let (val, _) = operator::binary_op(mir::BinOp::Add, old, kind, change, kind)?;
129-
self.write_primval(Lvalue::from_ptr(ptr), val, ty)?;
130-
},
131-
132-
"atomic_xsub_rel" => {
133-
let ty = substs.type_at(0);
134-
let ptr = arg_vals[0].read_ptr(&self.memory)?;
135-
let change = self.value_to_primval(arg_vals[1], ty)?;
136-
let old = self.read_value(ptr, ty)?;
137-
let old = match old {
138-
Value::ByVal(val) => val,
139-
Value::ByRef(_) => bug!("just read the value, can't be byref"),
140-
Value::ByValPair(..) => bug!("atomic_xsub_rel doesn't work with nonprimitives"),
129+
let op = match intrinsic_name.split('_').nth(1).unwrap() {
130+
"or" => mir::BinOp::BitOr,
131+
"xor" => mir::BinOp::BitXor,
132+
"and" => mir::BinOp::BitAnd,
133+
"xadd" => mir::BinOp::Add,
134+
"xsub" => mir::BinOp::Sub,
135+
_ => bug!(),
141136
};
142-
self.write_primval(dest, old, ty)?;
143-
let kind = self.ty_to_primval_kind(ty)?;
144137
// FIXME: what do atomics do on overflow?
145-
let (val, _) = operator::binary_op(mir::BinOp::Sub, old, kind, change, kind)?;
138+
let (val, _) = operator::binary_op(op, old, kind, change, kind)?;
146139
self.write_primval(Lvalue::from_ptr(ptr), val, ty)?;
147-
}
140+
},
148141

149142
"breakpoint" => unimplemented!(), // halt miri
150143

@@ -207,14 +200,50 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
207200
return self.eval_drop_impls(drops, span);
208201
}
209202

210-
"fabsf32" => {
203+
"sinf32" | "fabsf32" | "cosf32" |
204+
"sqrtf32" | "expf32" | "exp2f32" |
205+
"logf32" | "log10f32" | "log2f32" |
206+
"floorf32" | "ceilf32" | "truncf32" => {
211207
let f = self.value_to_primval(arg_vals[0], f32)?.to_f32()?;
212-
self.write_primval(dest, PrimVal::from_f32(f.abs()), dest_ty)?;
208+
let f = match intrinsic_name {
209+
"sinf32" => f.sin(),
210+
"fabsf32" => f.abs(),
211+
"cosf32" => f.cos(),
212+
"sqrtf32" => f.sqrt(),
213+
"expf32" => f.exp(),
214+
"exp2f32" => f.exp2(),
215+
"logf32" => f.ln(),
216+
"log10f32" => f.log10(),
217+
"log2f32" => f.log2(),
218+
"floorf32" => f.floor(),
219+
"ceilf32" => f.ceil(),
220+
"truncf32" => f.trunc(),
221+
_ => bug!(),
222+
};
223+
self.write_primval(dest, PrimVal::from_f32(f), dest_ty)?;
213224
}
214225

215-
"fabsf64" => {
226+
"sinf64" | "fabsf64" | "cosf64" |
227+
"sqrtf64" | "expf64" | "exp2f64" |
228+
"logf64" | "log10f64" | "log2f64" |
229+
"floorf64" | "ceilf64" | "truncf64" => {
216230
let f = self.value_to_primval(arg_vals[0], f64)?.to_f64()?;
217-
self.write_primval(dest, PrimVal::from_f64(f.abs()), dest_ty)?;
231+
let f = match intrinsic_name {
232+
"sinf64" => f.sin(),
233+
"fabsf64" => f.abs(),
234+
"cosf64" => f.cos(),
235+
"sqrtf64" => f.sqrt(),
236+
"expf64" => f.exp(),
237+
"exp2f64" => f.exp2(),
238+
"logf64" => f.ln(),
239+
"log10f64" => f.log10(),
240+
"log2f64" => f.log2(),
241+
"floorf64" => f.floor(),
242+
"ceilf64" => f.ceil(),
243+
"truncf64" => f.trunc(),
244+
_ => bug!(),
245+
};
246+
self.write_primval(dest, PrimVal::from_f64(f), dest_ty)?;
218247
}
219248

220249
"fadd_fast" | "fsub_fast" | "fmul_fast" | "fdiv_fast" | "frem_fast" => {
@@ -320,26 +349,42 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
320349
self.intrinsic_overflowing(mir::BinOp::Add, &args[0], &args[1], dest, dest_ty)?;
321350
}
322351

323-
"powif32" => {
352+
"powf32" => {
324353
let f = self.value_to_primval(arg_vals[0], f32)?.to_f32()?;
325-
let i = self.value_to_primval(arg_vals[1], i32)?.to_i128()?;
326-
self.write_primval(dest, PrimVal::from_f32(f.powi(i as i32)), dest_ty)?;
354+
let f2 = self.value_to_primval(arg_vals[1], f32)?.to_f32()?;
355+
self.write_primval(dest, PrimVal::from_f32(f.powf(f2)), dest_ty)?;
327356
}
328357

329-
"powif64" => {
358+
"powf64" => {
330359
let f = self.value_to_primval(arg_vals[0], f64)?.to_f64()?;
331-
let i = self.value_to_primval(arg_vals[1], i32)?.to_i128()?;
332-
self.write_primval(dest, PrimVal::from_f64(f.powi(i as i32)), dest_ty)?;
360+
let f2 = self.value_to_primval(arg_vals[1], f64)?.to_f64()?;
361+
self.write_primval(dest, PrimVal::from_f64(f.powf(f2)), dest_ty)?;
362+
}
363+
364+
"fmaf32" => {
365+
let a = self.value_to_primval(arg_vals[0], f32)?.to_f32()?;
366+
let b = self.value_to_primval(arg_vals[1], f32)?.to_f32()?;
367+
let c = self.value_to_primval(arg_vals[2], f32)?.to_f32()?;
368+
self.write_primval(dest, PrimVal::from_f32(a * b + c), dest_ty)?;
369+
}
370+
371+
"fmaf64" => {
372+
let a = self.value_to_primval(arg_vals[0], f64)?.to_f64()?;
373+
let b = self.value_to_primval(arg_vals[1], f64)?.to_f64()?;
374+
let c = self.value_to_primval(arg_vals[2], f64)?.to_f64()?;
375+
self.write_primval(dest, PrimVal::from_f64(a * b + c), dest_ty)?;
333376
}
334377

335-
"sqrtf32" => {
378+
"powif32" => {
336379
let f = self.value_to_primval(arg_vals[0], f32)?.to_f32()?;
337-
self.write_primval(dest, PrimVal::from_f32(f.sqrt()), dest_ty)?;
380+
let i = self.value_to_primval(arg_vals[1], i32)?.to_i128()?;
381+
self.write_primval(dest, PrimVal::from_f32(f.powi(i as i32)), dest_ty)?;
338382
}
339383

340-
"sqrtf64" => {
384+
"powif64" => {
341385
let f = self.value_to_primval(arg_vals[0], f64)?.to_f64()?;
342-
self.write_primval(dest, PrimVal::from_f64(f.sqrt()), dest_ty)?;
386+
let i = self.value_to_primval(arg_vals[1], i32)?.to_i128()?;
387+
self.write_primval(dest, PrimVal::from_f64(f.powi(i as i32)), dest_ty)?;
343388
}
344389

345390
"size_of" => {

‎tests/compile-fail/overflowing-rsh-6.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![allow(exceeding_bitshifts)]
12+
13+
fn main() {
14+
let _n = 1i64 >> 64; //~ Overflow(Shr)
15+
}

‎tests/run-pass/atomic-access-bool.rs

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT};
12+
use std::sync::atomic::Ordering::*;
13+
14+
static mut ATOMIC: AtomicBool = ATOMIC_BOOL_INIT;
15+
16+
fn main() {
17+
unsafe {
18+
assert_eq!(*ATOMIC.get_mut(), false);
19+
ATOMIC.store(true, SeqCst);
20+
assert_eq!(*ATOMIC.get_mut(), true);
21+
ATOMIC.fetch_or(false, SeqCst);
22+
assert_eq!(*ATOMIC.get_mut(), true);
23+
ATOMIC.fetch_and(false, SeqCst);
24+
assert_eq!(*ATOMIC.get_mut(), false);
25+
ATOMIC.fetch_nand(true, SeqCst);
26+
assert_eq!(*ATOMIC.get_mut(), true);
27+
ATOMIC.fetch_xor(true, SeqCst);
28+
assert_eq!(*ATOMIC.get_mut(), false);
29+
}
30+
}

‎tests/run-pass/atomic-compare_exchange.rs

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use std::sync::atomic::{AtomicIsize, ATOMIC_ISIZE_INIT};
12+
use std::sync::atomic::Ordering::*;
13+
14+
static ATOMIC: AtomicIsize = ATOMIC_ISIZE_INIT;
15+
16+
fn main() {
17+
// Make sure trans can emit all the intrinsics correctly
18+
ATOMIC.compare_exchange(0, 1, Relaxed, Relaxed).ok();
19+
ATOMIC.compare_exchange(0, 1, Acquire, Relaxed).ok();
20+
ATOMIC.compare_exchange(0, 1, Release, Relaxed).ok();
21+
ATOMIC.compare_exchange(0, 1, AcqRel, Relaxed).ok();
22+
ATOMIC.compare_exchange(0, 1, SeqCst, Relaxed).ok();
23+
ATOMIC.compare_exchange(0, 1, Acquire, Acquire).ok();
24+
ATOMIC.compare_exchange(0, 1, AcqRel, Acquire).ok();
25+
ATOMIC.compare_exchange(0, 1, SeqCst, Acquire).ok();
26+
ATOMIC.compare_exchange(0, 1, SeqCst, SeqCst).ok();
27+
ATOMIC.compare_exchange_weak(0, 1, Relaxed, Relaxed).ok();
28+
ATOMIC.compare_exchange_weak(0, 1, Acquire, Relaxed).ok();
29+
ATOMIC.compare_exchange_weak(0, 1, Release, Relaxed).ok();
30+
ATOMIC.compare_exchange_weak(0, 1, AcqRel, Relaxed).ok();
31+
ATOMIC.compare_exchange_weak(0, 1, SeqCst, Relaxed).ok();
32+
ATOMIC.compare_exchange_weak(0, 1, Acquire, Acquire).ok();
33+
ATOMIC.compare_exchange_weak(0, 1, AcqRel, Acquire).ok();
34+
ATOMIC.compare_exchange_weak(0, 1, SeqCst, Acquire).ok();
35+
ATOMIC.compare_exchange_weak(0, 1, SeqCst, SeqCst).ok();
36+
}

‎tests/run-pass/intrinsics-math.rs

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
macro_rules! assert_approx_eq {
12+
($a:expr, $b:expr) => ({
13+
let (a, b) = (&$a, &$b);
14+
assert!((*a - *b).abs() < 1.0e-6,
15+
"{} is not approximately equal to {}", *a, *b);
16+
})
17+
}
18+
19+
pub fn main() {
20+
use std::f32;
21+
use std::f64;
22+
23+
assert_approx_eq!(64f32.sqrt(), 8f32);
24+
assert_approx_eq!(64f64.sqrt(), 8f64);
25+
26+
assert_approx_eq!(25f32.powi(-2), 0.0016f32);
27+
assert_approx_eq!(23.2f64.powi(2), 538.24f64);
28+
29+
assert_approx_eq!(0f32.sin(), 0f32);
30+
assert_approx_eq!((f64::consts::PI / 2f64).sin(), 1f64);
31+
32+
assert_approx_eq!(0f32.cos(), 1f32);
33+
assert_approx_eq!((f64::consts::PI * 2f64).cos(), 1f64);
34+
35+
assert_approx_eq!(25f32.powf(-2f32), 0.0016f32);
36+
assert_approx_eq!(400f64.powf(0.5f64), 20f64);
37+
38+
assert_approx_eq!((1f32.exp() - f32::consts::E).abs(), 0f32);
39+
assert_approx_eq!(1f64.exp(), f64::consts::E);
40+
41+
assert_approx_eq!(10f32.exp2(), 1024f32);
42+
assert_approx_eq!(50f64.exp2(), 1125899906842624f64);
43+
44+
assert_approx_eq!((f32::consts::E.ln() - 1f32).abs(), 0f32);
45+
assert_approx_eq!(1f64.ln(), 0f64);
46+
47+
assert_approx_eq!(10f32.log10(), 1f32);
48+
assert_approx_eq!(f64::consts::E.log10(), f64::consts::LOG10_E);
49+
50+
assert_approx_eq!(8f32.log2(), 3f32);
51+
assert_approx_eq!(f64::consts::E.log2(), f64::consts::LOG2_E);
52+
53+
assert_approx_eq!(1.0f32.mul_add(2.0f32, 5.0f32), 7.0f32);
54+
assert_approx_eq!(0.0f64.mul_add(-2.0f64, f64::consts::E), f64::consts::E);
55+
56+
assert_approx_eq!((-1.0f32).abs(), 1.0f32);
57+
assert_approx_eq!(34.2f64.abs(), 34.2f64);
58+
59+
assert_approx_eq!(3.8f32.floor(), 3.0f32);
60+
assert_approx_eq!((-1.1f64).floor(), -2.0f64);
61+
62+
assert_approx_eq!((-2.3f32).ceil(), -2.0f32);
63+
assert_approx_eq!(3.8f64.ceil(), 4.0f64);
64+
65+
assert_approx_eq!(0.1f32.trunc(), 0.0f32);
66+
assert_approx_eq!((-0.1f64).trunc(), 0.0f64);
67+
}

0 commit comments

Comments
 (0)