Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2024-11-28 15:40:59 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix calcrom; set C++ std to 17

Browse Source
This commit is contained in:
PikalaxALT 2021-09-18 13:42:11 -04:00
parent f13a9c1231
commit b912557e5a
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/calcrom/Makefile vendored
View File

@ -1,5 +1,5 @@
CXX := g++ CXX := g++
CXXFLAGS := -g -O3 -std=c++11 CXXFLAGS := -g -O2 -std=c++17
ifeq ($(DEBUG),) ifeq ($(DEBUG),)
CXXFLAGS += -DNDEBUG CXXFLAGS += -DNDEBUG
endif endif
@ -12,9 +12,12 @@ endif
TARGET := calcrom$(EXE) TARGET := calcrom$(EXE)
.PHONY: all .PHONY: all clean
all: $(TARGET) all: $(TARGET)
$(TARGET): calcrom.cpp $(TARGET): calcrom.cpp
$(CXX) $(CXXFLAGS) -o $@ $^ $(CXX) $(CXXFLAGS) -o $@ $^
clean:
$(RM) $(TARGET)

36
.github/calcrom/calcrom.cpp vendored
View File

@ -27,6 +27,8 @@
* Support hgss * Support hgss
* - 0.2.1 (31 Aug 2021): * - 0.2.1 (31 Aug 2021):
* Make calcrom more generic and configurable via command line * Make calcrom more generic and configurable via command line
* - 0.2.2 (18 Sep 2021):
* Handle errors when paths are missing
*/ */
#include <iostream> #include <iostream>
@ -38,8 +40,10 @@
#include <string> #include <string>
#include <cassert> #include <cassert>
#include <algorithm> #include <algorithm>
#include <filesystem>
using namespace std; using namespace std;
using namespace std::filesystem;
// Wraps glob results from <glob.h> // Wraps glob results from <glob.h>
struct Glob : public vector<char const *> { struct Glob : public vector<char const *> {
@ -108,7 +112,7 @@ private:
handle.read((char*)strtab.data(), sec->sh_size); handle.read((char*)strtab.data(), sec->sh_size);
} }
public: public:
Elf32File(string const& filename, bool read_syms = false) : handle(filename, ios::binary) { Elf32File(path const& filename, bool read_syms = false) : handle(filename, ios::binary) {
assert(handle.good()); assert(handle.good());
ReadElfHeaderAndVerify(); ReadElfHeaderAndVerify();
ReadSectionHeaders(); ReadSectionHeaders();
@ -125,7 +129,7 @@ public:
string default_version(""); string default_version("");
void analyze(string& basedir, string& subdir, string& version = default_version) { void analyze(path& basedir, path& subdir, string& version = default_version) {
// Accumulate sizes // Accumulate sizes
// src asm // src asm
// data _____|_____ // data _____|_____
@ -136,19 +140,25 @@ void analyze(string& basedir, string& subdir, string& version = default_version)
sizes[1][1] = 0x800; // libsyscall.a sizes[1][1] = 0x800; // libsyscall.a
} }
string srcbase = basedir + (subdir.empty() ? "" : "/" + subdir); path srcbase = basedir / subdir;
string builddir = srcbase + "/build/" + version; string builddir = srcbase / "build" / version;
string pattern = srcbase + "/{src,asm,lib/{src,asm},lib/{!syscall}/{src,asm}}/*.{c,s,cpp}"; if (!exists(srcbase)) {
throw runtime_error("No such directory: " + srcbase.string());
}
string pattern = srcbase.string() + "/{src,asm,lib/{src,asm},lib/{!syscall}/{src,asm}}/*.{c,s,cpp}";
for (char const * & fname : Glob(pattern, GLOB_TILDE | GLOB_BRACE | GLOB_NOSORT)) for (char const * & fname : Glob(pattern, GLOB_TILDE | GLOB_BRACE | GLOB_NOSORT))
{ {
string fname_s(fname); path fname_s(fname);
string ext = fname_s.substr(fname_s.rfind('.'), string::npos); string ext = fname_s.extension();
bool is_asm = ext == ".s"; bool is_asm = ext == ".s";
fname_s = fname_s.replace(0, srcbase.size(), builddir); fname_s = builddir / relative(fname_s, srcbase);
fname_s = fname_s.replace(fname_s.rfind('.'), string::npos, ".o"); fname_s = fname_s.replace_extension(".o");
#ifndef NDEBUG #ifndef NDEBUG
cerr << fname << " --> " << fname_s << endl; cerr << fname << " --> " << fname_s << endl;
#endif #endif
if (!exists(fname_s)) {
throw runtime_error("No such file: " + fname_s.string());
}
Elf32File elf(fname_s); Elf32File elf(fname_s);
@ -165,7 +175,7 @@ void analyze(string& basedir, string& subdir, string& version = default_version)
} }
} }
cout << "Analysis of " << (version.empty() ? subdir : version) << " binary:" << endl; cout << "Analysis of " << (version.empty() ? subdir.string() : version) << " binary:" << endl;
// Report code // Report code
unsigned total_text = sizes[1][0] + sizes[1][1]; unsigned total_text = sizes[1][0] + sizes[1][1];
double total_text_d = total_text; double total_text_d = total_text;
@ -192,9 +202,9 @@ public:
}; };
struct Options { struct Options {
string arm9subdir = ""; path arm9subdir = "";
string arm7subdir = "sub"; path arm7subdir = "sub";
string projectdir = "."; path projectdir = ".";
vector<string> romnames; vector<string> romnames;
Options(int argc, char ** argv) { Options(int argc, char ** argv) {
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {