Implement popcnt and lzcnt for windows arm64

Fixes: #261
ngtcp2 · Aug 21, 2020 · 576f2d4 · 576f2d4
1 parent 6e02c26
commit 576f2d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/ngtcp2_cc.c b/lib/ngtcp2_cc.c
@@ -244,6 +244,14 @@ static uint64_t ngtcp2_cbrt(uint64_t n) {
 #if defined(_MSC_VER)
 #  if defined(_M_X64)
   d = (int)__lzcnt64(n);
+#  elif defined(_M_ARM64)
+  {
+    unsigned long index;
+    d = sizeof(uint64_t) * CHAR_BIT;
+    if (_BitScanReverse64(&index, n)) {
+      d = d - 1 - index;
+    }
+  }
 #  else
   if ((n >> 32) != 0) {
     d = __lzcnt((unsigned int)(n >> 32));

diff --git a/lib/ngtcp2_ringbuf.c b/lib/ngtcp2_ringbuf.c
@@ -31,6 +31,16 @@
 
 #include "ngtcp2_macro.h"
 
+#if defined(_MSC_VER) && defined(_M_ARM64)
+unsigned int __popcnt(unsigned int x) {
+  unsigned int c = 0;
+  for (; x; ++c) {
+    x &= x - 1;
+  }
+  return c;
+}
+#endif
+
 int ngtcp2_ringbuf_init(ngtcp2_ringbuf *rb, size_t nmemb, size_t size,
                         const ngtcp2_mem *mem) {
 #ifdef WIN32