FEX-Emu/FEX
1
0
Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2025-02-12 10:29:24 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Added EnvLoader to fontend binaries, called prior to ArgLoader

Browse Source
This commit is contained in:
David Miller 2020-04-24 19:35:59 -04:00
parent 75ee8f0604
commit d93c66e5f6
7 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Tests/ELFLoader.cpp
View File

@ -1,4 +1,5 @@
#include "Common/ArgumentLoader.h"
#include "Common/EnvironmentLoader.h"
#include "CommonCore/VMFactory.h"
#include "Common/Config.h"
#include "ELFLoader.h"
@ -83,6 +84,7 @@ int main(int argc, char **argv, char **const envp) {
}
FEX::Config::Init();
FEX::EnvLoader::Load(envp);
FEX::ArgLoader::Load(argc, argv);
FEX::Config::Value<uint8_t> CoreConfig{"Core", 0};

4
Source/Tests/LockstepRunner.cpp
View File

@ -1,4 +1,5 @@
#include "Common/ArgumentLoader.h"
#include "Common/EnvironmentLoader.h"
#include "Common/Config.h"
#include "CommonCore/VMFactory.h"
#include "HarnessHelpers.h"
@ -506,10 +507,11 @@ private:
const std::chrono::milliseconds HeartBeatRate = std::chrono::seconds(1);
};
int main(int argc, char **argv) {
int main(int argc, char **argv, char **const envp) {
LogMan::Throw::InstallHandler(AssertHandler);
LogMan::Msg::InstallHandler(MsgHandler);
FEX::Config::Init();
FEX::EnvLoader::Load(envp);
FEX::ArgLoader::Load(argc, argv);
auto Args = FEX::ArgLoader::Get();

4
Source/Tests/TestHarnessRunner.cpp
View File

@ -1,4 +1,5 @@
#include "Common/ArgumentLoader.h"
#include "Common/EnvironmentLoader.h"
#include "CommonCore/VMFactory.h"
#include "HarnessHelpers.h"
#include "LogManager.h"
@ -48,10 +49,11 @@ void AssertHandler(char const *Message) {
printf("[ASSERT] %s\n", Message);
}
int main(int argc, char **argv) {
int main(int argc, char **argv, char **const envp) {
LogMan::Throw::InstallHandler(AssertHandler);
LogMan::Msg::InstallHandler(MsgHandler);
FEX::Config::Init();
FEX::EnvLoader::Load(envp);
FEX::ArgLoader::Load(argc, argv);
FEX::Config::Value<uint8_t> CoreConfig{"Core", 0};

4
Source/Tests/TestSingleStepHardware.cpp
View File

@ -1,4 +1,5 @@
#include "Common/ArgumentLoader.h"
#include "Common/EnvironmentLoader.h"
#include "Common/Config.h"
#include "ELFLoader.h"
#include "HarnessHelpers.h"
@ -91,10 +92,11 @@ void AssertHandler(char const *Message) {
printf("[ASSERT] %s\n", Message);
}
int main(int argc, char **argv) {
int main(int argc, char **argv, char **const envp) {
LogMan::Throw::InstallHandler(AssertHandler);
LogMan::Msg::InstallHandler(MsgHandler);
FEX::Config::Init();
FEX::EnvLoader::Load(envp);
FEX::ArgLoader::Load(argc, argv);
FEX::Config::Value<uint8_t> CoreConfig{"Core", 0};

4
Source/Tests/UnitTestGenerator.cpp
View File

@ -1,4 +1,5 @@
#include "Common/ArgumentLoader.h"
#include "Common/EnvironmentLoader.h"
#include "Common/Config.h"
#include "LogManager.h"
@ -2385,11 +2386,12 @@ void GenerateSSEInstructions() {
printf("SSE NumInsts: %d\n", numInst);
}
int main(int argc, char **argv) {
int main(int argc, char **argv, char **const envp) {
LogMan::Throw::InstallHandler(AssertHandler);
LogMan::Msg::InstallHandler(MsgHandler);
FEX::Config::Init();
FEX::EnvLoader::Load(envp);
FEX::ArgLoader::Load(argc, argv);
auto Args = FEX::ArgLoader::Get();

4
Source/Tools/Debugger/Main.cpp
View File

@ -1,4 +1,5 @@
#include "Common/ArgumentLoader.h"
#include "Common/EnvironmentLoader.h"
#include "Common/Config.h"
#include "CommonCore/VMFactory.h"
#include "Tests/HarnessHelpers.h"
@ -128,8 +129,9 @@ void GetIRCallback(std::stringstream *out, uint64_t PC) {
// }
}
int main(int argc, char **argv) {
int main(int argc, char **argv, char **const envp) {
FEX::Config::Init();
FEX::EnvLoader::Load(envp);
FEX::ArgLoader::Load(argc, argv);
FEXCore::Context::InitializeStaticTables();

4
Source/Tools/Opt.cpp
View File

@ -1,10 +1,12 @@
#include "Common/ArgumentLoader.h"
#include "Common/EnvironmentLoader.h"
#include "Common/Config.h"
#include <FEXCore/IR/IntrusiveIRList.h>
int main(int argc, char **argv) {
int main(int argc, char **argv, char **const envp) {
FEX::Config::Init();
FEX::EnvLoader::Load(envp);
FEX::ArgLoader::Load(argc, argv);
FEX::Config::Shutdown();