u128 sdiv intrinsics

README.md

@@ -195,7 +195,7 @@ These builtins are needed to support 128-bit integers, which are in the process
 
 - [x] ashlti3.c
 - [x] ashrti3.c
-- [ ] divti3.c
+- [x] divti3.c
 - [ ] fixdfti.c
 - [ ] fixsfti.c
 - [ ] fixunsdfti.c
@@ -205,7 +205,7 @@ These builtins are needed to support 128-bit integers, which are in the process
 - [ ] floatuntidf.c
 - [ ] floatuntisf.c
 - [x] lshrti3.c
-- [ ] modti3.c
+- [x] modti3.c
 - [x] muloti4.c
 - [x] multi3.c
 - [x] udivmodti4.c

src/int/sdiv.rs

@@ -2,23 +2,30 @@ use int::Int;
 
 macro_rules! div {
     ($intrinsic:ident: $ty:ty, $uty:ty) => {
+        div!($intrinsic: $ty, $uty, $ty, |i| {i});
+    };
+    ($intrinsic:ident: $ty:ty, $uty:ty, $tyret:ty, $conv:expr) => {
         /// Returns `a / b`
         #[cfg_attr(not(test), no_mangle)]
-        pub extern "C" fn $intrinsic(a: $ty, b: $ty) -> $ty {
+        pub extern "C" fn $intrinsic(a: $ty, b: $ty) -> $tyret {
             let s_a = a >> (<$ty>::bits() - 1);
             let s_b = b >> (<$ty>::bits() - 1);
             let a = (a ^ s_a) - s_a;
             let b = (b ^ s_b) - s_b;
             let s = s_a ^ s_b;
 
             let r = udiv!(a as $uty, b as $uty);
-            (r as $ty ^ s) - s
+            let t = (r as $ty ^ s) - s;
+            ($conv)(t as $ty)
         }
     }
 }
 
 macro_rules! mod_ {
     ($intrinsic:ident: $ty:ty, $uty:ty) => {
+        mod_!($intrinsic: $ty, $uty, $ty, |i| {i});
+    };
+    ($intrinsic:ident: $ty:ty, $uty:ty, $tyret:ty, $conv:expr) => {
         /// Returns `a % b`
         #[cfg_attr(not(test), no_mangle)]
         pub extern "C" fn $intrinsic(a: $ty, b: $ty) -> $ty {
@@ -28,7 +35,8 @@ macro_rules! mod_ {
             let a = (a ^ s) - s;
 
             let r = urem!(a as $uty, b as $uty);
-            (r as $ty ^ s) - s
+            let t = (r as $ty ^ s) - s;
+            ($conv)(t)
         }
     }
 }
@@ -61,12 +69,28 @@ div!(__divsi3: i32, u32);
 #[cfg(not(all(feature = "c", target_arch = "x86")))]
 div!(__divdi3: i64, u64);
 
+#[cfg(not(stage0))]
+#[cfg(not(all(windows, target_pointer_width="64")))]
+div!(__divti3: u128, u128);
+
+#[cfg(not(stage0))]
+#[cfg(all(windows, target_pointer_width="64"))]
+div!(__divti3: u128, u128, ::U64x2, ::conv);
+
 #[cfg(not(all(feature = "c", target_arch = "arm", not(target_os = "ios"))))]
 mod_!(__modsi3: i32, u32);
 
 #[cfg(not(all(feature = "c", target_arch = "x86")))]
 mod_!(__moddi3: i64, u64);
 
+#[cfg(not(stage0))]
+#[cfg(not(all(windows, target_pointer_width="64")))]
+mod_!(__modti3: u128, u128);
+
+#[cfg(not(stage0))]
+#[cfg(all(windows, target_pointer_width="64"))]
+mod_!(__modti3: i128, u128, ::U64x2, ::conv);
+
 #[cfg(not(all(feature = "c", target_arch = "arm", not(target_os = "ios"))))]
 divmod!(__divmodsi4, __divsi3: i32);