Vortex 2.0 changes:

+ Microarchitecture optimizations
+ 64-bit support
+ Xilinx FPGA support
+ LLVM-16 support
+ Refactoring and quality control fixes

sim/common/bitmanip.h

@@ -1,7 +1,19 @@
+// Copyright © 2019-2023
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #pragma once
 
 #include <cstdint>
-#include <algorithm>
 #include <assert.h>
 
 constexpr uint32_t count_leading_zeros(uint32_t value) {
@@ -77,5 +89,15 @@ T sext(const T& word, uint32_t width) {
   if (width == (sizeof(T) * 8)) 
     return word;
   T mask((static_cast<T>(1) << width) - 1);
-  return ((word >> (width - 1)) & 0x1) ? (word | ~mask) : word;
-}
+  return ((word >> (width - 1)) & 0x1) ? (word | ~mask) : (word & mask);
+}
+
+template <typename T = uint32_t>
+T zext(const T& word, uint32_t width) {
+  assert(width > 1);
+  assert(width <= (sizeof(T) * 8));
+  if (width == (sizeof(T) * 8)) 
+    return word;
+  T mask((static_cast<T>(1) << width) - 1);
+  return word & mask;
+}