diff --git a/Assets/dll/melonDS.wbx.zst b/Assets/dll/melonDS.wbx.zst index 99fcfab1fb..62423c96fa 100644 Binary files a/Assets/dll/melonDS.wbx.zst and b/Assets/dll/melonDS.wbx.zst differ diff --git a/waterbox/melon/BizConfig.cpp b/waterbox/melon/BizConfig.cpp deleted file mode 100644 index 0d59cdc6a6..0000000000 --- a/waterbox/melon/BizConfig.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include -#include -#include -#include "BizConfig.h" - -namespace Config -{ - -std::string BIOS9Path = "bios9.rom"; -std::string BIOS7Path = "bios7.rom"; -std::string FirmwarePath = "firmware.bin"; - -std::string DSiBIOS9Path = "bios9i.rom"; -std::string DSiBIOS7Path = "bios7i.rom"; -std::string DSiFirmwarePath = "firmwarei.bin"; -std::string DSiNANDPath = "nand.bin"; - -bool DLDIEnable = false; -std::string DLDISDPath = ""; -int DLDISize = 0; -bool DLDIReadOnly = true; -bool DLDIFolderSync = false; -std::string DLDIFolderPath = ""; - -bool DSiSDEnable = false; -std::string DSiSDPath = ""; -int DSiSDSize = 0; -bool DSiSDReadOnly = true; -bool DSiSDFolderSync = false; -std::string DSiSDFolderPath = ""; - -} diff --git a/waterbox/melon/BizDebugging.cpp b/waterbox/melon/BizDebugging.cpp index 6db2d44581..da26cb856b 100644 --- a/waterbox/melon/BizDebugging.cpp +++ b/waterbox/melon/BizDebugging.cpp @@ -38,6 +38,23 @@ ECL_EXPORT void SetTraceCallback(void (*callback)(TraceMask_t mask, u32 opcode, TraceMask = callback ? mask : TRACE_NONE; } +ECL_EXPORT void GetDisassembly(TraceMask_t type, u32 opcode, char* ret) +{ + static char disasm[DTHUMB_STRING_LENGTH]; + + memset(disasm, 0, sizeof disasm); + switch (type) + { + case TRACE_ARM7_THUMB: Disassemble_thumb(opcode, disasm, ARMv4T); break; + case TRACE_ARM7_ARM: Disassemble_arm(opcode, disasm, ARMv4T); break; + case TRACE_ARM9_THUMB: Disassemble_thumb(opcode, disasm, ARMv5TE); break; + case TRACE_ARM9_ARM: Disassemble_arm(opcode, disasm, ARMv5TE); break; + default: __builtin_unreachable(); + } + + memcpy(ret, disasm, DTHUMB_STRING_LENGTH); +} + void TraceTrampoline(TraceMask_t type, u32* regs, u32 opcode) { static char disasm[DTHUMB_STRING_LENGTH];