Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 00:57:44 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

avoid crash with 2 args in mem tool (#585)

Browse source
This commit is contained in:
water111 2021-06-12 21:55:59 -04:00 committed by GitHub
parent 506b5d8ceb
commit 43b89dd982
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/MemoryDumpTool/main.cpp
View file

@ -206,10 +206,6 @@ void inspect_basics(const Ram& ram,
nlohmann::json type_results;
if (results.contains(name)) {
type_results = results.at(name);
if (name == "crate-bank") {
std::string wat = type_results.dump();
int i = 0;
}
type_results["__metadata"]["occurences"] =
type_results["__metadata"]["occurences"].get<int>() + basics.at(name).size();
} else {
@ -319,7 +315,7 @@ static bool ends_with(const std::string& str, const std::string& suffix) {
int main(int argc, char** argv) {
fmt::print("MemoryDumpTool\n");
if (argc != 2) {
if (argc != 2 && argc != 3) {
fmt::print("usage: memory_dump_tool <ee_ram.bin|savestate.p2s> [output folder]\n");
return 1;
}
@ -329,11 +325,13 @@ int main(int argc, char** argv) {
dts.parse_type_defs({"decompiler", "config", "all-types.gc"});
std::string file_name = argv[1];
fs::path output_folder = argv[2];
fs::path output_folder;
if (!fs::exists(output_folder) || argc != 3) {
if (!fs::exists(output_folder) || argc < 3) {
fmt::print("Output folder not found, defaulting to current directory");
output_folder = ".";
} else {
output_folder = argv[2];
}
// If it's a PCSX2 savestate, lets extract the ee memory automatically