CmdLine: Drop the legacy cpu core flags, use --cpu=

-i, -j, -r, -J, --ir and --jit-ir are gone. -r was also --root's short form,
and --root won, so -r took the next argument as the root path and nothing
booted (test.py -r failed every test).

-i, -j and -J now fail with an error pointing at --cpu= instead of quietly
running on the default core. Docs and test.py updated.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-10-21 16:05:55 +02:00
1 parent 62c8690701
commit 6e3994aac0
12 files changed
+22 -48

No files matched your search

+4 -21
View File
@@ -310,10 +310,6 @@ int CommandLineOptions::PrintUsage(const char *progname, const char *situationTe
PRINT_STDOUT(" --state=FILE load state from FILE\n");
PRINT_STDOUT(" --cpu=CPU use the specified CPU core (interpreter, ir, jit, jit-ir)\n");
PRINT_STDOUT(" -i use the interpreter\n");
PRINT_STDOUT(" -r use IR interpreter\n");
PRINT_STDOUT(" -j use JIT\n");
PRINT_STDOUT(" -J use IR JIT\n");
for (const auto &param : g_autoParams) {
if (param.mode != CmdLineMode::Both && param.mode != mode) {
@@ -402,19 +398,12 @@ CommandLineParseResult CommandLineOptions::Parse(int argc, const char *argv[], C
case 'h':
PrintUsage(argv[0], nullptr);
return CommandLineParseResult::Exit;
// Legacy cpucore options.
case 'j':
cpuCore = CPUCore::JIT;
break;
case 'i':
cpuCore = CPUCore::INTERPRETER;
break;
case 'r':
cpuCore = CPUCore::IR_INTERPRETER;
break;
case 'j':
case 'J':
cpuCore = CPUCore::JIT_IR;
break;
// Removed cpu core options. Fail rather than quietly run on the default core.
PRINT_STDERR("Error: %s was removed, use --cpu=interpreter, ir, jit or jit-ir.\n", argv[i]);
return CommandLineParseResult::Error;
}
}
@@ -452,12 +441,6 @@ CommandLineParseResult CommandLineOptions::Parse(int argc, const char *argv[], C
printf("%s\n", PPSSPP_GIT_VERSION);
return CommandLineParseResult::Exit;
// Commands with parameters. TODO: Should support both space and equals, like --config=foo.ini and --config foo.ini
} else if (equals(argv[i], "--jit-ir")) {
// Headless legacy
cpuCore = CPUCore::JIT_IR;
} else if (equals(argv[i], "--ir")) {
// Headless legacy
cpuCore = CPUCore::IR_INTERPRETER;
} else if (startsWith(argv[i], gpuBackendStr)) {
const std::string restOfOption = argv[i] + gpuBackendStr.size();
// Force software rendering off, as picking gles implies HW acceleration.