Mirrors/N64Recomp
1
0
Fork 0
mirror of https://github.com/N64Recomp/N64Recomp.git synced 2025-05-30 23:33:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix --dump-context arg, fix entrypoint detection

Browse source
This commit is contained in:
LittleCube 2024-12-23 23:00:07 -05:00
parent 0cc8edcf40
commit 7e04b95d71
2 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/elf.cpp
View file

@ -59,18 +59,6 @@ bool read_symbols(N64Recomp::Context& context, const ELFIO::elfio& elf_file, ELF
} }
if (section_index < context.sections.size()) { if (section_index < context.sections.size()) {
// Check if this symbol is the entrypoint
if (elf_config.has_entrypoint && (uint32_t) value == (uint32_t) elf_config.entrypoint_address && (type == ELFIO::STT_FUNC || type == ELFIO::STT_NOTYPE)) {
if (found_entrypoint_func) {
fmt::print(stderr, "Ambiguous entrypoint: {}\n", name);
return false;
}
found_entrypoint_func = true;
fmt::print("Found entrypoint, original name: {}\n", name);
size = 0x50; // dummy size for entrypoints, should cover them all
name = "recomp_entrypoint";
}
// Check if this symbol has a size override // Check if this symbol has a size override
auto size_find = elf_config.manually_sized_funcs.find(name); auto size_find = elf_config.manually_sized_funcs.find(name);
if (size_find != elf_config.manually_sized_funcs.end()) { if (size_find != elf_config.manually_sized_funcs.end()) {
@ -105,15 +93,17 @@ bool read_symbols(N64Recomp::Context& context, const ELFIO::elfio& elf_file, ELF
auto section_offset = value - elf_file.sections[section_index]->get_address(); auto section_offset = value - elf_file.sections[section_index]->get_address();
const uint32_t* words = reinterpret_cast<const uint32_t*>(elf_file.sections[section_index]->get_data() + section_offset); const uint32_t* words = reinterpret_cast<const uint32_t*>(elf_file.sections[section_index]->get_data() + section_offset);
uint32_t vram = static_cast<uint32_t>(value); uint32_t vram = static_cast<uint32_t>(value);
uint32_t num_instructions = (type == ELFIO::STT_FUNC || type == ELFIO::STT_NOTYPE) ? size / 4 : 0; uint32_t num_instructions = type == ELFIO::STT_FUNC ? size / 4 : 0;
uint32_t rom_address = static_cast<uint32_t>(section_offset + section.rom_addr); uint32_t rom_address = static_cast<uint32_t>(section_offset + section.rom_addr);
section.function_addrs.push_back(vram); section.function_addrs.push_back(vram);
context.functions_by_vram[vram].push_back(context.functions.size()); context.functions_by_vram[vram].push_back(context.functions.size());
// Find the entrypoint by rom address in case it doesn't have vram as its value // Find the entrypoint by rom address in case it doesn't have vram as its value
if (elf_config.has_entrypoint && rom_address == 0x1000 && type == ELFIO::STT_FUNC) { if (rom_address == 0x1000 && type == ELFIO::STT_FUNC) {
vram = elf_config.entrypoint_address; if (elf_config.has_entrypoint) {
vram = elf_config.entrypoint_address;
}
found_entrypoint_func = true; found_entrypoint_func = true;
name = "recomp_entrypoint"; name = "recomp_entrypoint";
if (size == 0) { if (size == 0) {

15
src/main.cpp
View file

@ -272,12 +272,17 @@ int main(int argc, char** argv) {
std::exit(EXIT_FAILURE); std::exit(EXIT_FAILURE);
}; };
// TODO expose a way to dump the context from the command line. bool dumping_context;
bool dumping_context = argc > 2;
if (argc > 3) { if (argc >= 3) {
fmt::print("Usage: {} [config file] (should-dump)\n", argv[0]); if (strncmp(argv[2], "--dump-context", 14) == 0) {
std::exit(EXIT_SUCCESS); dumping_context = true;
} else {
fmt::print("Usage: {} [config file] (should-dump)\n", argv[0]);
std::exit(EXIT_SUCCESS);
}
} else {
dumping_context = false;
} }
const char* config_path = argv[1]; const char* config_path = argv[1];