[MSVC] Many small fixes.

Fix wrong intrinsic, code style. Signed-off-by: Wang Jikai <[email protected]>
CloudBee7 · Sep 12, 2023 · 3567a04 · 3567a04
1 parent c46fd41
commit 3567a04
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/include/common/enum_errcode.hpp b/include/common/enum_errcode.hpp
@@ -118,9 +118,9 @@ class ErrCode {
   constexpr operator uint32_t() const noexcept { return Inner.Num; }
 
 private:
-  union Inner_t {
-    constexpr Inner_t(uint32_t num): Num(num) {}
-    constexpr Inner_t(ErrCode::Value code): Code(code) {}
+  union InnerT {
+    constexpr InnerT(uint32_t Num): Num(Num) {}
+    constexpr InnerT(ErrCode::Value Code): Code(Code) {}
     uint32_t Num;
     ErrCode::Value Code;
   } Inner;

diff --git a/include/common/int128.h b/include/common/int128.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #if defined(_MSC_VER) && !defined(__clang__)
-#pragma intrinsic(_BitScanForward64)
+#pragma intrinsic(_BitScanReverse64)
 #endif
 
 #include <ostream>

diff --git a/lib/api/wasmedge.cpp b/lib/api/wasmedge.cpp
@@ -2079,7 +2079,7 @@ WASMEDGE_CAPI_EXPORT WasmEdge_Result
 WasmEdge_TableInstanceGetData(const WasmEdge_TableInstanceContext *Cxt,
                               WasmEdge_Value *Data, const uint32_t Offset) {
   return wrap([&]() { return fromTabCxt(Cxt)->getRefAddr(Offset); },
-              [&, Cxt](auto &&Res) {
+              [&Data, &Cxt](auto &&Res) {
                 *Data = genWasmEdge_Value(
                     Res->template get<UnknownRef>(),
                     static_cast<WasmEdge_ValType>(

diff --git a/lib/host/wasi/inode-win.cpp b/lib/host/wasi/inode-win.cpp
@@ -760,15 +760,18 @@ WasiExpect<void> INode::fdAdvise(__wasi_filesize_t Offset, __wasi_filesize_t,
 
 WasiExpect<void> INode::fdAllocate(__wasi_filesize_t Offset,
                                    __wasi_filesize_t Len) const noexcept {
-  if (unlikely(Offset > static_cast<uint64_t>(std::numeric_limits<int64_t>::max()))) {
+  if (unlikely(Offset >
+               static_cast<uint64_t>(std::numeric_limits<int64_t>::max()))) {
     return WasiUnexpect(__WASI_ERRNO_INVAL);
   }
 
-  if (unlikely(Len > static_cast<uint64_t>((std::numeric_limits<int64_t>::max())))) {
+  if (unlikely(Len >
+               static_cast<uint64_t>((std::numeric_limits<int64_t>::max())))) {
     return WasiUnexpect(__WASI_ERRNO_INVAL);
   }
 
-  if (unlikely((Offset + Len) >  static_cast<uint64_t>(std::numeric_limits<int64_t>::max()))) {
+  if (unlikely((Offset + Len) >
+               static_cast<uint64_t>(std::numeric_limits<int64_t>::max()))) {
     return WasiUnexpect(__WASI_ERRNO_INVAL);
   }
 
@@ -867,7 +870,8 @@ INode::fdFilestatGet(__wasi_filestat_t &FileStat) const noexcept {
 
 WasiExpect<void>
 INode::fdFilestatSetSize(__wasi_filesize_t Size) const noexcept {
-  if (unlikely(Size > static_cast<uint64_t>(std::numeric_limits<int64_t>::max()))) {
+  if (unlikely(Size >
+               static_cast<uint64_t>(std::numeric_limits<int64_t>::max()))) {
     return WasiUnexpect(__WASI_ERRNO_INVAL);
   }