Support running unit tests on Windows.

BUG=swiftshader:7 Change-Id: I83e51a3256365700dbaf550ed4b50c2352612f7d Reviewed-on: https://chromium-review.googlesource.com/394887Reviewed-by: Jim Stichnoth <stichnot@chromium.org> Tested-by: Nicolas Capens <nicolascapens@google.com>

Support running unit tests on Windows.
46f4feaa · Nicolas Capens · Nicolas Capens · b0935390 · 46f4feaa · 46f4feaa
Commit 46f4feaa authored Oct 06, 2016 by Nicolas Capens Committed by Nicolas Capens Oct 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 50 additions and 2 deletions

TestUtil.h unittest/AssemblerX8632/TestUtil.h +24 -1

TestUtil.h unittest/AssemblerX8664/TestUtil.h +26 -1

No files found.
--- a/unittest/AssemblerX8632/TestUtil.h
+++ b/unittest/AssemblerX8632/TestUtil.h
@@ -19,8 +19,16 @@

 #include "gtest/gtest.h"

-#include <cassert>
+#if defined(__unix__)
 #include <sys/mman.h>
+#elif defined(_WIN32)
+#define NOMINMAX
+#include <Windows.h>
+#else
+#error "Platform unsupported"
+#endif
+
+#include <cassert>

 namespace Ice {
 namespace X8632 {
@@ -570,10 +578,21 @@ protected:
      uint32_t MaxCodeSize = MaximumCodeSize;
      EXPECT_LT(MySize, MaxCodeSize);
      assert(MySize < MaximumCodeSize);
+
+#if defined(__unix__)
      ExecutableData = mmap(nullptr, Size, PROT_WRITE | PROT_READ | PROT_EXEC,
                            MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
      EXPECT_NE(MAP_FAILED, ExecutableData) << strerror(errno);
      assert(MAP_FAILED != ExecutableData);
+#elif defined(_WIN32)
+      ExecutableData = VirtualAlloc(NULL, Size, MEM_COMMIT | MEM_RESERVE,
+                                    PAGE_EXECUTE_READWRITE);
+      EXPECT_NE(nullptr, ExecutableData) << strerror(errno);
+      assert(nullptr != ExecutableData);
+#else
+#error "Platform unsupported"
+#endif
+
      std::memcpy(ExecutableData, Data, MySize);
    }

@@ -595,7 +614,11 @@ protected:

    ~AssembledTest() {
      if (ExecutableData != nullptr) {
+#if defined(__unix__)
        munmap(ExecutableData, Size);
+#elif defined(_WIN32)
+        VirtualFree(ExecutableData, 0, MEM_RELEASE);
+#endif
        ExecutableData = nullptr;
      }
    }

--- a/unittest/AssemblerX8664/TestUtil.h
+++ b/unittest/AssemblerX8664/TestUtil.h
@@ -19,8 +19,16 @@

 #include "gtest/gtest.h"

-#include <cassert>
+#if defined(__unix__)
 #include <sys/mman.h>
+#elif defined(_WIN32)
+#define NOMINMAX
+#include <Windows.h>
+#else
+#error "Platform unsupported"
+#endif
+
+#include <cassert>

 namespace Ice {
 namespace X8664 {
@@ -700,10 +708,21 @@ protected:
      uint32_t MaxCodeSize = MaximumCodeSize;
      EXPECT_LT(MySize, MaxCodeSize);
      assert(MySize < MaximumCodeSize);
+
+#if defined(__unix__)
      ExecutableData = mmap(nullptr, Size, PROT_WRITE | PROT_READ | PROT_EXEC,
                            MAP_PRIVATE | MAP_ANONYMOUS | MAP_32BIT, -1, 0);
      EXPECT_NE(MAP_FAILED, ExecutableData) << strerror(errno);
      assert(MAP_FAILED != ExecutableData);
+#elif defined(_WIN32)
+      ExecutableData = VirtualAlloc(NULL, Size, MEM_COMMIT | MEM_RESERVE,
+                                    PAGE_EXECUTE_READWRITE);
+      EXPECT_NE(nullptr, ExecutableData) << strerror(errno);
+      assert(nullptr != ExecutableData);
+#else
+#error "Platform unsupported"
+#endif
+
      std::memcpy(ExecutableData, Data, MySize);
    }

@@ -725,7 +744,13 @@ protected:

    ~AssembledTest() {
      if (ExecutableData != nullptr) {
+#if defined(__unix__)
        munmap(ExecutableData, Size);
+#elif defined(_WIN32)
+        VirtualFree(ExecutableData, 0, MEM_RELEASE);
+#else
+#error "Platform unsupported"
+#endif
        ExecutableData = nullptr;
      }
    }