pret/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-10-05 08:57:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix calcrom

Browse Source
This commit is contained in:
PikalaxALT
2021-12-17 20:45:17 -05:00
parent 3fd325f0aa
commit 44cd7753b5
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/calcrom/BuildAnalyzer.cpp
+20 -15
View File
@@ -8,6 +8,9 @@
string default_version("");
void BuildAnalyzer::AnalyzeObject(path fname_s) {
#ifndef NDEBUG
cerr << fname_s << endl;
#endif //NDEBUG
string ext = fname_s.extension();
SourceType sourceType = ext == ".s" ? SOURCE_ASM : SOURCE_C;
fname_s = builddir / relative(fname_s, srcbase);
@@ -25,9 +28,9 @@ void BuildAnalyzer::AnalyzeObject(path fname_s) {
if (sectionType != SECTION_OTHER) {
sizes[sectionType][sourceType] += (hdr.sh_size + 3) & ~3;
auto data = elf.ReadSectionData<unsigned>(hdr);
#ifndef NDEBUG
unordered_set<unsigned> unique_addrs;
#endif
//#ifndef NDEBUG
// unordered_set<unsigned> unique_addrs;
//#endif
for (const auto & word : data) {
if (word == 0) {
continue; // might be a relocation
@@ -35,19 +38,19 @@ void BuildAnalyzer::AnalyzeObject(path fname_s) {
if (find_if(program.GetProgramHeaders().cbegin(), program.GetProgramHeaders().cend(), [&word](const auto & phdr) {
return phdr.p_vaddr <= word && word < phdr.p_vaddr + phdr.p_memsz;
}) != program.GetProgramHeaders().cend()) {
#ifndef NDEBUG
unique_addrs.insert(word);
#endif
//#ifndef NDEBUG
// unique_addrs.insert(word);
//#endif
n_hardcoded++;
}
}
#ifndef NDEBUG
if (!version.empty()) {
for (const auto & word : unique_addrs) {
cerr << "hardcoded " << version << " pointer to " << hex << word << endl;
}
}
#endif
//#ifndef NDEBUG
// if (!version.empty()) {
// for (const auto & word : unique_addrs) {
// cerr << "hardcoded " << version << " pointer to " << hex << word << endl;
// }
// }
//#endif
} else if (hdr.sh_type == SHT_RELA) {
n_relocations += elf.GetSectionElementCount<Elf32_Rela>(hdr);
}
@@ -87,9 +90,11 @@ BuildAnalyzer &BuildAnalyzer::operator()() {
if (analyzed) {
reset();
}
string pattern = srcbase.string() + "/{src,asm,lib/{src,asm},lib/{!syscall}/{src,asm}}/*.{c,s,cpp}";
string pattern = srcbase.string() + "/{src,asm,lib/{src,asm},lib/*/{src,asm},modules/*/{asm,src}}/*.{c,s,cpp}";
for (char const * & fname : Glob(pattern, GLOB_TILDE | GLOB_BRACE | GLOB_NOSORT)) {
AnalyzeObject(fname);
if (string(fname).find("lib/syscall/") == string::npos) {
AnalyzeObject(fname);
}
}
analyzed = true;
return *this;