From ac86ef3bd53c84f4597b841b8667b091076cd6c0 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Thu, 29 Oct 2015 18:22:46 +1100
Subject: [PATCH] maths: fix hi-lo normalisation shift size

---
 maths.hpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/maths.hpp b/maths.hpp
index 7ba92083..8c7ca35b 100644
--- a/maths.hpp
+++ b/maths.hpp
@@ -446,6 +446,9 @@ typename std::enable_if<
 >::type
 renormalise [[gnu::pure]] (T t)
 {
+    static_assert (sizeof (T) > sizeof (U),
+                   "assumes right shift is sufficient");
+
     // we have excess bits ,just shift and return
     constexpr auto shift = 8 * (sizeof (T) - sizeof (U));
     return t >> shift;
@@ -462,6 +465,9 @@ typename std::enable_if<
 >::type
 renormalise [[gnu::pure]] (T t)
 {
+    static_assert (sizeof (T) < sizeof (U),
+                   "assumes bit creation is required to fill space");
+
     // we need to create bits. fill the output integer with copies of ourself.
     // this is approximately correct in the general case (introducing a small
     // linear positive bias), but allows us to fill the output space in the
@@ -473,7 +479,7 @@ renormalise [[gnu::pure]] (T t)
     U out = 0;
 
     for (size_t i = 0; i < sizeof (U) / sizeof (T); ++i)
-        out |= t << sizeof (U) * 8 * i;
+        out |= U (t) << sizeof (T) * 8 * i;
 
     return out;
 }