Merge pull request #158 from dmiller423/default_U

Default UnifiedMemory,  ensure TestHarnessRunner doesn't enable it.
This commit is contained in:
Ryan Houdek authored and GitHub committed 2020-04-25 11:52:11 -07:00
commit 4c83b0d201
2 files changed
+2 -1

No files matched your search

+1 -1
View File
@@ -49,7 +49,7 @@ namespace FEXCore::Context {
uint64_t VirtualMemSize {1ULL << 36};
FEXCore::Config::ConfigCore Core {FEXCore::Config::CONFIG_INTERPRETER};
bool GdbServer {false};
bool UnifiedMemory {false};
bool UnifiedMemory {true};
std::string RootFSPath;
// LLVM JIT options
+1
View File
@@ -70,6 +70,7 @@ int main(int argc, char **argv, char **const envp) {
auto CTX = FEXCore::Context::CreateNewContext();
FEXCore::Context::SetCustomCPUBackendFactory(CTX, VMFactory::CPUCreationFactory);
FEXCore::Config::SetConfig(CTX, FEXCore::Config::CONFIG_UNIFIED_MEMORY, 0); // ensure TestHarnessRunner doesn't enable UnifiedMemory.
FEXCore::Config::SetConfig(CTX, FEXCore::Config::CONFIG_DEFAULTCORE, CoreConfig() > 3 ? FEXCore::Config::CONFIG_CUSTOM : CoreConfig());
FEXCore::Config::SetConfig(CTX, FEXCore::Config::CONFIG_MULTIBLOCK, MultiblockConfig());
FEXCore::Config::SetConfig(CTX, FEXCore::Config::CONFIG_SINGLESTEP, SingleStepConfig());