mirror of
https://github.com/FEX-Emu/FEX.git
synced 2026-10-06 12:00:17 +02:00
Ryan Houdek
46d0df9cba
The argument loader was loading configuration from the arguments twice. The use of the argument loader needs to preload the arguments before being handed off to the config system. This way we can pull remaining arguments that get passed to the guest application. Due to this, `Load` was getting called twice, once in the constructor and once in the Config system. This was causing the backend to allocate twice as much memory since the second load appends the arguments to a fextl::list internally. Not really any functional change but it was causing some heartburn with some changes I was working on.
62 lines
1.8 KiB
C++
62 lines
1.8 KiB
C++
// SPDX-License-Identifier: MIT
|
|
#include "Common/ArgumentLoader.h"
|
|
#include <FEXCore/Config/Config.h>
|
|
#include <FEXCore/fextl/fmt.h>
|
|
#include <FEXCore/fextl/string.h>
|
|
#include <FEXCore/fextl/vector.h>
|
|
|
|
#include "cpp-optparse/OptionParser.h"
|
|
#include "git_version.h"
|
|
|
|
#include <stdint.h>
|
|
|
|
namespace FEX::ArgLoader {
|
|
void FEX::ArgLoader::ArgLoader::PreLoad() {
|
|
RemainingArgs.clear();
|
|
ProgramArguments.clear();
|
|
if (Type == LoadType::WITHOUT_FEXLOADER_PARSER) {
|
|
LoadWithoutArguments();
|
|
return;
|
|
}
|
|
|
|
optparse::OptionParser Parser {};
|
|
Parser.version("FEX-Emu (" GIT_DESCRIBE_STRING ") ");
|
|
optparse::OptionGroup CPUGroup(Parser, "CPU Core options");
|
|
optparse::OptionGroup EmulationGroup(Parser, "Emulation options");
|
|
optparse::OptionGroup DebugGroup(Parser, "Debug options");
|
|
optparse::OptionGroup HacksGroup(Parser, "Hacks options");
|
|
optparse::OptionGroup MiscGroup(Parser, "Miscellaneous options");
|
|
optparse::OptionGroup LoggingGroup(Parser, "Logging options");
|
|
|
|
#define BEFORE_PARSE
|
|
#include <FEXCore/Config/ConfigOptions.inl>
|
|
|
|
Parser.add_option_group(CPUGroup);
|
|
Parser.add_option_group(EmulationGroup);
|
|
Parser.add_option_group(DebugGroup);
|
|
Parser.add_option_group(HacksGroup);
|
|
Parser.add_option_group(MiscGroup);
|
|
Parser.add_option_group(LoggingGroup);
|
|
|
|
optparse::Values Options = Parser.parse_args(argc, argv);
|
|
|
|
using int32 = int32_t;
|
|
using uint32 = uint32_t;
|
|
#define AFTER_PARSE
|
|
#include <FEXCore/Config/ConfigOptions.inl>
|
|
RemainingArgs = Parser.args();
|
|
ProgramArguments = Parser.parsed_args();
|
|
}
|
|
|
|
void FEX::ArgLoader::ArgLoader::LoadWithoutArguments() {
|
|
// Skip argument 0, which will be the interpreter
|
|
for (int i = 1; i < argc; ++i) {
|
|
RemainingArgs.emplace_back(argv[i]);
|
|
}
|
|
|
|
// Put the interpreter in ProgramArguments
|
|
ProgramArguments.emplace_back(argv[0]);
|
|
}
|
|
|
|
} // namespace FEX::ArgLoader
|