Fix out of bounds error when scanning jump tables if the end of the binary is encountered

* make osPiReadIo no longer ignored

* remove added dmtc1/dmfc1 functionality

* add dmtc1 and dmfc1 to recompiler

.gitignore

@@ -6,8 +6,8 @@
 *.elf
 *.z64
 
-# Output C files
-test/funcs
+# Local working data
+tests
 
 # Linux build output
 build/
@@ -42,12 +42,6 @@ bld/
 # Visual Studio 2015/2017 cache/options directory
 .vs/
 
-# Libraries (binaries that aren't in the repo)
-test/Lib
-
-# RT64 (since it's not public yet)
-test/RT64
-
 # Runtime files
 imgui.ini
 rt64.log

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "lib/tomlplusplus"]
 	path = lib/tomlplusplus
 	url = https://github.com/marzer/tomlplusplus
+[submodule "lib/sljit"]
+	path = lib/sljit
+	url = https://github.com/zherczeg/sljit

CMakeLists.txt

@@ -82,7 +82,6 @@ target_sources(N64Recomp PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/src/analysis.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/operations.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/cgenerator.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/luajitgenerator.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/recompilation.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/mod_symbols.cpp
 )
@@ -165,3 +164,32 @@ target_sources(OfflineModRecomp PRIVATE
 )
 
 target_link_libraries(OfflineModRecomp fmt rabbitizer tomlplusplus::tomlplusplus N64Recomp)
+
+# Live recompiler
+project(LiveRecomp)
+add_library(LiveRecomp)
+
+target_sources(LiveRecomp PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/LiveRecomp/live_generator.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/lib/sljit/sljit_src/sljitLir.c
+)
+
+target_include_directories(LiveRecomp PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/lib/sljit/sljit_src
+)
+
+target_link_libraries(LiveRecomp N64Recomp)
+
+# Live recompiler test
+project(LiveRecompTest)
+add_executable(LiveRecompTest)
+
+target_sources(LiveRecompTest PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/LiveRecomp/live_recompiler_test.cpp
+)
+
+target_include_directories(LiveRecompTest PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/lib/sljit/sljit_src
+)
+
+target_link_libraries(LiveRecompTest LiveRecomp)

LiveRecomp/live_recompiler_test.cpp

@@ -0,0 +1,364 @@
+#include <fstream>
+#include <chrono>
+#include <filesystem>
+#include <cinttypes>
+
+#include "sljitLir.h"
+#include "recompiler/live_recompiler.h"
+#include "recomp.h"
+
+static std::vector<uint8_t> read_file(const std::filesystem::path& path, bool& found) {
+    std::vector<uint8_t> ret;
+    found = false;
+
+    std::ifstream file{ path, std::ios::binary};
+
+    if (file.good()) {
+        file.seekg(0, std::ios::end);
+        ret.resize(file.tellg());
+        file.seekg(0, std::ios::beg);
+
+        file.read(reinterpret_cast<char*>(ret.data()), ret.size());
+        found = true;
+    }
+
+    return ret;
+}
+
+
+uint32_t read_u32_swap(const std::vector<uint8_t>& vec, size_t offset) {
+    return byteswap(*reinterpret_cast<const uint32_t*>(&vec[offset]));
+}
+
+uint32_t read_u32(const std::vector<uint8_t>& vec, size_t offset) {
+    return *reinterpret_cast<const uint32_t*>(&vec[offset]);
+}
+
+std::vector<uint8_t> rdram;
+
+void byteswap_copy(uint8_t* dst, uint8_t* src, size_t count) {
+    for (size_t i = 0; i < count; i++) {
+        dst[i ^ 3] = src[i];
+    }
+}
+
+bool byteswap_compare(uint8_t* a, uint8_t* b, size_t count) {
+    for (size_t i = 0; i < count; i++) {
+        if (a[i ^ 3] != b[i]) {
+            return false;
+        }
+    }
+    return true;
+}
+
+enum class TestError {
+    Success,
+    FailedToOpenInput,
+    FailedToRecompile,
+    UnknownStructType,
+    DataDifference
+};
+
+struct TestStats {
+    TestError error;
+    uint64_t codegen_microseconds;
+    uint64_t execution_microseconds;
+    uint64_t code_size;
+};
+
+void write1(uint8_t* rdram, recomp_context* ctx) {
+    MEM_B(0, ctx->r4) = 1;
+}
+
+recomp_func_t* test_get_function(int32_t vram) {
+    if (vram == 0x80100000) {
+        return write1;
+    }
+    assert(false);
+    return nullptr;
+}
+
+void test_switch_error(const char* func, uint32_t vram, uint32_t jtbl) {
+    printf("  Switch-case out of bounds in %s at 0x%08X for jump table at 0x%08X\n", func, vram, jtbl);
+}
+
+TestStats run_test(const std::filesystem::path& tests_dir, const std::string& test_name) {
+    std::filesystem::path input_path = tests_dir / (test_name + "_data.bin");
+    std::filesystem::path data_dump_path = tests_dir / (test_name + "_data_out.bin");
+
+    bool found;
+    std::vector<uint8_t> file_data = read_file(input_path, found);
+
+    if (!found) {
+        printf("Failed to open file: %s\n", input_path.string().c_str());
+        return { TestError::FailedToOpenInput };
+    }
+
+    // Parse the test file.
+    uint32_t text_offset = read_u32_swap(file_data, 0x00);
+    uint32_t text_length = read_u32_swap(file_data, 0x04);
+    uint32_t init_data_offset = read_u32_swap(file_data, 0x08);
+    uint32_t good_data_offset = read_u32_swap(file_data, 0x0C);
+    uint32_t data_length = read_u32_swap(file_data, 0x10);
+    uint32_t text_address = read_u32_swap(file_data, 0x14);
+    uint32_t data_address = read_u32_swap(file_data, 0x18);
+    uint32_t next_struct_address = read_u32_swap(file_data, 0x1C);
+
+    recomp_context ctx{};
+
+    byteswap_copy(&rdram[text_address - 0x80000000], &file_data[text_offset], text_length);
+    byteswap_copy(&rdram[data_address - 0x80000000], &file_data[init_data_offset], data_length);
+
+    // Build recompiler context.
+    N64Recomp::Context context{};
+
+    // Move the file data into the context.
+    context.rom = std::move(file_data);
+
+    context.sections.resize(2);
+    // Create a section for the function to exist in.
+    context.sections[0].ram_addr = text_address;
+    context.sections[0].rom_addr = text_offset;
+    context.sections[0].size = text_length;
+    context.sections[0].name = ".text";
+    context.sections[0].executable = true;
+    context.sections[0].relocatable = true;
+    context.section_functions.resize(context.sections.size());
+    // Create a section for .data (used for relocations)
+    context.sections[1].ram_addr = data_address;
+    context.sections[1].rom_addr = init_data_offset;
+    context.sections[1].size = data_length;
+    context.sections[1].name = ".data";
+    context.sections[1].executable = false;
+    context.sections[1].relocatable = true;
+
+    size_t start_func_index;
+    uint32_t function_desc_address = 0;
+    uint32_t reloc_desc_address = 0;
+
+    // Read any extra structs.
+    while (next_struct_address != 0) {
+        uint32_t cur_struct_address = next_struct_address;
+        uint32_t struct_type = read_u32_swap(context.rom, next_struct_address + 0x00);
+        next_struct_address = read_u32_swap(context.rom, next_struct_address + 0x04);
+
+        switch (struct_type) {
+            case 1: // Function desc
+                function_desc_address = cur_struct_address;
+                break;
+            case 2: // Relocation
+                reloc_desc_address = cur_struct_address;
+                break;
+            default:
+                printf("Unknown struct type %u\n", struct_type);
+                return { TestError::UnknownStructType };
+        }
+    }
+
+    // Check if a function description exists.
+    if (function_desc_address == 0) {
+        // No function description, so treat the whole thing as one function.
+
+        // Get the function's instruction words.
+        std::vector<uint32_t> text_words{};
+        text_words.resize(text_length / sizeof(uint32_t));
+        for (size_t i = 0; i < text_words.size(); i++) {
+            text_words[i] = read_u32(context.rom, text_offset + i * sizeof(uint32_t));
+        }
+
+        // Add the function to the context.
+        context.functions_by_vram[text_address].emplace_back(context.functions.size());
+        context.section_functions.emplace_back(context.functions.size());
+        context.sections[0].function_addrs.emplace_back(text_address);
+        context.functions.emplace_back(
+            text_address,
+            text_offset,
+            text_words,
+            "test_func",
+            0
+        );
+        start_func_index = 0;
+    }
+    else {
+        // Use the function description.
+        uint32_t num_funcs = read_u32_swap(context.rom, function_desc_address + 0x08);
+        start_func_index = read_u32_swap(context.rom, function_desc_address + 0x0C);
+
+        for (size_t func_index = 0; func_index < num_funcs; func_index++) {
+            uint32_t cur_func_address = read_u32_swap(context.rom, function_desc_address + 0x10 + 0x00 + 0x08 * func_index);
+            uint32_t cur_func_length = read_u32_swap(context.rom, function_desc_address + 0x10 + 0x04 + 0x08 * func_index);
+            uint32_t cur_func_offset = cur_func_address - text_address + text_offset;
+
+            // Get the function's instruction words.
+            std::vector<uint32_t> text_words{};
+            text_words.resize(cur_func_length / sizeof(uint32_t));
+            for (size_t i = 0; i < text_words.size(); i++) {
+                text_words[i] = read_u32(context.rom, cur_func_offset + i * sizeof(uint32_t));
+            }
+
+            // Add the function to the context.
+            context.functions_by_vram[cur_func_address].emplace_back(context.functions.size());
+            context.section_functions.emplace_back(context.functions.size());
+            context.sections[0].function_addrs.emplace_back(cur_func_address);
+            context.functions.emplace_back(
+                cur_func_address,
+                cur_func_offset,
+                std::move(text_words),
+                "test_func_" + std::to_string(func_index),
+                0
+            );
+        }
+    }
+
+    // Check if a relocation description exists.
+    if (reloc_desc_address != 0) {
+        uint32_t num_relocs = read_u32_swap(context.rom, reloc_desc_address + 0x08);
+        for (uint32_t reloc_index = 0; reloc_index < num_relocs; reloc_index++) {
+            uint32_t cur_desc_address = reloc_desc_address + 0x0C + reloc_index * 4 * sizeof(uint32_t);
+            uint32_t reloc_type = read_u32_swap(context.rom, cur_desc_address + 0x00);
+            uint32_t reloc_section = read_u32_swap(context.rom, cur_desc_address + 0x04);
+            uint32_t reloc_address = read_u32_swap(context.rom, cur_desc_address + 0x08);
+            uint32_t reloc_target_offset = read_u32_swap(context.rom, cur_desc_address + 0x0C);
+
+            context.sections[0].relocs.emplace_back(N64Recomp::Reloc{
+                .address = reloc_address,
+                .target_section_offset = reloc_target_offset,
+                .symbol_index = 0,
+                .target_section = static_cast<uint16_t>(reloc_section),
+                .type = static_cast<N64Recomp::RelocType>(reloc_type),
+                .reference_symbol = false
+            });
+        }
+    }
+
+    std::vector<std::vector<uint32_t>> dummy_static_funcs{};
+    std::vector<int32_t> section_addresses{};
+    section_addresses.emplace_back(text_address);
+    section_addresses.emplace_back(data_address);
+
+    auto before_codegen = std::chrono::system_clock::now();
+
+    N64Recomp::LiveGeneratorInputs generator_inputs {
+        .switch_error = test_switch_error,
+        .get_function = test_get_function,
+        .reference_section_addresses = nullptr,
+        .local_section_addresses = section_addresses.data()
+    };
+
+    // Create the sljit compiler and the generator.
+    N64Recomp::LiveGenerator generator{ context.functions.size(), generator_inputs };
+
+    for (size_t func_index = 0; func_index < context.functions.size(); func_index++) {
+        std::ostringstream dummy_ostream{};
+
+        //sljit_emit_op0(compiler, SLJIT_BREAKPOINT);
+
+        if (!N64Recomp::recompile_function_live(generator, context, func_index, dummy_ostream, dummy_static_funcs, true)) {
+            return { TestError::FailedToRecompile };
+        }
+    }
+
+    // Generate the code.
+    N64Recomp::LiveGeneratorOutput output = generator.finish();
+
+    auto after_codegen = std::chrono::system_clock::now();
+
+    auto before_execution = std::chrono::system_clock::now();
+
+    int old_rounding = fegetround();
+
+    // Run the generated code.
+    ctx.r29 = 0xFFFFFFFF80000000 + rdram.size() - 0x10; // Set the stack pointer.
+    output.functions[start_func_index](rdram.data(), &ctx);
+
+    fesetround(old_rounding);
+
+    auto after_execution = std::chrono::system_clock::now();
+
+    // Check the result of running the code.
+    bool good = byteswap_compare(&rdram[data_address - 0x80000000], &context.rom[good_data_offset], data_length);
+
+    // Dump the data if the results don't match.
+    if (!good) {
+        std::ofstream data_dump_file{ data_dump_path, std::ios::binary };
+        std::vector<uint8_t> data_swapped;
+        data_swapped.resize(data_length);
+        byteswap_copy(data_swapped.data(), &rdram[data_address - 0x80000000], data_length);
+        data_dump_file.write(reinterpret_cast<char*>(data_swapped.data()), data_length);
+        return { TestError::DataDifference };
+    }
+
+    // Return the test's stats.
+    TestStats ret{};
+    ret.error = TestError::Success;
+    ret.codegen_microseconds = std::chrono::duration_cast<std::chrono::microseconds>(after_codegen - before_codegen).count();
+    ret.execution_microseconds = std::chrono::duration_cast<std::chrono::microseconds>(after_execution - before_execution).count();
+    ret.code_size = output.code_size;
+
+    return ret;
+}
+
+int main(int argc, const char** argv) {
+    if (argc < 3) {
+        printf("Usage: %s [test directory] [test 1] ...\n", argv[0]);
+        return EXIT_SUCCESS;
+    }
+
+    N64Recomp::live_recompiler_init();
+
+    rdram.resize(0x8000000);
+
+    // Skip the first argument (program name) and second argument (test directory).
+    int count = argc - 1 - 1;
+    int passed_count = 0;
+
+    std::vector<size_t> failed_tests{};
+
+    for (size_t test_index = 0; test_index < count; test_index++) {
+        const char* cur_test_name = argv[2 + test_index];
+        printf("Running test: %s\n", cur_test_name);
+        TestStats stats = run_test(argv[1], cur_test_name);
+
+        switch (stats.error) {
+        case TestError::Success:
+            printf("  Success\n");
+            printf("  Generated %" PRIu64 " bytes in %" PRIu64 " microseconds and ran in %" PRIu64 " microseconds\n",
+                stats.code_size, stats.codegen_microseconds, stats.execution_microseconds);
+            passed_count++;
+            break;
+        case TestError::FailedToOpenInput:
+            printf("  Failed to open input data file\n");
+            break;
+        case TestError::FailedToRecompile:
+            printf("  Failed to recompile\n");
+            break;
+        case TestError::UnknownStructType:
+            printf("  Unknown additional data struct type in test data\n");
+            break;
+        case TestError::DataDifference:
+            printf("  Output data did not match, dumped to file\n");
+            break;
+        }
+
+        if (stats.error != TestError::Success) {
+            failed_tests.emplace_back(test_index);
+        }
+
+        printf("\n");
+    }
+
+    printf("Passed %d/%d tests\n", passed_count, count);
+    if (!failed_tests.empty()) {
+        printf("  Failed: ");
+        for (size_t i = 0; i < failed_tests.size(); i++) {
+            size_t test_index = failed_tests[i];
+
+            printf("%s", argv[2 + test_index]);
+            if (i != failed_tests.size() - 1) {
+                printf(", ");
+            }
+        }
+        printf("\n");
+    }
+    return 0;
+}

OfflineModRecomp/main.cpp

@@ -3,7 +3,7 @@
 #include <vector>
 #include <span>
 
-#include "n64recomp.h"
+#include "recompiler/context.h"
 #include "rabbitizer.hpp"
 
 static std::vector<uint8_t> read_file(const std::filesystem::path& path, bool& found) {
@@ -221,8 +221,7 @@ int main(int argc, const char** argv) {
 
     // Perform a second pass for recompiling all the functions.
     for (size_t func_index = 0; func_index < mod_context.functions.size(); func_index++) {
-        auto& func = mod_context.functions[func_index];
-        if (!N64Recomp::recompile_function(mod_context, func, output_file, static_funcs_by_section, true)) {
+        if (!N64Recomp::recompile_function(mod_context, func_index, output_file, static_funcs_by_section, true)) {
             output_file.close();
             std::error_code ec;
             std::filesystem::remove(output_file_path, ec);

README.md

@@ -29,7 +29,7 @@ For relocatable overlays, the tool will modify supported instructions possessing
 Support for relocations for TLB mapping is coming in the future, which will add the ability to provide a list of MIPS32 relocations so that the runtime can relocate them on load. Combining this with the functionality used for relocatable overlays should allow running most TLB mapped code without incurring a performance penalty on every RAM access.
 
 ## How to Use
-The recompiler is configured by providing a toml file in order to configure the recompiler behavior, which is the only argument provided to the recompiler. The toml is where you specify input and output file paths, as well as optionally stub out specific functions, skip recompilation of specific functions, and patch single instructions in the target binary. There is also planned functionality to be able to emit hooks in the recompiler output by adding them to the toml (the `[[patches.func]]` and `[[patches.hook]]` sections of the linked toml below), but this is currently unimplemented. Documentation on every option that the recompiler provides is not currently available, but an example toml can be found in the Zelda 64: Recompiled project [here](https://github.com/Mr-Wiseguy/Zelda64Recomp/blob/dev/us.rev1.toml).
+The recompiler is configured by providing a toml file in order to configure the recompiler behavior, which is the first argument provided to the recompiler. The toml is where you specify input and output file paths, as well as optionally stub out specific functions, skip recompilation of specific functions, and patch single instructions in the target binary. There is also planned functionality to be able to emit hooks in the recompiler output by adding them to the toml (the `[[patches.func]]` and `[[patches.hook]]` sections of the linked toml below), but this is currently unimplemented. Documentation on every option that the recompiler provides is not currently available, but an example toml can be found in the Zelda 64: Recompiled project [here](https://github.com/Mr-Wiseguy/Zelda64Recomp/blob/dev/us.rev1.toml).
 
 Currently, the only way to provide the required metadata is by passing an elf file to this tool. The easiest way to get such an elf is to set up a disassembly or decompilation of the target binary, but there will be support for providing the metadata via a custom format to bypass the need to do so in the future.
 

RSPRecomp/src/rsp_recomp.cpp

@@ -149,7 +149,7 @@ std::string_view c0_reg_write_action(int cop0_reg) {
     case Cop0Reg::RSP_COP0_SP_DRAM_ADDR:
         return "SET_DMA_DRAM";
     case Cop0Reg::RSP_COP0_SP_MEM_ADDR:
-        return "SET_DMA_DMEM";
+        return "SET_DMA_MEM";
     case Cop0Reg::RSP_COP0_SP_RD_LEN:
         return "DO_DMA_READ";
     case Cop0Reg::RSP_COP0_SP_WR_LEN:
@@ -161,6 +161,10 @@ std::string_view c0_reg_write_action(int cop0_reg) {
 
 }
 
+bool is_c0_reg_write_dma_read(int cop0_reg) {
+    return static_cast<Cop0Reg>(cop0_reg) == Cop0Reg::RSP_COP0_SP_RD_LEN;
+}
+
 std::optional<int> get_rsp_element(const rabbitizer::InstructionRsp& instr) {
     if (instr.hasOperand(rabbitizer::OperandType::rsp_vt_elementhigh)) {
         return instr.GetRsp_elementhigh();
@@ -193,7 +197,32 @@ BranchTargets get_branch_targets(const std::vector<rabbitizer::InstructionRsp>&
     return ret;
 }
 
-bool process_instruction(size_t instr_index, const std::vector<rabbitizer::InstructionRsp>& instructions, std::ofstream& output_file, const BranchTargets& branch_targets, const std::unordered_set<uint32_t>& unsupported_instructions, bool indent, bool in_delay_slot) {
+struct ResumeTargets {
+    std::unordered_set<uint32_t> non_delay_targets;
+    std::unordered_set<uint32_t> delay_targets;
+};
+
+void get_overlay_swap_resume_targets(const std::vector<rabbitizer::InstructionRsp>& instrs, ResumeTargets& targets) {
+    bool is_delay_slot = false;
+    for (const auto& instr : instrs) {
+        InstrId instr_id = instr.getUniqueId();
+        int rd = (int)instr.GetO32_rd();
+
+        if (instr_id == InstrId::rsp_mtc0 && is_c0_reg_write_dma_read(rd)) {
+            uint32_t vram = instr.getVram();
+
+            targets.non_delay_targets.insert(vram);
+
+            if (is_delay_slot) {
+                targets.delay_targets.insert(vram);
+            }
+        }
+
+        is_delay_slot = instr.hasDelaySlot();
+    }
+}
+
+bool process_instruction(size_t instr_index, const std::vector<rabbitizer::InstructionRsp>& instructions, std::ofstream& output_file, const BranchTargets& branch_targets, const std::unordered_set<uint32_t>& unsupported_instructions, const ResumeTargets& resume_targets, bool has_overlays, bool indent, bool in_delay_slot) {
     const auto& instr = instructions[instr_index];
 
     uint32_t instr_vram = instr.getVram();
@@ -236,7 +265,7 @@ bool process_instruction(size_t instr_index, const std::vector<rabbitizer::Instr
     auto print_unconditional_branch = [&]<typename... Ts>(fmt::format_string<Ts...> fmt_str, Ts&& ...args) {
         if (instr_index < instructions.size() - 1) {
             uint32_t next_vram = instr_vram + 4;
-            process_instruction(instr_index + 1, instructions, output_file, branch_targets, unsupported_instructions, false, true);
+            process_instruction(instr_index + 1, instructions, output_file, branch_targets, unsupported_instructions, resume_targets, has_overlays, false, true);
         }
         print_indent();
         fmt::print(output_file, fmt_str, std::forward<Ts>(args)...);
@@ -247,7 +276,7 @@ bool process_instruction(size_t instr_index, const std::vector<rabbitizer::Instr
         fmt::print(output_file, "{{\n    ");
         if (instr_index < instructions.size() - 1) {
             uint32_t next_vram = instr_vram + 4;
-            process_instruction(instr_index + 1, instructions, output_file, branch_targets, unsupported_instructions, true, true);
+            process_instruction(instr_index + 1, instructions, output_file, branch_targets, unsupported_instructions, resume_targets, has_overlays, true, true);
         }
         fmt::print(output_file, "        ");
         fmt::print(output_file, fmt_str, std::forward<Ts>(args)...);
@@ -508,8 +537,18 @@ bool process_instruction(size_t instr_index, const std::vector<rabbitizer::Instr
         case InstrId::rsp_mtc0:
             {
                 std::string_view write_action = c0_reg_write_action(rd);
+                if (has_overlays && is_c0_reg_write_dma_read(rd)) {
+                    // DMA read, do overlay swap if reading into IMEM
+                    fmt::print(output_file, 
+                        "    if (dma_mem_address & 0x1000) {{\n"
+                        "        ctx->resume_address = 0x{:04X};\n"
+                        "        ctx->resume_delay = {};\n"
+                        "        goto do_overlay_swap;\n"
+                        "    }}\n",
+                        instr_vram, in_delay_slot ? "true" : "false");
+                }
                 if (!write_action.empty()) {
-                    print_line("{}({}{})", write_action, ctx_gpr_prefix(rt), rt); \
+                    print_line("{}({}{})", write_action, ctx_gpr_prefix(rt), rt);
                 }
                 break;
             }
@@ -520,6 +559,17 @@ bool process_instruction(size_t instr_index, const std::vector<rabbitizer::Instr
         }
     }
 
+    // Write overlay swap resume labels
+    if (in_delay_slot) {
+        if (resume_targets.delay_targets.contains(instr_vram)) {
+            fmt::print(output_file, "R_{:04X}_delay:\n", instr_vram);
+        }
+    } else {
+        if (resume_targets.non_delay_targets.contains(instr_vram)) {
+            fmt::print(output_file, "R_{:04X}:\n", instr_vram);
+        }
+    }
+
     return true;
 }
 
@@ -538,10 +588,24 @@ void write_indirect_jumps(std::ofstream& output_file, const BranchTargets& branc
         "           \"               r16 = %08X r17 = %08X r18 = %08X r19 = %08X r20 = %08X r21 = %08X r22 = %08X r23 = %08X\\n\"\n"
         "           \"               r24 = %08X r25 = %08X r26 = %08X r27 = %08X r28 = %08X r29 = %08X r30 = %08X r31 = %08X\\n\",\n"
         "           0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16,\n"
-        "           r17, r18, r19, r20, r21, r22, r23, r24, r25, r26, r27, r29, r30, r31);\n"
+        "           r17, r18, r19, r20, r21, r22, r23, r24, r25, r26, r27, r28, r29, r30, r31);\n"
         "    return RspExitReason::UnhandledJumpTarget;\n", output_function_name);
 }
 
+void write_overlay_swap_return(std::ofstream& output_file) {
+    fmt::print(output_file,
+        "do_overlay_swap:\n"
+        "                    ctx->r1 = r1;   ctx->r2 = r2;   ctx->r3 = r3;   ctx->r4 = r4;   ctx->r5 = r5;   ctx->r6 = r6;   ctx->r7 = r7;\n"
+        "    ctx->r8 = r8;   ctx->r9 = r9;   ctx->r10 = r10; ctx->r11 = r11; ctx->r12 = r12; ctx->r13 = r13; ctx->r14 = r14; ctx->r15 = r15;\n"
+        "    ctx->r16 = r16; ctx->r17 = r17; ctx->r18 = r18; ctx->r19 = r19; ctx->r20 = r20; ctx->r21 = r21; ctx->r22 = r22; ctx->r23 = r23;\n"
+        "    ctx->r24 = r24; ctx->r25 = r25; ctx->r26 = r26; ctx->r27 = r27; ctx->r28 = r28; ctx->r29 = r29; ctx->r30 = r30; ctx->r31 = r31;\n"
+        "    ctx->dma_mem_address = dma_mem_address;\n"
+        "    ctx->dma_dram_address = dma_dram_address;\n"
+        "    ctx->jump_target = jump_target;\n"
+        "    ctx->rsp = rsp;\n"
+        "    return RspExitReason::SwapOverlay;\n");
+}
+
 #ifdef _MSC_VER
 inline uint32_t byteswap(uint32_t val) {
     return _byteswap_ulong(val);
@@ -552,6 +616,16 @@ constexpr uint32_t byteswap(uint32_t val) {
 }
 #endif
 
+struct RSPRecompilerOverlayConfig {
+    size_t offset;
+    size_t size;
+};
+
+struct RSPRecompilerOverlaySlotConfig {
+    size_t text_address;
+    std::vector<RSPRecompilerOverlayConfig> overlays;
+};
+
 struct RSPRecompilerConfig {
     size_t text_offset;
     size_t text_size;
@@ -561,6 +635,7 @@ struct RSPRecompilerConfig {
     std::string output_function_name;
     std::vector<uint32_t> extra_indirect_branch_targets;
     std::unordered_set<uint32_t> unsupported_instructions;
+    std::vector<RSPRecompilerOverlaySlotConfig> overlay_slots;
 };
 
 std::filesystem::path concat_if_not_empty(const std::filesystem::path& parent, const std::filesystem::path& child) {
@@ -666,6 +741,76 @@ bool read_config(const std::filesystem::path& config_path, RSPRecompilerConfig&
             const toml::array* unsupported_instructions_array = unsupported_instructions_data.as_array();
             ret.unsupported_instructions = toml_to_set<uint32_t>(unsupported_instructions_array);
         }
+
+        // Overlay slots (optional)
+        const toml::node_view overlay_slots = config_data["overlay_slots"];
+        if (overlay_slots.is_array()) {
+            const toml::array* overlay_slots_array = overlay_slots.as_array();
+
+            int slot_idx = 0;
+            overlay_slots_array->for_each([&](toml::table slot){
+                RSPRecompilerOverlaySlotConfig slot_config;
+
+                std::optional<uint32_t> text_address = slot["text_address"].value<uint32_t>();
+                if (text_address.has_value()) {
+                    slot_config.text_address = text_address.value();
+                }
+                else {
+                    throw toml::parse_error(
+                        fmt::format("Missing text_address in config file at overlay slot {}", slot_idx).c_str(), 
+                        config_data.source());
+                }
+
+                // Overlays per slot
+                const toml::node_view overlays = slot["overlays"];
+                if (overlays.is_array()) {
+                    const toml::array* overlay_array = overlays.as_array();
+
+                    int overlay_idx = 0;
+                    overlay_array->for_each([&](toml::table overlay){
+                        RSPRecompilerOverlayConfig overlay_config;
+                        
+                        std::optional<uint32_t> offset = overlay["offset"].value<uint32_t>();
+                        if (offset.has_value()) {
+                            overlay_config.offset = offset.value();
+                        }
+                        else {
+                            throw toml::parse_error(
+                                fmt::format("Missing offset in config file at overlay slot {} overlay {}", slot_idx, overlay_idx).c_str(), 
+                                config_data.source());
+                        }
+
+                        std::optional<uint32_t> size = overlay["size"].value<uint32_t>();
+                        if (size.has_value()) {
+                            overlay_config.size = size.value();
+
+                            if ((size.value() % sizeof(uint32_t)) != 0) {
+                                throw toml::parse_error(
+                                    fmt::format("Overlay size must be a multiple of {} in config file at overlay slot {} overlay {}", sizeof(uint32_t), slot_idx, overlay_idx).c_str(), 
+                                    config_data.source());
+                            }
+                        }
+                        else {
+                            throw toml::parse_error(
+                                fmt::format("Missing size in config file at overlay slot {} overlay {}", slot_idx, overlay_idx).c_str(), 
+                                config_data.source());
+                        }
+
+                        slot_config.overlays.push_back(overlay_config);
+                        overlay_idx++;
+                    });
+                }
+                else {
+                    throw toml::parse_error(
+                        fmt::format("Missing overlays in config file at overlay slot {}", slot_idx).c_str(), 
+                        config_data.source());
+                }
+
+                ret.overlay_slots.push_back(slot_config);
+                slot_idx++;
+            });
+        }
+
     }
     catch (const toml::parse_error& err) {
         std::cerr << "Syntax error parsing toml: " << *err.source().path << " (" << err.source().begin <<  "):\n" << err.description() << std::endl;
@@ -676,6 +821,269 @@ bool read_config(const std::filesystem::path& config_path, RSPRecompilerConfig&
     return true;
 }
 
+struct FunctionPermutation {
+    std::vector<rabbitizer::InstructionRsp> instrs;
+    std::vector<uint32_t> permutation;
+};
+
+struct Permutation {
+    std::vector<uint32_t> instr_words;
+    std::vector<uint32_t> permutation;
+};
+
+struct Overlay {
+    std::vector<uint32_t> instr_words;
+};
+
+struct OverlaySlot {
+    uint32_t offset;
+    std::vector<Overlay> overlays;
+};
+
+bool next_permutation(const std::vector<uint32_t>& option_lengths, std::vector<uint32_t>& current) {
+    current[current.size() - 1] += 1;
+
+    size_t i = current.size() - 1;
+    while (current[i] == option_lengths[i]) {
+        current[i] = 0;
+        if (i == 0) {
+            return false;
+        }
+
+        current[i - 1] += 1;
+        i--;
+    }
+
+    return true;
+}
+
+void permute(const std::vector<uint32_t>& base_words, const std::vector<OverlaySlot>& overlay_slots, std::vector<Permutation>& permutations) {
+    auto current = std::vector<uint32_t>(overlay_slots.size(), 0);
+    auto slot_options = std::vector<uint32_t>(overlay_slots.size(), 0);
+
+    for (size_t i = 0; i < overlay_slots.size(); i++) {
+        slot_options[i] = overlay_slots[i].overlays.size();
+    }
+
+    do {
+        Permutation permutation = {
+            .instr_words = std::vector<uint32_t>(base_words),
+            .permutation = std::vector<uint32_t>(current)
+        };
+
+        for (size_t i = 0; i < overlay_slots.size(); i++) {
+            const OverlaySlot &slot = overlay_slots[i];
+            const Overlay &overlay = slot.overlays[current[i]];
+
+            uint32_t word_offset = slot.offset / sizeof(uint32_t);
+
+            size_t size_needed = word_offset + overlay.instr_words.size();
+            if (permutation.instr_words.size() < size_needed) {
+                permutation.instr_words.reserve(size_needed);
+            }
+
+            std::copy(overlay.instr_words.begin(), overlay.instr_words.end(), permutation.instr_words.data() + word_offset);
+        }
+
+        permutations.push_back(permutation);
+    } while (next_permutation(slot_options, current));
+}
+
+std::string make_permutation_string(const std::vector<uint32_t> permutation) {
+    std::string str = "";
+
+    for (uint32_t opt : permutation) {
+        str += std::to_string(opt);
+    }
+
+    return str;
+}
+
+void create_overlay_swap_function(const std::string& function_name, std::ofstream& output_file, const std::vector<FunctionPermutation>& permutations, const RSPRecompilerConfig& config) {
+    // Includes and permutation protos
+    fmt::print(output_file, 
+        "#include <map>\n"
+        "#include <vector>\n\n"
+        "using RspUcodePermutationFunc = RspExitReason(uint8_t* rdram, RspContext* ctx);\n\n"
+        "RspExitReason {}(uint8_t* rdram, RspContext* ctx);\n",
+        config.output_function_name + "_initial");
+
+    for (const auto& permutation : permutations) {
+        fmt::print(output_file, "RspExitReason {}(uint8_t* rdram, RspContext* ctx);\n",
+            config.output_function_name + make_permutation_string(permutation.permutation));
+    }
+    fmt::print(output_file, "\n");
+
+    // IMEM -> slot index mapping
+    fmt::print(output_file, 
+        "static const std::map<uint32_t, uint32_t> imemToSlot = {{\n");
+    for (size_t i = 0; i < config.overlay_slots.size(); i++) {
+        const RSPRecompilerOverlaySlotConfig& slot = config.overlay_slots[i];
+
+        uint32_t imemAddress = slot.text_address & rsp_mem_mask;
+        fmt::print(output_file, "    {{ 0x{:04X}, {} }},\n",
+            imemAddress, i);
+    }
+    fmt::print(output_file, "}};\n\n");
+
+    // ucode offset -> overlay index mapping (per slot)
+    fmt::print(output_file, 
+        "static const std::vector<std::map<uint32_t, uint32_t>> offsetToOverlay = {{\n");
+    for (const auto& slot : config.overlay_slots) {
+        fmt::print(output_file, "    {{\n");
+        for (size_t i = 0; i < slot.overlays.size(); i++) {
+            const RSPRecompilerOverlayConfig& overlay = slot.overlays[i];
+
+            fmt::print(output_file, "        {{ 0x{:04X}, {} }},\n",
+                overlay.offset, i);
+        }
+        fmt::print(output_file, "    }},\n");
+    }
+    fmt::print(output_file, "}};\n\n");
+
+    // Permutation function pointers
+    fmt::print(output_file, 
+        "static RspUcodePermutationFunc* permutations[] = {{\n");
+    for (const auto& permutation : permutations) {
+        fmt::print(output_file, "    {},\n",
+            config.output_function_name + make_permutation_string(permutation.permutation));
+    }
+    fmt::print(output_file, "}};\n\n");
+
+    // Main function
+    fmt::print(output_file,
+        "RspExitReason {}(uint8_t* rdram, uint32_t ucode_addr) {{\n"
+        "    RspContext ctx{{}};\n",
+        config.output_function_name);
+    
+    std::string slots_init_str = "";
+    for (size_t i = 0; i < config.overlay_slots.size(); i++) {
+        if (i > 0) {
+            slots_init_str += ", ";
+        }
+
+        slots_init_str += "0";
+    }
+
+    fmt::print(output_file, "    uint32_t slots[] = {{{}}};\n\n",
+        slots_init_str);
+
+    fmt::print(output_file, "    RspExitReason exitReason = {}(rdram, &ctx);\n\n",
+        config.output_function_name + "_initial");
+    
+    fmt::print(output_file, "");
+
+    std::string perm_index_str = "";
+    for (size_t i = 0; i < config.overlay_slots.size(); i++) {
+        if (i > 0) {
+            perm_index_str += " + ";
+        }
+
+        uint32_t multiplier = 1;
+        for (size_t k = i + 1; k < config.overlay_slots.size(); k++) {
+            multiplier *= config.overlay_slots[k].overlays.size();
+        }
+
+        perm_index_str += fmt::format("slots[{}] * {}", i, multiplier);
+    }
+    
+    fmt::print(output_file,
+        "    while (exitReason == RspExitReason::SwapOverlay) {{\n"
+        "        uint32_t slot = imemToSlot.at(ctx.dma_mem_address);\n"
+        "        uint32_t overlay = offsetToOverlay.at(slot).at(ctx.dma_dram_address - ucode_addr);\n"
+        "        slots[slot] = overlay;\n"
+        "\n"
+        "        RspUcodePermutationFunc* permutationFunc = permutations[{}];\n"
+        "        exitReason = permutationFunc(rdram, &ctx);\n"
+        "    }}\n\n"
+        "    return exitReason;\n"
+        "}}\n\n",
+        perm_index_str);
+}
+
+void create_function(const std::string& function_name, std::ofstream& output_file, const std::vector<rabbitizer::InstructionRsp>& instrs, const RSPRecompilerConfig& config, const ResumeTargets& resume_targets, bool is_permutation, bool is_initial) {
+    // Collect indirect jump targets (return addresses for linked jumps)
+    BranchTargets branch_targets = get_branch_targets(instrs);
+
+    // Add any additional indirect branch targets that may not be found directly in the code (e.g. from a jump table)
+    for (uint32_t target : config.extra_indirect_branch_targets) {
+        branch_targets.indirect_targets.insert(target);
+    }
+    
+    // Write function
+    if (is_permutation) {
+        fmt::print(output_file,
+            "RspExitReason {}(uint8_t* rdram, RspContext* ctx) {{\n"
+            "    uint32_t                 r1 = ctx->r1,   r2 = ctx->r2,   r3 = ctx->r3,   r4 = ctx->r4,   r5 = ctx->r5,   r6 = ctx->r6,   r7 = ctx->r7;\n"
+            "    uint32_t  r8 = ctx->r8,  r9 = ctx->r9,   r10 = ctx->r10, r11 = ctx->r11, r12 = ctx->r12, r13 = ctx->r13, r14 = ctx->r14, r15 = ctx->r15;\n"
+            "    uint32_t r16 = ctx->r16, r17 = ctx->r17, r18 = ctx->r18, r19 = ctx->r19, r20 = ctx->r20, r21 = ctx->r21, r22 = ctx->r22, r23 = ctx->r23;\n"
+            "    uint32_t r24 = ctx->r24, r25 = ctx->r25, r26 = ctx->r26, r27 = ctx->r27, r28 = ctx->r28, r29 = ctx->r29, r30 = ctx->r30, r31 = ctx->r31;\n"
+            "    uint32_t dma_mem_address = ctx->dma_mem_address, dma_dram_address = ctx->dma_dram_address, jump_target = ctx->jump_target;\n"
+            "    const char * debug_file = NULL; int debug_line = 0;\n"
+            "    RSP rsp = ctx->rsp;\n", function_name);
+
+        // Write jumps to resume targets
+        if (!is_initial) {
+            fmt::print(output_file,
+                "    if (ctx->resume_delay) {{\n"
+                "        switch (ctx->resume_address) {{\n");
+            
+            for (uint32_t address : resume_targets.delay_targets) {
+                fmt::print(output_file, "            case 0x{0:04X}: goto R_{0:04X}_delay;\n", 
+                    address);
+            }
+            
+            fmt::print(output_file,
+                "        }}\n"
+                "    }} else {{\n"
+                "        switch (ctx->resume_address) {{\n");
+            
+            for (uint32_t address : resume_targets.non_delay_targets) {
+                fmt::print(output_file, "            case 0x{0:04X}: goto R_{0:04X};\n", 
+                    address);
+            }
+
+            fmt::print(output_file,
+                "        }}\n"
+                "    }}\n"
+                "    printf(\"Unhandled resume target 0x%04X (delay slot: %d) in microcode {}\\n\", ctx->resume_address, ctx->resume_delay);\n"
+                "    return RspExitReason::UnhandledResumeTarget;\n",
+                config.output_function_name);
+        }
+
+        fmt::print(output_file, "    r1 = 0xFC0;\n");
+    } else {
+        fmt::print(output_file,
+            "RspExitReason {}(uint8_t* rdram, [[maybe_unused]] uint32_t ucode_addr) {{\n"
+            "    uint32_t           r1 = 0,  r2 = 0,  r3 = 0,  r4 = 0,  r5 = 0,  r6 = 0,  r7 = 0;\n"
+            "    uint32_t  r8 = 0,  r9 = 0, r10 = 0, r11 = 0, r12 = 0, r13 = 0, r14 = 0, r15 = 0;\n"
+            "    uint32_t r16 = 0, r17 = 0, r18 = 0, r19 = 0, r20 = 0, r21 = 0, r22 = 0, r23 = 0;\n"
+            "    uint32_t r24 = 0, r25 = 0, r26 = 0, r27 = 0, r28 = 0, r29 = 0, r30 = 0, r31 = 0;\n"
+            "    uint32_t dma_mem_address = 0, dma_dram_address = 0, jump_target = 0;\n"
+            "    const char * debug_file = NULL; int debug_line = 0;\n"
+            "    RSP rsp{{}};\n"
+            "    r1 = 0xFC0;\n", function_name);
+    }
+    // Write each instruction
+    for (size_t instr_index = 0; instr_index < instrs.size(); instr_index++) {
+        process_instruction(instr_index, instrs, output_file, branch_targets, config.unsupported_instructions, resume_targets, is_permutation, false, false);
+    }
+
+    // Terminate instruction code with a return to indicate that the microcode has run past its end
+    fmt::print(output_file, "    return RspExitReason::ImemOverrun;\n");
+
+    // Write the section containing the indirect jump table
+    write_indirect_jumps(output_file, branch_targets, config.output_function_name);
+
+    // Write routine for returning for an overlay swap
+    if (is_permutation) {
+        write_overlay_swap_return(output_file);
+    }
+
+    // End the file
+    fmt::print(output_file, "}}\n");
+}
+
 int main(int argc, const char** argv) {
     if (argc != 2) {
         fmt::print("Usage: {} [config file]\n", argv[0]);
@@ -689,6 +1097,7 @@ int main(int argc, const char** argv) {
     }
 
     std::vector<uint32_t> instr_words{};
+    std::vector<OverlaySlot> overlay_slots{};
     instr_words.resize(config.text_size / sizeof(uint32_t));
     {
         std::ifstream rom_file{ config.rom_file_path, std::ios_base::binary };
@@ -700,6 +1109,29 @@ int main(int argc, const char** argv) {
 
         rom_file.seekg(config.text_offset);
         rom_file.read(reinterpret_cast<char*>(instr_words.data()), config.text_size);
+
+        for (const RSPRecompilerOverlaySlotConfig &slot_config : config.overlay_slots) {
+            OverlaySlot slot{};
+            slot.offset = (slot_config.text_address - config.text_address) & rsp_mem_mask;
+
+            for (const RSPRecompilerOverlayConfig &overlay_config : slot_config.overlays) {
+                Overlay overlay{};
+                overlay.instr_words.resize(overlay_config.size / sizeof(uint32_t));
+
+                rom_file.seekg(config.text_offset + overlay_config.offset);
+                rom_file.read(reinterpret_cast<char*>(overlay.instr_words.data()), overlay_config.size);
+
+                slot.overlays.push_back(overlay);
+            }
+
+            overlay_slots.push_back(slot);
+        }
+    }
+
+    // Create overlay permutations
+    std::vector<Permutation> permutations{};
+    if (!overlay_slots.empty()) {
+        permute(instr_words, overlay_slots, permutations);
     }
 
     // Disable appropriate pseudo instructions
@@ -717,12 +1149,27 @@ int main(int argc, const char** argv) {
         vram += instr_size;
     }
 
-    // Collect indirect jump targets (return addresses for linked jumps)
-    BranchTargets branch_targets = get_branch_targets(instrs);
+    std::vector<FunctionPermutation> func_permutations{};
+    func_permutations.reserve(permutations.size());
+    for (const Permutation& permutation : permutations) {
+        FunctionPermutation func = {
+            .permutation = std::vector<uint32_t>(permutation.permutation)
+        };
 
-    // Add any additional indirect branch targets that may not be found directly in the code (e.g. from a jump table)
-    for (uint32_t target : config.extra_indirect_branch_targets) {
-        branch_targets.indirect_targets.insert(target);
+        func.instrs.reserve(permutation.instr_words.size());
+        uint32_t vram = config.text_address & rsp_mem_mask;
+        for (uint32_t instr_word : permutation.instr_words) {
+            const rabbitizer::InstructionRsp& instr = func.instrs.emplace_back(byteswap(instr_word), vram);
+            vram += instr_size;
+        }
+
+        func_permutations.emplace_back(func);
+    }
+
+    // Determine all possible overlay swap resume targets
+    ResumeTargets resume_targets{};
+    for (const FunctionPermutation& permutation : func_permutations) {
+        get_overlay_swap_resume_targets(permutation.instrs, resume_targets);
     }
 
     // Open output file and write beginning
@@ -730,28 +1177,20 @@ int main(int argc, const char** argv) {
     std::ofstream output_file(config.output_file_path);
     fmt::print(output_file,
         "#include \"librecomp/rsp.hpp\"\n"
-        "#include \"librecomp/rsp_vu_impl.hpp\"\n"
-        "RspExitReason {}(uint8_t* rdram) {{\n"
-        "    uint32_t           r1 = 0,  r2 = 0,  r3 = 0,  r4 = 0,  r5 = 0,  r6 = 0,  r7 = 0;\n"
-        "    uint32_t  r8 = 0,  r9 = 0, r10 = 0, r11 = 0, r12 = 0, r13 = 0, r14 = 0, r15 = 0;\n"
-        "    uint32_t r16 = 0, r17 = 0, r18 = 0, r19 = 0, r20 = 0, r21 = 0, r22 = 0, r23 = 0;\n"
-        "    uint32_t r24 = 0, r25 = 0, r26 = 0, r27 = 0, r28 = 0, r29 = 0, r30 = 0, r31 = 0;\n"
-        "    uint32_t dma_dmem_address = 0, dma_dram_address = 0, jump_target = 0;\n"
-        "    const char * debug_file = NULL; int debug_line = 0;\n"
-        "    RSP rsp{{}};\n"
-        "    r1 = 0xFC0;\n", config.output_function_name);
-    // Write each instruction
-    for (size_t instr_index = 0; instr_index < instrs.size(); instr_index++) {
-        process_instruction(instr_index, instrs, output_file, branch_targets, config.unsupported_instructions, false, false);
+        "#include \"librecomp/rsp_vu_impl.hpp\"\n");
+    
+    // Write function(s)
+    if (overlay_slots.empty()) {
+        create_function(config.output_function_name, output_file, instrs, config, resume_targets, false, false);
+    } else {
+        create_overlay_swap_function(config.output_function_name, output_file, func_permutations, config);
+        create_function(config.output_function_name + "_initial", output_file, instrs, config, ResumeTargets{}, true, true);
+
+        for (const auto& permutation : func_permutations) {
+            create_function(config.output_function_name + make_permutation_string(permutation.permutation), 
+                output_file, permutation.instrs, config, resume_targets, true, false);
+        }
     }
 
-    // Terminate instruction code with a return to indicate that the microcode has run past its end
-    fmt::print(output_file, "    return RspExitReason::ImemOverrun;\n");
-
-    // Write the section containing the indirect jump table
-    write_indirect_jumps(output_file, branch_targets, config.output_function_name);
-
-    // End the file
-    fmt::print(output_file, "}}\n");
     return 0;
 }

RecompModTool/main.cpp

@@ -7,7 +7,7 @@
 #include <cstdlib>
 #include "fmt/format.h"
 #include "fmt/ostream.h"
-#include "n64recomp.h"
+#include "recompiler/context.h"
 #include <toml++/toml.hpp>
 
 #ifdef _WIN32
@@ -20,21 +20,28 @@
 
 constexpr std::string_view symbol_filename = "mod_syms.bin";
 constexpr std::string_view binary_filename = "mod_binary.bin";
-constexpr std::string_view manifest_filename = "manifest.json";
+constexpr std::string_view manifest_filename = "mod.json";
 
 struct ModManifest {
     std::string mod_id;
     std::string version_string;
+    std::string display_name;
+    std::string description;
+    std::string short_description;
     std::vector<std::string> authors;
     std::string game_id;
     std::string minimum_recomp_version;
     std::unordered_map<std::string, std::vector<std::string>> native_libraries;
+    std::vector<toml::table> config_options;
     std::vector<std::string> dependencies;
     std::vector<std::string> full_dependency_strings;
+    std::vector<std::string> optional_dependencies;
+    std::vector<std::string> full_optional_dependency_strings;
 };
 
 struct ModInputs {
     std::filesystem::path elf_path;
+    std::string mod_filename;
     std::filesystem::path func_reference_syms_file_path;
     std::vector<std::filesystem::path> data_reference_syms_file_paths;
     std::vector<std::filesystem::path> additional_files;
@@ -161,7 +168,7 @@ static T read_toml_value(const toml::table& data, std::string_view key, bool req
 
     if (value_node == nullptr) {
         if (required) {
-            throw toml::parse_error(("Missing required field " + std::string{key}).c_str(), data.source());
+            throw toml::parse_error(("Missing required field \"" + std::string{key} + "\"").c_str(), data.source());
         }
         else {
             return T{};
@@ -173,7 +180,7 @@ static T read_toml_value(const toml::table& data, std::string_view key, bool req
         return opt.value();
     }
     else {
-        throw toml::parse_error(("Incorrect type for field " + std::string{key}).c_str(), data.source());
+        throw toml::parse_error(("Incorrect type for field \"" + std::string{key} + "\"").c_str(), data.source());
     }
 }
 
@@ -214,11 +221,19 @@ static std::vector<std::filesystem::path> get_toml_path_array(const toml::array&
     return ret;
 }
 
+bool validate_config_option(const toml::table& option) {
+    // TODO config option validation.
+    return true;
+}
+
 ModManifest parse_mod_config_manifest(const std::filesystem::path& basedir, const toml::table& manifest_table) {
     ModManifest ret;
 
     // Mod ID
     ret.mod_id = read_toml_value<std::string_view>(manifest_table, "id", true);
+    if (!N64Recomp::validate_mod_id(ret.mod_id)) {
+        throw toml::parse_error("Invalid mod id", manifest_table["id"].node()->source());
+    }
 
     // Mod version
     ret.version_string = read_toml_value<std::string_view>(manifest_table, "version", true);
@@ -227,6 +242,15 @@ ModManifest parse_mod_config_manifest(const std::filesystem::path& basedir, cons
         throw toml::parse_error("Invalid mod version", manifest_table["version"].node()->source());
     }
 
+    // Display name
+    ret.display_name = read_toml_value<std::string_view>(manifest_table, "display_name", true);
+
+    // Description (optional)
+    ret.description = read_toml_value<std::string_view>(manifest_table, "description", false);
+
+    // Short description (optional)
+    ret.short_description = read_toml_value<std::string_view>(manifest_table, "short_description", false);
+
     // Authors
     const toml::array& authors_array = read_toml_array(manifest_table, "authors", true);
     authors_array.for_each([&ret](auto&& el) {
@@ -301,6 +325,48 @@ ModManifest parse_mod_config_manifest(const std::filesystem::path& basedir, cons
         });
     }
 
+    // Optional dependency list (optional)
+    const toml::array& optional_dependency_array = read_toml_array(manifest_table, "optional_dependencies", false);
+    if (!optional_dependency_array.empty()) {
+        // Reserve room for all the dependencies.
+        ret.dependencies.reserve(optional_dependency_array.size());
+        optional_dependency_array.for_each([&ret](const auto& el) {
+            if constexpr (toml::is_string<decltype(el)>) {
+                size_t dependency_id_length;
+                bool dependency_version_has_label;
+                if (!validate_dependency_string(el.template ref<std::string>(), dependency_id_length, dependency_version_has_label)) {
+                    throw toml::parse_error("Invalid optional dependency entry", el.source());
+                }
+                if (dependency_version_has_label) {
+                    throw toml::parse_error("Dependency versions may not have labels", el.source());
+                }
+                std::string dependency_id = el.template ref<std::string>().substr(0, dependency_id_length);
+                ret.optional_dependencies.emplace_back(dependency_id);
+                ret.full_optional_dependency_strings.emplace_back(el.template ref<std::string>());
+            }
+            else {
+                throw toml::parse_error("Invalid type for optional dependency entry", el.source());
+            }
+        });
+    }
+
+    // Config schema (optional)
+    const toml::array& config_options_array = read_toml_array(manifest_table, "config_options", false);
+    if (!config_options_array.empty()) {
+        ret.config_options.reserve(config_options_array.size());
+        config_options_array.for_each([&ret](const auto& el) {
+            if constexpr (toml::is_table<decltype(el)>) {
+                if (!validate_config_option(el)) {
+                    throw toml::parse_error("Invalid config option", el.source());
+                }
+                ret.config_options.emplace_back(el);
+            }
+            else {
+                throw toml::parse_error("Invalid type for config option", el.source());
+            }
+        });
+    }
+
     return ret;
 }
 
@@ -316,6 +382,15 @@ ModInputs parse_mod_config_inputs(const std::filesystem::path& basedir, const to
         throw toml::parse_error("Mod toml input section is missing elf file", inputs_table.source());
     }
 
+    // Output NRM file
+    std::optional<std::string> mod_filename_opt = inputs_table["mod_filename"].value<std::string>();
+    if (mod_filename_opt.has_value()) {
+        ret.mod_filename = std::move(mod_filename_opt.value());
+    }
+    else {
+        throw toml::parse_error("Mod toml input section is missing the output mod filename", inputs_table.source());
+    }
+
     // Function reference symbols file
     std::optional<std::string> func_reference_syms_file_opt = inputs_table["func_reference_syms_file"].value<std::string>();
     if (func_reference_syms_file_opt.has_value()) {
@@ -416,57 +491,65 @@ bool parse_callback_name(std::string_view data, std::string& dependency_name, st
     return true;
 }
 
-void print_vector_elements(std::ostream& output_file, const std::vector<std::string>& vec, bool compact) {
-    char separator = compact ? ' ' : '\n';
-    for (size_t i = 0; i < vec.size(); i++) {
-        const std::string& val = vec[i];
-        fmt::print(output_file, "{}\"{}\"{}{}",
-            compact ? "" : "        ", val, i == vec.size() - 1 ? "" : ",", separator);
+toml::array string_vector_to_toml(const std::vector<std::string>& input) {
+    toml::array ret{};
+    for (const std::string& str : input) {
+        ret.emplace_back(str);
     }
+    return ret;
 }
 
 void write_manifest(const std::filesystem::path& path, const ModManifest& manifest) {
-    std::ofstream output_file(path);
+    toml::table output_data{};
 
-    fmt::print(output_file,
-        "{{\n"
-        "    \"game_id\": \"{}\",\n"
-        "    \"id\": \"{}\",\n"
-        "    \"version\": \"{}\",\n"
-        "    \"authors\": [\n",
-        manifest.game_id, manifest.mod_id, manifest.version_string);
+    output_data.emplace("game_id", manifest.game_id);
+    output_data.emplace("id", manifest.mod_id);
+    output_data.emplace("version", manifest.version_string);
+    output_data.emplace("display_name", manifest.display_name);
     
-    print_vector_elements(output_file, manifest.authors, false);
+    if (!manifest.description.empty()) {
+        output_data.emplace("description", manifest.description);
+    }
     
-    fmt::print(output_file, 
-        "    ],\n"
-        "    \"minimum_recomp_version\": \"{}\"",
-        manifest.minimum_recomp_version);
+    if (!manifest.short_description.empty()) {
+        output_data.emplace("short_description", manifest.short_description);
+    }
+
+    output_data.emplace("authors", string_vector_to_toml(manifest.authors));
+
+    output_data.emplace("minimum_recomp_version", manifest.minimum_recomp_version);
 
     if (!manifest.native_libraries.empty()) {
-        fmt::print(output_file, ",\n"
-            "    \"native_libraries\": {{\n");
+        toml::table libraries_table{};
+
         size_t library_index = 0; 
         for (const auto& [library, funcs] : manifest.native_libraries) {
-            fmt::print(output_file, "        \"{}\": [ ",
-                library);
-            print_vector_elements(output_file, funcs, true);
-            fmt::print(output_file, "]{}\n",
-                library_index == manifest.native_libraries.size() - 1 ? "" : ",");
-            library_index++;
+            libraries_table.emplace(library, string_vector_to_toml(funcs));
         }
-        fmt::print(output_file, "    }}");
+
+        output_data.emplace("native_libraries", std::move(libraries_table));
     }
 
     if (!manifest.full_dependency_strings.empty()) {
-        fmt::print(output_file, ",\n"
-            "    \"dependencies\": [\n");
-        print_vector_elements(output_file, manifest.full_dependency_strings, false);
-        fmt::print(output_file, "    ]");
+        output_data.emplace("dependencies", string_vector_to_toml(manifest.full_dependency_strings));
     }
 
+    if (!manifest.full_optional_dependency_strings.empty()) {
+        output_data.emplace("optional_dependencies", string_vector_to_toml(manifest.full_optional_dependency_strings));
+    }
 
-    fmt::print(output_file, "\n}}\n");
+    if (!manifest.config_options.empty()) {
+        toml::array options_array{};
+        for (const auto& option : manifest.config_options) {
+            options_array.emplace_back(option);
+        }
+        output_data.emplace("config_schema", toml::table{{"options", std::move(options_array)}});
+    }
+
+    toml::json_formatter formatter{output_data, toml::format_flags::indentation | toml::format_flags::indentation};
+    std::ofstream output_file(path);
+
+    output_file << formatter << std::endl;
 }
 
 N64Recomp::Context build_mod_context(const N64Recomp::Context& input_context, bool& good) {
@@ -563,6 +646,8 @@ N64Recomp::Context build_mod_context(const N64Recomp::Context& input_context, bo
         bool event_section = cur_section.name == N64Recomp::EventSectionName;
         bool import_section = cur_section.name.starts_with(N64Recomp::ImportSectionPrefix);
         bool callback_section = cur_section.name.starts_with(N64Recomp::CallbackSectionPrefix);
+        bool hook_section = cur_section.name.starts_with(N64Recomp::HookSectionPrefix);
+        bool hook_return_section = cur_section.name.starts_with(N64Recomp::HookReturnSectionPrefix);
 
         // Add the functions from the current input section to the current output section.
         auto& section_out = ret.sections[output_section_index];
@@ -628,6 +713,42 @@ N64Recomp::Context build_mod_context(const N64Recomp::Context& input_context, bo
                     );
                 }
 
+                if (hook_section || hook_return_section) {
+                    // Get the name of the hooked function.
+                    size_t section_prefix_length = hook_section ? N64Recomp::HookSectionPrefix.size() : N64Recomp::HookReturnSectionPrefix.size();
+                    std::string hooked_function_name = cur_section.name.substr(section_prefix_length);
+
+                    // Find the corresponding symbol in the reference symbols.
+                    N64Recomp::SymbolReference cur_reference;
+                    bool original_func_exists = input_context.find_regular_reference_symbol(hooked_function_name, cur_reference);
+
+                    // Check that the function being patched exists in the original reference symbols.
+                    if (!original_func_exists) {
+                        fmt::print(stderr, "Function {} hooks a function ({}) that doesn't exist in the original ROM.\n", cur_func.name, hooked_function_name);
+                        return {};
+                    }
+
+                    // Check that the reference symbol is actually a function.
+                    const auto& reference_symbol = input_context.get_reference_symbol(cur_reference);
+                    if (!reference_symbol.is_function) {
+                        fmt::print(stderr, "Function {0} hooks {1}, but {1} was a variable in the original ROM.\n", cur_func.name, hooked_function_name);
+                        return {};
+                    }
+
+                    uint32_t reference_section_vram = input_context.get_reference_section_vram(reference_symbol.section_index);
+                    uint32_t reference_section_rom = input_context.get_reference_section_rom(reference_symbol.section_index);
+
+                    // Add a replacement for this function to the output context.
+                    ret.hooks.emplace_back(
+                        N64Recomp::FunctionHook {
+                            .func_index = (uint32_t)output_func_index,
+                            .original_section_vrom = reference_section_rom,
+                            .original_vram = reference_section_vram + reference_symbol.section_offset,
+                            .flags = hook_return_section ? N64Recomp::HookFlags::AtReturn : N64Recomp::HookFlags{}
+                        }
+                    );
+                }
+
                 std::string name_out;
 
                 if (export_section) {
@@ -879,16 +1000,16 @@ N64Recomp::Context build_mod_context(const N64Recomp::Context& input_context, bo
 }
 
 bool create_mod_zip(const std::filesystem::path& output_dir, const ModConfig& config) {
-    std::filesystem::path output_path = output_dir / (config.manifest.mod_id + "-" + config.manifest.version_string + ".nrm");
+    std::filesystem::path output_path = output_dir / (config.inputs.mod_filename + ".nrm");
 
 #ifdef _WIN32
     std::filesystem::path temp_zip_path = output_path;
     temp_zip_path.replace_extension(".zip");
-    std::string command_string = fmt::format("powershell -command Compress-Archive -Force -CompressionLevel Optimal -DestinationPath \"{}\" -Path \"{}\",\"{}\",\"{}\"",
+    std::string command_string = fmt::format("powershell -command Compress-Archive -Force -CompressionLevel Optimal -DestinationPath '{}' -Path '{}','{}','{}'",
         temp_zip_path.string(), (output_dir / symbol_filename).string(), (output_dir / binary_filename).string(), (output_dir / manifest_filename).string());
 
     for (const auto& cur_file : config.inputs.additional_files) {
-        command_string += fmt::format(",\"{}\"", cur_file.string());
+        command_string += fmt::format(",'{}'", cur_file.string());
     }
 
     STARTUPINFOA si{};
@@ -1048,8 +1169,9 @@ int main(int argc, const char** argv) {
         }
     }
 
-    // Copy the dependencies from the config into the context.
+    // Copy the dependencies and optional dependencies from the config into the context.
     context.add_dependencies(config.manifest.dependencies);
+    context.add_dependencies(config.manifest.optional_dependencies);
 
     N64Recomp::ElfParsingConfig elf_config {
         .bss_section_suffix = {},
@@ -1077,6 +1199,11 @@ int main(int argc, const char** argv) {
 
     bool mod_context_good;
     N64Recomp::Context mod_context = build_mod_context(context, mod_context_good);
+    if (!mod_context_good) {
+        fmt::print(stderr, "Failed to create mod context\n");
+        return EXIT_FAILURE;
+    }
+
     std::vector<uint8_t> symbols_bin = N64Recomp::symbols_to_bin_v1(mod_context);
     if (symbols_bin.empty()) {
         fmt::print(stderr, "Failed to create symbol file\n");

include/recomp.h

@@ -0,0 +1,475 @@
+#ifndef __RECOMP_H__
+#define __RECOMP_H__
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <math.h>
+#include <fenv.h>
+#include <assert.h>
+
+// Compiler definition to disable inter-procedural optimization, allowing multiple functions to be in a single file without breaking interposition.
+#if defined(_MSC_VER) && !defined(__clang__) && !defined(__INTEL_COMPILER)
+    // MSVC's __declspec(noinline) seems to disable inter-procedural optimization entirely, so it's all that's needed.
+    #define RECOMP_FUNC __declspec(noinline)
+    
+    // Use MSVC's fenv_access pragma.
+    #define SET_FENV_ACCESS() _Pragma("fenv_access(on)")
+#elif defined(__clang__)
+    // Clang has no dedicated IPO attribute, so we use a combination of other attributes to give the desired behavior.
+    // The inline keyword allows multiple definitions during linking, and extern forces clang to emit an externally visible definition.
+    // Weak forces Clang to not perform any IPO as the symbol can be interposed, which prevents actual inlining due to the inline keyword.
+    // Add noinline on for good measure, which doesn't conflict with the inline keyword as they have different meanings.
+    #define RECOMP_FUNC extern inline __attribute__((weak,noinline))
+
+    // Use the standard STDC FENV_ACCESS pragma.
+    #define SET_FENV_ACCESS() _Pragma("STDC FENV_ACCESS ON")
+#elif defined(__GNUC__) && !defined(__INTEL_COMPILER)
+    // Use GCC's attribute for disabling inter-procedural optimizations. Also enable the rounding-math compiler flag to disable
+    // constant folding so that arithmetic respects the floating point environment. This is needed because gcc doesn't implement
+    // any FENV_ACCESS pragma.
+    #define RECOMP_FUNC __attribute__((noipa, optimize("rounding-math")))
+
+    // There's no FENV_ACCESS pragma in gcc, so this can be empty.
+    #define SET_FENV_ACCESS()
+#else
+    #error "No RECOMP_FUNC definition for this compiler"
+#endif
+
+// Implementation of 64-bit multiply and divide instructions
+#if defined(__SIZEOF_INT128__)
+
+static inline void DMULT(int64_t a, int64_t b, int64_t* lo64, int64_t* hi64) {
+    __int128 full128 = ((__int128)a) * ((__int128)b);
+
+    *hi64 = (int64_t)(full128 >> 64);
+    *lo64 = (int64_t)(full128 >> 0);
+}
+
+static inline void DMULTU(uint64_t a, uint64_t b, uint64_t* lo64, uint64_t* hi64) {
+    unsigned __int128 full128 = ((unsigned __int128)a) * ((unsigned __int128)b);
+
+    *hi64 = (uint64_t)(full128 >> 64);
+    *lo64 = (uint64_t)(full128 >> 0);
+}
+
+#elif defined(_MSC_VER)
+
+#include <intrin.h>
+#pragma intrinsic(_mul128)
+#pragma intrinsic(_umul128)
+
+static inline void DMULT(int64_t a, int64_t b, int64_t* lo64, int64_t* hi64) {
+    *lo64 = _mul128(a, b, hi64);
+}
+
+static inline void DMULTU(uint64_t a, uint64_t b, uint64_t* lo64, uint64_t* hi64) {
+    *lo64 = _umul128(a, b, hi64);
+}
+
+#else
+#error "128-bit integer type not found"
+#endif
+
+static inline void DDIV(int64_t a, int64_t b, int64_t* quot, int64_t* rem) {
+    int overflow = ((uint64_t)a == 0x8000000000000000ull) && (b == -1ll);
+    *quot = overflow ? a : (a / b);
+    *rem = overflow ? 0 : (a % b);
+}
+
+static inline void DDIVU(uint64_t a, uint64_t b, uint64_t* quot, uint64_t* rem) {
+    *quot = a / b;
+    *rem = a % b;
+}
+
+typedef uint64_t gpr;
+
+#define SIGNED(val) \
+    ((int64_t)(val))
+
+#define ADD32(a, b) \
+    ((gpr)(int32_t)((a) + (b)))
+
+#define SUB32(a, b) \
+    ((gpr)(int32_t)((a) - (b)))
+
+#define MEM_W(offset, reg) \
+    (*(int32_t*)(rdram + ((((reg) + (offset))) - 0xFFFFFFFF80000000)))
+
+#define MEM_H(offset, reg) \
+    (*(int16_t*)(rdram + ((((reg) + (offset)) ^ 2) - 0xFFFFFFFF80000000)))
+
+#define MEM_B(offset, reg) \
+    (*(int8_t*)(rdram + ((((reg) + (offset)) ^ 3) - 0xFFFFFFFF80000000)))
+
+#define MEM_HU(offset, reg) \
+    (*(uint16_t*)(rdram + ((((reg) + (offset)) ^ 2) - 0xFFFFFFFF80000000)))
+
+#define MEM_BU(offset, reg) \
+    (*(uint8_t*)(rdram + ((((reg) + (offset)) ^ 3) - 0xFFFFFFFF80000000)))
+
+#define SD(val, offset, reg) { \
+    *(uint32_t*)(rdram + ((((reg) + (offset) + 4)) - 0xFFFFFFFF80000000)) = (uint32_t)((gpr)(val) >> 0); \
+    *(uint32_t*)(rdram + ((((reg) + (offset) + 0)) - 0xFFFFFFFF80000000)) = (uint32_t)((gpr)(val) >> 32); \
+}
+
+static inline uint64_t load_doubleword(uint8_t* rdram, gpr reg, gpr offset) {
+    uint64_t ret = 0;
+    uint64_t lo = (uint64_t)(uint32_t)MEM_W(reg, offset + 4);
+    uint64_t hi = (uint64_t)(uint32_t)MEM_W(reg, offset + 0);
+    ret = (lo << 0) | (hi << 32);
+    return ret;
+}
+
+#define LD(offset, reg) \
+    load_doubleword(rdram, offset, reg)
+
+static inline gpr do_lwl(uint8_t* rdram, gpr initial_value, gpr offset, gpr reg) {
+    // Calculate the overall address
+    gpr address = (offset + reg);
+
+    // Load the aligned word
+    gpr word_address = address & ~0x3;
+    uint32_t loaded_value = MEM_W(0, word_address);
+
+    // Mask the existing value and shift the loaded value appropriately
+    gpr misalignment = address & 0x3;
+    gpr masked_value = initial_value & (gpr)(uint32_t)~(0xFFFFFFFFu << (misalignment * 8));
+    loaded_value <<= (misalignment * 8);
+
+    // Cast to int32_t to sign extend first
+    return (gpr)(int32_t)(masked_value | loaded_value);
+}
+
+static inline gpr do_lwr(uint8_t* rdram, gpr initial_value, gpr offset, gpr reg) {
+    // Calculate the overall address
+    gpr address = (offset + reg);
+    
+    // Load the aligned word
+    gpr word_address = address & ~0x3;
+    uint32_t loaded_value = MEM_W(0, word_address);
+
+    // Mask the existing value and shift the loaded value appropriately
+    gpr misalignment = address & 0x3;
+    gpr masked_value = initial_value & (gpr)(uint32_t)~(0xFFFFFFFFu >> (24 - misalignment * 8));
+    loaded_value >>= (24 - misalignment * 8);
+
+    // Cast to int32_t to sign extend first
+    return (gpr)(int32_t)(masked_value | loaded_value);
+}
+
+static inline void do_swl(uint8_t* rdram, gpr offset, gpr reg, gpr val) {
+    // Calculate the overall address
+    gpr address = (offset + reg);
+
+    // Get the initial value of the aligned word
+    gpr word_address = address & ~0x3;
+    uint32_t initial_value = MEM_W(0, word_address);
+
+    // Mask the initial value and shift the input value appropriately
+    gpr misalignment = address & 0x3;
+    uint32_t masked_initial_value = initial_value & ~(0xFFFFFFFFu >> (misalignment * 8));
+    uint32_t shifted_input_value = ((uint32_t)val) >> (misalignment * 8);
+    MEM_W(0, word_address) = masked_initial_value | shifted_input_value;
+}
+
+static inline void do_swr(uint8_t* rdram, gpr offset, gpr reg, gpr val) {
+    // Calculate the overall address
+    gpr address = (offset + reg);
+
+    // Get the initial value of the aligned word
+    gpr word_address = address & ~0x3;
+    uint32_t initial_value = MEM_W(0, word_address);
+
+    // Mask the initial value and shift the input value appropriately
+    gpr misalignment = address & 0x3;
+    uint32_t masked_initial_value = initial_value & ~(0xFFFFFFFFu << (24 - misalignment * 8));
+    uint32_t shifted_input_value = ((uint32_t)val) << (24 - misalignment * 8);
+    MEM_W(0, word_address) = masked_initial_value | shifted_input_value;
+}
+
+static inline gpr do_ldl(uint8_t* rdram, gpr initial_value, gpr offset, gpr reg) {
+    // Calculate the overall address
+    gpr address = (offset + reg);
+
+    // Load the aligned dword
+    gpr dword_address = address & ~0x7;
+    uint64_t loaded_value = load_doubleword(rdram, 0, dword_address);
+
+    // Mask the existing value and shift the loaded value appropriately
+    gpr misalignment = address & 0x7;
+    gpr masked_value = initial_value & ~(0xFFFFFFFFFFFFFFFFu << (misalignment * 8));
+    loaded_value <<= (misalignment * 8);
+
+    return masked_value | loaded_value;
+}
+
+static inline gpr do_ldr(uint8_t* rdram, gpr initial_value, gpr offset, gpr reg) {
+    // Calculate the overall address
+    gpr address = (offset + reg);
+    
+    // Load the aligned dword
+    gpr dword_address = address & ~0x7;
+    uint64_t loaded_value = load_doubleword(rdram, 0, dword_address);
+
+    // Mask the existing value and shift the loaded value appropriately
+    gpr misalignment = address & 0x7;
+    gpr masked_value = initial_value & ~(0xFFFFFFFFFFFFFFFFu >> (56 - misalignment * 8));
+    loaded_value >>= (56 - misalignment * 8);
+
+    return masked_value | loaded_value;
+}
+
+static inline void do_sdl(uint8_t* rdram, gpr offset, gpr reg, gpr val) {
+    // Calculate the overall address
+    gpr address = (offset + reg);
+
+    // Get the initial value of the aligned dword
+    gpr dword_address = address & ~0x7;
+    uint64_t initial_value = load_doubleword(rdram, 0, dword_address);
+
+    // Mask the initial value and shift the input value appropriately
+    gpr misalignment = address & 0x7;
+    uint64_t masked_initial_value = initial_value & ~(0xFFFFFFFFFFFFFFFFu >> (misalignment * 8));
+    uint64_t shifted_input_value = val >> (misalignment * 8);
+
+    uint64_t ret = masked_initial_value | shifted_input_value;
+    uint32_t lo = (uint32_t)ret;
+    uint32_t hi = (uint32_t)(ret >> 32);
+
+    MEM_W(0, dword_address + 4) = lo;
+    MEM_W(0, dword_address + 0) = hi;
+}
+
+static inline void do_sdr(uint8_t* rdram, gpr offset, gpr reg, gpr val) {
+    // Calculate the overall address
+    gpr address = (offset + reg);
+
+    // Get the initial value of the aligned dword
+    gpr dword_address = address & ~0x7;
+    uint64_t initial_value = load_doubleword(rdram, 0, dword_address);
+
+    // Mask the initial value and shift the input value appropriately
+    gpr misalignment = address & 0x7;
+    uint64_t masked_initial_value = initial_value & ~(0xFFFFFFFFFFFFFFFFu << (56 - misalignment * 8));
+    uint64_t shifted_input_value = val << (56 - misalignment * 8);
+    
+    uint64_t ret = masked_initial_value | shifted_input_value;
+    uint32_t lo = (uint32_t)ret;
+    uint32_t hi = (uint32_t)(ret >> 32);
+
+    MEM_W(0, dword_address + 4) = lo;
+    MEM_W(0, dword_address + 0) = hi;
+}
+
+static inline uint32_t get_cop1_cs() {
+    uint32_t rounding_mode = 0;
+    switch (fegetround()) {
+        // round to nearest value
+        case FE_TONEAREST:
+        default:
+            rounding_mode = 0;
+            break;
+        // round to zero (truncate)
+        case FE_TOWARDZERO:
+            rounding_mode = 1;
+            break;
+        // round to positive infinity (ceil)
+        case FE_UPWARD:
+            rounding_mode = 2;
+            break;
+        // round to negative infinity (floor)
+        case FE_DOWNWARD:
+            rounding_mode = 3;
+            break;
+    }
+    return rounding_mode;
+}
+
+static inline void set_cop1_cs(uint32_t val) {
+    uint32_t rounding_mode = val & 0x3;
+    int round = FE_TONEAREST;
+    switch (rounding_mode) {
+        case 0: // round to nearest value
+            round = FE_TONEAREST;
+            break;
+        case 1: // round to zero (truncate)
+            round = FE_TOWARDZERO;
+            break;
+        case 2: // round to positive infinity (ceil)
+            round = FE_UPWARD;
+            break;
+        case 3: // round to negative infinity (floor)
+            round = FE_DOWNWARD;
+            break;
+    }
+    fesetround(round);
+}
+
+#define S32(val) \
+    ((int32_t)(val))
+    
+#define U32(val) \
+    ((uint32_t)(val))
+
+#define S64(val) \
+    ((int64_t)(val))
+
+#define U64(val) \
+    ((uint64_t)(val))
+
+#define MUL_S(val1, val2) \
+    ((val1) * (val2))
+
+#define MUL_D(val1, val2) \
+    ((val1) * (val2))
+
+#define DIV_S(val1, val2) \
+    ((val1) / (val2))
+
+#define DIV_D(val1, val2) \
+    ((val1) / (val2))
+
+#define CVT_S_W(val) \
+    ((float)((int32_t)(val)))
+
+#define CVT_D_W(val) \
+    ((double)((int32_t)(val)))
+
+#define CVT_D_L(val) \
+    ((double)((int64_t)(val)))
+
+#define CVT_S_L(val) \
+    ((float)((int64_t)(val)))
+
+#define CVT_D_S(val) \
+    ((double)(val))
+
+#define CVT_S_D(val) \
+    ((float)(val))
+
+#define TRUNC_W_S(val) \
+    ((int32_t)(val))
+
+#define TRUNC_W_D(val) \
+    ((int32_t)(val))
+
+#define TRUNC_L_S(val) \
+    ((int64_t)(val))
+
+#define TRUNC_L_D(val) \
+    ((int64_t)(val))
+
+#define DEFAULT_ROUNDING_MODE 0
+
+static inline int32_t do_cvt_w_s(float val) {
+    // Rounding mode aware float to 32-bit int conversion.
+    return (int32_t)lrintf(val);
+}
+
+#define CVT_W_S(val) \
+    do_cvt_w_s(val)
+
+static inline int64_t do_cvt_l_s(float val) {
+    // Rounding mode aware float to 64-bit int conversion.
+    return (int64_t)llrintf(val);
+}
+
+#define CVT_L_S(val) \
+    do_cvt_l_s(val);
+
+static inline int32_t do_cvt_w_d(double val) {
+    // Rounding mode aware double to 32-bit int conversion.
+    return (int32_t)lrint(val);
+}
+
+#define CVT_W_D(val) \
+    do_cvt_w_d(val)
+
+static inline int64_t do_cvt_l_d(double val) {
+    // Rounding mode aware double to 64-bit int conversion.
+    return (int64_t)llrint(val);
+}
+
+#define CVT_L_D(val) \
+    do_cvt_l_d(val)
+
+#define NAN_CHECK(val) \
+    assert(val == val)
+
+//#define NAN_CHECK(val)
+
+typedef union {
+    double d;
+    struct {
+        float fl;
+        float fh;
+    };
+    struct {
+        uint32_t u32l;
+        uint32_t u32h;
+    };
+    uint64_t u64;
+} fpr;
+
+typedef struct {
+    gpr r0,  r1,  r2,  r3,  r4,  r5,  r6,  r7,
+        r8,  r9,  r10, r11, r12, r13, r14, r15,
+        r16, r17, r18, r19, r20, r21, r22, r23,
+        r24, r25, r26, r27, r28, r29, r30, r31;
+    fpr f0,  f1,  f2,  f3,  f4,  f5,  f6,  f7,
+        f8,  f9,  f10, f11, f12, f13, f14, f15,
+        f16, f17, f18, f19, f20, f21, f22, f23,
+        f24, f25, f26, f27, f28, f29, f30, f31;
+    uint64_t hi, lo;
+    uint32_t* f_odd;
+    uint32_t status_reg;
+    uint8_t mips3_float_mode;
+} recomp_context;
+
+// Checks if the target is an even float register or that mips3 float mode is enabled
+#define CHECK_FR(ctx, idx) \
+    assert(((idx) & 1) == 0 || (ctx)->mips3_float_mode)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void cop0_status_write(recomp_context* ctx, gpr value);
+gpr cop0_status_read(recomp_context* ctx);
+void switch_error(const char* func, uint32_t vram, uint32_t jtbl);
+void do_break(uint32_t vram);
+
+// The function signature for all recompiler output functions.
+typedef void (recomp_func_t)(uint8_t* rdram, recomp_context* ctx);
+// The function signature for special functions that need a third argument.
+// These get called via generated shims to allow providing some information about the caller, such as mod id.
+typedef void (recomp_func_ext_t)(uint8_t* rdram, recomp_context* ctx, uintptr_t arg);
+
+recomp_func_t* get_function(int32_t vram);
+
+#define LOOKUP_FUNC(val) \
+    get_function((int32_t)(val))
+
+extern int32_t* section_addresses;
+
+#define LO16(x) \
+    ((x) & 0xFFFF)
+
+#define HI16(x) \
+    (((x) >> 16) + (((x) >> 15) & 1))
+
+#define RELOC_HI16(section_index, offset) \
+    HI16(section_addresses[section_index] + (offset))
+
+#define RELOC_LO16(section_index, offset) \
+    LO16(section_addresses[section_index] + (offset))
+
+void recomp_syscall_handler(uint8_t* rdram, recomp_context* ctx, int32_t instruction_vram);
+
+void pause_self(uint8_t *rdram);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/recompiler/context.h

@@ -9,6 +9,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <filesystem>
+#include <optional>
 
 #ifdef _MSC_VER
 inline uint32_t byteswap(uint32_t val) {
@@ -37,6 +38,21 @@ namespace N64Recomp {
         Function() = default;
     };
     
+    struct JumpTable {
+        uint32_t vram;
+        uint32_t addend_reg;
+        uint32_t rom;
+        uint32_t lw_vram;
+        uint32_t addu_vram;
+        uint32_t jr_vram;
+        uint16_t section_index;
+        std::optional<uint32_t> got_offset;
+        std::vector<uint32_t> entries;
+
+        JumpTable(uint32_t vram, uint32_t addend_reg, uint32_t rom, uint32_t lw_vram, uint32_t addu_vram, uint32_t jr_vram, uint16_t section_index, std::optional<uint32_t> got_offset, std::vector<uint32_t>&& entries)
+                : vram(vram), addend_reg(addend_reg), rom(rom), lw_vram(lw_vram), addu_vram(addu_vram), jr_vram(jr_vram), section_index(section_index), got_offset(got_offset), entries(std::move(entries)) {}
+    };
+
     enum class RelocType : uint8_t {
         R_MIPS_NONE = 0,
         R_MIPS_16,
@@ -69,6 +85,8 @@ namespace N64Recomp {
     constexpr std::string_view EventSectionName = ".recomp_event";
     constexpr std::string_view ImportSectionPrefix = ".recomp_import.";
     constexpr std::string_view CallbackSectionPrefix = ".recomp_callback.";
+    constexpr std::string_view HookSectionPrefix = ".recomp_hook.";
+    constexpr std::string_view HookReturnSectionPrefix = ".recomp_hook_return.";
 
     // Special dependency names.
     constexpr std::string_view DependencySelf = ".";
@@ -86,6 +104,7 @@ namespace N64Recomp {
         bool executable = false;
         bool relocatable = false; // TODO is this needed? relocs being non-empty should be an equivalent check.
         bool has_mips32_relocs = false;
+        std::optional<uint32_t> got_ram_addr = std::nullopt;
     };
 
     struct ReferenceSection {
@@ -166,6 +185,19 @@ namespace N64Recomp {
         ReplacementFlags flags;
     };
 
+    enum class HookFlags : uint32_t {
+        AtReturn = 1 << 0,
+    };
+    inline HookFlags operator&(HookFlags lhs, HookFlags rhs) { return HookFlags(uint32_t(lhs) & uint32_t(rhs)); }
+    inline HookFlags operator|(HookFlags lhs, HookFlags rhs) { return HookFlags(uint32_t(lhs) | uint32_t(rhs)); }
+
+    struct FunctionHook {
+        uint32_t func_index;
+        uint32_t original_section_vrom;
+        uint32_t original_vram;
+        HookFlags flags;
+    };
+
     class Context {
     private:
         //// Reference symbols (used for populating relocations for patches)
@@ -175,6 +207,8 @@ namespace N64Recomp {
         std::vector<ReferenceSymbol> reference_symbols;
         // Mapping of symbol name to reference symbol index.
         std::unordered_map<std::string, SymbolReference> reference_symbols_by_name;
+        // Whether all reference sections should be treated as relocatable (used in live recompilation).
+        bool all_reference_sections_relocatable = false;
     public:
         std::vector<Section> sections;
         std::vector<Function> functions;
@@ -187,6 +221,10 @@ namespace N64Recomp {
         // The target ROM being recompiled, TODO move this outside of the context to avoid making a copy for mod contexts.
         // Used for reading relocations and for the output binary feature.
         std::vector<uint8_t> rom;
+        // Whether reference symbols should be validated when emitting function calls during recompilation.
+        bool skip_validating_reference_symbols = true;
+        // Whether all function calls (excluding reference symbols) should go through lookup.
+        bool use_lookup_for_all_function_calls = false;
 
         //// Only used by the CLI, TODO move this to a struct in the internal headers.
         // A mapping of function name to index in the functions vector
@@ -195,6 +233,8 @@ namespace N64Recomp {
         //// Mod dependencies and their symbols
         
         //// Imported values
+        // Dependency names.
+        std::vector<std::string> dependencies;
         // Mapping of dependency name to dependency index.
         std::unordered_map<std::string, size_t> dependencies_by_name;
         // List of symbols imported from dependencies.
@@ -215,6 +255,11 @@ namespace N64Recomp {
         std::vector<Callback> callbacks;
         // List of symbols from events, which contains the names of events that this context provides.
         std::vector<EventSymbol> event_symbols;
+        // List of hooks, which contains the original function to hook and the function index to call at the hook.
+        std::vector<FunctionHook> hooks;
+
+        // Causes functions to print their name to the console the first time they're called.
+        bool trace_mode;
 
         // Imports sections and function symbols from a provided context into this context's reference sections and reference functions.
         bool import_reference_context(const Context& reference_context);
@@ -233,6 +278,7 @@ namespace N64Recomp {
 
             size_t dependency_index = dependencies_by_name.size();
 
+            dependencies.emplace_back(id);
             dependencies_by_name.emplace(id, dependency_index);
             dependency_events_by_name.resize(dependencies_by_name.size());
             dependency_imports_by_name.resize(dependencies_by_name.size());
@@ -252,6 +298,7 @@ namespace N64Recomp {
 
             for (const std::string& dep : new_dependencies) {
                 size_t dependency_index = dependencies_by_name.size();
+                dependencies.emplace_back(dep);
                 dependencies_by_name.emplace(dep, dependency_index);
             }
 
@@ -356,6 +403,9 @@ namespace N64Recomp {
         }
 
         bool is_reference_section_relocatable(uint16_t section_index) const {
+            if (all_reference_sections_relocatable) {
+                return true;
+            }
             if (section_index == SectionAbsolute) {
                 return false;
             }
@@ -515,12 +565,16 @@ namespace N64Recomp {
         void copy_reference_sections_from(const Context& rhs) {
             reference_sections = rhs.reference_sections;
         }
+
+        void set_all_reference_sections_relocatable() {
+            all_reference_sections_relocatable = true;
+        }
+
     };
 
     class Generator;
-    bool recompile_function(const Context& context, const Function& func, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs, bool tag_reference_relocs);
-    bool recompile_function_luajit(const Context& context, const Function& func, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs, bool tag_reference_relocs);
-    bool recompile_function_custom(Generator& generator, const Context& context, const Function& func, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs_out, bool tag_reference_relocs);
+    bool recompile_function(const Context& context, size_t function_index, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs, bool tag_reference_relocs);
+    bool recompile_function_custom(Generator& generator, const Context& context, size_t function_index, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs_out, bool tag_reference_relocs);
 
     enum class ModSymbolsError {
         Good,
@@ -533,6 +587,22 @@ namespace N64Recomp {
     ModSymbolsError parse_mod_symbols(std::span<const char> data, std::span<const uint8_t> binary, const std::unordered_map<uint32_t, uint16_t>& sections_by_vrom, Context& context_out);
     std::vector<uint8_t> symbols_to_bin_v1(const Context& mod_context);
     
+    inline bool is_manual_patch_symbol(uint32_t vram) {
+        // Zero-sized symbols between 0x8F000000 and 0x90000000 are manually specified symbols for use with patches.
+        // TODO make this configurable or come up with a more sensible solution for dealing with manual symbols for patches.
+        return vram >= 0x8F000000 && vram < 0x90000000;
+    }
+
+    // Locale-independent ASCII-only version of isalpha.
+    inline bool isalpha_nolocale(char c) {
+        return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+    }
+    
+    // Locale-independent ASCII-only version of isalnum.
+    inline bool isalnum_nolocale(char c) {
+        return isalpha_nolocale(c) || (c >= '0' && c <= '9');
+    }
+
     inline bool validate_mod_id(std::string_view str) {
         // Disallow empty ids.
         if (str.size() == 0) {
@@ -548,13 +618,13 @@ namespace N64Recomp {
         // so this is just to prevent "weird" mod ids.
 
         // Check the first character, which must be alphabetical or an underscore.
-        if (!isalpha(str[0]) && str[0] != '_') {
+        if (!isalpha_nolocale(str[0]) && str[0] != '_') {
             return false;
         }
 
         // Check the remaining characters, which can be alphanumeric or underscore.
         for (char c : str.substr(1)) {
-            if (!isalnum(c) && c != '_') {
+            if (!isalnum_nolocale(c) && c != '_') {
                 return false;
             }
         }

include/recompiler/generator.h

@@ -1,7 +1,7 @@
 #ifndef __GENERATOR_H__
 #define __GENERATOR_H__
 
-#include "n64recomp.h"
+#include "recompiler/context.h"
 #include "operations.h"
 
 namespace N64Recomp {
@@ -30,21 +30,25 @@ namespace N64Recomp {
         virtual void process_binary_op(const BinaryOp& op, const InstructionContext& ctx) const = 0;
         virtual void process_unary_op(const UnaryOp& op, const InstructionContext& ctx) const = 0;
         virtual void process_store_op(const StoreOp& op, const InstructionContext& ctx) const = 0;
-        virtual void emit_function_start(const std::string& function_name) const = 0;
+        virtual void emit_function_start(const std::string& function_name, size_t func_index) const = 0;
         virtual void emit_function_end() const = 0;
         virtual void emit_function_call_lookup(uint32_t addr) const = 0;
         virtual void emit_function_call_by_register(int reg) const = 0;
-        virtual void emit_function_call_by_name(const std::string& func_name) const = 0;
+        // target_section_offset can each be deduced from symbol_index if the full context is available,
+        // but for live recompilation the reference symbol list is unavailable so it's still provided.
+        virtual void emit_function_call_reference_symbol(const Context& context, uint16_t section_index, size_t symbol_index, uint32_t target_section_offset) const = 0;
+        virtual void emit_function_call(const Context& context, size_t function_index) const = 0;
+        virtual void emit_named_function_call(const std::string& function_name) const = 0;
         virtual void emit_goto(const std::string& target) const = 0;
         virtual void emit_label(const std::string& label_name) const = 0;
-        virtual void emit_variable_declaration(const std::string& var_name, int reg) const = 0;
+        virtual void emit_jtbl_addend_declaration(const JumpTable& jtbl, int reg) const = 0;
         virtual void emit_branch_condition(const ConditionalBranchOp& op, const InstructionContext& ctx) const = 0;
         virtual void emit_branch_close() const = 0;
-        virtual void emit_switch(const std::string& jump_variable, int shift_amount) const = 0;
+        virtual void emit_switch(const Context& recompiler_context, const JumpTable& jtbl, int reg) const = 0;
         virtual void emit_case(int case_index, const std::string& target_label) const = 0;
         virtual void emit_switch_error(uint32_t instr_vram, uint32_t jtbl_vram) const = 0;
         virtual void emit_switch_close() const = 0;
-        virtual void emit_return() const = 0;
+        virtual void emit_return(const Context& context, size_t func_index) const = 0;
         virtual void emit_check_fr(int fpr) const = 0;
         virtual void emit_check_nan(int fpr, bool is_double) const = 0;
         virtual void emit_cop0_status_read(int reg) const = 0;
@@ -55,7 +59,7 @@ namespace N64Recomp {
         virtual void emit_syscall(uint32_t instr_vram) const = 0;
         virtual void emit_do_break(uint32_t instr_vram) const = 0;
         virtual void emit_pause_self() const = 0;
-        virtual void emit_trigger_event(size_t event_index) const = 0;
+        virtual void emit_trigger_event(uint32_t event_index) const = 0;
         virtual void emit_comment(const std::string& comment) const = 0;
     };
 
@@ -65,21 +69,23 @@ namespace N64Recomp {
         void process_binary_op(const BinaryOp& op, const InstructionContext& ctx) const final;
         void process_unary_op(const UnaryOp& op, const InstructionContext& ctx) const final;
         void process_store_op(const StoreOp& op, const InstructionContext& ctx) const final;
-        void emit_function_start(const std::string& function_name) const final;
+        void emit_function_start(const std::string& function_name, size_t func_index) const final;
         void emit_function_end() const final;
         void emit_function_call_lookup(uint32_t addr) const final;
         void emit_function_call_by_register(int reg) const final;
-        void emit_function_call_by_name(const std::string& func_name) const final;
+        void emit_function_call_reference_symbol(const Context& context, uint16_t section_index, size_t symbol_index, uint32_t target_section_offset) const final;
+        void emit_function_call(const Context& context, size_t function_index) const final;
+        void emit_named_function_call(const std::string& function_name) const final;
         void emit_goto(const std::string& target) const final;
         void emit_label(const std::string& label_name) const final;
-        void emit_variable_declaration(const std::string& var_name, int reg) const final;
+        void emit_jtbl_addend_declaration(const JumpTable& jtbl, int reg) const final;
         void emit_branch_condition(const ConditionalBranchOp& op, const InstructionContext& ctx) const final;
         void emit_branch_close() const final;
-        void emit_switch(const std::string& jump_variable, int shift_amount) const final;
+        void emit_switch(const Context& recompiler_context, const JumpTable& jtbl, int reg) const final;
         void emit_case(int case_index, const std::string& target_label) const final;
         void emit_switch_error(uint32_t instr_vram, uint32_t jtbl_vram) const final;
         void emit_switch_close() const final;
-        void emit_return() const final;
+        void emit_return(const Context& context, size_t func_index) const final;
         void emit_check_fr(int fpr) const final;
         void emit_check_nan(int fpr, bool is_double) const final;
         void emit_cop0_status_read(int reg) const final;
@@ -90,47 +96,7 @@ namespace N64Recomp {
         void emit_syscall(uint32_t instr_vram) const final;
         void emit_do_break(uint32_t instr_vram) const final;
         void emit_pause_self() const final;
-        void emit_trigger_event(size_t event_index) const final;
-        void emit_comment(const std::string& comment) const final;
-    private:
-        void get_operand_string(Operand operand, UnaryOpType operation, const InstructionContext& context, std::string& operand_string) const;
-        void get_binary_expr_string(BinaryOpType type, const BinaryOperands& operands, const InstructionContext& ctx, const std::string& output, std::string& expr_string) const;
-        void get_notation(BinaryOpType op_type, std::string& func_string, std::string& infix_string) const;
-        std::ostream& output_file;
-    };
-
-    class LuajitGenerator final : Generator {
-    public:
-        LuajitGenerator(std::ostream& output_file) : output_file(output_file) {};
-        void process_binary_op(const BinaryOp& op, const InstructionContext& ctx) const final;
-        void process_unary_op(const UnaryOp& op, const InstructionContext& ctx) const final;
-        void process_store_op(const StoreOp& op, const InstructionContext& ctx) const final;
-        void emit_function_start(const std::string& function_name) const final;
-        void emit_function_end() const final;
-        void emit_function_call_lookup(uint32_t addr) const final;
-        void emit_function_call_by_register(int reg) const final;
-        void emit_function_call_by_name(const std::string& func_name) const final;
-        void emit_goto(const std::string& target) const final;
-        void emit_label(const std::string& label_name) const final;
-        void emit_variable_declaration(const std::string& var_name, int reg) const final;
-        void emit_branch_condition(const ConditionalBranchOp& op, const InstructionContext& ctx) const final;
-        void emit_branch_close() const final;
-        void emit_switch(const std::string& jump_variable, int shift_amount) const final;
-        void emit_case(int case_index, const std::string& target_label) const final;
-        void emit_switch_error(uint32_t instr_vram, uint32_t jtbl_vram) const final;
-        void emit_switch_close() const final;
-        void emit_return() const final;
-        void emit_check_fr(int fpr) const final;
-        void emit_check_nan(int fpr, bool is_double) const final;
-        void emit_cop0_status_read(int reg) const final;
-        void emit_cop0_status_write(int reg) const final;
-        void emit_cop1_cs_read(int reg) const final;
-        void emit_cop1_cs_write(int reg) const final;
-        void emit_muldiv(InstrId instr_id, int reg1, int reg2) const final;
-        void emit_syscall(uint32_t instr_vram) const final;
-        void emit_do_break(uint32_t instr_vram) const final;
-        void emit_pause_self() const final;
-        void emit_trigger_event(size_t event_index) const final;
+        void emit_trigger_event(uint32_t event_index) const final;
         void emit_comment(const std::string& comment) const final;
     private:
         void get_operand_string(Operand operand, UnaryOpType operation, const InstructionContext& context, std::string& operand_string) const;

include/recompiler/live_recompiler.h

@@ -0,0 +1,159 @@
+#ifndef __LIVE_RECOMPILER_H__
+#define __LIVE_RECOMPILER_H__
+
+#include <unordered_map>
+#include "recompiler/generator.h"
+#include "recomp.h"
+
+struct sljit_compiler;
+
+namespace N64Recomp {
+    struct LiveGeneratorContext;
+    struct ReferenceJumpDetails {
+        uint16_t section;
+        uint32_t section_offset;
+    };
+    struct LiveGeneratorOutput {
+        LiveGeneratorOutput() = default;
+        LiveGeneratorOutput(const LiveGeneratorOutput& rhs) = delete;
+        LiveGeneratorOutput(LiveGeneratorOutput&& rhs) { *this = std::move(rhs); }
+        LiveGeneratorOutput& operator=(const LiveGeneratorOutput& rhs) = delete;
+        LiveGeneratorOutput& operator=(LiveGeneratorOutput&& rhs) {
+            good = rhs.good;
+            string_literals = std::move(rhs.string_literals);
+            jump_tables = std::move(rhs.jump_tables);
+            code = rhs.code;
+            code_size = rhs.code_size;
+            functions = std::move(rhs.functions);
+            reference_symbol_jumps = std::move(rhs.reference_symbol_jumps);
+            import_jumps_by_index = std::move(rhs.import_jumps_by_index);
+            executable_offset = rhs.executable_offset;
+
+            rhs.good = false;
+            rhs.code = nullptr;
+            rhs.code_size = 0;
+            rhs.reference_symbol_jumps.clear();
+            rhs.executable_offset = 0;
+
+            return *this;
+        }
+        ~LiveGeneratorOutput();
+        size_t num_reference_symbol_jumps() const;
+        void set_reference_symbol_jump(size_t jump_index, recomp_func_t* func);
+        ReferenceJumpDetails get_reference_symbol_jump_details(size_t jump_index);
+        void populate_import_symbol_jumps(size_t import_index, recomp_func_t* func);
+        bool good = false;
+        // Storage for string literals referenced by recompiled code. These are allocated as unique_ptr arrays
+        // to prevent them from moving, as the referenced address is baked into the recompiled code.
+        std::vector<std::unique_ptr<char[]>> string_literals;
+        // Storage for jump tables referenced by recompiled code (vector of arrays of pointers). These are also
+        // allocated as unique_ptr arrays for the same reason as strings.
+        std::vector<std::unique_ptr<void*[]>> jump_tables;
+        // Recompiled code.
+        void* code;
+        // Size of the recompiled code.
+        size_t code_size;
+        // Pointers to each individual function within the recompiled code.
+        std::vector<recomp_func_t*> functions;
+    private:
+        // List of jump details and the corresponding jump instruction address. These jumps get populated after recompilation is complete
+        // during dependency resolution.
+        std::vector<std::pair<ReferenceJumpDetails, void*>> reference_symbol_jumps;
+        // Mapping of import symbol index to any jumps to that import symbol.
+        std::unordered_multimap<size_t, void*> import_jumps_by_index;
+        // sljit executable offset.
+        int64_t executable_offset;
+
+        friend class LiveGenerator;
+    };
+    struct LiveGeneratorInputs {
+        uint32_t base_event_index;
+        void (*cop0_status_write)(recomp_context* ctx, gpr value);
+        gpr (*cop0_status_read)(recomp_context* ctx);
+        void (*switch_error)(const char* func, uint32_t vram, uint32_t jtbl);
+        void (*do_break)(uint32_t vram);
+        recomp_func_t* (*get_function)(int32_t vram);
+        void (*syscall_handler)(uint8_t* rdram, recomp_context* ctx, int32_t instruction_vram);
+        void (*pause_self)(uint8_t* rdram);
+        void (*trigger_event)(uint8_t* rdram, recomp_context* ctx, uint32_t event_index);
+        int32_t *reference_section_addresses;
+        int32_t *local_section_addresses;
+        void (*run_hook)(uint8_t* rdram, recomp_context* ctx, size_t hook_table_index);
+        // Maps function index in recompiler context to function's entry hook slot.
+        std::unordered_map<size_t, size_t> entry_func_hooks;
+        // Maps function index in recompiler context to function's return hook slot.
+        std::unordered_map<size_t, size_t> return_func_hooks;
+        // Maps section index in the generated code to original section index. Used by regenerated
+        // code to relocate using the corresponding original section's address.
+        std::vector<size_t> original_section_indices;
+    };
+    class LiveGenerator final : public Generator {
+    public:
+        LiveGenerator(size_t num_funcs, const LiveGeneratorInputs& inputs);
+        ~LiveGenerator();
+        // Prevent moving or copying.
+        LiveGenerator(const LiveGenerator& rhs) = delete;
+        LiveGenerator(LiveGenerator&& rhs) = delete;
+        LiveGenerator& operator=(const LiveGenerator& rhs) = delete;
+        LiveGenerator& operator=(LiveGenerator&& rhs) = delete;
+
+        LiveGeneratorOutput finish();
+        void process_binary_op(const BinaryOp& op, const InstructionContext& ctx) const final;
+        void process_unary_op(const UnaryOp& op, const InstructionContext& ctx) const final;
+        void process_store_op(const StoreOp& op, const InstructionContext& ctx) const final;
+        void emit_function_start(const std::string& function_name, size_t func_index) const final;
+        void emit_function_end() const final;
+        void emit_function_call_lookup(uint32_t addr) const final;
+        void emit_function_call_by_register(int reg) const final;
+        void emit_function_call_reference_symbol(const Context& context, uint16_t section_index, size_t symbol_index, uint32_t target_section_offset) const final;
+        void emit_function_call(const Context& context, size_t function_index) const final;
+        void emit_named_function_call(const std::string& function_name) const final;
+        void emit_goto(const std::string& target) const final;
+        void emit_label(const std::string& label_name) const final;
+        void emit_jtbl_addend_declaration(const JumpTable& jtbl, int reg) const final;
+        void emit_branch_condition(const ConditionalBranchOp& op, const InstructionContext& ctx) const final;
+        void emit_branch_close() const final;
+        void emit_switch(const Context& recompiler_context, const JumpTable& jtbl, int reg) const final;
+        void emit_case(int case_index, const std::string& target_label) const final;
+        void emit_switch_error(uint32_t instr_vram, uint32_t jtbl_vram) const final;
+        void emit_switch_close() const final;
+        void emit_return(const Context& context, size_t func_index) const final;
+        void emit_check_fr(int fpr) const final;
+        void emit_check_nan(int fpr, bool is_double) const final;
+        void emit_cop0_status_read(int reg) const final;
+        void emit_cop0_status_write(int reg) const final;
+        void emit_cop1_cs_read(int reg) const final;
+        void emit_cop1_cs_write(int reg) const final;
+        void emit_muldiv(InstrId instr_id, int reg1, int reg2) const final;
+        void emit_syscall(uint32_t instr_vram) const final;
+        void emit_do_break(uint32_t instr_vram) const final;
+        void emit_pause_self() const final;
+        void emit_trigger_event(uint32_t event_index) const final;
+        void emit_comment(const std::string& comment) const final;
+    private:
+        void get_operand_string(Operand operand, UnaryOpType operation, const InstructionContext& context, std::string& operand_string) const;
+        void get_binary_expr_string(BinaryOpType type, const BinaryOperands& operands, const InstructionContext& ctx, const std::string& output, std::string& expr_string) const;
+        void get_notation(BinaryOpType op_type, std::string& func_string, std::string& infix_string) const;
+        // Loads the relocated address specified by the instruction context into the target register.
+        void load_relocated_address(const InstructionContext& ctx, int reg) const;
+        sljit_compiler* compiler;
+        LiveGeneratorInputs inputs;
+        mutable std::unique_ptr<LiveGeneratorContext> context;
+        mutable bool errored;
+    };
+
+    void live_recompiler_init();
+    bool recompile_function_live(LiveGenerator& generator, const Context& context, size_t function_index, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs_out, bool tag_reference_relocs);
+
+    class ShimFunction {
+    private:
+        void* code;
+        recomp_func_t* func;
+    public:
+        ShimFunction(recomp_func_ext_t* to_shim, uintptr_t value);
+        ~ShimFunction();
+        recomp_func_t* get_func() { return func; }
+    };
+}
+
+#endif

include/recompiler/operations.h

@@ -50,12 +50,20 @@ namespace N64Recomp {
         ConvertLFromS,
         TruncateWFromS,
         TruncateWFromD,
+        TruncateLFromS,
+        TruncateLFromD,
         RoundWFromS,
         RoundWFromD,
+        RoundLFromS,
+        RoundLFromD,
         CeilWFromS,
         CeilWFromD,
+        CeilLFromS,
+        CeilLFromD,
         FloorWFromS,
-        FloorWFromD
+        FloorWFromD,
+        FloorLFromS,
+        FloorLFromD
     };
 
     enum class BinaryOpType {
@@ -91,6 +99,12 @@ namespace N64Recomp {
         LessEq,
         Greater,
         GreaterEq,
+        EqualFloat,
+        LessFloat,
+        LessEqFloat,
+        EqualDouble,
+        LessDouble,
+        LessEqDouble,
         // Loads
         LD,
         LW,

src/analysis.cpp

@@ -4,7 +4,7 @@
 #include "rabbitizer.hpp"
 #include "fmt/format.h"
 
-#include "n64recomp.h"
+#include "recompiler/context.h"
 #include "analysis.h"
 
 extern "C" const char* RabbitizerRegister_getNameGpr(uint8_t regValue);
@@ -16,15 +16,18 @@ struct RegState {
     uint32_t prev_addiu_vram;
     uint32_t prev_addu_vram;
     uint8_t prev_addend_reg;
+    uint32_t prev_got_offset; // offset of lw rt,offset(gp)
     bool valid_lui;
     bool valid_addiu;
     bool valid_addend;
+    bool valid_got_offset;
     // For tracking a register that has been loaded from RAM
     uint32_t loaded_lw_vram;
     uint32_t loaded_addu_vram;
     uint32_t loaded_address;
     uint8_t loaded_addend_reg;
     bool valid_loaded;
+    bool valid_got_loaded; // valid load through the GOT
 
     RegState() = default;
 
@@ -33,10 +36,12 @@ struct RegState {
         prev_addiu_vram = 0;
         prev_addu_vram = 0;
         prev_addend_reg = 0;
+        prev_got_offset = 0;
 
         valid_lui = false;
         valid_addiu = false;
         valid_addend = false;
+        valid_got_offset = false;
 
         loaded_lw_vram = 0;
         loaded_addu_vram = 0;
@@ -44,6 +49,7 @@ struct RegState {
         loaded_addend_reg = 0;
 
         valid_loaded = false;
+        valid_got_loaded = false;
     }
 };
 
@@ -51,7 +57,7 @@ using InstrId = rabbitizer::InstrId::UniqueId;
 using RegId = rabbitizer::Registers::Cpu::GprO32;
 
 bool analyze_instruction(const rabbitizer::InstructionCpu& instr, const N64Recomp::Function& func, N64Recomp::FunctionStats& stats,
-    RegState reg_states[32], std::vector<RegState>& stack_states) {
+    RegState reg_states[32], std::vector<RegState>& stack_states, bool is_got_addr_defined) {
     // Temporary register state for tracking the register being operated on
     RegState temp{};
 
@@ -98,8 +104,26 @@ bool analyze_instruction(const rabbitizer::InstructionCpu& instr, const N64Recom
     case InstrId::cpu_addu:
         // rd has been completely overwritten, so invalidate it
         temp.invalidate();
+        if (reg_states[rs].valid_got_offset != reg_states[rt].valid_got_offset) {
+            // Track which of the two registers has the valid GOT offset state and which is the addend
+            int valid_got_offset_reg = reg_states[rs].valid_got_offset ? rs : rt;
+            int addend_reg = reg_states[rs].valid_got_offset ? rt : rs;
+
+            // Copy the got offset reg's state into the destination reg, then set the destination reg's addend to the other operand
+            temp = reg_states[valid_got_offset_reg];
+            temp.valid_addend = true;
+            temp.prev_addend_reg = addend_reg;
+            temp.prev_addu_vram = instr.getVram();
+        } else if (((rs == (int)RegId::GPR_O32_gp) || (rt == (int)RegId::GPR_O32_gp)) 
+                && reg_states[rs].valid_got_loaded != reg_states[rt].valid_got_loaded) {
+            // `addu rd, rs, $gp` or `addu rd, $gp, rt` after valid GOT load, this is the last part of a position independent
+            // jump table call. Keep the register state intact.
+            int valid_got_loaded_reg = reg_states[rs].valid_got_loaded ? rs : rt;
+
+            temp = reg_states[valid_got_loaded_reg];
+        }
         // Exactly one of the two addend register states should have a valid lui at this time
-        if (reg_states[rs].valid_lui != reg_states[rt].valid_lui) {
+        else if (reg_states[rs].valid_lui != reg_states[rt].valid_lui) {
             // Track which of the two registers has the valid lui state and which is the addend
             int valid_lui_reg = reg_states[rs].valid_lui ? rs : rt;
             int addend_reg = reg_states[rs].valid_lui ? rt : rs;
@@ -178,6 +202,21 @@ bool analyze_instruction(const rabbitizer::InstructionCpu& instr, const N64Recom
                 temp.loaded_addu_vram = reg_states[base].prev_addu_vram;
             }
         }
+        // If the base register has a valid GOT offset and a valid addend before this, then this may be a load from a position independent jump table
+        else if (reg_states[base].valid_got_offset && reg_states[base].valid_addend) {
+            // At this point, we will have the offset from the value of the previously read GOT entry to the address being
+            // loaded here as well as the GOT entry offset itself
+            temp.valid_got_loaded = true;
+            temp.loaded_lw_vram = instr.getVram();
+            temp.loaded_address = imm; // This address is relative for now, we'll calculate the absolute address later
+            temp.loaded_addend_reg = reg_states[base].prev_addend_reg;
+            temp.loaded_addu_vram = reg_states[base].prev_addu_vram;
+            temp.prev_got_offset = reg_states[base].prev_got_offset;
+        } else if (base == (int)RegId::GPR_O32_gp && is_got_addr_defined) {
+            // lw from the $gp register implies a read from the global offset table
+            temp.prev_got_offset = imm;
+            temp.valid_got_offset = true;
+        }
         reg_states[rt] = temp;
         break;
     case InstrId::cpu_jr:
@@ -194,6 +233,20 @@ bool analyze_instruction(const rabbitizer::InstructionCpu& instr, const N64Recom
                 reg_states[rs].loaded_lw_vram,
                 reg_states[rs].loaded_addu_vram,
                 instr.getVram(),
+                0, // section index gets filled in later
+                std::nullopt,
+                std::vector<uint32_t>{}
+            );
+        } else if (reg_states[rs].valid_got_loaded) {
+            stats.jump_tables.emplace_back(
+                reg_states[rs].loaded_address,
+                reg_states[rs].loaded_addend_reg,
+                0,
+                reg_states[rs].loaded_lw_vram,
+                reg_states[rs].loaded_addu_vram,
+                instr.getVram(),
+                0, // section index gets filled in later
+                reg_states[rs].prev_got_offset,
                 std::vector<uint32_t>{}
             );
         }
@@ -213,6 +266,9 @@ bool analyze_instruction(const rabbitizer::InstructionCpu& instr, const N64Recom
 
 bool N64Recomp::analyze_function(const N64Recomp::Context& context, const N64Recomp::Function& func,
     const std::vector<rabbitizer::InstructionCpu>& instructions, N64Recomp::FunctionStats& stats) {
+    const Section* section = &context.sections[func.section_index];
+    std::optional<uint32_t> got_ram_addr = section->got_ram_addr;
+
     // Create a state to track each register (r0 won't be used)
     RegState reg_states[32] {};
     std::vector<RegState> stack_states{};
@@ -220,11 +276,26 @@ bool N64Recomp::analyze_function(const N64Recomp::Context& context, const N64Rec
     // Look for jump tables
     // A linear search through the func won't be accurate due to not taking control flow into account, but it'll work for finding jtables
     for (const auto& instr : instructions) {
-        if (!analyze_instruction(instr, func, stats, reg_states, stack_states)) {
+        if (!analyze_instruction(instr, func, stats, reg_states, stack_states, got_ram_addr.has_value())) {
             return false;
         }
     }
 
+    // Calculate absolute addresses for position-independent jump tables
+    if (got_ram_addr.has_value()) {
+        uint32_t got_rom_addr = got_ram_addr.value() + func.rom - func.vram;
+
+        for (size_t i = 0; i < stats.jump_tables.size(); i++) {
+            JumpTable& cur_jtbl = stats.jump_tables[i];
+
+            if (cur_jtbl.got_offset.has_value()) {
+                uint32_t got_word = byteswap(*reinterpret_cast<const uint32_t*>(&context.rom[got_rom_addr + cur_jtbl.got_offset.value()]));
+
+                cur_jtbl.vram += (section->ram_addr + got_word);
+            }
+        }
+    }
+
     // Sort jump tables by their address
     std::sort(stats.jump_tables.begin(), stats.jump_tables.end(),
         [](const JumpTable& a, const JumpTable& b)
@@ -245,14 +316,28 @@ bool N64Recomp::analyze_function(const N64Recomp::Context& context, const N64Rec
 
         // TODO this assumes that the jump table is in the same section as the function itself
         cur_jtbl.rom = cur_jtbl.vram + func.rom - func.vram;
+        cur_jtbl.section_index = func.section_index;
 
         while (vram < end_address) {
             // Retrieve the current entry of the jump table
             // TODO same as above
+
+            // Stop scanning if the end of the ROM is reached.
             uint32_t rom_addr = vram + func.rom - func.vram;
+            if (rom_addr >= context.rom.size()) {
+                break;
+            }
+
             uint32_t jtbl_word = byteswap(*reinterpret_cast<const uint32_t*>(&context.rom[rom_addr]));
+
+            if (cur_jtbl.got_offset.has_value() && got_ram_addr.has_value()) {
+                // Position independent jump tables have values that are offsets from the GOT,
+                // convert those to absolute addresses
+                jtbl_word += got_ram_addr.value();
+            }
+
             // Check if the entry is a valid address in the current function
-            if (jtbl_word < func.vram || jtbl_word > func.vram + func.words.size() * sizeof(func.words[0])) {
+            if (jtbl_word < func.vram || jtbl_word >= func.vram + func.words.size() * sizeof(func.words[0])) {
                 // If it's not then this is the end of the jump table
                 break;
             }

src/analysis.h

@@ -4,22 +4,9 @@
 #include <cstdint>
 #include <vector>
 
-#include "n64recomp.h"
+#include "recompiler/context.h"
 
 namespace N64Recomp {
-    struct JumpTable {
-        uint32_t vram;
-        uint32_t addend_reg;
-        uint32_t rom;
-        uint32_t lw_vram;
-        uint32_t addu_vram;
-        uint32_t jr_vram;
-        std::vector<uint32_t> entries;
-
-        JumpTable(uint32_t vram, uint32_t addend_reg, uint32_t rom, uint32_t lw_vram, uint32_t addu_vram, uint32_t jr_vram, std::vector<uint32_t>&& entries)
-                : vram(vram), addend_reg(addend_reg), rom(rom), lw_vram(lw_vram), addu_vram(addu_vram), jr_vram(jr_vram), entries(std::move(entries)) {}
-    };
-
     struct AbsoluteJump {
         uint32_t jump_target;
         uint32_t instruction_vram;

src/cgenerator.cpp

@@ -4,7 +4,7 @@
 #include "fmt/format.h"
 #include "fmt/ostream.h"
 
-#include "generator.h"
+#include "recompiler/generator.h"
 
 struct BinaryOpFields { std::string func_string; std::string infix_string; };
 
@@ -45,9 +45,15 @@ static std::vector<BinaryOpFields> c_op_fields = []() {
     setup_op(N64Recomp::BinaryOpType::Sra32,     "S32",    ">>"); // Arithmetic aspect will be taken care of by unary op for first operand.
     setup_op(N64Recomp::BinaryOpType::Sra64,     "",       ">>"); // Arithmetic aspect will be taken care of by unary op for first operand.
     setup_op(N64Recomp::BinaryOpType::Equal,     "",       "==");
+    setup_op(N64Recomp::BinaryOpType::EqualFloat,"",       "==");
+    setup_op(N64Recomp::BinaryOpType::EqualDouble,"",      "==");
     setup_op(N64Recomp::BinaryOpType::NotEqual,  "",       "!=");
     setup_op(N64Recomp::BinaryOpType::Less,      "",       "<");
+    setup_op(N64Recomp::BinaryOpType::LessFloat, "",       "<");
+    setup_op(N64Recomp::BinaryOpType::LessDouble,"",       "<");
     setup_op(N64Recomp::BinaryOpType::LessEq,    "",       "<=");
+    setup_op(N64Recomp::BinaryOpType::LessEqFloat,"",      "<=");
+    setup_op(N64Recomp::BinaryOpType::LessEqDouble,"",     "<=");
     setup_op(N64Recomp::BinaryOpType::Greater,   "",       ">");
     setup_op(N64Recomp::BinaryOpType::GreaterEq, "",       ">=");
     setup_op(N64Recomp::BinaryOpType::LD,        "LD",     "");
@@ -289,24 +295,49 @@ void N64Recomp::CGenerator::get_operand_string(Operand operand, UnaryOpType oper
         case UnaryOpType::TruncateWFromD:
             operand_string = "TRUNC_W_D(" + operand_string + ")";
             break;
+        case UnaryOpType::TruncateLFromS:
+            operand_string = "TRUNC_L_S(" + operand_string + ")";
+            break;
+        case UnaryOpType::TruncateLFromD:
+            operand_string = "TRUNC_L_D(" + operand_string + ")";
+            break;
+        // TODO these four operations should use banker's rounding, but roundeven is C23 so it's unavailable here.
         case UnaryOpType::RoundWFromS:
             operand_string = "lroundf(" + operand_string + ")";
             break;
         case UnaryOpType::RoundWFromD:
             operand_string = "lround(" + operand_string + ")";
             break;
+        case UnaryOpType::RoundLFromS:
+            operand_string = "llroundf(" + operand_string + ")";
+            break;
+        case UnaryOpType::RoundLFromD:
+            operand_string = "llround(" + operand_string + ")";
+            break;
         case UnaryOpType::CeilWFromS:
             operand_string = "S32(ceilf(" + operand_string + "))";
             break;
         case UnaryOpType::CeilWFromD:
             operand_string = "S32(ceil(" + operand_string + "))";
             break;
+        case UnaryOpType::CeilLFromS:
+            operand_string = "S64(ceilf(" + operand_string + "))";
+            break;
+        case UnaryOpType::CeilLFromD:
+            operand_string = "S64(ceil(" + operand_string + "))";
+            break;
         case UnaryOpType::FloorWFromS:
             operand_string = "S32(floorf(" + operand_string + "))";
             break;
         case UnaryOpType::FloorWFromD:
             operand_string = "S32(floor(" + operand_string + "))";
             break;
+        case UnaryOpType::FloorLFromS:
+            operand_string = "S64(floorf(" + operand_string + "))";
+            break;
+        case UnaryOpType::FloorLFromD:
+            operand_string = "S64(floor(" + operand_string + "))";
+            break;
     }
 }
 
@@ -320,7 +351,6 @@ void N64Recomp::CGenerator::get_binary_expr_string(BinaryOpType type, const Bina
     thread_local std::string input_b{};
     thread_local std::string func_string{};
     thread_local std::string infix_string{};
-    bool is_infix;
     get_operand_string(operands.operands[0], operands.operand_operations[0], ctx, input_a);
     get_operand_string(operands.operands[1], operands.operand_operations[1], ctx, input_b);
     get_notation(type, func_string, infix_string);
@@ -362,12 +392,12 @@ void N64Recomp::CGenerator::get_binary_expr_string(BinaryOpType type, const Bina
     }
 }
 
-void N64Recomp::CGenerator::emit_function_start(const std::string& function_name) const {
+void N64Recomp::CGenerator::emit_function_start(const std::string& function_name, size_t func_index) const {
+    (void)func_index;
     fmt::print(output_file,
         "RECOMP_FUNC void {}(uint8_t* rdram, recomp_context* ctx) {{\n"
         // these variables shouldn't need to be preserved across function boundaries, so make them local for more efficient output
         "    uint64_t hi = 0, lo = 0, result = 0;\n"
-        "    unsigned int rounding_mode = DEFAULT_ROUNDING_MODE;\n"
         "    int c1cs = 0;\n", // cop1 conditional signal
         function_name);
 }
@@ -384,8 +414,18 @@ void N64Recomp::CGenerator::emit_function_call_by_register(int reg) const {
     fmt::print(output_file, "LOOKUP_FUNC({})(rdram, ctx);\n", gpr_to_string(reg));
 }
 
-void N64Recomp::CGenerator::emit_function_call_by_name(const std::string& func_name) const {
-    fmt::print(output_file, "{}(rdram, ctx);\n", func_name);
+void N64Recomp::CGenerator::emit_function_call_reference_symbol(const Context& context, uint16_t section_index, size_t symbol_index, uint32_t target_section_offset) const {
+    (void)target_section_offset;
+    const N64Recomp::ReferenceSymbol& sym = context.get_reference_symbol(section_index, symbol_index);
+    fmt::print(output_file, "{}(rdram, ctx);\n", sym.name);
+}
+
+void N64Recomp::CGenerator::emit_function_call(const Context& context, size_t function_index) const {
+    fmt::print(output_file, "{}(rdram, ctx);\n", context.functions[function_index].name);
+}
+
+void N64Recomp::CGenerator::emit_named_function_call(const std::string& function_name) const {
+    fmt::print(output_file, "{}(rdram, ctx);\n", function_name);
 }
 
 void N64Recomp::CGenerator::emit_goto(const std::string& target) const {
@@ -398,8 +438,9 @@ void N64Recomp::CGenerator::emit_label(const std::string& label_name) const {
         "{}:\n", label_name);
 }
 
-void N64Recomp::CGenerator::emit_variable_declaration(const std::string& var_name, int reg) const {
-    fmt::print(output_file, "gpr {} = {};\n", var_name, gpr_to_string(reg));
+void N64Recomp::CGenerator::emit_jtbl_addend_declaration(const JumpTable& jtbl, int reg) const {
+    std::string jump_variable = fmt::format("jr_addend_{:08X}", jtbl.jr_vram);
+    fmt::print(output_file, "gpr {} = {};\n", jump_variable, gpr_to_string(reg));
 }
 
 void N64Recomp::CGenerator::emit_branch_condition(const ConditionalBranchOp& op, const InstructionContext& ctx) const {
@@ -418,8 +459,14 @@ void N64Recomp::CGenerator::emit_switch_close() const {
     fmt::print(output_file, "}}\n");
 }
 
-void N64Recomp::CGenerator::emit_switch(const std::string& jump_variable, int shift_amount) const {
-    fmt::print(output_file, "switch ({} >> {}) {{\n", jump_variable, shift_amount);
+void N64Recomp::CGenerator::emit_switch(const Context& recompiler_context, const JumpTable& jtbl, int reg) const {
+    (void)recompiler_context;
+    (void)reg;
+    // TODO generate code to subtract the jump table address from the register's value instead.
+    // Once that's done, the addend temp can be deleted to simplify the generator interface.
+    std::string jump_variable = fmt::format("jr_addend_{:08X}", jtbl.jr_vram);
+
+    fmt::print(output_file, "switch ({} >> 2) {{\n", jump_variable);
 }
 
 void N64Recomp::CGenerator::emit_case(int case_index, const std::string& target_label) const {
@@ -430,7 +477,11 @@ void N64Recomp::CGenerator::emit_switch_error(uint32_t instr_vram, uint32_t jtbl
     fmt::print(output_file, "default: switch_error(__func__, 0x{:08X}, 0x{:08X});\n", instr_vram, jtbl_vram);
 }
 
-void N64Recomp::CGenerator::emit_return() const {
+void N64Recomp::CGenerator::emit_return(const Context& context, size_t func_index) const {
+    (void)func_index;
+    if (context.trace_mode) {
+        fmt::print(output_file, "TRACE_RETURN()\n    ");
+    }
     fmt::print(output_file, "return;\n");
 }
 
@@ -447,15 +498,15 @@ void N64Recomp::CGenerator::emit_cop0_status_read(int reg) const {
 }
 
 void N64Recomp::CGenerator::emit_cop0_status_write(int reg) const {
-    fmt::print(output_file, "cop0_status_write(ctx, {})", gpr_to_string(reg));
+    fmt::print(output_file, "cop0_status_write(ctx, {});", gpr_to_string(reg));
 }
 
 void N64Recomp::CGenerator::emit_cop1_cs_read(int reg) const {
-    fmt::print(output_file, "{} = rounding_mode;\n", gpr_to_string(reg));
+    fmt::print(output_file, "{} = get_cop1_cs();\n", gpr_to_string(reg));
 }
 
 void N64Recomp::CGenerator::emit_cop1_cs_write(int reg) const {
-    fmt::print(output_file, "rounding_mode = ({}) & 0x3;\n", gpr_to_string(reg));
+    fmt::print(output_file, "set_cop1_cs({});\n", gpr_to_string(reg));
 }
 
 void N64Recomp::CGenerator::emit_muldiv(InstrId instr_id, int reg1, int reg2) const {
@@ -485,6 +536,9 @@ void N64Recomp::CGenerator::emit_muldiv(InstrId instr_id, int reg1, int reg2) co
         case InstrId::cpu_ddivu:
             fmt::print(output_file, "DDIVU(U64({}), U64({}), &lo, &hi);\n", gpr_to_string(reg1), gpr_to_string(reg2));
             break;
+        default:
+            assert(false);
+            break;
     }
 }
 
@@ -500,7 +554,7 @@ void N64Recomp::CGenerator::emit_pause_self() const {
     fmt::print(output_file, "pause_self(rdram);\n");
 }
 
-void N64Recomp::CGenerator::emit_trigger_event(size_t event_index) const {
+void N64Recomp::CGenerator::emit_trigger_event(uint32_t event_index) const {
     fmt::print(output_file, "recomp_trigger_event(rdram, ctx, base_event_index + {});\n", event_index);
 }
 
@@ -523,7 +577,6 @@ void N64Recomp::CGenerator::process_unary_op(const UnaryOp& op, const Instructio
     // TODO these thread locals probably don't actually help right now, so figure out a better way to prevent allocations.
     thread_local std::string output{};
     thread_local std::string input{};
-    bool is_infix;
     get_operand_string(op.output, UnaryOpType::None, ctx, output);
     get_operand_string(op.input, op.operation, ctx, input);
     fmt::print(output_file, "{} = {};\n", output, input);
@@ -535,7 +588,6 @@ void N64Recomp::CGenerator::process_store_op(const StoreOp& op, const Instructio
     thread_local std::string base_str{};
     thread_local std::string imm_str{};
     thread_local std::string value_input{};
-    bool is_infix;
     get_operand_string(Operand::Base, UnaryOpType::None, ctx, base_str);
     get_operand_string(Operand::ImmS16, UnaryOpType::None, ctx, imm_str);
     get_operand_string(op.value_input, UnaryOpType::None, ctx, value_input);

src/config.cpp

@@ -3,7 +3,7 @@
 #include <toml++/toml.hpp>
 #include "fmt/format.h"
 #include "config.h"
-#include "n64recomp.h"
+#include "recompiler/context.h"
 
 std::filesystem::path concat_if_not_empty(const std::filesystem::path& parent, const std::filesystem::path& child) {
     if (!child.empty()) {
@@ -93,7 +93,7 @@ std::vector<std::string> get_ignored_funcs(const toml::table* patches_data) {
         // Make room for all the ignored funcs in the array.
         ignored_funcs.reserve(ignored_funcs_array->size());
 
-        // Gather the stubs and place them into the array.
+        // Gather the ignored and place them into the array.
         ignored_funcs_array->for_each([&ignored_funcs](auto&& el) {
             if constexpr (toml::is_string<decltype(el)>) {
                 ignored_funcs.push_back(*el);
@@ -104,42 +104,56 @@ std::vector<std::string> get_ignored_funcs(const toml::table* patches_data) {
     return ignored_funcs;
 }
 
-std::vector<N64Recomp::FunctionSize> get_func_sizes(const toml::table* patches_data) {
-    std::vector<N64Recomp::FunctionSize> func_sizes{};
+std::vector<std::string> get_renamed_funcs(const toml::table* patches_data) {
+    std::vector<std::string> renamed_funcs{};
 
-    // Check if the func size array exists.
-    const toml::node_view funcs_data = (*patches_data)["function_sizes"];
-    if (funcs_data.is_array()) {
-        const toml::array* sizes_array = funcs_data.as_array();
+    // Check if the renamed funcs array exists.
+    const toml::node_view renamed_funcs_data = (*patches_data)["renamed"];
 
-        // Copy all the sizes into the output vector.
-        sizes_array->for_each([&func_sizes](auto&& el) {
-            if constexpr (toml::is_table<decltype(el)>) {
-                const toml::table& cur_size = *el.as_table();
+    if (renamed_funcs_data.is_array()) {
+        const toml::array* renamed_funcs_array = renamed_funcs_data.as_array();
 
-                // Get the function name and size.
-                std::optional<std::string> func_name = cur_size["name"].value<std::string>();
-                std::optional<uint32_t> func_size = cur_size["size"].value<uint32_t>();
+        // Make room for all the renamed funcs in the array.
+        renamed_funcs.reserve(renamed_funcs_array->size());
 
-                if (func_name.has_value() && func_size.has_value()) {
-                    // Make sure the size is divisible by 4
-                    if (func_size.value() & (4 - 1)) {
-                        // It's not, so throw an error (and make it look like a normal toml one).
-                        throw toml::parse_error("Function size is not divisible by 4", el.source());
-                    }
-                }
-                else {
-                    throw toml::parse_error("Manually size function is missing required value(s)", el.source());
-                }
-
-                func_sizes.emplace_back(func_name.value(), func_size.value());
-            }
-            else {
-                throw toml::parse_error("Invalid manually sized function entry", el.source());
+        // Gather the renamed and place them into the array.
+        renamed_funcs_array->for_each([&renamed_funcs](auto&& el) {
+            if constexpr (toml::is_string<decltype(el)>) {
+                renamed_funcs.push_back(*el);
             }
         });
     }
 
+    return renamed_funcs;
+}
+
+std::vector<N64Recomp::FunctionSize> get_func_sizes(const toml::array* func_sizes_array) {
+    std::vector<N64Recomp::FunctionSize> func_sizes{};
+
+    // Reserve room for all the funcs in the map.
+    func_sizes.reserve(func_sizes_array->size());
+    func_sizes_array->for_each([&func_sizes](auto&& el) {
+        if constexpr (toml::is_table<decltype(el)>) {
+            std::optional<std::string> func_name = el["name"].template value<std::string>();
+            std::optional<uint32_t> func_size = el["size"].template value<uint32_t>();
+
+            if (func_name.has_value() && func_size.has_value()) {
+                // Make sure the size is divisible by 4
+                if (func_size.value() & (4 - 1)) {
+                    // It's not, so throw an error (and make it look like a normal toml one).
+                    throw toml::parse_error("Function size is not divisible by 4", el.source());
+                }
+                func_sizes.emplace_back(func_name.value(), func_size.value());
+            }
+            else {
+                throw toml::parse_error("Manually sized function is missing required value(s)", el.source());
+            }
+        }
+        else {
+            throw toml::parse_error("Missing required value in function_sizes array", el.source());
+        }
+    });
+
     return func_sizes;
 }
 
@@ -187,8 +201,8 @@ std::vector<N64Recomp::InstructionPatch> get_instruction_patches(const toml::tab
     return ret;
 }
 
-std::vector<N64Recomp::FunctionHook> get_function_hooks(const toml::table* patches_data) {
-    std::vector<N64Recomp::FunctionHook> ret;
+std::vector<N64Recomp::FunctionTextHook> get_function_hooks(const toml::table* patches_data) {
+    std::vector<N64Recomp::FunctionTextHook> ret;
 
     // Check if the function hook array exists.
     const toml::node_view func_hook_data = (*patches_data)["hook"];
@@ -216,7 +230,7 @@ std::vector<N64Recomp::FunctionHook> get_function_hooks(const toml::table* patch
                     throw toml::parse_error("before_vram is not word-aligned", el.source());
                 }
 
-                ret.push_back(N64Recomp::FunctionHook{
+                ret.push_back(N64Recomp::FunctionTextHook{
                     .func_name = func_name.value(),
                     .before_vram = before_vram.has_value() ? (int32_t)before_vram.value() : 0,
                     .text = text.value(),
@@ -329,6 +343,13 @@ N64Recomp::Config::Config(const char* path) {
             manual_functions = get_manual_funcs(array);
         }
 
+        // Manual function sizes (optional)
+        toml::node_view function_sizes_data = input_data["function_sizes"];
+        if (function_sizes_data.is_array()) {
+            const toml::array* array = function_sizes_data.as_array();
+            manual_func_sizes = get_func_sizes(array);
+        }
+
         // Output binary path when using an elf file input, includes patching reference symbol MIPS32 relocs (optional)
         std::optional<std::string> output_binary_path_opt = input_data["output_binary_path"].value<std::string>();
         if (output_binary_path_opt.has_value()) {
@@ -352,7 +373,7 @@ N64Recomp::Config::Config(const char* path) {
             recomp_include = recomp_include_opt.value();
         }
         else {
-            recomp_include = "#include \"librecomp/recomp.h\"";
+            recomp_include = "#include \"recomp.h\"";
         }
 
         std::optional<int32_t> funcs_per_file_opt = input_data["functions_per_output_file"].value<int32_t>();
@@ -377,16 +398,28 @@ N64Recomp::Config::Config(const char* path) {
             // Ignored funcs array (optional)
             ignored_funcs = get_ignored_funcs(table);
 
+            // Renamed funcs array (optional)
+            renamed_funcs = get_renamed_funcs(table);
+
             // Single-instruction patches (optional)
             instruction_patches = get_instruction_patches(table);
 
-            // Manual function sizes (optional)
-            manual_func_sizes = get_func_sizes(table);
-
             // Function hooks (optional)
             function_hooks = get_function_hooks(table);
         }
 
+        // Use trace mode if enabled (optional)
+        std::optional<bool> trace_mode_opt = input_data["trace_mode"].value<bool>();
+        if (trace_mode_opt.has_value()) {
+            trace_mode = trace_mode_opt.value();
+            if (trace_mode) {
+                recomp_include += "\n#include \"trace.h\"";
+            }
+        }
+        else {
+            trace_mode = false;
+        }
+
         // Function reference symbols file (optional)
         std::optional<std::string> func_reference_syms_file_opt = input_data["func_reference_syms_file"].value<std::string>();
         if (func_reference_syms_file_opt.has_value()) {
@@ -476,6 +509,7 @@ bool N64Recomp::Context::from_symbol_file(const std::filesystem::path& symbol_fi
                 std::optional<uint32_t> vram_addr = el["vram"].template value<uint32_t>();
                 std::optional<uint32_t> size = el["size"].template value<uint32_t>();
                 std::optional<std::string> name = el["name"].template value<std::string>();
+                std::optional<uint32_t> got_ram_addr = el["got_address"].template value<uint32_t>();
 
                 if (!rom_addr.has_value() || !vram_addr.has_value() || !size.has_value() || !name.has_value()) {
                     throw toml::parse_error("Section entry missing required field(s)", el.source());
@@ -488,6 +522,7 @@ bool N64Recomp::Context::from_symbol_file(const std::filesystem::path& symbol_fi
                 section.ram_addr = vram_addr.value();
                 section.size = size.value();
                 section.name = name.value();
+                section.got_ram_addr = got_ram_addr;
                 section.executable = true;
 
                 // Read functions for the section.
@@ -574,7 +609,7 @@ bool N64Recomp::Context::from_symbol_file(const std::filesystem::path& symbol_fi
 
                                 RelocType reloc_type = reloc_type_from_name(type_string.value());
 
-                                if (reloc_type != RelocType::R_MIPS_HI16 && reloc_type != RelocType::R_MIPS_LO16 && reloc_type != RelocType::R_MIPS_32) {
+                                if (reloc_type != RelocType::R_MIPS_HI16 && reloc_type != RelocType::R_MIPS_LO16 && reloc_type != RelocType::R_MIPS_26 && reloc_type != RelocType::R_MIPS_32) {
                                     throw toml::parse_error("Invalid reloc entry type", reloc_el.source());
                                 }
 

src/config.h

@@ -12,7 +12,7 @@ namespace N64Recomp {
         uint32_t value;
     };
 
-    struct FunctionHook {
+    struct FunctionTextHook {
         std::string func_name;
         int32_t before_vram;
         std::string text;
@@ -42,6 +42,7 @@ namespace N64Recomp {
         bool single_file_output;
         bool use_absolute_symbols;
         bool unpaired_lo16_warnings;
+        bool trace_mode;
         bool allow_exports;
         bool strict_patch_mode;
         std::filesystem::path elf_path;
@@ -54,8 +55,9 @@ namespace N64Recomp {
         std::filesystem::path output_binary_path;
         std::vector<std::string> stubbed_funcs;
         std::vector<std::string> ignored_funcs;
+        std::vector<std::string> renamed_funcs;
         std::vector<InstructionPatch> instruction_patches;
-        std::vector<FunctionHook> function_hooks;
+        std::vector<FunctionTextHook> function_hooks;
         std::vector<FunctionSize> manual_func_sizes;
         std::vector<ManualFunction> manual_functions;
         std::string bss_section_suffix;

src/elf.cpp

@@ -3,7 +3,7 @@
 #include "fmt/format.h"
 // #include "fmt/ostream.h"
 
-#include "n64recomp.h"
+#include "recompiler/context.h"
 #include "elfio/elfio.hpp"
 
 bool read_symbols(N64Recomp::Context& context, const ELFIO::elfio& elf_file, ELFIO::section* symtab_section, const N64Recomp::ElfParsingConfig& elf_config, bool dumping_context, std::unordered_map<uint16_t, std::vector<N64Recomp::DataSymbol>>& data_syms) {
@@ -60,6 +60,7 @@ bool read_symbols(N64Recomp::Context& context, const ELFIO::elfio& elf_file, ELF
 
         if (section_index < context.sections.size()) {
             // Check if this symbol is the entrypoint
+            // TODO this never fires, the check is broken due to signedness
             if (elf_config.has_entrypoint && value == elf_config.entrypoint_address && type == ELFIO::STT_FUNC) {
                 if (found_entrypoint_func) {
                     fmt::print(stderr, "Ambiguous entrypoint: {}\n", name);
@@ -103,10 +104,10 @@ bool read_symbols(N64Recomp::Context& context, const ELFIO::elfio& elf_file, ELF
 
                 if (section_index < context.sections.size()) {
                     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);
                     uint32_t vram = static_cast<uint32_t>(value);
                     uint32_t num_instructions = type == ELFIO::STT_FUNC ? size / 4 : 0;
                     uint32_t rom_address = static_cast<uint32_t>(section_offset + section.rom_addr);
+                    const uint32_t* words = reinterpret_cast<const uint32_t*>(context.rom.data() + rom_address);
 
                     section.function_addrs.push_back(vram);
                     context.functions_by_vram[vram].push_back(context.functions.size());
@@ -164,27 +165,30 @@ bool read_symbols(N64Recomp::Context& context, const ELFIO::elfio& elf_file, ELF
 
         // The symbol wasn't detected as a function, so add it to the data symbols if the context is being dumped.
         if (!recorded_symbol && dumping_context && !name.empty()) {
-            uint32_t vram = static_cast<uint32_t>(value);
+            // Skip internal symbols.
+            if (ELF_ST_VISIBILITY(other) != ELFIO::STV_INTERNAL) {
+                uint32_t vram = static_cast<uint32_t>(value);
 
-            // Place this symbol in the absolute symbol list if it's in the absolute section.
-            uint16_t target_section_index = section_index;
-            if (section_index == ELFIO::SHN_ABS) {
-                target_section_index = N64Recomp::SectionAbsolute;
-            }
-            else if (section_index >= context.sections.size()) {
-                fmt::print("Symbol \"{}\" not in a valid section ({})\n", name, section_index);
-            }
+                // Place this symbol in the absolute symbol list if it's in the absolute section.
+                uint16_t target_section_index = section_index;
+                if (section_index == ELFIO::SHN_ABS) {
+                    target_section_index = N64Recomp::SectionAbsolute;
+                }
+                else if (section_index >= context.sections.size()) {
+                    fmt::print("Symbol \"{}\" not in a valid section ({})\n", name, section_index);
+                }
 
-            // Move this symbol into the corresponding non-bss section if it's in a bss section.
-            auto find_bss_it = bss_section_to_target_section.find(target_section_index);
-            if (find_bss_it != bss_section_to_target_section.end()) {
-                target_section_index = find_bss_it->second;
-            }
+                // Move this symbol into the corresponding non-bss section if it's in a bss section.
+                auto find_bss_it = bss_section_to_target_section.find(target_section_index);
+                if (find_bss_it != bss_section_to_target_section.end()) {
+                    target_section_index = find_bss_it->second;
+                }
 
-            data_syms[target_section_index].emplace_back(
-                vram,
-                std::move(name)
-            );
+                data_syms[target_section_index].emplace_back(
+                    vram,
+                    std::move(name)
+                );
+            }
         }
     }
 
@@ -364,8 +368,8 @@ ELFIO::section* read_sections(N64Recomp::Context& context, const N64Recomp::ElfP
                 ELFIO::relocation_section_accessor rel_accessor{ elf_file, reloc_find->second };
                 // Allocate space for the relocs in this section
                 section_out.relocs.resize(rel_accessor.get_entries_num());
-                // Track whether the previous reloc was a HI16 and its previous full_immediate
-                bool prev_hi = false;
+                // Track consecutive identical HI16 relocs to handle the GNU extension to the o32 ABI.
+                int prev_hi_count = 0;
                 // Track whether the previous reloc was a LO16
                 bool prev_lo = false;
                 uint32_t prev_hi_immediate = 0;
@@ -458,7 +462,7 @@ ELFIO::section* read_sections(N64Recomp::Context& context, const N64Recomp::ElfP
                         uint32_t rel_immediate = reloc_rom_word & 0xFFFF;
                         uint32_t full_immediate = (prev_hi_immediate << 16) + (int16_t)rel_immediate;
                         reloc_out.target_section_offset = full_immediate + rel_symbol_offset - rel_section_vram;
-                        if (prev_hi) {
+                        if (prev_hi_count != 0) {
                             if (prev_hi_symbol != rel_symbol) {
                                 fmt::print(stderr, "Paired HI16 and LO16 relocations have different symbols\n"
                                                     "  LO16 reloc index {} in section {} referencing symbol {} with offset 0x{:08X}\n",
@@ -466,8 +470,12 @@ ELFIO::section* read_sections(N64Recomp::Context& context, const N64Recomp::ElfP
                                 return nullptr;
                             }
 
-                            // Set the previous HI16 relocs' relocated address.
-                            section_out.relocs[i - 1].target_section_offset = reloc_out.target_section_offset;
+                            // Set the previous HI16 relocs' relocated addresses.
+                            for (size_t paired_index = i - prev_hi_count; paired_index < i; paired_index++) {
+                                uint32_t hi_immediate = section_out.relocs[paired_index].target_section_offset;
+                                uint32_t paired_full_immediate = hi_immediate + (int16_t)rel_immediate;
+                                section_out.relocs[paired_index].target_section_offset = paired_full_immediate + rel_symbol_offset - rel_section_vram;
+                            }
                         }
                         else {
                             // Orphaned LO16 reloc warnings.
@@ -491,7 +499,8 @@ ELFIO::section* read_sections(N64Recomp::Context& context, const N64Recomp::ElfP
                         }
                         prev_lo = true;
                     } else {
-                        if (prev_hi) {
+                        // Allow a HI16 to follow another HI16 for the GNU ABI extension.
+                        if (reloc_out.type != N64Recomp::RelocType::R_MIPS_HI16 && prev_hi_count != 0) {
                             // This is an invalid elf as the MIPS System V ABI documentation states:
                             // "Each relocation type of R_MIPS_HI16 must have an associated R_MIPS_LO16 entry
                             // immediately following it in the list of relocations."
@@ -504,11 +513,26 @@ ELFIO::section* read_sections(N64Recomp::Context& context, const N64Recomp::ElfP
 
                     if (reloc_out.type == N64Recomp::RelocType::R_MIPS_HI16) {
                         uint32_t rel_immediate = reloc_rom_word & 0xFFFF;
-                        prev_hi = true;
-                        prev_hi_immediate = rel_immediate;
-                        prev_hi_symbol = rel_symbol;
+                        // First HI16, store its immediate.
+                        if (prev_hi_count == 0) {
+                            prev_hi_immediate = rel_immediate;
+                            prev_hi_symbol = rel_symbol;
+                        }
+                        // HI16 that follows another HI16, ensure they reference the same symbol.
+                        else {
+                            if (prev_hi_symbol != rel_symbol) {
+                                fmt::print(stderr, "HI16 reloc (index {} symbol {} offset 0x{:08X}) follows another HI16 reloc with a different symbol (index {} symbol {} offset 0x{:08X}) in section {}\n",
+                                    i, rel_symbol, section_out.relocs[i].address,
+                                    i - 1, prev_hi_symbol, section_out.relocs[i - 1].address,
+                                    section_out.name);
+                                return nullptr;
+                            }
+                        }
+                        // Populate the reloc temporarily, the full offset will be calculated upon pairing.
+                        reloc_out.target_section_offset = rel_immediate << 16;
+                        prev_hi_count++;
                     } else {
-                        prev_hi = false;
+                        prev_hi_count = 0;
                     }
 
                     if (reloc_out.type == N64Recomp::RelocType::R_MIPS_32) {
@@ -547,6 +571,36 @@ ELFIO::section* read_sections(N64Recomp::Context& context, const N64Recomp::ElfP
                     return a.address < b.address;
                 }
             );
+
+            // Patch the ROM word for HI16 and LO16 reference symbol relocs to non-relocatable sections.
+            for (size_t i = 0; i < section_out.relocs.size(); i++) {
+                auto& reloc = section_out.relocs[i];
+                if (reloc.reference_symbol && (reloc.type == N64Recomp::RelocType::R_MIPS_HI16 || reloc.type == N64Recomp::RelocType::R_MIPS_LO16)) {
+                    bool target_section_relocatable = context.is_reference_section_relocatable(reloc.target_section);
+                    if (!target_section_relocatable) {
+                        uint32_t reloc_rom_addr = reloc.address - section_out.ram_addr + section_out.rom_addr;
+                        uint32_t reloc_rom_word = byteswap(*reinterpret_cast<const uint32_t*>(context.rom.data() + reloc_rom_addr));
+
+                        uint32_t ref_section_vram = context.get_reference_section_vram(reloc.target_section);
+                        uint32_t full_immediate = reloc.target_section_offset + ref_section_vram;
+
+                        uint32_t imm;
+
+                        if (reloc.type == N64Recomp::RelocType::R_MIPS_HI16) {
+                            imm = (full_immediate >> 16) + ((full_immediate >> 15) & 1);
+                        }
+                        else {
+                            imm = full_immediate & 0xFFFF;
+                        }
+
+                        *reinterpret_cast<uint32_t*>(context.rom.data() + reloc_rom_addr) = byteswap(reloc_rom_word | imm);
+                        // Remove the reloc by setting it to a type of NONE.
+                        reloc.type = N64Recomp::RelocType::R_MIPS_NONE;
+                        reloc.reference_symbol = false;
+                        reloc.symbol_index = (uint32_t)-1;
+                    }
+                }
+            }
         }
     }
 

src/luajitgenerator.cpp

@@ -1,558 +0,0 @@
-#include <cassert>
-#include <fstream>
-
-#include "fmt/format.h"
-#include "fmt/ostream.h"
-
-#include "generator.h"
-
-struct BinaryOpFields { std::string func_string; std::string infix_string; };
-
-static std::vector<BinaryOpFields> luajit_op_fields = []() {
-    std::vector<BinaryOpFields> ret{};
-    ret.resize(static_cast<size_t>(N64Recomp::BinaryOpType::COUNT));
-    std::vector<char> ops_setup{};
-    ops_setup.resize(static_cast<size_t>(N64Recomp::BinaryOpType::COUNT));
-
-    auto setup_op = [&ret, &ops_setup](N64Recomp::BinaryOpType op_type, const std::string& func_string, const std::string& infix_string) {
-        size_t index = static_cast<size_t>(op_type);
-        // Prevent setting up an operation twice.
-        assert(ops_setup[index] == false && "Operation already setup!");
-        ops_setup[index] = true;
-        ret[index] = { func_string, infix_string };
-    };
-
-    setup_op(N64Recomp::BinaryOpType::Add32,     "ADD32",       "");
-    setup_op(N64Recomp::BinaryOpType::Sub32,     "SUB32",       "");
-    setup_op(N64Recomp::BinaryOpType::Add64,     "",            "+");
-    setup_op(N64Recomp::BinaryOpType::Sub64,     "",            "-");
-    setup_op(N64Recomp::BinaryOpType::And64,     "bit.band",    "");
-    setup_op(N64Recomp::BinaryOpType::AddFloat,  "",            "+");
-    setup_op(N64Recomp::BinaryOpType::AddDouble, "",            "+");
-    setup_op(N64Recomp::BinaryOpType::SubFloat,  "",            "-");
-    setup_op(N64Recomp::BinaryOpType::SubDouble, "",            "-");
-    setup_op(N64Recomp::BinaryOpType::MulFloat,  "MUL_S",       "");
-    setup_op(N64Recomp::BinaryOpType::MulDouble, "MUL_D",       "");
-    setup_op(N64Recomp::BinaryOpType::DivFloat,  "DIV_S",       "");
-    setup_op(N64Recomp::BinaryOpType::DivDouble, "DIV_D",       "");
-    setup_op(N64Recomp::BinaryOpType::Or64,      "bit.bor",     "");
-    setup_op(N64Recomp::BinaryOpType::Nor64,     "NOR",         "");
-    setup_op(N64Recomp::BinaryOpType::Xor64,     "bit.bxor",    "");
-    setup_op(N64Recomp::BinaryOpType::Sll32,     "SLL32",       "");
-    setup_op(N64Recomp::BinaryOpType::Sll64,     "bit.lshift",  "");
-    setup_op(N64Recomp::BinaryOpType::Srl32,     "SRL32",       "");
-    setup_op(N64Recomp::BinaryOpType::Srl64,     "bit.rshift",  "");
-    setup_op(N64Recomp::BinaryOpType::Sra32,     "SRA32",       "");
-    setup_op(N64Recomp::BinaryOpType::Sra64,     "bit.arshift", "");
-    setup_op(N64Recomp::BinaryOpType::Equal,     "",            "==");
-    setup_op(N64Recomp::BinaryOpType::NotEqual,  "",            "~=");
-    setup_op(N64Recomp::BinaryOpType::Less,      "",            "<");
-    setup_op(N64Recomp::BinaryOpType::LessEq,    "",            "<=");
-    setup_op(N64Recomp::BinaryOpType::Greater,   "",            ">");
-    setup_op(N64Recomp::BinaryOpType::GreaterEq, "",            ">=");
-    setup_op(N64Recomp::BinaryOpType::LD,        "MEM_LD",      "");
-    setup_op(N64Recomp::BinaryOpType::LW,        "MEM_LW",      "");
-    setup_op(N64Recomp::BinaryOpType::LWU,       "MEM_LWU",     "");
-    setup_op(N64Recomp::BinaryOpType::LH,        "MEM_LH",      "");
-    setup_op(N64Recomp::BinaryOpType::LHU,       "MEM_LHU",     "");
-    setup_op(N64Recomp::BinaryOpType::LB,        "MEM_LB",      "");
-    setup_op(N64Recomp::BinaryOpType::LBU,       "MEM_LBU",     "");
-    setup_op(N64Recomp::BinaryOpType::LDL,       "MEM_LDL",     "");
-    setup_op(N64Recomp::BinaryOpType::LDR,       "MEM_LDR",     "");
-    setup_op(N64Recomp::BinaryOpType::LWL,       "MEM_LWL",     "");
-    setup_op(N64Recomp::BinaryOpType::LWR,       "MEM_LWR",     "");
-    setup_op(N64Recomp::BinaryOpType::True,      "",            "");
-    setup_op(N64Recomp::BinaryOpType::False,     "",            "");
-
-    // Ensure every operation has been setup.
-    for (char is_set : ops_setup) {
-        assert(is_set && "Operation has not been setup!");
-    }
-
-    return ret;
-}();
-
-static std::string gpr_to_string(int gpr_index) {
-    if (gpr_index == 0) {
-        return "0ULL";
-    }
-    return fmt::format("ctx.r{}", gpr_index);
-}
-
-static std::string fpr_to_string(int fpr_index) {
-    return fmt::format("ctx.f{}.fl", fpr_index);
-}
-
-static std::string fpr_double_to_string(int fpr_index) {
-    return fmt::format("ctx.f{}.d", fpr_index);
-}
-
-static std::string fpr_u32l_to_string(int fpr_index) {
-    if (fpr_index & 1) {
-        return fmt::format("ctx.f_odd[({} - 1) * 2]", fpr_index);
-    }
-    else {
-        return fmt::format("ctx.f{}.u32l", fpr_index);
-    }
-}
-
-static std::string fpr_u64_to_string(int fpr_index) {
-    return fmt::format("ctx.f{}.u64", fpr_index);
-}
-
-static std::string unsigned_reloc(const N64Recomp::InstructionContext& context) {
-    switch (context.reloc_type) {
-        case N64Recomp::RelocType::R_MIPS_HI16:
-            return fmt::format("{}RELOC_HI16({}, {:#X}ULL)",
-                context.reloc_tag_as_reference ? "REF_" : "", context.reloc_section_index, context.reloc_target_section_offset);
-        case N64Recomp::RelocType::R_MIPS_LO16:
-            return fmt::format("{}RELOC_LO16({}, {:#X}ULL)",
-                context.reloc_tag_as_reference ? "REF_" : "", context.reloc_section_index, context.reloc_target_section_offset);
-        default:
-            throw std::runtime_error(fmt::format("Unexpected reloc type {}\n", static_cast<int>(context.reloc_type)));
-    }
-}
-
-static std::string signed_reloc(const N64Recomp::InstructionContext& context) {
-    return "(int16_t)" + unsigned_reloc(context);
-}
-
-void N64Recomp::LuajitGenerator::get_operand_string(Operand operand, UnaryOpType operation, const InstructionContext& context, std::string& operand_string) const {
-    switch (operand) {
-        case Operand::Rd:
-            operand_string = gpr_to_string(context.rd);
-            break;
-        case Operand::Rs:
-            operand_string = gpr_to_string(context.rs);
-            break;
-        case Operand::Rt:
-            operand_string = gpr_to_string(context.rt);
-            break;
-        case Operand::Fd:
-            operand_string = fpr_to_string(context.fd);
-            break;
-        case Operand::Fs:
-            operand_string = fpr_to_string(context.fs);
-            break;
-        case Operand::Ft:
-            operand_string = fpr_to_string(context.ft);
-            break;
-        case Operand::FdDouble:
-            operand_string = fpr_double_to_string(context.fd);
-            break;
-        case Operand::FsDouble:
-            operand_string = fpr_double_to_string(context.fs);
-            break;
-        case Operand::FtDouble:
-            operand_string = fpr_double_to_string(context.ft);
-            break;
-        case Operand::FdU32L:
-            operand_string = fpr_u32l_to_string(context.fd);
-            break;
-        case Operand::FsU32L:
-            operand_string = fpr_u32l_to_string(context.fs);
-            break;
-        case Operand::FtU32L:
-            operand_string = fpr_u32l_to_string(context.ft);
-            break;
-        case Operand::FdU32H:
-            assert(false);
-            break;
-        case Operand::FsU32H:
-            assert(false);
-            break;
-        case Operand::FtU32H:
-            assert(false);
-            break;
-        case Operand::FdU64:
-            operand_string = fpr_u64_to_string(context.fd);
-            break;
-        case Operand::FsU64:
-            operand_string = fpr_u64_to_string(context.fs);
-            break;
-        case Operand::FtU64:
-            operand_string = fpr_u64_to_string(context.ft);
-            break;
-        case Operand::ImmU16:
-            if (context.reloc_type != N64Recomp::RelocType::R_MIPS_NONE) {
-                operand_string = unsigned_reloc(context);
-            }
-            else {
-                operand_string = fmt::format("{:#X}ULL", context.imm16);
-            }
-            break;
-        case Operand::ImmS16:
-            if (context.reloc_type != N64Recomp::RelocType::R_MIPS_NONE) {
-                operand_string = signed_reloc(context);
-            }
-            else {
-                operand_string = fmt::format("{:#X}ULL", (int16_t)context.imm16);
-            }
-            break;
-        case Operand::Sa:
-            operand_string = std::to_string(context.sa);
-            break;
-        case Operand::Sa32:
-            operand_string = fmt::format("({} + 32ULL)", context.sa);
-            break;
-        case Operand::Cop1cs:
-            operand_string = fmt::format("c1cs");
-            break;
-        case Operand::Hi:
-            operand_string = "hi";
-            break;
-        case Operand::Lo:
-            operand_string = "lo";
-            break;
-        case Operand::Zero:
-            operand_string = "0ULL";
-            break;
-    }
-    switch (operation) {
-        case UnaryOpType::None:
-            break;
-        case UnaryOpType::ToS32:
-        case UnaryOpType::ToInt32:
-            operand_string = "S32(" + operand_string + ")"; 
-            break;
-        case UnaryOpType::ToU32:
-            operand_string = "U32(" + operand_string + ")"; 
-            break;
-        case UnaryOpType::ToS64:
-            operand_string = "SIGNED(" + operand_string + ")"; 
-            break;
-        case UnaryOpType::ToU64:
-            // Nothing to do here, they're already U64
-            break;
-        case UnaryOpType::Lui:
-            operand_string = "S32(bit.lshift(" + operand_string + "), 16ULL)"; 
-            break;
-        case UnaryOpType::Mask5:
-            operand_string = "(bit.band(" + operand_string + "), 31ULL)";
-            break;
-        case UnaryOpType::Mask6:
-            operand_string = "(bit.band(" + operand_string + "), 63ULL)";
-            break;
-        case UnaryOpType::NegateFloat:
-            operand_string = "-" + operand_string;
-            break;
-        case UnaryOpType::NegateDouble:
-            operand_string = "-" + operand_string;
-            break;
-        case UnaryOpType::AbsFloat:
-            operand_string = "ABSF(" + operand_string + ")";
-            break;
-        case UnaryOpType::AbsDouble:
-            operand_string = "ABS(" + operand_string + ")";
-            break;
-        case UnaryOpType::SqrtFloat:
-            operand_string = "SQRTF(" + operand_string + ")";
-            break;
-        case UnaryOpType::SqrtDouble:
-            operand_string = "SQRT(" + operand_string + ")";
-            break;
-        case UnaryOpType::ConvertSFromW:
-            operand_string = "CVT_S_W(" + operand_string + ")";
-            break;
-        case UnaryOpType::ConvertWFromS:
-            operand_string = "CVT_W_S(" + operand_string + ", rounding_mode)";
-            break;
-        case UnaryOpType::ConvertDFromW:
-            operand_string = "CVT_D_W(" + operand_string + ")";
-            break;
-        case UnaryOpType::ConvertWFromD:
-            operand_string = "CVT_W_D(" + operand_string + ", rounding_mode)";
-            break;
-        case UnaryOpType::ConvertDFromS:
-            operand_string = "CVT_D_S(" + operand_string + ")";
-            break;
-        case UnaryOpType::ConvertSFromD:
-            operand_string = "CVT_S_D(" + operand_string + ")";
-            break;
-        case UnaryOpType::ConvertDFromL:
-            operand_string = "CVT_D_L(" + operand_string + ")";
-            break;
-        case UnaryOpType::ConvertLFromD:
-            operand_string = "CVT_L_D(" + operand_string + ")";
-            break;
-        case UnaryOpType::ConvertSFromL:
-            operand_string = "CVT_S_L(" + operand_string + ")";
-            break;
-        case UnaryOpType::ConvertLFromS:
-            operand_string = "CVT_L_S(" + operand_string + ")";
-            break;
-        case UnaryOpType::TruncateWFromS:
-            operand_string = "TRUNC_W_S(" + operand_string + ")";
-            break;
-        case UnaryOpType::TruncateWFromD:
-            operand_string = "TRUNC_W_D(" + operand_string + ")";
-            break;
-        case UnaryOpType::RoundWFromS:
-            operand_string = "ROUND_W_S(" + operand_string + ")";
-            break;
-        case UnaryOpType::RoundWFromD:
-            operand_string = "ROUND_W_D(" + operand_string + ")";
-            break;
-        case UnaryOpType::CeilWFromS:
-            operand_string = "CEILF(" + operand_string + ")";
-            break;
-        case UnaryOpType::CeilWFromD:
-            operand_string = "CEIL(" + operand_string + ")";
-            break;
-        case UnaryOpType::FloorWFromS:
-            operand_string = "FLOORF(" + operand_string + ")";
-            break;
-        case UnaryOpType::FloorWFromD:
-            operand_string = "FLOOR(" + operand_string + ")";
-            break;
-    }
-}
-
-void N64Recomp::LuajitGenerator::get_notation(BinaryOpType op_type, std::string& func_string, std::string& infix_string) const {
-    func_string = luajit_op_fields[static_cast<size_t>(op_type)].func_string;
-    infix_string = luajit_op_fields[static_cast<size_t>(op_type)].infix_string;
-}
-
-void N64Recomp::LuajitGenerator::get_binary_expr_string(BinaryOpType type, const BinaryOperands& operands, const InstructionContext& ctx, const std::string& output, std::string& expr_string) const {
-    thread_local std::string input_a{};
-    thread_local std::string input_b{};
-    thread_local std::string func_string{};
-    thread_local std::string infix_string{};
-    bool is_infix;
-    get_operand_string(operands.operands[0], operands.operand_operations[0], ctx, input_a);
-    get_operand_string(operands.operands[1], operands.operand_operations[1], ctx, input_b);
-    get_notation(type, func_string, infix_string);
-    
-    if (!func_string.empty() && !infix_string.empty()) {
-        expr_string = fmt::format("{}({} {} {})", func_string, input_a, infix_string, input_b);
-    }
-    else if (!func_string.empty()) {
-        expr_string = fmt::format("{}({}, {})", func_string, input_a, input_b);
-    }
-    else if (!infix_string.empty()) {
-        expr_string = fmt::format("{} {} {}", input_a, infix_string, input_b);
-    }
-    else {
-        // Handle special cases
-        if (type == BinaryOpType::True) {
-            expr_string = "true";
-        }
-        else if (type == BinaryOpType::False) {
-            expr_string = "false";
-        }
-        assert(false && "Binary operation must have either a function or infix!");
-    }
-}
-
-
-void N64Recomp::LuajitGenerator::process_binary_op(const BinaryOp& op, const InstructionContext& ctx) const {
-    // Thread local variables to prevent allocations when possible.
-    // TODO these thread locals probably don't actually help right now, so figure out a better way to prevent allocations.
-    thread_local std::string output{};
-    thread_local std::string expression{};
-    get_operand_string(op.output, UnaryOpType::None, ctx, output);
-    get_binary_expr_string(op.type, op.operands, ctx, output, expression);
-
-    // Explicitly convert coprocessor 1 compare results into a number to ensure comparisons work correctly with it.
-    if (op.output == Operand::Cop1cs) {
-        expression = "BOOL_TO_NUM(" + expression + ")";
-    }
-
-    fmt::print(output_file, "{} = {}\n", output, expression);
-}
-
-void N64Recomp::LuajitGenerator::process_unary_op(const UnaryOp& op, const InstructionContext& ctx) const {
-    // Thread local variables to prevent allocations when possible.
-    // TODO these thread locals probably don't actually help right now, so figure out a better way to prevent allocations.
-    thread_local std::string output{};
-    thread_local std::string input{};
-    bool is_infix;
-    get_operand_string(op.output, UnaryOpType::None, ctx, output);
-    get_operand_string(op.input, op.operation, ctx, input);
-    fmt::print(output_file, "{} = {}\n", output, input);
-}
-
-void N64Recomp::LuajitGenerator::process_store_op(const StoreOp& op, const InstructionContext& ctx) const {
-    // Thread local variables to prevent allocations when possible.
-    // TODO these thread locals probably don't actually help right now, so figure out a better way to prevent allocations.
-    thread_local std::string base_str{};
-    thread_local std::string imm_str{};
-    thread_local std::string value_input{};
-    bool is_infix;
-    get_operand_string(Operand::Base, UnaryOpType::None, ctx, base_str);
-    get_operand_string(Operand::ImmS16, UnaryOpType::None, ctx, imm_str);
-    get_operand_string(op.value_input, UnaryOpType::None, ctx, value_input);
-
-    std::string func_text;
-
-    switch (op.type) {
-        case StoreOpType::SD:
-            func_text = "MEM_SD";
-            break;
-        case StoreOpType::SDL:
-            func_text = "MEM_SDL";
-            break;
-        case StoreOpType::SDR:
-            func_text = "MEM_SDR";
-            break;
-        case StoreOpType::SW:
-            func_text = "MEM_SW";
-            break;
-        case StoreOpType::SWL:
-            func_text = "MEM_SWL";
-            break;
-        case StoreOpType::SWR:
-            func_text = "MEM_SWR";
-            break;
-        case StoreOpType::SH:
-            func_text = "MEM_SH";
-            break;
-        case StoreOpType::SB:
-            func_text = "MEM_SB";
-            break;
-        case StoreOpType::SDC1:
-            func_text = "MEM_SD";
-            break;
-        case StoreOpType::SWC1:
-            func_text = "MEM_SW";
-            break;
-        default:
-            throw std::runtime_error("Unhandled store op");
-    }
-
-    fmt::print(output_file, "{}(rdram, {}, {}, {});\n", func_text, imm_str, base_str, value_input);
-}
-
-void N64Recomp::LuajitGenerator::emit_function_start(const std::string& function_name) const {
-    fmt::print(output_file,
-        "function {}(rdram, ctx)\n"
-        // these variables shouldn't need to be preserved across function boundaries, so make them local for more efficient output
-        "    local hi = 0ULL\n"
-        "    local lo = 0ULL\n"
-        "    local result = 0ULL\n"
-        "    local rounding_mode = DEFAULT_ROUNDING_MODE\n"
-        "    local c1cs = 0ULL\n", // cop1 conditional signal
-        function_name);
-}
-
-void N64Recomp::LuajitGenerator::emit_function_end() const {
-    fmt::print(output_file, "end\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_function_call_lookup(uint32_t addr) const {
-    // TODO
-    fmt::print(output_file, "\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_function_call_by_register(int reg) const {
-    // TODO
-    fmt::print(output_file, "\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_function_call_by_name(const std::string& func_name) const {
-    // TODO
-    fmt::print(output_file, "\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_goto(const std::string& target) const {
-    fmt::print(output_file, "goto {}\n", target);
-}
-
-void N64Recomp::LuajitGenerator::emit_label(const std::string& label_name) const {
-    fmt::print(output_file, "::{}::\n", label_name);
-}
-
-void N64Recomp::LuajitGenerator::emit_variable_declaration(const std::string& var_name, int reg) const {
-    // TODO
-    fmt::print(output_file, "{} = 0\n", var_name);
-}
-
-void N64Recomp::LuajitGenerator::emit_branch_condition(const ConditionalBranchOp& op, const InstructionContext& ctx) const {
-    // Thread local variables to prevent allocations when possible.
-    // TODO these thread locals probably don't actually help right now, so figure out a better way to prevent allocations.
-    thread_local std::string expr_string{};
-    get_binary_expr_string(op.comparison, op.operands, ctx, "", expr_string);
-    fmt::print(output_file, "if {} then\n", expr_string);
-}
-
-void N64Recomp::LuajitGenerator::emit_branch_close() const {
-    fmt::print(output_file, "end\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_switch(const std::string& jump_variable, int shift_amount) const {
-    fmt::print(output_file, "do local case_index = bit.rshift({}, {}ULL)\n", jump_variable, shift_amount);
-}
-
-void N64Recomp::LuajitGenerator::emit_case(int case_index, const std::string& target_label) const {
-    fmt::print(output_file, "if case_index == {} then goto {} end\n", case_index, target_label);
-}
-
-void N64Recomp::LuajitGenerator::emit_switch_error(uint32_t instr_vram, uint32_t jtbl_vram) const {
-    fmt::print(output_file, "switch_error(\'lua\', {:08X}, {:08X})\n", instr_vram, jtbl_vram);
-}
-
-void N64Recomp::LuajitGenerator::emit_switch_close() const {
-    fmt::print(output_file, "end\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_return() const {
-    // Wrap the retur in a do/end construct to prevent errors from statements after the return.
-    fmt::print(output_file, "do return end\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_check_fr(int fpr) const {
-    // Not used
-}
-
-void N64Recomp::LuajitGenerator::emit_check_nan(int fpr, bool is_double) const {
-    // Not used
-}
-
-void N64Recomp::LuajitGenerator::emit_cop0_status_read(int reg) const {
-    // TODO
-    fmt::print(output_file, "\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_cop0_status_write(int reg) const {
-    // TODO
-    fmt::print(output_file, "\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_cop1_cs_read(int reg) const {
-    // TODO
-    fmt::print(output_file, "\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_cop1_cs_write(int reg) const {
-    // TODO
-    fmt::print(output_file, "\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_muldiv(InstrId instr_id, int reg1, int reg2) const {
-    // TODO
-    fmt::print(output_file, "\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_syscall(uint32_t instr_vram) const {
-    // TODO
-    fmt::print(output_file, "\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_do_break(uint32_t instr_vram) const {
-    // TODO
-    fmt::print(output_file, "\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_pause_self() const {
-    // TODO
-    fmt::print(output_file, "\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_trigger_event(size_t event_index) const {
-    // TODO
-    fmt::print(output_file, "\n");
-}
-
-void N64Recomp::LuajitGenerator::emit_comment(const std::string& comment) const {
-    fmt::print(output_file, "-- {}\n", comment);
-}

src/main.cpp

@@ -9,7 +9,7 @@
 #include "fmt/format.h"
 #include "fmt/ostream.h"
 
-#include "n64recomp.h"
+#include "recompiler/context.h"
 #include "config.h"
 #include <set>
 
@@ -111,7 +111,7 @@ bool compare_files(const std::filesystem::path& file1_path, const std::filesyste
     return std::equal(begin1, std::istreambuf_iterator<char>(), begin2); //Second argument is end-of-range iterator
 }
 
-bool recompile_single_function(const N64Recomp::Context& context, const N64Recomp::Function& func, const std::string& recomp_include, const std::filesystem::path& output_path, std::span<std::vector<uint32_t>> static_funcs_out) {
+bool recompile_single_function(const N64Recomp::Context& context, size_t func_index, const std::string& recomp_include, const std::filesystem::path& output_path, std::span<std::vector<uint32_t>> static_funcs_out) {
     // Open the temporary output file
     std::filesystem::path temp_path = output_path;
     temp_path.replace_extension(".tmp");
@@ -127,7 +127,7 @@ bool recompile_single_function(const N64Recomp::Context& context, const N64Recom
         "\n",
         recomp_include);
 
-    if (!N64Recomp::recompile_function(context, func, output_file, static_funcs_out, false)) {
+    if (!N64Recomp::recompile_function(context, func_index, output_file, static_funcs_out, false)) {
         return false;
     }
     
@@ -199,7 +199,7 @@ void dump_context(const N64Recomp::Context& context, const std::unordered_map<ui
                 for (const N64Recomp::Reloc& reloc : section.relocs) {
                     if (reloc.target_section == section_index || reloc.target_section == section.bss_section_index) {
                         // TODO allow emitting MIPS32 relocs for specific sections via a toml option for TLB mapping support.
-                        if (reloc.type == N64Recomp::RelocType::R_MIPS_HI16 || reloc.type == N64Recomp::RelocType::R_MIPS_LO16) {
+                        if (reloc.type == N64Recomp::RelocType::R_MIPS_HI16 || reloc.type == N64Recomp::RelocType::R_MIPS_LO16 || reloc.type == N64Recomp::RelocType::R_MIPS_26) {
                             fmt::print(func_context_file, "    {{ type = \"{}\", vram = 0x{:08X}, target_vram = 0x{:08X} }},\n",
                                 reloc_names[static_cast<int>(reloc.type)], reloc.address, reloc.target_section_offset + section.ram_addr);
                         }
@@ -272,12 +272,18 @@ int main(int argc, char** argv) {
         std::exit(EXIT_FAILURE);
     };
 
-    // TODO expose a way to dump the context from the command line.
-    bool dumping_context = false;
+    bool dumping_context;
 
-    if (argc != 2) {
-        fmt::print("Usage: {} [config file]\n", argv[0]);
-        std::exit(EXIT_SUCCESS);
+    if (argc >= 3) {
+        std::string arg2 = argv[2];
+        if (arg2 == "--dump-context") {
+            dumping_context = true;
+        } else {
+            fmt::print("Usage: {} <config file> [--dump-context]\n", argv[0]);
+            std::exit(EXIT_SUCCESS);
+        }
+    } else {
+        dumping_context = false;
     }
 
     const char* config_path = argv[1];
@@ -485,10 +491,27 @@ int main(int argc, char** argv) {
             // This helps prevent typos in the config file or functions renamed between versions from causing issues.
             exit_failure(fmt::format("Function {} is set as ignored in the config file but does not exist!", ignored_func));
         }
-        // Mark the function as .
+        // Mark the function as ignored.
         context.functions[func_find->second].ignored = true;
     }
 
+    // Rename any functions specified in the config file.
+    for (const std::string& renamed_func : config.renamed_funcs) {
+        // Check if the specified function exists.
+        auto func_find = context.functions_by_name.find(renamed_func);
+        if (func_find == context.functions_by_name.end()) {
+            // Function doesn't exist, present an error to the user instead of silently failing to rename it.
+            // This helps prevent typos in the config file or functions renamed between versions from causing issues.
+            exit_failure(fmt::format("Function {} is set as renamed in the config file but does not exist!", renamed_func));
+        }
+        // Rename the function.
+        N64Recomp::Function* func = &context.functions[func_find->second];
+        func->name = func->name + "_recomp";
+    }
+
+    // Propogate the trace mode parameter.
+    context.trace_mode = config.trace_mode;
+
     // Apply any single-instruction patches.
     for (const N64Recomp::InstructionPatch& patch : config.instruction_patches) {
         // Check if the specified function exists.
@@ -513,7 +536,7 @@ int main(int argc, char** argv) {
     }
 
     // Apply any function hooks.
-    for (const N64Recomp::FunctionHook& patch : config.function_hooks) {
+    for (const N64Recomp::FunctionTextHook& patch : config.function_hooks) {
         // Check if the specified function exists.
         auto func_find = context.functions_by_name.find(patch.func_name);
         if (func_find == context.functions_by_name.end()) {
@@ -702,7 +725,7 @@ int main(int argc, char** argv) {
 
             // Recompile the function.
             if (config.single_file_output || config.functions_per_output_file > 1) {
-                result = N64Recomp::recompile_function(context, func, current_output_file, static_funcs_by_section, false);
+                result = N64Recomp::recompile_function(context, i, current_output_file, static_funcs_by_section, false);
                 if (!config.single_file_output) {
                     cur_file_function_count++;
                     if (cur_file_function_count >= config.functions_per_output_file) {
@@ -711,7 +734,7 @@ int main(int argc, char** argv) {
                 }
             }
             else {
-                result = recompile_single_function(context, func, config.recomp_include, config.output_func_path / (func.name + ".c"), static_funcs_by_section);
+                result = recompile_single_function(context, i, config.recomp_include, config.output_func_path / (func.name + ".c"), static_funcs_by_section);
             }
             if (result == false) {
                 fmt::print(stderr, "Error recompiling {}\n", func.name);
@@ -774,22 +797,25 @@ int main(int argc, char** argv) {
             std::vector<uint32_t> insn_words((cur_func_end - static_func_addr) / sizeof(uint32_t));
             insn_words.assign(func_rom_start, func_rom_start + insn_words.size());
 
-            N64Recomp::Function func {
+            // Create the new function and add it to the context.
+            size_t new_func_index = context.functions.size();
+            context.functions.emplace_back(
                 static_func_addr,
                 rom_addr,
                 std::move(insn_words),
                 fmt::format("static_{}_{:08X}", section_index, static_func_addr),
                 static_cast<uint16_t>(section_index),
                 false
-            };
+            );
+            const N64Recomp::Function& new_func = context.functions[new_func_index];
 
             fmt::print(func_header_file,
-                       "void {}(uint8_t* rdram, recomp_context* ctx);\n", func.name);
+                       "void {}(uint8_t* rdram, recomp_context* ctx);\n", new_func.name);
 
             bool result;
-            size_t prev_num_statics = static_funcs_by_section[func.section_index].size();
+            size_t prev_num_statics = static_funcs_by_section[new_func.section_index].size();
             if (config.single_file_output || config.functions_per_output_file > 1) {
-                result = N64Recomp::recompile_function(context, func, current_output_file, static_funcs_by_section, false);
+                result = N64Recomp::recompile_function(context, new_func_index, current_output_file, static_funcs_by_section, false);
                 if (!config.single_file_output) {
                     cur_file_function_count++;
                     if (cur_file_function_count >= config.functions_per_output_file) {
@@ -798,14 +824,14 @@ int main(int argc, char** argv) {
                 }
             }
             else {
-                result = recompile_single_function(context, func, config.recomp_include, config.output_func_path / (func.name + ".c"), static_funcs_by_section);
+                result = recompile_single_function(context, new_func_index, config.recomp_include, config.output_func_path / (new_func.name + ".c"), static_funcs_by_section);
             }
 
             // Add any new static functions that were found while recompiling this one.
-            size_t cur_num_statics = static_funcs_by_section[func.section_index].size();
+            size_t cur_num_statics = static_funcs_by_section[new_func.section_index].size();
             if (cur_num_statics != prev_num_statics) {
                 for (size_t new_static_index = prev_num_statics; new_static_index < cur_num_statics; new_static_index++) {
-                    uint32_t new_static_vram = static_funcs_by_section[func.section_index][new_static_index];
+                    uint32_t new_static_vram = static_funcs_by_section[new_func.section_index][new_static_index];
 
                     if (!statics_set.contains(new_static_vram)) {
                         statics_set.emplace(new_static_vram);
@@ -815,7 +841,7 @@ int main(int argc, char** argv) {
             }
 
             if (result == false) {
-                fmt::print(stderr, "Error recompiling {}\n", func.name);
+                fmt::print(stderr, "Error recompiling {}\n", new_func.name);
                 std::exit(EXIT_FAILURE);
             }
         }
@@ -840,13 +866,6 @@ int main(int argc, char** argv) {
         );
     }
 
-    fmt::print(func_header_file,
-        "\n"
-        "#ifdef __cplusplus\n"
-        "}}\n"
-        "#endif\n"
-    );
-
     {
         std::ofstream overlay_file(config.output_func_path / "recomp_overlays.inl");
         std::string section_load_table = "static SectionTableEntry section_table[] = {\n";
@@ -865,6 +884,7 @@ int main(int argc, char** argv) {
         for (size_t section_index = 0; section_index < context.sections.size(); section_index++) {
             const auto& section = context.sections[section_index];
             const auto& section_funcs = context.section_functions[section_index];
+            const auto& section_relocs = section.relocs;
 
             if (section.has_mips32_relocs || !section_funcs.empty()) {
                 std::string_view section_name_trimmed{ section.name };
@@ -878,21 +898,66 @@ int main(int argc, char** argv) {
                 }
 
                 std::string section_funcs_array_name = fmt::format("section_{}_{}_funcs", section_index, section_name_trimmed);
+                std::string section_relocs_array_name = section_relocs.empty() ? "nullptr" : fmt::format("section_{}_{}_relocs", section_index, section_name_trimmed);
+                std::string section_relocs_array_size = section_relocs.empty() ? "0" : fmt::format("ARRLEN({})", section_relocs_array_name);
 
-                section_load_table += fmt::format("    {{ .rom_addr = 0x{0:08X}, .ram_addr = 0x{1:08X}, .size = 0x{2:08X}, .funcs = {3}, .num_funcs = ARRLEN({3}), .index = {4} }},\n",
-                                                  section.rom_addr, section.ram_addr, section.size, section_funcs_array_name, section_index);
+                // Write the section's table entry.
+                section_load_table += fmt::format("    {{ .rom_addr = 0x{0:08X}, .ram_addr = 0x{1:08X}, .size = 0x{2:08X}, .funcs = {3}, .num_funcs = ARRLEN({3}), .relocs = {4}, .num_relocs = {5}, .index = {6} }},\n",
+                                                  section.rom_addr, section.ram_addr, section.size, section_funcs_array_name,
+                                                  section_relocs_array_name, section_relocs_array_size, section_index);
 
+                // Write the section's functions.
                 fmt::print(overlay_file, "static FuncEntry {}[] = {{\n", section_funcs_array_name);
 
                 for (size_t func_index : section_funcs) {
                     const auto& func = context.functions[func_index];
+                    size_t func_size = func.reimplemented ? 0 : func.words.size() * sizeof(func.words[0]);
 
                     if (func.reimplemented || (!func.name.empty() && !func.ignored && func.words.size() != 0)) {
-                        fmt::print(overlay_file, "    {{ .func = {}, .offset = 0x{:08x} }},\n", func.name, func.rom - section.rom_addr);
+                        fmt::print(overlay_file, "    {{ .func = {}, .offset = 0x{:08X}, .rom_size = 0x{:08X} }},\n",
+                            func.name, func.rom - section.rom_addr, func_size);
                     }
                 }
 
                 fmt::print(overlay_file, "}};\n");
+
+                // Write the section's relocations.
+                if (!section_relocs.empty()) {
+                    // Determine if reference symbols are being used.
+                    bool reference_symbol_mode = !config.func_reference_syms_file_path.empty();
+
+                    fmt::print(overlay_file, "static RelocEntry {}[] = {{\n", section_relocs_array_name);
+
+                    for (const N64Recomp::Reloc& reloc : section_relocs) {
+                        bool emit_reloc = false;
+                        uint16_t target_section = reloc.target_section;
+                        // In reference symbol mode, only emit relocations into the table that point to
+                        // non-absolute reference symbols, events, or manual patch symbols.
+                        if (reference_symbol_mode) {
+                            bool manual_patch_symbol = N64Recomp::is_manual_patch_symbol(reloc.target_section_offset);
+                            bool is_absolute = reloc.target_section == N64Recomp::SectionAbsolute;
+                            emit_reloc = (reloc.reference_symbol && !is_absolute) || target_section == N64Recomp::SectionEvent || manual_patch_symbol;
+                        }
+                        // Otherwise, emit all relocs.
+                        else {
+                            emit_reloc = true;
+                        }
+                        if (emit_reloc) {
+                            uint32_t target_section_offset;
+                            if (reloc.target_section == N64Recomp::SectionEvent) {
+                                target_section_offset = reloc.symbol_index;
+                            }
+                            else {
+                                target_section_offset = reloc.target_section_offset;
+                            }
+                            fmt::print(overlay_file, "    {{ .offset = 0x{:08X}, .target_section_offset = 0x{:08X}, .target_section = {}, .type = {} }}, \n",
+                                reloc.address - section.ram_addr, target_section_offset, reloc.target_section, reloc_names[static_cast<size_t>(reloc.type)] );
+                        }
+                    }
+
+                    fmt::print(overlay_file, "}};\n");
+                }
+
                 written_sections++;
             }
         }
@@ -956,9 +1021,45 @@ int main(int argc, char** argv) {
             // Add a dummy element at the end to ensure the array has a valid length because C doesn't allow zero-size arrays.
             fmt::print(overlay_file, "    NULL\n");
             fmt::print(overlay_file, "}};\n");
+
+            // Collect manual patch symbols.
+            std::vector<std::pair<uint32_t, std::string>> manual_patch_syms{};
+
+            for (const auto& func : context.functions) {
+                if (func.words.empty() && N64Recomp::is_manual_patch_symbol(func.vram)) {
+                    manual_patch_syms.emplace_back(func.vram, func.name);
+                }
+            }            
+
+            // Sort the manual patch symbols by vram.
+            std::sort(manual_patch_syms.begin(), manual_patch_syms.end(), [](const auto& lhs, const auto& rhs) {
+                return lhs.first < rhs.first;
+            });
+
+            // Emit the manual patch symbols.
+            fmt::print(overlay_file,
+                "\n"
+                "static const ManualPatchSymbol manual_patch_symbols[] = {{\n"
+            );
+            for (const auto& manual_patch_sym_entry : manual_patch_syms) {
+                fmt::print(overlay_file, "    {{ 0x{:08X}, {} }},\n", manual_patch_sym_entry.first, manual_patch_sym_entry.second);
+
+                fmt::print(func_header_file,
+                    "void {}(uint8_t* rdram, recomp_context* ctx);\n", manual_patch_sym_entry.second);
+            }
+            // Add a dummy element at the end to ensure the array has a valid length because C doesn't allow zero-size arrays.
+            fmt::print(overlay_file, "    {{ 0, NULL }}\n");
+            fmt::print(overlay_file, "}};\n");
         }
     }
 
+    fmt::print(func_header_file,
+        "\n"
+        "#ifdef __cplusplus\n"
+        "}}\n"
+        "#endif\n"
+    );
+
     if (!config.output_binary_path.empty()) {
         std::ofstream output_binary{config.output_binary_path, std::ios::binary};
         output_binary.write(reinterpret_cast<const char*>(context.rom.data()), context.rom.size());

src/mod_symbols.cpp

@@ -1,6 +1,6 @@
 #include <cstring>
 
-#include "n64recomp.h"
+#include "recompiler/context.h"
 
 struct FileHeader {
     char magic[8]; // N64RSYMS
@@ -16,6 +16,7 @@ struct FileSubHeaderV1 {
     uint32_t num_exports;
     uint32_t num_callbacks;
     uint32_t num_provided_events;
+    uint32_t num_hooks;
     uint32_t string_data_size;
 };
 
@@ -89,6 +90,13 @@ struct EventV1 {
     uint32_t name_size;
 };
 
+struct HookV1 {
+    uint32_t func_index;
+    uint32_t original_section_vrom;
+    uint32_t original_vram;
+    uint32_t flags; // end
+};
+
 template <typename T>
 const T* reinterpret_data(std::span<const char> data, size_t& offset, size_t count = 1) {
     if (offset + (sizeof(T) * count) > data.size()) {
@@ -126,6 +134,7 @@ bool parse_v1(std::span<const char> data, const std::unordered_map<uint32_t, uin
     size_t num_exports = subheader->num_exports;
     size_t num_callbacks = subheader->num_callbacks;
     size_t num_provided_events = subheader->num_provided_events;
+    size_t num_hooks = subheader->num_hooks;
     size_t string_data_size = subheader->string_data_size;
 
     if (string_data_size & 0b11) {
@@ -147,6 +156,7 @@ bool parse_v1(std::span<const char> data, const std::unordered_map<uint32_t, uin
     mod_context.exported_funcs.resize(num_exports); // Add method
     mod_context.callbacks.reserve(num_callbacks);
     mod_context.event_symbols.reserve(num_provided_events);
+    mod_context.hooks.reserve(num_provided_events);
 
     for (size_t section_index = 0; section_index < num_sections; section_index++) {
         const SectionHeaderV1* section_header = reinterpret_data<SectionHeaderV1>(data, offset);
@@ -434,6 +444,22 @@ bool parse_v1(std::span<const char> data, const std::unordered_map<uint32_t, uin
         mod_context.add_event_symbol(std::string{import_name});
     }
 
+    const HookV1* hooks = reinterpret_data<HookV1>(data, offset, num_hooks);
+    if (hooks == nullptr) {
+        printf("Failed to read hooks (count: %zu)\n", num_hooks);
+        return false;
+    }
+
+    for (size_t hook_index = 0; hook_index < num_hooks; hook_index++) {
+        const HookV1& hook_in = hooks[hook_index];
+        N64Recomp::FunctionHook& hook_out = mod_context.hooks.emplace_back();
+
+        hook_out.func_index = hook_in.func_index;
+        hook_out.original_section_vrom = hook_in.original_section_vrom;
+        hook_out.original_vram = hook_in.original_vram;
+        hook_out.flags = static_cast<N64Recomp::HookFlags>(hook_in.flags);
+    }
+
     return offset == data.size();
 }
 
@@ -512,6 +538,7 @@ std::vector<uint8_t> N64Recomp::symbols_to_bin_v1(const N64Recomp::Context& cont
     size_t num_events = context.event_symbols.size();
     size_t num_callbacks = context.callbacks.size();
     size_t num_provided_events = context.event_symbols.size();
+    size_t num_hooks = context.hooks.size();
 
     FileSubHeaderV1 sub_header {
         .num_sections = static_cast<uint32_t>(context.sections.size()),
@@ -522,6 +549,7 @@ std::vector<uint8_t> N64Recomp::symbols_to_bin_v1(const N64Recomp::Context& cont
         .num_exports = static_cast<uint32_t>(num_exported_funcs),
         .num_callbacks = static_cast<uint32_t>(num_callbacks),
         .num_provided_events = static_cast<uint32_t>(num_provided_events),
+        .num_hooks = static_cast<uint32_t>(num_hooks),
         .string_data_size = 0,
     };
 
@@ -757,5 +785,22 @@ std::vector<uint8_t> N64Recomp::symbols_to_bin_v1(const N64Recomp::Context& cont
         vec_put(ret, &event_out);
     }
 
+    // Write the hooks.
+    for (const FunctionHook& cur_hook : context.hooks) {
+        uint32_t flags = 0;
+        if ((cur_hook.flags & HookFlags::AtReturn) == HookFlags::AtReturn) {
+            flags |= 0x1;
+        }
+
+        HookV1 hook_out {
+            .func_index = cur_hook.func_index,
+            .original_section_vrom = cur_hook.original_section_vrom,
+            .original_vram = cur_hook.original_vram,
+            .flags = flags
+        };
+
+        vec_put(ret, &hook_out);
+    }
+
     return ret;
 }

src/operations.cpp

@@ -1,4 +1,4 @@
-#include "operations.h"
+#include "recompiler/operations.h"
 
 namespace N64Recomp {
     const std::unordered_map<InstrId, UnaryOp> unary_ops {
@@ -9,6 +9,8 @@ namespace N64Recomp {
         { InstrId::cpu_mflo, { UnaryOpType::None, Operand::Rd, Operand::Lo } },
         { InstrId::cpu_mtc1, { UnaryOpType::None, Operand::FsU32L, Operand::Rt } },
         { InstrId::cpu_mfc1, { UnaryOpType::ToInt32, Operand::Rt, Operand::FsU32L } },
+        { InstrId::cpu_dmtc1, { UnaryOpType::None, Operand::FsU64, Operand::Rt } },
+        { InstrId::cpu_dmfc1, { UnaryOpType::None, Operand::Rt, Operand::FsU64 } },
         // Float operations
         { InstrId::cpu_mov_s,     { UnaryOpType::None,           Operand::Fd,       Operand::Fs,       true } },
         { InstrId::cpu_mov_d,     { UnaryOpType::None,           Operand::FdDouble, Operand::FsDouble, true } },
@@ -65,24 +67,22 @@ namespace N64Recomp {
         { InstrId::cpu_ori,    { BinaryOpType::Or64,  Operand::Rt, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Rs, Operand::ImmU16 }}} },
         { InstrId::cpu_xori,   { BinaryOpType::Xor64, Operand::Rt, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Rs, Operand::ImmU16 }}} },
         // Shifts
-        /* BUG Should mask after (change op to Sll32 and input op to ToU32) */
-        { InstrId::cpu_sllv,   { BinaryOpType::Sll64, Operand::Rd, {{ UnaryOpType::ToS32, UnaryOpType::Mask5 }, { Operand::Rt, Operand::Rs }}} },
+        { InstrId::cpu_sllv,   { BinaryOpType::Sll32, Operand::Rd, {{ UnaryOpType::None,  UnaryOpType::Mask5 }, { Operand::Rt, Operand::Rs }}} },
         { InstrId::cpu_dsllv,  { BinaryOpType::Sll64, Operand::Rd, {{ UnaryOpType::None,  UnaryOpType::Mask6 }, { Operand::Rt, Operand::Rs }}} },
         { InstrId::cpu_srlv,   { BinaryOpType::Srl32, Operand::Rd, {{ UnaryOpType::ToU32, UnaryOpType::Mask5 }, { Operand::Rt, Operand::Rs }}} },
         { InstrId::cpu_dsrlv,  { BinaryOpType::Srl64, Operand::Rd, {{ UnaryOpType::ToU64, UnaryOpType::Mask6 }, { Operand::Rt, Operand::Rs }}} },
-        /* BUG Should mask after (change op to Sra32 and input op to ToS64) */
-        { InstrId::cpu_srav,   { BinaryOpType::Sra64, Operand::Rd, {{ UnaryOpType::ToS32, UnaryOpType::Mask5 }, { Operand::Rt, Operand::Rs }}} },
+        // Hardware bug: The input is not masked to 32 bits before right shifting, so bits from the upper half of the register will bleed into the lower half.
+        { InstrId::cpu_srav,   { BinaryOpType::Sra32, Operand::Rd, {{ UnaryOpType::ToS64, UnaryOpType::Mask5 }, { Operand::Rt, Operand::Rs }}} },
         { InstrId::cpu_dsrav,  { BinaryOpType::Sra64, Operand::Rd, {{ UnaryOpType::ToS64, UnaryOpType::Mask6 }, { Operand::Rt, Operand::Rs }}} },
         // Shifts (immediate)
-        /* BUG Should mask after (change op to Sll32 and input op to ToU32) */
-        { InstrId::cpu_sll,    { BinaryOpType::Sll64, Operand::Rd, {{ UnaryOpType::ToS32, UnaryOpType::None }, { Operand::Rt, Operand::Sa }}} },
+        { InstrId::cpu_sll,    { BinaryOpType::Sll32, Operand::Rd, {{ UnaryOpType::None,  UnaryOpType::None }, { Operand::Rt, Operand::Sa }}} },
         { InstrId::cpu_dsll,   { BinaryOpType::Sll64, Operand::Rd, {{ UnaryOpType::None,  UnaryOpType::None }, { Operand::Rt, Operand::Sa }}} },
         { InstrId::cpu_dsll32, { BinaryOpType::Sll64, Operand::Rd, {{ UnaryOpType::None,  UnaryOpType::None }, { Operand::Rt, Operand::Sa32 }}} },
         { InstrId::cpu_srl,    { BinaryOpType::Srl32, Operand::Rd, {{ UnaryOpType::ToU32, UnaryOpType::None }, { Operand::Rt, Operand::Sa }}} },
         { InstrId::cpu_dsrl,   { BinaryOpType::Srl64, Operand::Rd, {{ UnaryOpType::ToU64, UnaryOpType::None }, { Operand::Rt, Operand::Sa }}} },
         { InstrId::cpu_dsrl32, { BinaryOpType::Srl64, Operand::Rd, {{ UnaryOpType::ToU64, UnaryOpType::None }, { Operand::Rt, Operand::Sa32 }}} },
-        /* BUG should cast after (change op to Sra32 and input op to ToS64) */
-        { InstrId::cpu_sra,    { BinaryOpType::Sra64, Operand::Rd, {{ UnaryOpType::ToS32, UnaryOpType::None }, { Operand::Rt, Operand::Sa }}} },
+        // Hardware bug: The input is not masked to 32 bits before right shifting, so bits from the upper half of the register will bleed into the lower half.
+        { InstrId::cpu_sra,    { BinaryOpType::Sra32, Operand::Rd, {{ UnaryOpType::ToS64, UnaryOpType::None }, { Operand::Rt, Operand::Sa }}} },
         { InstrId::cpu_dsra,   { BinaryOpType::Sra64, Operand::Rd, {{ UnaryOpType::ToS64, UnaryOpType::None }, { Operand::Rt, Operand::Sa }}} },
         { InstrId::cpu_dsra32, { BinaryOpType::Sra64, Operand::Rd, {{ UnaryOpType::ToS64, UnaryOpType::None }, { Operand::Rt, Operand::Sa32 }}} },
         // Comparisons
@@ -100,48 +100,60 @@ namespace N64Recomp {
         { InstrId::cpu_mul_d, { BinaryOpType::MulDouble, Operand::FdDouble, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true, true } },
         { InstrId::cpu_div_s, { BinaryOpType::DivFloat,  Operand::Fd,       {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true, true } },
         { InstrId::cpu_div_d, { BinaryOpType::DivDouble, Operand::FdDouble, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true, true } },
-        // Float comparisons TODO remaining operations and investigate ordered/unordered and default values
-        { InstrId::cpu_c_lt_s,  { BinaryOpType::Less,   Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
-        { InstrId::cpu_c_nge_s, { BinaryOpType::Less,   Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
-        { InstrId::cpu_c_olt_s, { BinaryOpType::Less,   Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
-        { InstrId::cpu_c_ult_s, { BinaryOpType::Less,   Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
-        { InstrId::cpu_c_lt_d,  { BinaryOpType::Less,   Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
-        { InstrId::cpu_c_nge_d, { BinaryOpType::Less,   Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
-        { InstrId::cpu_c_olt_d, { BinaryOpType::Less,   Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
-        { InstrId::cpu_c_ult_d, { BinaryOpType::Less,   Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
-
-        { InstrId::cpu_c_le_s,  { BinaryOpType::LessEq, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
-        { InstrId::cpu_c_ngt_s, { BinaryOpType::LessEq, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
-        { InstrId::cpu_c_ole_s, { BinaryOpType::LessEq, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
-        { InstrId::cpu_c_ule_s, { BinaryOpType::LessEq, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
-        { InstrId::cpu_c_le_d,  { BinaryOpType::LessEq, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
-        { InstrId::cpu_c_ngt_d, { BinaryOpType::LessEq, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
-        { InstrId::cpu_c_ole_d, { BinaryOpType::LessEq, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
-        { InstrId::cpu_c_ule_d, { BinaryOpType::LessEq, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
-
-        { InstrId::cpu_c_eq_s,  { BinaryOpType::Equal,  Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
-        { InstrId::cpu_c_ueq_s, { BinaryOpType::Equal,  Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
-        { InstrId::cpu_c_ngl_s, { BinaryOpType::Equal,  Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
-        { InstrId::cpu_c_seq_s, { BinaryOpType::Equal,  Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
-        { InstrId::cpu_c_eq_d,  { BinaryOpType::Equal,  Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
-        { InstrId::cpu_c_ueq_d, { BinaryOpType::Equal,  Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
-        { InstrId::cpu_c_ngl_d, { BinaryOpType::Equal,  Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        // Float comparisons TODO investigate ordered/unordered and default values
+        //  Single Ordered
+        { InstrId::cpu_c_f_s,   { BinaryOpType::False, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_eq_s,  { BinaryOpType::EqualFloat, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_olt_s, { BinaryOpType::LessFloat, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_ole_s, { BinaryOpType::LessEqFloat, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_sf_s,  { BinaryOpType::False, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_seq_s, { BinaryOpType::EqualFloat, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_lt_s,  { BinaryOpType::LessFloat, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_le_s,  { BinaryOpType::LessEqFloat, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        //  Single Unordered
+        { InstrId::cpu_c_un_s,   { BinaryOpType::False, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_ueq_s,  { BinaryOpType::EqualFloat, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_ult_s,  { BinaryOpType::LessFloat, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_ule_s,  { BinaryOpType::LessEqFloat, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_ngle_s, { BinaryOpType::False, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_ngl_s,  { BinaryOpType::EqualFloat, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_nge_s,  { BinaryOpType::LessFloat, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        { InstrId::cpu_c_ngt_s,  { BinaryOpType::LessEqFloat, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Fs, Operand::Ft }}, true } },
+        //  Double Ordered
+        { InstrId::cpu_c_f_d,   { BinaryOpType::False, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_eq_d,  { BinaryOpType::EqualDouble, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_olt_d, { BinaryOpType::LessDouble, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_ole_d, { BinaryOpType::LessEqDouble, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        /* TODO rename to c_sf_d when fixed in rabbitizer */
+        { InstrId::cpu_c_df_d,  { BinaryOpType::False, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
         /* TODO rename to c_seq_d when fixed in rabbitizer */
-        { InstrId::cpu_c_deq_d, { BinaryOpType::Equal,  Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_deq_d, { BinaryOpType::EqualDouble, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_lt_d,  { BinaryOpType::LessDouble, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_le_d,  { BinaryOpType::LessEqDouble, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        //  Double Unordered
+        { InstrId::cpu_c_un_d,   { BinaryOpType::False, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_ueq_d,  { BinaryOpType::EqualDouble, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_ult_d,  { BinaryOpType::LessDouble, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_ule_d,  { BinaryOpType::LessEqDouble, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_ngle_d, { BinaryOpType::False, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_ngl_d,  { BinaryOpType::EqualDouble, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_nge_d,  { BinaryOpType::LessDouble, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+        { InstrId::cpu_c_ngt_d,  { BinaryOpType::LessEqDouble, Operand::Cop1cs, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::FsDouble, Operand::FtDouble }}, true } },
+
         // Loads
-        { InstrId::cpu_ld,   { BinaryOpType::LD,  Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}} },
-        { InstrId::cpu_lw,   { BinaryOpType::LW,  Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}} },
-        { InstrId::cpu_lwu,  { BinaryOpType::LWU, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}} },
-        { InstrId::cpu_lh,   { BinaryOpType::LH,  Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}} },
-        { InstrId::cpu_lhu,  { BinaryOpType::LHU, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}} },
-        { InstrId::cpu_lb,   { BinaryOpType::LB,  Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}} },
-        { InstrId::cpu_lbu,  { BinaryOpType::LBU, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}} },
-        { InstrId::cpu_ldl,  { BinaryOpType::LDL, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}} },
-        { InstrId::cpu_ldr,  { BinaryOpType::LDR, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}} },
-        { InstrId::cpu_lwl,  { BinaryOpType::LWL, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}} },
-        { InstrId::cpu_lwr,  { BinaryOpType::LWR, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}} },
-        { InstrId::cpu_lwc1, { BinaryOpType::LW, Operand::FtU32L, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}} },
-        { InstrId::cpu_ldc1, { BinaryOpType::LD, Operand::FtU64,  {{ UnaryOpType::None, UnaryOpType::None }, { Operand::ImmS16, Operand::Base }}, true } },
+        { InstrId::cpu_ld,   { BinaryOpType::LD,  Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}} },
+        { InstrId::cpu_lw,   { BinaryOpType::LW,  Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}} },
+        { InstrId::cpu_lwu,  { BinaryOpType::LWU, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}} },
+        { InstrId::cpu_lh,   { BinaryOpType::LH,  Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}} },
+        { InstrId::cpu_lhu,  { BinaryOpType::LHU, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}} },
+        { InstrId::cpu_lb,   { BinaryOpType::LB,  Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}} },
+        { InstrId::cpu_lbu,  { BinaryOpType::LBU, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}} },
+        { InstrId::cpu_ldl,  { BinaryOpType::LDL, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}} },
+        { InstrId::cpu_ldr,  { BinaryOpType::LDR, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}} },
+        { InstrId::cpu_lwl,  { BinaryOpType::LWL, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}} },
+        { InstrId::cpu_lwr,  { BinaryOpType::LWR, Operand::Rt,    {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}} },
+        { InstrId::cpu_lwc1, { BinaryOpType::LW, Operand::FtU32L, {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}} },
+        { InstrId::cpu_ldc1, { BinaryOpType::LD, Operand::FtU64,  {{ UnaryOpType::None, UnaryOpType::None }, { Operand::Base, Operand::ImmS16 }}, true } },
     };
 
     const std::unordered_map<InstrId, ConditionalBranchOp> conditional_branch_ops {
@@ -159,6 +171,8 @@ namespace N64Recomp {
         { InstrId::cpu_bltzl,   { BinaryOpType::Less,      {{ UnaryOpType::ToS64, UnaryOpType::None }, { Operand::Rs, Operand::Zero }}, false, true }},
         { InstrId::cpu_bgezal,  { BinaryOpType::GreaterEq, {{ UnaryOpType::ToS64, UnaryOpType::None }, { Operand::Rs, Operand::Zero }}, true, false }},
         { InstrId::cpu_bgezall, { BinaryOpType::GreaterEq, {{ UnaryOpType::ToS64, UnaryOpType::None }, { Operand::Rs, Operand::Zero }}, true, true }},
+        { InstrId::cpu_bltzal,  { BinaryOpType::Less,      {{ UnaryOpType::ToS64, UnaryOpType::None }, { Operand::Rs, Operand::Zero }}, true, false }},
+        { InstrId::cpu_bltzall, { BinaryOpType::Less,      {{ UnaryOpType::ToS64, UnaryOpType::None }, { Operand::Rs, Operand::Zero }}, true, true }},
         { InstrId::cpu_bc1f,    { BinaryOpType::Equal,     {{ UnaryOpType::None,  UnaryOpType::None }, { Operand::Cop1cs, Operand::Zero }}, false, false }},
         { InstrId::cpu_bc1fl,   { BinaryOpType::Equal,     {{ UnaryOpType::None,  UnaryOpType::None }, { Operand::Cop1cs, Operand::Zero }}, false, true }},
         { InstrId::cpu_bc1t,    { BinaryOpType::NotEqual,  {{ UnaryOpType::None,  UnaryOpType::None }, { Operand::Cop1cs, Operand::Zero }}, false, false }},

src/recompilation.cpp

@@ -8,10 +8,10 @@
 #include "fmt/format.h"
 #include "fmt/ostream.h"
 
-#include "n64recomp.h"
+#include "recompiler/context.h"
 #include "analysis.h"
-#include "operations.h"
-#include "generator.h"
+#include "recompiler/operations.h"
+#include "recompiler/generator.h"
 
 enum class JalResolutionResult {
     NoMatch,
@@ -22,13 +22,17 @@ enum class JalResolutionResult {
 };
 
 JalResolutionResult resolve_jal(const N64Recomp::Context& context, size_t cur_section_index, uint32_t target_func_vram, size_t& matched_function_index) {
+    // Skip resolution if all function calls should use lookup and just return Ambiguous.
+    if (context.use_lookup_for_all_function_calls) {
+        return JalResolutionResult::Ambiguous;
+    }
+
     // Look for symbols with the target vram address
     const N64Recomp::Section& cur_section = context.sections[cur_section_index];
     const auto matching_funcs_find = context.functions_by_vram.find(target_func_vram);
     uint32_t section_vram_start = cur_section.ram_addr;
     uint32_t section_vram_end = cur_section.ram_addr + cur_section.size;
     bool in_current_section = target_func_vram >= section_vram_start && target_func_vram < section_vram_end;
-    bool needs_static = false;
     bool exact_match_found = false;
 
     // Use a thread local to prevent reallocation across runs and to allow multi-threading in the future.
@@ -42,9 +46,7 @@ JalResolutionResult resolve_jal(const N64Recomp::Context& context, size_t cur_se
 
             // Zero-sized symbol handling. unless there's only one matching target.
             if (target_func.words.empty()) {
-                // Allow zero-sized symbols between 0x8F000000 and 0x90000000 for use with patches.
-                // TODO make this configurable or come up with a more sensible solution for dealing with manual symbols for patches.
-                if (target_func.vram < 0x8F000000 || target_func.vram > 0x90000000) {
+                if (!N64Recomp::is_manual_patch_symbol(target_func.vram)) {
                     continue;
                 }
             }
@@ -110,7 +112,7 @@ std::string_view ctx_gpr_prefix(int reg) {
 }
 
 template <typename GeneratorType>
-bool process_instruction(GeneratorType& generator, const N64Recomp::Context& context, const N64Recomp::Function& func, const N64Recomp::FunctionStats& stats, const std::unordered_set<uint32_t>& skipped_insns, size_t instr_index, const std::vector<rabbitizer::InstructionCpu>& instructions, std::ostream& output_file, bool indent, bool emit_link_branch, int link_branch_index, size_t reloc_index, bool& needs_link_branch, bool& is_branch_likely, bool tag_reference_relocs, std::span<std::vector<uint32_t>> static_funcs_out) {
+bool process_instruction(GeneratorType& generator, const N64Recomp::Context& context, const N64Recomp::Function& func, size_t func_index, const N64Recomp::FunctionStats& stats, const std::unordered_set<uint32_t>& jtbl_lw_instructions, size_t instr_index, const std::vector<rabbitizer::InstructionCpu>& instructions, std::ostream& output_file, bool indent, bool emit_link_branch, int link_branch_index, size_t reloc_index, bool& needs_link_branch, bool& is_branch_likely, bool tag_reference_relocs, std::span<std::vector<uint32_t>> static_funcs_out) {
     using namespace N64Recomp;
 
     const auto& section = context.sections[func.section_index];
@@ -118,6 +120,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
     needs_link_branch = false;
     is_branch_likely = false;
     uint32_t instr_vram = instr.getVram();
+    InstrId instr_id = instr.getUniqueId();
 
     auto print_indent = [&]() {
         fmt::print(output_file, "    ");
@@ -133,16 +136,19 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
 
     // Output a comment with the original instruction
     print_indent();
-    if (instr.isBranch() || instr.getUniqueId() == InstrId::cpu_j) {
+    if (instr.isBranch() || instr_id == InstrId::cpu_j) {
         generator.emit_comment(fmt::format("0x{:08X}: {}", instr_vram, instr.disassemble(0, fmt::format("L_{:08X}", (uint32_t)instr.getBranchVramGeneric()))));
-    } else if (instr.getUniqueId() == InstrId::cpu_jal) {
+    } else if (instr_id == InstrId::cpu_jal) {
         generator.emit_comment(fmt::format("0x{:08X}: {}", instr_vram, instr.disassemble(0, fmt::format("0x{:08X}", (uint32_t)instr.getBranchVramGeneric()))));
     } else {
         generator.emit_comment(fmt::format("0x{:08X}: {}", instr_vram, instr.disassemble(0)));
     }
 
-    if (skipped_insns.contains(instr_vram)) {
-        return true;
+    // Replace loads for jump table entries into addiu. This leaves the jump table entry's address in the output register
+    // instead of the entry's value, which can then be used to determine the offset from the start of the jump table.
+    if (jtbl_lw_instructions.contains(instr_vram)) {
+        assert(instr_id == InstrId::cpu_lw);
+        instr_id = InstrId::cpu_addiu;
     }
 
     N64Recomp::RelocType reloc_type = N64Recomp::RelocType::R_MIPS_NONE;
@@ -178,19 +184,10 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
                     reloc_reference_symbol = reloc.symbol_index;
                     // Don't try to relocate special section symbols.
                     if (context.is_regular_reference_section(reloc.target_section) || reloc_section == N64Recomp::SectionAbsolute) {
+                        // TODO this may not be needed anymore as HI16/LO16 relocs to non-relocatable sections is handled directly in elf parsing.
                         bool ref_section_relocatable = context.is_reference_section_relocatable(reloc.target_section);
-                        uint32_t ref_section_vram = context.get_reference_section_vram(reloc.target_section);
                         // Resolve HI16 and LO16 reference symbol relocs to non-relocatable sections by patching the instruction immediate.
                         if (!ref_section_relocatable && (reloc_type == N64Recomp::RelocType::R_MIPS_HI16 || reloc_type == N64Recomp::RelocType::R_MIPS_LO16)) {
-                            uint32_t full_immediate = reloc.target_section_offset + ref_section_vram;
-
-                            if (reloc_type == N64Recomp::RelocType::R_MIPS_HI16) {
-                                imm = (full_immediate >> 16) + ((full_immediate >> 15) & 1);
-                            }
-                            else if (reloc_type == N64Recomp::RelocType::R_MIPS_LO16) {
-                                imm = full_immediate & 0xFFFF;
-                            }
-
                             // The reloc has been processed, so set it to none to prevent it getting processed a second time during instruction code generation.
                             reloc_type = N64Recomp::RelocType::R_MIPS_NONE;
                             reloc_reference_symbol = (size_t)-1;
@@ -216,7 +213,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
             if (reloc_index + 1 < section.relocs.size() && next_vram > section.relocs[reloc_index].address) {
                 next_reloc_index++;
             }
-            if (!process_instruction(generator, context, func, stats, skipped_insns, instr_index + 1, instructions, output_file, use_indent, false, link_branch_index, next_reloc_index, dummy_needs_link_branch, dummy_is_branch_likely, tag_reference_relocs, static_funcs_out)) {
+            if (!process_instruction(generator, context, func, func_index, stats, jtbl_lw_instructions, instr_index + 1, instructions, output_file, use_indent, false, link_branch_index, next_reloc_index, dummy_needs_link_branch, dummy_is_branch_likely, tag_reference_relocs, static_funcs_out)) {
                 return false;
             }
         }
@@ -235,7 +232,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
             return false;
         }
         print_indent();
-        generator.emit_return();
+        generator.emit_return(context, func_index);
         print_link_branch();
         return true;
     };
@@ -260,10 +257,11 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
         return true;
     };
 
-    auto print_func_call_by_address = [&generator, reloc_target_section_offset, reloc_section, reloc_reference_symbol, reloc_type, &context, &section, &func, &static_funcs_out, &needs_link_branch, &print_indent, &process_delay_slot, &output_file, &print_link_branch]
+    auto print_func_call_by_address = [&generator, reloc_target_section_offset, reloc_section, reloc_reference_symbol, reloc_type, &context, &func, &static_funcs_out, &needs_link_branch, &print_indent, &process_delay_slot, &print_link_branch]
         (uint32_t target_func_vram, bool tail_call = false, bool indent = false)
     {
         bool call_by_lookup = false;
+        bool call_by_name = false;
         // Event symbol, emit a call to the runtime to trigger this event.
         if (reloc_section == N64Recomp::SectionEvent) {
             needs_link_branch = !tail_call;
@@ -274,29 +272,28 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
                 return false;
             }
             print_indent();
-            generator.emit_trigger_event(reloc_reference_symbol);
+            generator.emit_trigger_event((uint32_t)reloc_reference_symbol);
             print_link_branch();
         }
         // Normal symbol or reference symbol, 
         else {
             std::string jal_target_name{};
+            size_t matched_func_index = (size_t)-1;
             if (reloc_reference_symbol != (size_t)-1) {
-                const auto& ref_symbol = context.get_reference_symbol(reloc_section, reloc_reference_symbol);
-
                 if (reloc_type != N64Recomp::RelocType::R_MIPS_26) {
                     fmt::print(stderr, "Unsupported reloc type {} on jal instruction in {}\n", (int)reloc_type, func.name);
                     return false;
                 }
 
-                if (ref_symbol.section_offset != reloc_target_section_offset) {
-                    fmt::print(stderr, "Function {} uses a MIPS_R_26 addend, which is not supported yet\n", func.name);
-                    return false;
+                if (!context.skip_validating_reference_symbols) {
+                    const auto& ref_symbol = context.get_reference_symbol(reloc_section, reloc_reference_symbol);
+                    if (ref_symbol.section_offset != reloc_target_section_offset) {
+                        fmt::print(stderr, "Function {} uses a MIPS_R_26 addend, which is not supported yet\n", func.name);
+                        return false;
+                    }
                 }
-
-                jal_target_name = ref_symbol.name;
             }
             else {
-                size_t matched_func_index = 0;
                 JalResolutionResult jal_result = resolve_jal(context, func.section_index, target_func_vram, matched_func_index);
 
                 switch (jal_result) {
@@ -310,9 +307,13 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
                         // Create a static function add it to the static function list for this section.
                         jal_target_name = fmt::format("static_{}_{:08X}", func.section_index, target_func_vram);
                         static_funcs_out[func.section_index].push_back(target_func_vram);
+                        call_by_name = true;
                         break;
                     case JalResolutionResult::Ambiguous:
-                        fmt::print(stderr, "[Info] Ambiguous jal target 0x{:08X} in function {}, falling back to function lookup\n", target_func_vram, func.name);
+                        // Print a warning if lookup isn't forced for all non-reloc function calls.
+                        if (!context.use_lookup_for_all_function_calls) {
+                            fmt::print(stderr, "[Info] Ambiguous jal target 0x{:08X} in function {}, falling back to function lookup\n", target_func_vram, func.name);
+                        }
                         // Relocation isn't necessary for jumps inside a relocatable section, as this code path will never run if the target vram
                         // is in the current function's section (see the branch for `in_current_section` above).
                         // If a game ever needs to jump between multiple relocatable sections, relocation will be necessary here.
@@ -331,11 +332,17 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
                 return false;
             }
             print_indent();
-            if (call_by_lookup) {
+            if (reloc_reference_symbol != (size_t)-1) {
+                generator.emit_function_call_reference_symbol(context, reloc_section, reloc_reference_symbol, reloc_target_section_offset);
+            }
+            else if (call_by_lookup) {
                 generator.emit_function_call_lookup(target_func_vram);
             }
+            else if (call_by_name) {
+                generator.emit_named_function_call(jal_target_name);
+            }
             else {
-                generator.emit_function_call_by_name(jal_target_name);
+                generator.emit_function_call(context, matched_func_index);
             }
             print_link_branch();
         }
@@ -353,10 +360,10 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
                     return false;
                 }
                 print_indent();
-                generator.emit_return();
+                generator.emit_return(context, func_index);
                 // TODO check if this branch close should exist.
-                print_indent();
-                generator.emit_branch_close();
+                // print_indent();
+                // generator.emit_branch_close();
                 return true;
             }
 
@@ -385,7 +392,6 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
 
     int rd = (int)instr.GetO32_rd();
     int rs = (int)instr.GetO32_rs();
-    int base = rs;
     int rt = (int)instr.GetO32_rt();
     int sa = (int)instr.Get_sa();
 
@@ -397,7 +403,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
 
     bool handled = true;
 
-    switch (instr.getUniqueId()) {
+    switch (instr_id) {
     case InstrId::cpu_nop:
         fmt::print(output_file, "\n");
         break;
@@ -443,7 +449,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
             if (find_result != stats.jump_tables.end()) {
                 const N64Recomp::JumpTable& cur_jtbl = *find_result;
                 print_indent();
-                generator.emit_variable_declaration(fmt::format("jr_addend_{:08X}", cur_jtbl.jr_vram), cur_jtbl.addend_reg);
+                generator.emit_jtbl_addend_declaration(cur_jtbl, cur_jtbl.addend_reg);
             }
         }
         break;
@@ -456,7 +462,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
     case InstrId::cpu_divu:
     case InstrId::cpu_ddivu:
         print_indent();
-        generator.emit_muldiv(instr.getUniqueId(), rs, rt);
+        generator.emit_muldiv(instr_id, rs, rt);
         break;
     // Branches
     case InstrId::cpu_jal:
@@ -503,7 +509,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
                     return false;
                 }
                 print_indent();
-                generator.emit_return();
+                generator.emit_return(context, func_index);
             }
             else {
                 fmt::print(stderr, "Unhandled branch in {} at 0x{:08X} to 0x{:08X}\n", func.name, instr_vram, branch_target);
@@ -526,7 +532,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
                     return false;
                 }
                 print_indent();
-                generator.emit_switch(fmt::format("jr_addend_{:08X}", cur_jtbl.jr_vram), 2);
+                generator.emit_switch(context, cur_jtbl, rs);
                 for (size_t entry_index = 0; entry_index < cur_jtbl.entries.size(); entry_index++) {
                     print_indent();
                     print_indent();
@@ -543,7 +549,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
             fmt::print("[Info] Indirect tail call in {}\n", func.name);
             print_func_call_by_register(rs);
             print_indent();
-            generator.emit_return();
+            generator.emit_return(context, func_index);
             break;
         }
         break;
@@ -552,7 +558,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
         generator.emit_syscall(instr_vram);
         // syscalls don't link, so treat it like a tail call
         print_indent();
-        generator.emit_return();
+        generator.emit_return(context, func_index);
         break;
     case InstrId::cpu_break:
         print_indent();
@@ -651,7 +657,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
         }
     };
 
-    auto find_binary_it = binary_ops.find(instr.getUniqueId());
+    auto find_binary_it = binary_ops.find(instr_id);
     if (find_binary_it != binary_ops.end()) {
         print_indent();
         const BinaryOp& op = find_binary_it->second;
@@ -673,7 +679,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
         handled = true;
     }
 
-    auto find_unary_it = unary_ops.find(instr.getUniqueId());
+    auto find_unary_it = unary_ops.find(instr_id);
     if (find_unary_it != unary_ops.end()) {
         print_indent();
         const UnaryOp& op = find_unary_it->second;
@@ -693,7 +699,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
         handled = true;
     }
 
-    auto find_conditional_branch_it = conditional_branch_ops.find(instr.getUniqueId());
+    auto find_conditional_branch_it = conditional_branch_ops.find(instr_id);
     if (find_conditional_branch_it != conditional_branch_ops.end()) {
         print_indent();
         // TODO combining the branch condition and branch target into one generator call would allow better optimization in the runtime's JIT generator.
@@ -719,7 +725,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
         handled = true;
     }
 
-    auto find_store_it = store_ops.find(instr.getUniqueId());
+    auto find_store_it = store_ops.find(instr_id);
     if (find_store_it != store_ops.end()) {
         print_indent();
         const StoreOp& op = find_store_it->second;
@@ -747,11 +753,18 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
 }
 
 template <typename GeneratorType>
-bool recompile_function_impl(GeneratorType& generator, const N64Recomp::Context& context, const N64Recomp::Function& func, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs_out, bool tag_reference_relocs) {
+bool recompile_function_impl(GeneratorType& generator, const N64Recomp::Context& context, size_t func_index, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs_out, bool tag_reference_relocs) {
+    const N64Recomp::Function& func = context.functions[func_index];
     //fmt::print("Recompiling {}\n", func.name);
     std::vector<rabbitizer::InstructionCpu> instructions;
 
-    generator.emit_function_start(func.name);
+    generator.emit_function_start(func.name, func_index);
+
+    if (context.trace_mode) {
+        fmt::print(output_file,
+            "    TRACE_ENTRY()\n",
+            func.name);
+    }
 
     // Skip analysis and recompilation of this function is stubbed.
     if (!func.stubbed) {
@@ -786,11 +799,11 @@ bool recompile_function_impl(GeneratorType& generator, const N64Recomp::Context&
             return false;
         }
 
-        std::unordered_set<uint32_t> skipped_insns{};
+        std::unordered_set<uint32_t> jtbl_lw_instructions{};
 
         // Add jump table labels into function
         for (const auto& jtbl : stats.jump_tables) {
-            skipped_insns.insert(jtbl.lw_vram);
+            jtbl_lw_instructions.insert(jtbl.lw_vram);
             for (uint32_t jtbl_entry : jtbl.entries) {
                 branch_labels.insert(jtbl_entry);
             }
@@ -824,7 +837,7 @@ bool recompile_function_impl(GeneratorType& generator, const N64Recomp::Context&
             }
 
             // Process the current instruction and check for errors
-            if (process_instruction(generator, context, func, stats, skipped_insns, instr_index, instructions, output_file, false, needs_link_branch, num_link_branches, reloc_index, needs_link_branch, is_branch_likely, tag_reference_relocs, static_funcs_out) == false) {
+            if (process_instruction(generator, context, func, func_index, stats, jtbl_lw_instructions, instr_index, instructions, output_file, false, needs_link_branch, num_link_branches, reloc_index, needs_link_branch, is_branch_likely, tag_reference_relocs, static_funcs_out) == false) {
                 fmt::print(stderr, "Error in recompiling {}, clearing output file\n", func.name);
                 output_file.clear();
                 return false;
@@ -853,16 +866,11 @@ bool recompile_function_impl(GeneratorType& generator, const N64Recomp::Context&
 }
 
 // Wrap the templated function with CGenerator as the template parameter.
-bool N64Recomp::recompile_function(const N64Recomp::Context& context, const N64Recomp::Function& func, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs_out, bool tag_reference_relocs) {
+bool N64Recomp::recompile_function(const N64Recomp::Context& context, size_t function_index, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs_out, bool tag_reference_relocs) {
     CGenerator generator{output_file};
-    return recompile_function_impl(generator, context, func, output_file, static_funcs_out, tag_reference_relocs);
+    return recompile_function_impl(generator, context, function_index, output_file, static_funcs_out, tag_reference_relocs);
 }
 
-bool N64Recomp::recompile_function_luajit(const N64Recomp::Context& context, const N64Recomp::Function& func, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs_out, bool tag_reference_relocs) {
-    LuajitGenerator generator{output_file};
-    return recompile_function_impl(generator, context, func, output_file, static_funcs_out, tag_reference_relocs);
-}
-
-bool N64Recomp::recompile_function_custom(Generator& generator, const Context& context, const Function& func, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs_out, bool tag_reference_relocs) {
-    return recompile_function_impl(generator, context, func, output_file, static_funcs_out, tag_reference_relocs);
+bool N64Recomp::recompile_function_custom(Generator& generator, const Context& context, size_t function_index, std::ostream& output_file, std::span<std::vector<uint32_t>> static_funcs_out, bool tag_reference_relocs) {
+    return recompile_function_impl(generator, context, function_index, output_file, static_funcs_out, tag_reference_relocs);
 }

src/symbol_lists.cpp

@@ -1,6 +1,6 @@
-#include "n64recomp.h"
+#include "recompiler/context.h"
 
-const std::unordered_set<std::string> N64Recomp::reimplemented_funcs{
+const std::unordered_set<std::string> N64Recomp::reimplemented_funcs {
     // OS initialize functions
     "__osInitialize_common",
     "osInitialize",
@@ -58,6 +58,7 @@ const std::unordered_set<std::string> N64Recomp::reimplemented_funcs{
     // Parallel interface (cartridge, DMA, etc.) functions
     "osCartRomInit",
     "osCreatePiManager",
+    "osPiReadIo",
     "osPiStartDma",
     "osEPiStartDma",
     "osPiGetStatus",
@@ -268,7 +269,6 @@ const std::unordered_set<std::string> N64Recomp::ignored_funcs {
     "__osDevMgrMain",
     "osPiGetCmdQueue",
     "osPiGetStatus",
-    "osPiReadIo",
     "osPiStartDma",
     "osPiWriteIo",
     "osEPiGetDeviceType",
@@ -557,7 +557,7 @@ const std::unordered_set<std::string> N64Recomp::ignored_funcs {
     "kdebugserver",
 };
 
-const std::unordered_set<std::string> N64Recomp::renamed_funcs{
+const std::unordered_set<std::string> N64Recomp::renamed_funcs {
     // Math
     "sincosf",
     "sinf",