Merge pull request #26 from antoyo/fix/pointer-offset

Fix exactsdiv

Author: antoyo

gcc-test-backend/src/main.rs

@@ -1,12 +1,11 @@
 fn main() {
-    const OPTION: Option<usize> = Some(32);
-
-    const REF: Option<&usize> = OPTION.as_ref();
-    assert_eq!(REF, Some(&32));
-
-    const IS_SOME: bool = OPTION.is_some();
-    assert!(IS_SOME);
-
-    const IS_NONE: bool = OPTION.is_none();
-    assert!(!IS_NONE);
+    let mut a = [0; 5];
+    let ptr1: *mut i32 = &mut a[1];
+    let ptr2: *mut i32 = &mut a[3];
+    unsafe {
+        assert_eq!(ptr2.offset_from(ptr1), 2);
+        assert_eq!(ptr1.offset_from(ptr2), -2);
+        assert_eq!(ptr1.offset(2), ptr2);
+        assert_eq!(ptr2.offset(-2), ptr1);
+    }
 }

src/builder.rs

@@ -580,23 +580,28 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
     }
 
     fn udiv(&mut self, a: RValue<'gcc>, b: RValue<'gcc>) -> RValue<'gcc> {
+        // TODO: convert the arguments to unsigned?
         a / b
     }
 
     fn exactudiv(&mut self, a: RValue<'gcc>, b: RValue<'gcc>) -> RValue<'gcc> {
+        // TODO: convert the arguments to unsigned?
         // TODO: poison if not exact.
         a / b
     }
 
     fn sdiv(&mut self, a: RValue<'gcc>, b: RValue<'gcc>) -> RValue<'gcc> {
+        // TODO: convert the arguments to signed?
         a / b
     }
 
     fn exactsdiv(&mut self, a: RValue<'gcc>, b: RValue<'gcc>) -> RValue<'gcc> {
         // TODO: posion if not exact.
         // FIXME: rustc_codegen_ssa::mir::intrinsic uses different types for a and b but they
         // should be the same.
-        let a = self.context.new_cast(None, a, b.get_type());
+        let typ = a.get_type().to_signed(self);
+        let a = self.context.new_cast(None, a, typ);
+        let b = self.context.new_cast(None, b, typ);
         a / b
     }