From 9c0dbec8c99288138a1dbaadc4461d0e6980e041 Mon Sep 17 00:00:00 2001
From: Matthias Hochsteger <mhochsteger@cerbsim.com>
Date: Tue, 15 Dec 2020 15:31:17 +0100
Subject: [PATCH] Fix SIMD<mask64> ctor and Unpack

---
 libsrc/core/simd_generic.hpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libsrc/core/simd_generic.hpp b/libsrc/core/simd_generic.hpp
index c83b5348..5846ad4c 100644
--- a/libsrc/core/simd_generic.hpp
+++ b/libsrc/core/simd_generic.hpp
@@ -76,7 +76,7 @@ namespace ngcore
     SIMD<mask64,N2> hi;
   public:
 
-    SIMD (int i) : lo(i), hi(i-N1) { ; }
+    SIMD (size_t i) : lo(i), hi(i>N1 ? i-N1 : 0) { ; }
     SIMD (SIMD<mask64,N1> lo_, SIMD<mask64,N2> hi_) : lo(lo_), hi(hi_) { ; }
     SIMD<mask64,N1> Lo() const { return lo; }
     SIMD<mask64,N2> Hi() const { return hi; }
@@ -664,6 +664,11 @@ namespace ngcore
       {
         return std::make_tuple(SIMD<double,N>{a.Data()}, SIMD<double,N>{b.Data()} );
       }
+    else if constexpr(N==2)
+      {
+        return std::make_tuple(SIMD<double,N>{ a.Lo(), b.Lo() },
+            SIMD<double,N>{ a.Hi(), b.Hi() });
+      }
     else
       {
         auto [a1,b1] = Unpack(a.Lo(), b.Lo());