Make Reactor build stand-alone.
This is accomplished by duplicating files from the Common directory
that Reactor (both with LLVM and Subzero back-end) depended on. They
will be minimized in the next change.
Bug b/115344057
Bug swiftshader:16
Change-Id: I2dc087e91b761cc4402ed8594022551e9246b855
Reviewed-on: https://swiftshader-review.googlesource.com/c/20108
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/src/Reactor/SubzeroReactor.cpp b/src/Reactor/SubzeroReactor.cpp
index b92005c..a691037 100644
--- a/src/Reactor/SubzeroReactor.cpp
+++ b/src/Reactor/SubzeroReactor.cpp
@@ -15,8 +15,7 @@
#include "Reactor.hpp"
#include "Optimizer.hpp"
-
-#include "Common/Memory.hpp"
+#include "Memory.hpp"
#include "src/IceTypes.h"
#include "src/IceCfg.h"
@@ -49,7 +48,7 @@
#endif
#endif
-//#include <mutex>
+#include <mutex>
#include <limits>
#include <iostream>
#include <cassert>
@@ -427,12 +426,12 @@
T *allocate(size_type n)
{
- return (T*)sw::allocateExecutable(sizeof(T) * n);
+ return (T*)allocateExecutable(sizeof(T) * n);
}
void deallocate(T *p, size_type n)
{
- sw::deallocateExecutable(p, sizeof(T) * n);
+ deallocateExecutable(p, sizeof(T) * n);
}
};
