Commit 3df9389215b365a83b1a509e55086595105c1f58 | zig

author	Andrew Kelley <andrew@ziglang.org> 2016-05-14 20:04:04-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2016-05-15 12:02:37-07:00
log	3df9389215b365a83b1a509e55086595105c1f58
tree	e7258b8b5ca3ebbe230fc2468a8592503d61e205
parent	7b0052abbb0919339315be7ae4eb293ef83566cd

1 files changed, 15 insertions(+), 4 deletions(-)

std/compiler_rt.zig+15-4

 @@ -1,6 +1,6 @@
 const CHAR_BIT = 8;
-const du_int = c_ulonglong;
+const du_int = u64;
-const di_int = c_longlong;
+const di_int = i64;
 const si_int = c_int;
 const su_int = c_uint;
 @@ -204,11 +204,11 @@ export fn __udivmoddi4(a: du_int, b: du_int, maybe_rem: ?&du_int) -> du_int {
             */
         const s: di_int = (di_int)(*(&du_int)(&d[0]) - *(&du_int)(&r[0]) - 1) >> (n_udword_bits - 1);
         carry = su_int(s & 1);
-        *(&du_int)(&r[0]) -= *(&du_int)(&d[0]) & c_ulonglong(s);
+        *(&du_int)(&r[0]) -= *(&du_int)(&d[0]) & u64(s);
         sr -= 1;
     }
-    *(&du_int)(&q[0]) = (*(&du_int)(&q[0]) << 1) | carry;
+    *(&du_int)(&q[0]) = (*(&du_int)(&q[0]) << 1) | u64(carry);
     if (var rem ?= maybe_rem) {
         *rem = *(&du_int)(&r[0]);
     }
 @@ -222,6 +222,17 @@ export fn __umoddi3(a: du_int, b: du_int) -> du_int {
     return r;
 }
+struct AeabiUlDivModResult {
+    quot: u64,
+    rem: u64,
+}
+#debug_safety(false)
+export fn __aeabi_uldivmod(numerator: u64, denominator: u64) -> AeabiUlDivModResult{
+    var result: AeabiUlDivModResult = undefined;
+    result.quot = __udivmoddi4(numerator, denominator, &result.rem);
+    return result;
+}
 #attribute("test")
 fn test_umoddi3() {