mirror of
https://github.com/open-goal/jak-project
synced 2026-07-07 06:05:15 -04:00
minor windows fixes (#1311)
* [pp2] put `define` dest on a single line * update source! * Update type_analysis.cpp * update old credits & racer code * change clang-cl args (REALLY force avx) * Update credits_REF.gc * comment small unused code * add timer to decompiler * fix unnecessary copy-constructors (no speed increase) * fixes * Update expression_build.cpp * wtf is this thing anyway * im bored. * clang * fix! * Revert "fix!" This reverts commit5b1ce6c718. * Revert "clang" This reverts commit5e67d9ccd1. * Revert "im bored." This reverts commit070e957ce8. * Revert "Update expression_build.cpp" This reverts commitb94d092fc5. * Revert "fixes" This reverts commitf3d871f60a. * Revert "fix unnecessary copy-constructors (no speed increase)" This reverts commit9100725802. * Keep the random inoffensive changes * Revert "Update type_analysis.cpp" This reverts commitd2456a5c75. * Update type_analysis.cpp
This commit is contained in:
@@ -562,11 +562,13 @@ static void link_v5(LinkedObjectFile& f,
|
||||
} else if ((reloc & 0x3f) == 0x3f) {
|
||||
ASSERT(false); // todo, does this ever get hit?
|
||||
} else {
|
||||
/*
|
||||
int n_methods_base = reloc & 0x3f;
|
||||
int n_methods = n_methods_base * 4;
|
||||
if (n_methods_base) {
|
||||
n_methods += 3;
|
||||
}
|
||||
*/
|
||||
link_ptr += 2; // ghidra misses some aliasing here and would have you think this is +1!
|
||||
const char* sname = (const char*)(&data.at(link_ptr));
|
||||
link_ptr += strlen(sname) + 1;
|
||||
|
||||
@@ -79,9 +79,8 @@ std::string ObjectFileData::to_unique_name() const {
|
||||
std::string result = record.name + "-";
|
||||
auto dgo_names_sorted = dgo_names;
|
||||
std::sort(dgo_names_sorted.begin(), dgo_names_sorted.end());
|
||||
for (auto x : dgo_names_sorted) {
|
||||
x = strip_dgo_extension(x);
|
||||
result += x + "-";
|
||||
for (const auto& x : dgo_names_sorted) {
|
||||
result += strip_dgo_extension(x) + "-";
|
||||
}
|
||||
result.pop_back();
|
||||
return result;
|
||||
|
||||
Reference in New Issue
Block a user