Fix SwitchInt on 128bit integers

Author: bjorn3

example/mini_core.rs

@@ -336,6 +336,10 @@ impl<T: ?Sized> PartialEq for *const T {
     }
 }
 
+pub fn is_true(a: bool) -> u8 {
+    if a { 1 } else { 0 }
+}
+
 #[lang = "neg"]
 pub trait Neg {
     type Output;

example/std_example.rs

@@ -1,300 +1,12 @@
-#![feature(core_intrinsics, generators, generator_trait, is_sorted)]
-
-use std::arch::x86_64::*;
-use std::io::Write;
-use std::ops::Generator;
-
 fn main() {
-    println!("{:?}", std::env::args().collect::<Vec<_>>());
-
-    let mutex = std::sync::Mutex::new(());
-    let _guard = mutex.lock().unwrap();
-
-    let _ = ::std::iter::repeat('a' as u8).take(10).collect::<Vec<_>>();
-    let stderr = ::std::io::stderr();
-    let mut stderr = stderr.lock();
-
-    std::thread::spawn(move || {
-        println!("Hello from another thread!");
-    });
-
-    writeln!(stderr, "some {} text", "<unknown>").unwrap();
-
-    let _ = std::process::Command::new("true").env("c", "d").spawn();
-
-    println!("cargo:rustc-link-lib=z");
-
-    static ONCE: std::sync::Once = std::sync::Once::new();
-    ONCE.call_once(|| {});
-
-    let _eq = LoopState::Continue(()) == LoopState::Break(());
-
-    // Make sure ByValPair values with differently sized components are correctly passed
-    map(None::<(u8, Box<Instruction>)>);
-
-    println!("{}", 2.3f32.exp());
-    println!("{}", 2.3f32.exp2());
-    println!("{}", 2.3f32.abs());
-    println!("{}", 2.3f32.sqrt());
-    println!("{}", 2.3f32.floor());
-    println!("{}", 2.3f32.ceil());
-    println!("{}", 2.3f32.min(1.0));
-    println!("{}", 2.3f32.max(1.0));
-    println!("{}", 2.3f32.powi(2));
-    println!("{}", 2.3f32.log2());
-    assert_eq!(2.3f32.copysign(-1.0), -2.3f32);
-    println!("{}", 2.3f32.powf(2.0));
-
-    assert_eq!(-128i8, (-128i8).saturating_sub(1));
-    assert_eq!(127i8, 127i8.saturating_sub(-128));
-    assert_eq!(-128i8, (-128i8).saturating_add(-128));
-    assert_eq!(127i8, 127i8.saturating_add(1));
-
-    assert_eq!(0b0000000000000000000000000010000010000000000000000000000000000000_0000000000100000000000000000000000001000000000000100000000000000u128.leading_zeros(), 26);
-    assert_eq!(0b0000000000000000000000000010000000000000000000000000000000000000_0000000000000000000000000000000000001000000000000000000010000000u128.trailing_zeros(), 7);
-
-    let _d = 0i128.checked_div(2i128);
-    let _d = 0u128.checked_div(2u128);
-    assert_eq!(1u128 + 2, 3);
-
-    assert_eq!(0b100010000000000000000000000000000u128 >> 10, 0b10001000000000000000000u128);
-    assert_eq!(0xFEDCBA987654321123456789ABCDEFu128 >> 64, 0xFEDCBA98765432u128);
-    assert_eq!(0xFEDCBA987654321123456789ABCDEFu128 as i128 >> 64, 0xFEDCBA98765432i128);
-
-    let tmp = 353985398u128;
-    assert_eq!(tmp * 932490u128, 330087843781020u128);
-
-    let tmp = -0x1234_5678_9ABC_DEF0i64;
-    assert_eq!(tmp as i128, -0x1234_5678_9ABC_DEF0i128);
-
-    // Check that all u/i128 <-> float casts work correctly.
-    let houndred_u128 = 100u128;
-    let houndred_i128 = 100i128;
-    let houndred_f32 = 100.0f32;
-    let houndred_f64 = 100.0f64;
-    assert_eq!(houndred_u128 as f32, 100.0);
-    assert_eq!(houndred_u128 as f64, 100.0);
-    assert_eq!(houndred_f32 as u128, 100);
-    assert_eq!(houndred_f64 as u128, 100);
-    assert_eq!(houndred_i128 as f32, 100.0);
-    assert_eq!(houndred_i128 as f64, 100.0);
-    assert_eq!(houndred_f32 as i128, 100);
-    assert_eq!(houndred_f64 as i128, 100);
-
-    // Test signed 128bit comparing
-    let max = usize::MAX as i128;
-    if 100i128 < 0i128 || 100i128 > max {
-        panic!();
-    }
-
-    test_checked_mul();
-
-    let _a = 1u32 << 2u8;
-
-    let empty: [i32; 0] = [];
-    assert!(empty.is_sorted());
-
-    println!("{:?}", std::intrinsics::caller_location());
-
-    unsafe {
-        test_simd();
-    }
-
-    Box::pin(move |mut _task_context| {
-        yield ();
-    }).as_mut().resume(0);
-}
-
-#[target_feature(enable = "sse2")]
-unsafe fn test_simd() {
-    let x = _mm_setzero_si128();
-    let y = _mm_set1_epi16(7);
-    let or = _mm_or_si128(x, y);
-    let cmp_eq = _mm_cmpeq_epi8(y, y);
-    let cmp_lt = _mm_cmplt_epi8(y, y);
-
-    assert_eq!(std::mem::transmute::<_, [u16; 8]>(or), [7, 7, 7, 7, 7, 7, 7, 7]);
-    assert_eq!(std::mem::transmute::<_, [u16; 8]>(cmp_eq), [0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff]);
-    assert_eq!(std::mem::transmute::<_, [u16; 8]>(cmp_lt), [0, 0, 0, 0, 0, 0, 0, 0]);
-
-    test_mm_slli_si128();
-    test_mm_movemask_epi8();
-    test_mm256_movemask_epi8();
-    test_mm_add_epi8();
-    test_mm_add_pd();
-    test_mm_cvtepi8_epi16();
-    test_mm_cvtsi128_si64();
-
-    // FIXME(#666) implement `#[rustc_arg_required_const(..)]` support
-    //test_mm_extract_epi8();
-
-    let mask1 = _mm_movemask_epi8(dbg!(_mm_setr_epi8(255u8 as i8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)));
-    assert_eq!(mask1, 1);
-}
-
-#[target_feature(enable = "sse2")]
-unsafe fn test_mm_slli_si128() {
-    #[rustfmt::skip]
-    let a = _mm_setr_epi8(
-        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-    );
-    let r = _mm_slli_si128(a, 1);
-    let e = _mm_setr_epi8(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
-    assert_eq_m128i(r, e);
-
-    #[rustfmt::skip]
-    let a = _mm_setr_epi8(
-        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-    );
-    let r = _mm_slli_si128(a, 15);
-    let e = _mm_setr_epi8(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1);
-    assert_eq_m128i(r, e);
-
-    #[rustfmt::skip]
-    let a = _mm_setr_epi8(
-        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-    );
-    let r = _mm_slli_si128(a, 16);
-    assert_eq_m128i(r, _mm_set1_epi8(0));
-
-    #[rustfmt::skip]
-    let a = _mm_setr_epi8(
-        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-    );
-    let r = _mm_slli_si128(a, -1);
-    assert_eq_m128i(_mm_set1_epi8(0), r);
-
-    #[rustfmt::skip]
-    let a = _mm_setr_epi8(
-        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-    );
-    let r = _mm_slli_si128(a, -0x80000000);
-    assert_eq_m128i(r, _mm_set1_epi8(0));
-}
-
-#[target_feature(enable = "sse2")]
-unsafe fn test_mm_movemask_epi8() {
-    #[rustfmt::skip]
-    let a = _mm_setr_epi8(
-        0b1000_0000u8 as i8, 0b0, 0b1000_0000u8 as i8, 0b01,
-        0b0101, 0b1111_0000u8 as i8, 0, 0,
-        0, 0, 0b1111_0000u8 as i8, 0b0101,
-        0b01, 0b1000_0000u8 as i8, 0b0, 0b1000_0000u8 as i8,
-    );
-    let r = _mm_movemask_epi8(a);
-    assert_eq!(r, 0b10100100_00100101);
-}
-
-#[target_feature(enable = "avx2")]
-unsafe fn test_mm256_movemask_epi8() {
-    let a = _mm256_set1_epi8(-1);
-    let r = _mm256_movemask_epi8(a);
-    let e = -1;
-    assert_eq!(r, e);
-}
-
-#[target_feature(enable = "sse2")]
-unsafe fn test_mm_add_epi8() {
-    let a = _mm_setr_epi8(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
-    #[rustfmt::skip]
-    let b = _mm_setr_epi8(
-        16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-    );
-    let r = _mm_add_epi8(a, b);
-    #[rustfmt::skip]
-    let e = _mm_setr_epi8(
-        16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46,
-    );
-    assert_eq_m128i(r, e);
-}
-
-#[target_feature(enable = "sse2")]
-unsafe fn test_mm_add_pd() {
-    let a = _mm_setr_pd(1.0, 2.0);
-    let b = _mm_setr_pd(5.0, 10.0);
-    let r = _mm_add_pd(a, b);
-    assert_eq_m128d(r, _mm_setr_pd(6.0, 12.0));
-}
-
-fn assert_eq_m128i(x: std::arch::x86_64::__m128i, y: std::arch::x86_64::__m128i) {
-    unsafe {
-        assert_eq!(std::mem::transmute::<_, [u8; 16]>(x), std::mem::transmute::<_, [u8; 16]>(y));
-    }
-}
-
-#[target_feature(enable = "sse2")]
-pub unsafe fn assert_eq_m128d(a: __m128d, b: __m128d) {
-    if _mm_movemask_pd(_mm_cmpeq_pd(a, b)) != 0b11 {
-        panic!("{:?} != {:?}", a, b);
-    }
-}
-
-#[target_feature(enable = "sse2")]
-unsafe fn test_mm_cvtsi128_si64() {
-    let r = _mm_cvtsi128_si64(std::mem::transmute::<[i64; 2], _>([5, 0]));
-    assert_eq!(r, 5);
-}
-
-#[target_feature(enable = "sse4.1")]
-unsafe fn test_mm_cvtepi8_epi16() {
-    let a = _mm_set1_epi8(10);
-    let r = _mm_cvtepi8_epi16(a);
-    let e = _mm_set1_epi16(10);
-    assert_eq_m128i(r, e);
-    let a = _mm_set1_epi8(-10);
-    let r = _mm_cvtepi8_epi16(a);
-    let e = _mm_set1_epi16(-10);
-    assert_eq_m128i(r, e);
-}
-
-#[target_feature(enable = "sse4.1")]
-unsafe fn test_mm_extract_epi8() {
-    #[rustfmt::skip]
-    let a = _mm_setr_epi8(
-        -1, 1, 2, 3, 4, 5, 6, 7,
-        8, 9, 10, 11, 12, 13, 14, 15
-    );
-    let r1 = _mm_extract_epi8(a, 0);
-    let r2 = _mm_extract_epi8(a, 19);
-    assert_eq!(r1, 0xFF);
-    assert_eq!(r2, 3);
-}
-
-fn test_checked_mul() {
-    let u: Option<u8> = u8::from_str_radix("1000", 10).ok();
-    assert_eq!(u, None);
-
-    assert_eq!(1u8.checked_mul(255u8), Some(255u8));
-    assert_eq!(255u8.checked_mul(255u8), None);
-    assert_eq!(1i8.checked_mul(127i8), Some(127i8));
-    assert_eq!(127i8.checked_mul(127i8), None);
-    assert_eq!((-1i8).checked_mul(-127i8), Some(127i8));
-    assert_eq!(1i8.checked_mul(-128i8), Some(-128i8));
-    assert_eq!((-128i8).checked_mul(-128i8), None);
-
-    assert_eq!(1u64.checked_mul(u64::max_value()), Some(u64::max_value()));
-    assert_eq!(u64::max_value().checked_mul(u64::max_value()), None);
-    assert_eq!(1i64.checked_mul(i64::max_value()), Some(i64::max_value()));
-    assert_eq!(i64::max_value().checked_mul(i64::max_value()), None);
-    assert_eq!((-1i64).checked_mul(i64::min_value() + 1), Some(i64::max_value()));
-    assert_eq!(1i64.checked_mul(i64::min_value()), Some(i64::min_value()));
-    assert_eq!(i64::min_value().checked_mul(i64::min_value()), None);
-}
-
-#[derive(PartialEq)]
-enum LoopState {
-    Continue(()),
-    Break(())
-}
-
-pub enum Instruction {
-    Increment,
-    Loop,
+    let options = [1u128];
+    match options[0] {
+        1 => (),
+        0 => loop {},
+        v => panic(v),
+    };
 }
 
-fn map(a: Option<(u8, Box<Instruction>)>) -> Option<Box<Instruction>> {
-    match a {
-        None => None,
-        Some((_, instr)) => Some(instr),
-    }
+fn panic(v: u128) -> !{
+    panic!("{}", v)
 }

src/base.rs

@@ -282,7 +282,7 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
                 let mut switch = ::cranelift_frontend::Switch::new();
                 for (i, value) in values.iter().enumerate() {
                     let block = fx.get_block(targets[i]);
-                    switch.set_entry(*value as u64, block);
+                    switch.set_entry(*value, block);
                 }
                 let otherwise_block = fx.get_block(targets[targets.len() - 1]);
                 switch.emit(&mut fx.bcx, discr, otherwise_block);