Attachment 29568 Details for Bug 23964 – 0001-Use-__uint128_t-and-__int128_t-if-available.patch

[patch] 0001-Use-__uint128_t-and-__int128_t-if-available.patch

0001-Use-__uint128_t-and-__int128_t-if-available.patch (text/plain), 4.39 KB, created by Sebastian Dröge (slomo) on 2009-09-15 08:52:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Dröge (slomo)

Created: 2009-09-15 08:52:46 UTC

Size: 4.39 KB

patch

obsolete

>From 2cd46aef22d3cb7ff80ba9afe5108bb7200680de Mon Sep 17 00:00:00 2001
>From: =?utf-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
>Date: Tue, 15 Sep 2009 17:26:59 +0200
>Subject: [PATCH] Use __uint128_t and __int128_t if available
>
>---
> build/configure.ac.system        |    2 +-
> src/cairo-wideint-private.h      |    1 +
> src/cairo-wideint-type-private.h |    5 ++
> src/cairo-wideint.c              |   97 +++++++++++++++++++-------------------
> 4 files changed, 55 insertions(+), 50 deletions(-)
>
>diff --git a/build/configure.ac.system b/build/configure.ac.system
>index 3fffb94..3f6ab7e 100644
>--- a/build/configure.ac.system
>+++ b/build/configure.ac.system
>@@ -87,7 +87,7 @@ fi
> 
> dnl Checks for precise integer types
> AC_CHECK_HEADERS([stdint.h inttypes.h sys/int_types.h])
>-AC_CHECK_TYPES([uint64_t, uint128_t])
>+AC_CHECK_TYPES([uint64_t, uint128_t, __uint128_t])
> 
> dnl Check for socket support for any2ppm daemon
> AC_CHECK_HEADERS([fcntl.h unistd.h signal.h sys/stat.h sys/socket.h sys/poll.h sys/un.h])
>diff --git a/src/cairo-wideint-private.h b/src/cairo-wideint-private.h
>index ec7fa1f..d3b01cb 100644
>--- a/src/cairo-wideint-private.h
>+++ b/src/cairo-wideint-private.h
>@@ -272,6 +272,7 @@ int	        I	_cairo_int128_cmp (cairo_int128_t a, cairo_int128_t b);
> #define			_cairo_int128_sub(a,b)	    ((a) - (b))
> #define			_cairo_int128_mul(a,b)	    ((a) * (b))
> #define			_cairo_int64x64_128_mul(a,b) ((int128_t) (a) * (b))
>+#define                 _cairo_int64x32_128_mul(a, b) _cairo_int64x64_128_mul(a, _cairo_int32_to_int64(b))
> #define			_cairo_int128_lt(a,b)	    ((a) < (b))
> #define			_cairo_int128_cmp(a,b)	    ((a) == (b) ? 0 : (a) < (b) ? -1 : 1)
> #define			_cairo_int128_is_zero(a)    ((a) == 0)
>diff --git a/src/cairo-wideint-type-private.h b/src/cairo-wideint-type-private.h
>index 3d24150..5079ebe 100644
>--- a/src/cairo-wideint-type-private.h
>+++ b/src/cairo-wideint-type-private.h
>@@ -121,6 +121,11 @@ typedef struct _cairo_quorem64 {
>     cairo_int64_t	rem;
> } cairo_quorem64_t;
> 
>+#if HAVE___UINT128_T && !HAVE_UINT128_T
>+typedef __uint128_t uint128_t;
>+typedef __int128_t int128_t;
>+#define HAVE_UINT128_T 1
>+#endif
> 
> #if !HAVE_UINT128_T
> 
>diff --git a/src/cairo-wideint.c b/src/cairo-wideint.c
>index 1843a60..746da62 100644
>--- a/src/cairo-wideint.c
>+++ b/src/cairo-wideint.c
>@@ -37,6 +37,54 @@
> 
> #if HAVE_UINT64_T
> 
>+#define uint64_lo32(i)	((i) & 0xffffffff)
>+#define uint64_hi32(i)	((i) >> 32)
>+#define uint64_lo(i)	((i) & 0xffffffff)
>+#define uint64_hi(i)	((i) >> 32)
>+#define uint64_shift32(i)   ((i) << 32)
>+#define uint64_carry32	(((uint64_t) 1) << 32)
>+
>+#else
>+
>+#define uint64_lo32(i)	((i).lo)
>+#define uint64_hi32(i)	((i).hi)
>+
>+static cairo_uint64_t
>+uint64_lo (cairo_uint64_t i)
>+{
>+    cairo_uint64_t  s;
>+
>+    s.lo = i.lo;
>+    s.hi = 0;
>+    return s;
>+}
>+
>+static cairo_uint64_t
>+uint64_hi (cairo_uint64_t i)
>+{
>+    cairo_uint64_t  s;
>+
>+    s.lo = i.hi;
>+    s.hi = 0;
>+    return s;
>+}
>+
>+static cairo_uint64_t
>+uint64_shift32 (cairo_uint64_t i)
>+{
>+    cairo_uint64_t  s;
>+
>+    s.lo = 0;
>+    s.hi = i.lo;
>+    return s;
>+}
>+
>+static const cairo_uint64_t uint64_carry32 = { 0, 1 };
>+
>+#endif
>+
>+#if HAVE_UINT64_T
>+
> #define _cairo_uint32s_to_uint64(h,l) ((uint64_t) (h) << 32 | (l))
> 
> #else
>@@ -308,7 +356,6 @@ _cairo_uint64_divrem (cairo_uint64_t num, cairo_uint64_t den)
> #endif /* !HAVE_UINT64_T */
> 
> #if HAVE_UINT128_T
>-
> cairo_uquorem128_t
> _cairo_uint128_divrem (cairo_uint128_t num, cairo_uint128_t den)
> {
>@@ -385,54 +432,6 @@ _cairo_uint128_sub (cairo_uint128_t a, cairo_uint128_t b)
>     return s;
> }
> 
>-#if HAVE_UINT64_T
>-
>-#define uint64_lo32(i)	((i) & 0xffffffff)
>-#define uint64_hi32(i)	((i) >> 32)
>-#define uint64_lo(i)	((i) & 0xffffffff)
>-#define uint64_hi(i)	((i) >> 32)
>-#define uint64_shift32(i)   ((i) << 32)
>-#define uint64_carry32	(((uint64_t) 1) << 32)
>-
>-#else
>-
>-#define uint64_lo32(i)	((i).lo)
>-#define uint64_hi32(i)	((i).hi)
>-
>-static cairo_uint64_t
>-uint64_lo (cairo_uint64_t i)
>-{
>-    cairo_uint64_t  s;
>-
>-    s.lo = i.lo;
>-    s.hi = 0;
>-    return s;
>-}
>-
>-static cairo_uint64_t
>-uint64_hi (cairo_uint64_t i)
>-{
>-    cairo_uint64_t  s;
>-
>-    s.lo = i.hi;
>-    s.hi = 0;
>-    return s;
>-}
>-
>-static cairo_uint64_t
>-uint64_shift32 (cairo_uint64_t i)
>-{
>-    cairo_uint64_t  s;
>-
>-    s.lo = 0;
>-    s.hi = i.lo;
>-    return s;
>-}
>-
>-static const cairo_uint64_t uint64_carry32 = { 0, 1 };
>-
>-#endif
>-
> cairo_uint128_t
> _cairo_uint64x64_128_mul (cairo_uint64_t a, cairo_uint64_t b)
> {
>-- 
>1.6.3.3
>

Actions: View | Splinter Review

Attachments on bug 23964: 29568

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.