thirdpartymirrors/N64Recomp
1
0
Fork 0
mirror of https://github.com/N64Recomp/N64Recomp.git synced 2026-05-08 01:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for special dependency names (self and base recomp), fix non-compliant offline mod recompiler output

Browse source
This commit is contained in:
Mr-Wiseguy 2024-08-27 01:23:37 -04:00
parent 0aacb52e75
commit 131157dad8
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OfflineModRecomp/main.cpp
View file

@ -145,7 +145,8 @@ int main(int argc, const char** argv) {
const auto& import = mod_context.import_symbols[import_index]; const auto& import = mod_context.import_symbols[import_index];
output_file << "#define " << import.base.name << " imported_funcs[" << import_index << "]\n"; output_file << "#define " << import.base.name << " imported_funcs[" << import_index << "]\n";
} }
output_file << "RECOMP_EXPORT recomp_func_t* imported_funcs[" << num_imports << "] = {};\n";
output_file << "RECOMP_EXPORT recomp_func_t* imported_funcs[" << std::max(size_t{1}, num_imports) << "] = {0};\n";
output_file << "\n"; output_file << "\n";
// Use reloc list to write reference symbol function pointer array and defines (i.e. `#define func_80102468 reference_symbol_funcs[0]`) // Use reloc list to write reference symbol function pointer array and defines (i.e. `#define func_80102468 reference_symbol_funcs[0]`)
@ -160,11 +161,12 @@ int main(int argc, const char** argv) {
} }
} }
} }
output_file << "RECOMP_EXPORT recomp_func_t* reference_symbol_funcs[" << num_reference_symbols << "] = {};\n\n"; // C doesn't allow 0-sized arrays, so always add at least one member to all arrays. The actual size will be pulled from the mod symbols.
output_file << "RECOMP_EXPORT recomp_func_t* reference_symbol_funcs[" << std::max(size_t{1},num_reference_symbols) << "] = {0};\n\n";
// Write provided event array (maps internal event indices to global ones). // Write provided event array (maps internal event indices to global ones).
output_file << "// Mapping of internal event indices to global ones.\n"; output_file << "// Mapping of internal event indices to global ones.\n";
output_file << "RECOMP_EXPORT uint32_t event_indices[" << mod_context.event_symbols.size() <<"] = {};\n\n"; output_file << "RECOMP_EXPORT uint32_t event_indices[" << std::max(size_t{1}, mod_context.event_symbols.size()) <<"] = {0};\n\n";
// Write the event trigger function pointer. // Write the event trigger function pointer.
output_file << "// Pointer to the runtime function for triggering events.\n"; output_file << "// Pointer to the runtime function for triggering events.\n";
@ -181,7 +183,7 @@ int main(int argc, const char** argv) {
// Write the local section addresses pointer array. // Write the local section addresses pointer array.
size_t num_sections = mod_context.sections.size(); size_t num_sections = mod_context.sections.size();
output_file << "// Array of this mod's loaded section addresses.\n"; output_file << "// Array of this mod's loaded section addresses.\n";
output_file << "RECOMP_EXPORT int32_t section_addresses[" << num_sections << "] = {};\n\n"; output_file << "RECOMP_EXPORT int32_t section_addresses[" << std::max(size_t{1}, num_sections) << "] = {0};\n\n";
for (size_t func_index = 0; func_index < mod_context.functions.size(); func_index++) { for (size_t func_index = 0; func_index < mod_context.functions.size(); func_index++) {
auto& func = mod_context.functions[func_index]; auto& func = mod_context.functions[func_index];

21
include/n64recomp.h
View file

@ -70,9 +70,9 @@ namespace N64Recomp {
constexpr std::string_view ImportSectionPrefix = ".recomp_import."; constexpr std::string_view ImportSectionPrefix = ".recomp_import.";
constexpr std::string_view CallbackSectionPrefix = ".recomp_callback."; constexpr std::string_view CallbackSectionPrefix = ".recomp_callback.";
// Special mod names. // Special dependency names.
constexpr std::string_view ModSelf = "."; constexpr std::string_view DependencySelf = ".";
constexpr std::string_view ModBaseRecomp = "*"; constexpr std::string_view DependencyBaseRecomp = "*";
struct Section { struct Section {
uint32_t rom_addr = 0; uint32_t rom_addr = 0;
@ -279,10 +279,19 @@ namespace N64Recomp {
bool find_dependency(const std::string& mod_id, size_t& dependency_index) { bool find_dependency(const std::string& mod_id, size_t& dependency_index) {
auto find_it = dependencies_by_name.find(mod_id); auto find_it = dependencies_by_name.find(mod_id);
if (find_it == dependencies_by_name.end()) { if (find_it != dependencies_by_name.end()) {
return false; dependency_index = find_it->second;
}
else {
// Handle special dependency names.
if (mod_id == DependencySelf || mod_id == DependencyBaseRecomp) {
add_dependency(mod_id, 0, 0, 0);
dependency_index = dependencies_by_name[mod_id];
}
else {
return false;
}
} }
dependency_index = find_it->second;
return true; return true;
} }