diff --git a/RSPRecomp/src/rsp_recomp.cpp b/RSPRecomp/src/rsp_recomp.cpp index fa32626..c3c35b8 100644 --- a/RSPRecomp/src/rsp_recomp.cpp +++ b/RSPRecomp/src/rsp_recomp.cpp @@ -542,39 +542,6 @@ void write_indirect_jumps(std::ofstream& output_file, const BranchTargets& branc " return RspExitReason::UnhandledJumpTarget;\n", output_function_name); } -// TODO de-hardcode these -// OoT njpgdspMain -//constexpr size_t rsp_text_offset = 0xB8BAD0; -//constexpr size_t rsp_text_size = 0xAF0; -//constexpr size_t rsp_text_address = 0x04001080; -//std::string rom_file_path = "../test/oot_mq_debug.z64"; -//std::string output_file_path = "../test/rsp/njpgdspMain.cpp"; -//std::string output_function_name = "njpgdspMain"; -//const std::vector extra_indirect_branch_targets{}; -//const std::unordered_set unsupported_instructions{}; - -// OoT aspMain -//constexpr size_t rsp_text_offset = 0xB89260; -//constexpr size_t rsp_text_size = 0xFB0; -//constexpr size_t rsp_text_address = 0x04001000; -//std::string rom_file_path = "../test/oot_mq_debug.z64"; -//std::string output_file_path = "../test/rsp/aspMain.cpp"; -//std::string output_function_name = "aspMain"; -//const std::vector extra_indirect_branch_targets{ 0x1F68, 0x1230, 0x114C, 0x1F18, 0x1E2C, 0x14F4, 0x1E9C, 0x1CB0, 0x117C, 0x17CC, 0x11E8, 0x1AA4, 0x1B34, 0x1190, 0x1C5C, 0x1220, 0x1784, 0x1830, 0x1A20, 0x1884, 0x1A84, 0x1A94, 0x1A48, 0x1BA0 }; -//const std::unordered_set unsupported_instructions{}; - -// MM's njpgdspMain is identical to OoT's - -//// MM aspMain -//constexpr size_t rsp_text_offset = 0xC40FF0; -//constexpr size_t rsp_text_size = 0x1000; -//constexpr size_t rsp_text_address = 0x04001000; -//std::string rom_file_path = "../../MMRecomp/mm.us.rev1.z64"; // uncompressed rom! -//std::string output_file_path = "../../MMRecomp/rsp/aspMain.cpp"; -//std::string output_function_name = "aspMain"; -//const std::vector extra_indirect_branch_targets{ 0x1F80, 0x1250, 0x1154, 0x1094, 0x1E0C, 0x1514, 0x1E7C, 0x1C90, 0x1180, 0x1808, 0x11E8, 0x1ADC, 0x1B6C, 0x1194, 0x1EF8, 0x1240, 0x17C0, 0x186C, 0x1A58, 0x18BC, 0x1ABC, 0x1ACC, 0x1A80, 0x1BD4 }; -//const std::unordered_set unsupported_instructions{}; - #ifdef _MSC_VER inline uint32_t byteswap(uint32_t val) { return _byteswap_ulong(val);