From 6f1e76198aeedecb4d5113f823a374cfde1293e0 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Wed, 1 Jul 2015 20:09:26 +0300 Subject: [PATCH] Some fixes --- Utilities/File.cpp | 14 +- Utilities/Thread.cpp | 8 +- Utilities/Thread.h | 4 +- rpcs3/Emu/ARMv7/ARMv7Context.h | 2 +- rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp | 1449 +++++++++--------- rpcs3/Emu/ARMv7/ARMv7Thread.cpp | 10 +- rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp | 8 +- rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp | 26 +- rpcs3/Emu/ARMv7/Modules/sceAudio.cpp | 16 +- rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp | 6 +- rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp | 14 +- rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp | 16 +- rpcs3/Emu/ARMv7/Modules/sceCamera.cpp | 82 +- rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp | 8 +- rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp | 80 +- rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp | 16 +- rpcs3/Emu/ARMv7/Modules/sceDbg.cpp | 8 +- rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp | 10 +- rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp | 26 +- rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp | 28 +- rpcs3/Emu/ARMv7/Modules/sceFiber.cpp | 16 +- rpcs3/Emu/ARMv7/Modules/sceFios.cpp | 272 ++-- rpcs3/Emu/ARMv7/Modules/sceFpu.cpp | 28 +- rpcs3/Emu/ARMv7/Modules/sceGxm.cpp | 422 ++--- rpcs3/Emu/ARMv7/Modules/sceHttp.cpp | 110 +- rpcs3/Emu/ARMv7/Modules/sceIme.cpp | 10 +- rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp | 18 +- rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp | 18 +- rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp | 284 ++-- rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp | 6 +- rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp | 4 +- rpcs3/Emu/ARMv7/Modules/sceLocation.cpp | 34 +- rpcs3/Emu/ARMv7/Modules/sceMd5.cpp | 8 +- rpcs3/Emu/ARMv7/Modules/sceMotion.cpp | 32 +- rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp | 4 +- rpcs3/Emu/ARMv7/Modules/sceNet.cpp | 116 +- rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp | 32 +- rpcs3/Emu/ARMv7/Modules/sceNgs.cpp | 126 +- rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp | 36 +- rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp | 22 +- rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp | 20 +- rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp | 62 +- rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp | 58 +- rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp | 40 +- rpcs3/Emu/ARMv7/Modules/scePerf.cpp | 20 +- rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp | 4 +- rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp | 6 +- rpcs3/Emu/ARMv7/Modules/sceRtc.cpp | 74 +- rpcs3/Emu/ARMv7/Modules/sceSas.cpp | 58 +- rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp | 8 +- rpcs3/Emu/ARMv7/Modules/sceSsl.cpp | 22 +- rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp | 26 +- rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp | 34 +- rpcs3/Emu/ARMv7/Modules/sceTouch.cpp | 10 +- rpcs3/Emu/ARMv7/Modules/sceUlt.cpp | 118 +- rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp | 18 +- rpcs3/Emu/ARMv7/Modules/sceVoice.cpp | 50 +- rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp | 34 +- rpcs3/Emu/CPU/CPUThread.cpp | 25 +- rpcs3/Emu/CPU/CPUThread.h | 15 +- rpcs3/Emu/Cell/PPUInterpreter.cpp | 24 +- rpcs3/Emu/Cell/PPUInterpreter.h | 4 +- rpcs3/Emu/Cell/PPULLVMRecompiler.cpp | 31 +- rpcs3/Emu/Cell/PPULLVMRecompiler.h | 6 +- rpcs3/Emu/Cell/PPUThread.cpp | 10 +- rpcs3/Emu/Cell/SPUInterpreter.cpp | 30 +- rpcs3/Emu/Cell/SPUThread.cpp | 77 +- rpcs3/Emu/Event.cpp | 40 +- rpcs3/Emu/Event.h | 25 +- rpcs3/Emu/IdManager.h | 14 +- rpcs3/Emu/Memory/Memory.cpp | 18 +- rpcs3/Emu/Memory/Memory.h | 2 + rpcs3/Emu/Memory/vm.cpp | 4 +- rpcs3/Emu/RSX/GL/GLGSRender.cpp | 7 +- rpcs3/Emu/SysCalls/Callback.cpp | 3 + rpcs3/Emu/SysCalls/Modules/cellAudio.cpp | 6 +- rpcs3/Emu/SysCalls/Modules/cellDmux.cpp | 13 +- rpcs3/Emu/SysCalls/Modules/cellDmux.h | 2 +- rpcs3/Emu/SysCalls/Modules/cellFs.cpp | 2 +- rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp | 14 +- rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp | 14 +- rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp | 2 +- rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp | 62 +- rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp | 10 +- rpcs3/Emu/SysCalls/Modules/cellSync.cpp | 16 +- rpcs3/Emu/SysCalls/Modules/cellSync.h | 2 +- rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp | 4 +- rpcs3/Emu/SysCalls/lv2/sys_cond.cpp | 6 +- rpcs3/Emu/SysCalls/lv2/sys_event.cpp | 20 +- rpcs3/Emu/SysCalls/lv2/sys_event.h | 12 +- rpcs3/Emu/SysCalls/lv2/sys_fs.cpp | 10 +- rpcs3/Emu/SysCalls/lv2/sys_fs.h | 14 +- rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp | 10 +- rpcs3/Emu/SysCalls/lv2/sys_lwcond.cpp | 2 +- rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp | 2 +- rpcs3/Emu/SysCalls/lv2/sys_prx.cpp | 9 +- rpcs3/Emu/SysCalls/lv2/sys_prx.h | 6 +- rpcs3/Emu/SysCalls/lv2/sys_spu.cpp | 10 +- 98 files changed, 2326 insertions(+), 2348 deletions(-) diff --git a/Utilities/File.cpp b/Utilities/File.cpp index ba91e15f87..03e4b8d9bb 100644 --- a/Utilities/File.cpp +++ b/Utilities/File.cpp @@ -13,14 +13,13 @@ std::unique_ptr to_wchar(const std::string& source) { const auto length = source.size() + 1; // size + null terminator - const int size = source.size() < INT_MAX ? static_cast(length) : throw std::length_error(__FUNCTION__); + const int size = source.size() < INT_MAX ? static_cast(length) : throw EXCEPTION("Invalid source length (0x%llx)", source.size()); std::unique_ptr buffer(new wchar_t[length]); // allocate buffer assuming that length is the max possible size if (!MultiByteToWideChar(CP_UTF8, 0, source.c_str(), size, buffer.get(), size)) { - LOG_ERROR(GENERAL, "ConvertUTF8ToWChar(source='%s') failed: 0x%llx", source, GET_API_ERROR); - throw __FUNCTION__; + throw EXCEPTION("Conversion failed (0x%llx)", GET_API_ERROR); } return buffer; @@ -39,15 +38,14 @@ void to_utf8(std::string& result, const wchar_t* source) if (size <= 0) { - LOG_ERROR(GENERAL, "ConvertWCharToUTF8(length=%d) failed: 0x%llx", length, GET_API_ERROR); - throw __FUNCTION__; + throw EXCEPTION("Conversion failed (0x%llx)", GET_API_ERROR); } result.resize(size); if (!WideCharToMultiByte(CP_UTF8, 0, source, length, &result.front(), size, NULL, NULL)) { - throw __FUNCTION__; + throw EXCEPTION("Conversion failed (0x%llx)", GET_API_ERROR); } } @@ -532,7 +530,7 @@ bool fs::file::close() u64 fs::file::read(void* buffer, u64 count) const { - const int size = count <= INT_MAX ? static_cast(count) : throw std::length_error(__FUNCTION__); + const int size = count <= INT_MAX ? static_cast(count) : throw EXCEPTION("Invalid count (0x%llx)", count); #ifdef _WIN32 DWORD nread; @@ -549,7 +547,7 @@ u64 fs::file::read(void* buffer, u64 count) const u64 fs::file::write(const void* buffer, u64 count) const { - const int size = count <= INT_MAX ? static_cast(count) : throw std::length_error(__FUNCTION__); + const int size = count <= INT_MAX ? static_cast(count) : throw EXCEPTION("Invalid count (0x%llx)", count); #ifdef _WIN32 DWORD nwritten; diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp index 1ac022b890..cfd6980f29 100644 --- a/Utilities/Thread.cpp +++ b/Utilities/Thread.cpp @@ -1222,7 +1222,7 @@ thread_t::~thread_t() } else { - m_thread->m_thread.detach(); + throw EXCEPTION("Deadlock"); } } } @@ -1310,11 +1310,7 @@ void thread_t::start(std::function name, std::function fu error(e); } - if (Emu.IsStopped()) - { - LOG_NOTICE(GENERAL, "Thread aborted"); - } - else if (Ini.HLELogging.GetValue()) + if (Ini.HLELogging.GetValue()) { LOG_NOTICE(GENERAL, "Thread ended"); } diff --git a/Utilities/Thread.h b/Utilities/Thread.h index cac506b400..09a077b3ec 100644 --- a/Utilities/Thread.h +++ b/Utilities/Thread.h @@ -54,8 +54,8 @@ public: // create named thread thread_t(std::function name, std::function func); - // destructor, joins automatically - virtual ~thread_t(); + // destructor, joins automatically (questionable, don't rely on this functionality in derived destructors) + virtual ~thread_t() noexcept(false); thread_t(const thread_t&) = delete; diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h index 4307ef3374..592109ae60 100644 --- a/rpcs3/Emu/ARMv7/ARMv7Context.h +++ b/rpcs3/Emu/ARMv7/ARMv7Context.h @@ -107,7 +107,7 @@ struct ARMv7Context operator bool() const { - return check_state; + return check_state != 0; } } ITSTATE; diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp index 6c7e2f9c25..7f02b66f94 100644 --- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp +++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp @@ -8,7 +8,7 @@ #include "PSVFuncList.h" #include "ARMv7Interpreter.h" -#define reject(cond, info) { if (cond) Error(__FUNCTION__, code, type, #cond, info); } +#define reject(cond, info) { if (cond) throw EXCEPTION("%s ('%s', type=%s)", info, #cond, fmt_encoding(type)); } std::map g_armv7_dump; @@ -83,7 +83,7 @@ namespace ARMv7_instrs } break; - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } return shift_t; @@ -99,7 +99,7 @@ namespace ARMv7_instrs // case 1: shift_t = SRType_LSR; break; // case 2: shift_t = SRType_ASR; break; // case 3: shift_t = SRType_ROR; break; - // default: throw __FUNCTION__; + // default: throw EXCEPTION(""); // } // return shift_t; @@ -181,7 +181,7 @@ namespace ARMv7_instrs case SRType_ASR: return ASR_C(value, amount, carry_out); case SRType_ROR: return ROR_C(value, amount, carry_out); case SRType_RRX: return RRX_C(value, carry_in, carry_out); - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } } @@ -264,25 +264,6 @@ namespace ARMv7_instrs return result; } - void Error(const char* func, const ARMv7Code code, const ARMv7_encoding type, const char* cond, const char* info) - { - auto format_encoding = [](const ARMv7_encoding type) -> const char* - { - switch (type) - { - case T1: return "T1"; - case T2: return "T2"; - case T3: return "T3"; - case T4: return "T4"; - case A1: return "A1"; - case A2: return "A2"; - default: return "???"; - } - }; - - throw fmt::format("%s(%s) error: %s (%s)", func, format_encoding(type), info, cond); - } - bool process_debug(ARMv7Context& context) { if (context.debug & DF_PRINT) @@ -319,6 +300,20 @@ namespace ARMv7_instrs return false; } + const char* fmt_encoding(const ARMv7_encoding type) + { + switch (type) + { + case T1: return "T1"; + case T2: return "T2"; + case T3: return "T3"; + case T4: return "T4"; + case A1: return "A1"; + case A2: return "A2"; + default: return "???"; + } + }; + const char* fmt_cond(u32 cond) { switch (cond) @@ -518,7 +513,7 @@ void ARMv7_instrs::HACK(ARMv7Context& context, const ARMv7Code code, const ARMv7 index = (code.data & 0xfff00) >> 4 | (code.data & 0xf); break; } - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } if (context.debug) @@ -571,7 +566,7 @@ void ARMv7_instrs::MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7 reject(t == 13 && (type == T1 || type == T2), "UNPREDICTABLE"); break; } - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } auto disasm = [&]() @@ -595,14 +590,14 @@ void ARMv7_instrs::MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7 if (!context.TLS) { - throw "TLS not initialized"; + throw EXCEPTION("TLS not initialized"); } context.GPR[t] = context.TLS; return; } - Error(__FUNCTION__, code, type, (disasm(), context.debug_str.c_str()), "Bad instruction"); + throw EXCEPTION("Bad instruction: '%s' (code=0x%x, type=%d)", (disasm(), context.debug_str.c_str()), code.data, type); } } @@ -624,8 +619,8 @@ void ARMv7_instrs::ADC_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13 || n == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -678,8 +673,8 @@ void ARMv7_instrs::ADC_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -709,8 +704,8 @@ void ARMv7_instrs::ADC_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -763,8 +758,8 @@ void ARMv7_instrs::ADD_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -834,8 +829,8 @@ void ARMv7_instrs::ADD_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -865,8 +860,8 @@ void ARMv7_instrs::ADD_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -914,8 +909,8 @@ void ARMv7_instrs::ADD_SPI(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -980,8 +975,8 @@ void ARMv7_instrs::ADD_SPR(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -1043,8 +1038,8 @@ void ARMv7_instrs::ADR(ARMv7Context& context, const ARMv7Code code, const ARMv7_ reject(d == 13 || d == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } const u32 base = context.read_pc() & ~3; @@ -1082,8 +1077,8 @@ void ARMv7_instrs::AND_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13 || n == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -1135,8 +1130,8 @@ void ARMv7_instrs::AND_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -1165,8 +1160,8 @@ void ARMv7_instrs::AND_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1175,8 +1170,8 @@ void ARMv7_instrs::ASR_IMM(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1184,8 +1179,8 @@ void ARMv7_instrs::ASR_REG(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1247,7 +1242,7 @@ void ARMv7_instrs::B(ARMv7Context& context, const ARMv7Code code, const ARMv7_en imm32 = sign<26, u32>((code.data & 0xffffff) << 2); break; } - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } if (context.debug) @@ -1267,8 +1262,8 @@ void ARMv7_instrs::BFC(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1276,8 +1271,8 @@ void ARMv7_instrs::BFI(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1300,8 +1295,8 @@ void ARMv7_instrs::BIC_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13 || n == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -1352,8 +1347,8 @@ void ARMv7_instrs::BIC_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -1382,8 +1377,8 @@ void ARMv7_instrs::BIC_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1392,8 +1387,8 @@ void ARMv7_instrs::BKPT(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1423,7 +1418,7 @@ void ARMv7_instrs::BL(ARMv7Context& context, const ARMv7Code code, const ARMv7_e imm32 = sign<26, u32>((code.data & 0xffffff) << 2); break; } - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } const u32 lr = context.ISET == ARM ? context.read_pc() - 4 : context.read_pc() | 1; @@ -1489,7 +1484,7 @@ void ARMv7_instrs::BLX(ARMv7Context& context, const ARMv7Code code, const ARMv7_ target = 1 | context.PC + 8 + sign<25, u32>((code.data & 0xffffff) << 2 | (code.data & 0x1000000) >> 23); break; } - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } if (context.debug) @@ -1534,7 +1529,7 @@ void ARMv7_instrs::BX(ARMv7Context& context, const ARMv7Code code, const ARMv7_e m = (code.data & 0xf); break; } - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } if (context.debug) @@ -1566,7 +1561,7 @@ void ARMv7_instrs::CB_Z(ARMv7Context& context, const ARMv7Code code, const ARMv7 reject(context.ITSTATE, "UNPREDICTABLE"); break; } - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } if (context.debug) @@ -1598,8 +1593,8 @@ void ARMv7_instrs::CLZ(ARMv7Context& context, const ARMv7Code code, const ARMv7_ reject(d == 13 || d == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -1619,8 +1614,8 @@ void ARMv7_instrs::CMN_IMM(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1628,8 +1623,8 @@ void ARMv7_instrs::CMN_REG(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1637,8 +1632,8 @@ void ARMv7_instrs::CMN_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1665,8 +1660,8 @@ void ARMv7_instrs::CMP_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(n == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -1726,8 +1721,8 @@ void ARMv7_instrs::CMP_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(n == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -1756,8 +1751,8 @@ void ARMv7_instrs::CMP_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1766,8 +1761,8 @@ void ARMv7_instrs::DBG(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1775,8 +1770,8 @@ void ARMv7_instrs::DMB(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1784,8 +1779,8 @@ void ARMv7_instrs::DSB(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1809,8 +1804,8 @@ void ARMv7_instrs::EOR_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13 || n == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -1862,8 +1857,8 @@ void ARMv7_instrs::EOR_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -1892,8 +1887,8 @@ void ARMv7_instrs::EOR_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1915,7 +1910,7 @@ void ARMv7_instrs::IT(ARMv7Context& context, const ARMv7Code code, const ARMv7_e context.ITSTATE.IT = code.data & 0xff; break; } - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } if (context.debug) @@ -1956,8 +1951,8 @@ void ARMv7_instrs::LDM(ARMv7Context& context, const ARMv7Code code, const ARMv7_ reject(wback && reg_list & (1 << n), "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -1989,8 +1984,8 @@ void ARMv7_instrs::LDMDA(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -1998,8 +1993,8 @@ void ARMv7_instrs::LDMDB(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2007,8 +2002,8 @@ void ARMv7_instrs::LDMIB(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2073,8 +2068,8 @@ void ARMv7_instrs::LDR_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject((wback && n == t) || (t == 15 && context.ITSTATE), "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -2121,8 +2116,8 @@ void ARMv7_instrs::LDR_LIT(ARMv7Context& context, const ARMv7Code code, const AR reject(t == 15 && context.ITSTATE, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } const u32 base = context.read_pc() & ~3; @@ -2178,8 +2173,8 @@ void ARMv7_instrs::LDR_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(t == 15 && context.ITSTATE, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -2253,8 +2248,8 @@ void ARMv7_instrs::LDRB_IMM(ARMv7Context& context, const ARMv7Code code, const A reject(t == 13 || t == 15 || (wback && n == t), "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -2280,8 +2275,8 @@ void ARMv7_instrs::LDRB_LIT(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2322,8 +2317,8 @@ void ARMv7_instrs::LDRB_REG(ARMv7Context& context, const ARMv7Code code, const A reject(t == 13 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -2371,8 +2366,8 @@ void ARMv7_instrs::LDRD_IMM(ARMv7Context& context, const ARMv7Code code, const A reject(t == 13 || t == 15 || t2 == 13 || t2 == 15 || t == t2, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -2415,8 +2410,8 @@ void ARMv7_instrs::LDRD_LIT(ARMv7Context& context, const ARMv7Code code, const A reject(t == 13 || t == 15 || t2 == 13 || t2 == 15 || t == t2, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } const u32 base = context.read_pc() & ~3; @@ -2440,8 +2435,8 @@ void ARMv7_instrs::LDRD_REG(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2496,8 +2491,8 @@ void ARMv7_instrs::LDRH_IMM(ARMv7Context& context, const ARMv7Code code, const A reject(t == 13 || t == 15 || (wback && n == t), "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -2523,8 +2518,8 @@ void ARMv7_instrs::LDRH_LIT(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2532,8 +2527,8 @@ void ARMv7_instrs::LDRH_REG(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2577,8 +2572,8 @@ void ARMv7_instrs::LDRSB_IMM(ARMv7Context& context, const ARMv7Code code, const reject(t == 13 || t == 15 || (wback && n == t), "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -2605,8 +2600,8 @@ void ARMv7_instrs::LDRSB_LIT(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2614,8 +2609,8 @@ void ARMv7_instrs::LDRSB_REG(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2624,8 +2619,8 @@ void ARMv7_instrs::LDRSH_IMM(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2633,8 +2628,8 @@ void ARMv7_instrs::LDRSH_LIT(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2642,8 +2637,8 @@ void ARMv7_instrs::LDRSH_REG(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2664,8 +2659,8 @@ void ARMv7_instrs::LDREX(ARMv7Context& context, const ARMv7Code code, const ARMv reject(t == 13 || t == 15 || n == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -2689,8 +2684,8 @@ void ARMv7_instrs::LDREXB(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2698,8 +2693,8 @@ void ARMv7_instrs::LDREXD(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2707,8 +2702,8 @@ void ARMv7_instrs::LDREXH(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2742,8 +2737,8 @@ void ARMv7_instrs::LSL_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -2792,8 +2787,8 @@ void ARMv7_instrs::LSL_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -2844,8 +2839,8 @@ void ARMv7_instrs::LSR_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -2873,8 +2868,8 @@ void ARMv7_instrs::LSR_REG(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2883,8 +2878,8 @@ void ARMv7_instrs::MLA(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2892,8 +2887,8 @@ void ARMv7_instrs::MLS(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -2933,7 +2928,7 @@ void ARMv7_instrs::MOV_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15, "UNPREDICTABLE"); break; } - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } if (context.debug) @@ -3001,8 +2996,8 @@ void ARMv7_instrs::MOV_REG(ARMv7Context& context, const ARMv7Code code, const AR reject((d == 13 && (m == 13 || m == 15)) || d == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -3040,8 +3035,8 @@ void ARMv7_instrs::MOVT(ARMv7Context& context, const ARMv7Code code, const ARMv7 reject(d == 13 || d == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -3061,8 +3056,8 @@ void ARMv7_instrs::MRS(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3070,8 +3065,8 @@ void ARMv7_instrs::MSR_IMM(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3079,8 +3074,8 @@ void ARMv7_instrs::MSR_REG(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3112,8 +3107,8 @@ void ARMv7_instrs::MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_ reject(d == 13 || d == 15 || n == 13 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -3155,8 +3150,8 @@ void ARMv7_instrs::MVN_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -3206,8 +3201,8 @@ void ARMv7_instrs::MVN_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -3236,8 +3231,8 @@ void ARMv7_instrs::MVN_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3263,7 +3258,7 @@ void ARMv7_instrs::NOP(ARMv7Context& context, const ARMv7Code code, const ARMv7_ cond = code.data >> 28; break; } - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } if (context.debug) @@ -3282,8 +3277,8 @@ void ARMv7_instrs::ORN_IMM(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3291,8 +3286,8 @@ void ARMv7_instrs::ORN_REG(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3316,8 +3311,8 @@ void ARMv7_instrs::ORR_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -3369,8 +3364,8 @@ void ARMv7_instrs::ORR_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -3399,8 +3394,8 @@ void ARMv7_instrs::ORR_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3409,8 +3404,8 @@ void ARMv7_instrs::PKH(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3463,7 +3458,7 @@ void ARMv7_instrs::POP(ARMv7Context& context, const ARMv7Code code, const ARMv7_ reject(reg_list & 0x2000, "UNPREDICTABLE"); break; } - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } if (context.debug) @@ -3534,7 +3529,7 @@ void ARMv7_instrs::PUSH(ARMv7Context& context, const ARMv7Code code, const ARMv7 reject(reg_list & 0x2000, "UNPREDICTABLE"); break; } - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } if (context.debug) @@ -3564,8 +3559,8 @@ void ARMv7_instrs::QADD(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3573,8 +3568,8 @@ void ARMv7_instrs::QADD16(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3582,8 +3577,8 @@ void ARMv7_instrs::QADD8(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3591,8 +3586,8 @@ void ARMv7_instrs::QASX(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3600,8 +3595,8 @@ void ARMv7_instrs::QDADD(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3609,8 +3604,8 @@ void ARMv7_instrs::QDSUB(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3618,8 +3613,8 @@ void ARMv7_instrs::QSAX(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3627,8 +3622,8 @@ void ARMv7_instrs::QSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3636,8 +3631,8 @@ void ARMv7_instrs::QSUB16(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3645,8 +3640,8 @@ void ARMv7_instrs::QSUB8(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3655,8 +3650,8 @@ void ARMv7_instrs::RBIT(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3683,8 +3678,8 @@ void ARMv7_instrs::REV(ARMv7Context& context, const ARMv7Code code, const ARMv7_ reject(d == 13 || d == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -3703,8 +3698,8 @@ void ARMv7_instrs::REV16(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3712,8 +3707,8 @@ void ARMv7_instrs::REVSH(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3737,8 +3732,8 @@ void ARMv7_instrs::ROR_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -3787,8 +3782,8 @@ void ARMv7_instrs::ROR_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -3818,8 +3813,8 @@ void ARMv7_instrs::RRX(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3850,8 +3845,8 @@ void ARMv7_instrs::RSB_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 13 || n == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -3880,8 +3875,8 @@ void ARMv7_instrs::RSB_REG(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3889,8 +3884,8 @@ void ARMv7_instrs::RSB_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3899,8 +3894,8 @@ void ARMv7_instrs::RSC_IMM(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3908,8 +3903,8 @@ void ARMv7_instrs::RSC_REG(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3917,8 +3912,8 @@ void ARMv7_instrs::RSC_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3927,8 +3922,8 @@ void ARMv7_instrs::SADD16(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3936,8 +3931,8 @@ void ARMv7_instrs::SADD8(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3945,8 +3940,8 @@ void ARMv7_instrs::SASX(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3955,8 +3950,8 @@ void ARMv7_instrs::SBC_IMM(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3964,8 +3959,8 @@ void ARMv7_instrs::SBC_REG(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3973,8 +3968,8 @@ void ARMv7_instrs::SBC_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3983,8 +3978,8 @@ void ARMv7_instrs::SBFX(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -3993,8 +3988,8 @@ void ARMv7_instrs::SDIV(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4003,8 +3998,8 @@ void ARMv7_instrs::SEL(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4013,8 +4008,8 @@ void ARMv7_instrs::SHADD16(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4022,8 +4017,8 @@ void ARMv7_instrs::SHADD8(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4031,8 +4026,8 @@ void ARMv7_instrs::SHASX(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4040,8 +4035,8 @@ void ARMv7_instrs::SHSAX(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4049,8 +4044,8 @@ void ARMv7_instrs::SHSUB16(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4058,8 +4053,8 @@ void ARMv7_instrs::SHSUB8(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4068,8 +4063,8 @@ void ARMv7_instrs::SMLA__(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4077,8 +4072,8 @@ void ARMv7_instrs::SMLAD(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4086,8 +4081,8 @@ void ARMv7_instrs::SMLAL(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4095,8 +4090,8 @@ void ARMv7_instrs::SMLAL__(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4104,8 +4099,8 @@ void ARMv7_instrs::SMLALD(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4113,8 +4108,8 @@ void ARMv7_instrs::SMLAW_(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4122,8 +4117,8 @@ void ARMv7_instrs::SMLSD(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4131,8 +4126,8 @@ void ARMv7_instrs::SMLSLD(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4140,8 +4135,8 @@ void ARMv7_instrs::SMMLA(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4149,8 +4144,8 @@ void ARMv7_instrs::SMMLS(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4158,8 +4153,8 @@ void ARMv7_instrs::SMMUL(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4167,8 +4162,8 @@ void ARMv7_instrs::SMUAD(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4176,8 +4171,8 @@ void ARMv7_instrs::SMUL__(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4185,8 +4180,8 @@ void ARMv7_instrs::SMULL(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4194,8 +4189,8 @@ void ARMv7_instrs::SMULW_(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4203,8 +4198,8 @@ void ARMv7_instrs::SMUSD(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4213,8 +4208,8 @@ void ARMv7_instrs::SSAT(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4222,8 +4217,8 @@ void ARMv7_instrs::SSAT16(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4231,8 +4226,8 @@ void ARMv7_instrs::SSAX(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4240,8 +4235,8 @@ void ARMv7_instrs::SSUB16(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4249,8 +4244,8 @@ void ARMv7_instrs::SSUB8(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4283,8 +4278,8 @@ void ARMv7_instrs::STM(ARMv7Context& context, const ARMv7Code code, const ARMv7_ reject(wback && reg_list & (1 << n), "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -4316,8 +4311,8 @@ void ARMv7_instrs::STMDA(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4325,8 +4320,8 @@ void ARMv7_instrs::STMDB(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4334,8 +4329,8 @@ void ARMv7_instrs::STMIB(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4399,8 +4394,8 @@ void ARMv7_instrs::STR_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(t == 15 || (wback && n == t), "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -4458,8 +4453,8 @@ void ARMv7_instrs::STR_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(t == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -4530,8 +4525,8 @@ void ARMv7_instrs::STRB_IMM(ARMv7Context& context, const ARMv7Code code, const A reject(t == 13 || t == 15 || (wback && n == t), "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -4589,8 +4584,8 @@ void ARMv7_instrs::STRB_REG(ARMv7Context& context, const ARMv7Code code, const A reject(t == 13 || t == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -4637,8 +4632,8 @@ void ARMv7_instrs::STRD_IMM(ARMv7Context& context, const ARMv7Code code, const A reject(n == 15 || t == 13 || t == 15 || t2 == 13 || t2 == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -4665,8 +4660,8 @@ void ARMv7_instrs::STRD_REG(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4718,8 +4713,8 @@ void ARMv7_instrs::STRH_IMM(ARMv7Context& context, const ARMv7Code code, const A reject(t == 13 || t == 15 || (wback && n == t), "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -4777,8 +4772,8 @@ void ARMv7_instrs::STRH_REG(ARMv7Context& context, const ARMv7Code code, const A reject(t == 13 || t == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -4820,8 +4815,8 @@ void ARMv7_instrs::STREX(ARMv7Context& context, const ARMv7Code code, const ARMv reject(d == n || d == t, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -4842,8 +4837,8 @@ void ARMv7_instrs::STREXB(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4851,8 +4846,8 @@ void ARMv7_instrs::STREXD(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4860,8 +4855,8 @@ void ARMv7_instrs::STREXH(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -4914,8 +4909,8 @@ void ARMv7_instrs::SUB_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -4971,8 +4966,8 @@ void ARMv7_instrs::SUB_REG(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 13 || d == 15 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -5002,8 +4997,8 @@ void ARMv7_instrs::SUB_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5043,8 +5038,8 @@ void ARMv7_instrs::SUB_SPI(ARMv7Context& context, const ARMv7Code code, const AR reject(d == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -5073,8 +5068,8 @@ void ARMv7_instrs::SUB_SPR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5083,8 +5078,8 @@ void ARMv7_instrs::SVC(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5093,8 +5088,8 @@ void ARMv7_instrs::SXTAB(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5102,8 +5097,8 @@ void ARMv7_instrs::SXTAB16(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5111,8 +5106,8 @@ void ARMv7_instrs::SXTAH(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5120,8 +5115,8 @@ void ARMv7_instrs::SXTB(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5129,8 +5124,8 @@ void ARMv7_instrs::SXTB16(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5138,8 +5133,8 @@ void ARMv7_instrs::SXTH(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5148,8 +5143,8 @@ void ARMv7_instrs::TB_(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5158,8 +5153,8 @@ void ARMv7_instrs::TEQ_IMM(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5167,8 +5162,8 @@ void ARMv7_instrs::TEQ_REG(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5176,8 +5171,8 @@ void ARMv7_instrs::TEQ_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5198,8 +5193,8 @@ void ARMv7_instrs::TST_IMM(ARMv7Context& context, const ARMv7Code code, const AR reject(n == 13 || n == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -5221,8 +5216,8 @@ void ARMv7_instrs::TST_REG(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5230,8 +5225,8 @@ void ARMv7_instrs::TST_RSR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5240,8 +5235,8 @@ void ARMv7_instrs::UADD16(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5249,8 +5244,8 @@ void ARMv7_instrs::UADD8(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5258,8 +5253,8 @@ void ARMv7_instrs::UASX(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5267,8 +5262,8 @@ void ARMv7_instrs::UBFX(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5276,8 +5271,8 @@ void ARMv7_instrs::UDIV(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5285,8 +5280,8 @@ void ARMv7_instrs::UHADD16(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5294,8 +5289,8 @@ void ARMv7_instrs::UHADD8(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5303,8 +5298,8 @@ void ARMv7_instrs::UHASX(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5312,8 +5307,8 @@ void ARMv7_instrs::UHSAX(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5321,8 +5316,8 @@ void ARMv7_instrs::UHSUB16(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5330,8 +5325,8 @@ void ARMv7_instrs::UHSUB8(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5339,8 +5334,8 @@ void ARMv7_instrs::UMAAL(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5348,8 +5343,8 @@ void ARMv7_instrs::UMLAL(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5373,8 +5368,8 @@ void ARMv7_instrs::UMULL(ARMv7Context& context, const ARMv7Code code, const ARMv reject(d0 == d1, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -5401,8 +5396,8 @@ void ARMv7_instrs::UQADD16(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5410,8 +5405,8 @@ void ARMv7_instrs::UQADD8(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5419,8 +5414,8 @@ void ARMv7_instrs::UQASX(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5428,8 +5423,8 @@ void ARMv7_instrs::UQSAX(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5437,8 +5432,8 @@ void ARMv7_instrs::UQSUB16(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5446,8 +5441,8 @@ void ARMv7_instrs::UQSUB8(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5455,8 +5450,8 @@ void ARMv7_instrs::USAD8(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5464,8 +5459,8 @@ void ARMv7_instrs::USADA8(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5473,8 +5468,8 @@ void ARMv7_instrs::USAT(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5482,8 +5477,8 @@ void ARMv7_instrs::USAT16(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5491,8 +5486,8 @@ void ARMv7_instrs::USAX(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5500,8 +5495,8 @@ void ARMv7_instrs::USUB16(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5509,8 +5504,8 @@ void ARMv7_instrs::USUB8(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5518,8 +5513,8 @@ void ARMv7_instrs::UXTAB(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5527,8 +5522,8 @@ void ARMv7_instrs::UXTAB16(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5536,8 +5531,8 @@ void ARMv7_instrs::UXTAH(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5565,8 +5560,8 @@ void ARMv7_instrs::UXTB(ARMv7Context& context, const ARMv7Code code, const ARMv7 reject(d == 13 || d == 15 || m == 13 || m == 15, "UNPREDICTABLE"); break; } - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } if (context.debug) @@ -5585,8 +5580,8 @@ void ARMv7_instrs::UXTB16(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5594,8 +5589,8 @@ void ARMv7_instrs::UXTH(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5604,8 +5599,8 @@ void ARMv7_instrs::VABA_(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5613,8 +5608,8 @@ void ARMv7_instrs::VABD_(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5622,8 +5617,8 @@ void ARMv7_instrs::VABD_FP(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5631,8 +5626,8 @@ void ARMv7_instrs::VABS(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5640,8 +5635,8 @@ void ARMv7_instrs::VAC__(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5649,8 +5644,8 @@ void ARMv7_instrs::VADD(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5658,8 +5653,8 @@ void ARMv7_instrs::VADD_FP(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5667,8 +5662,8 @@ void ARMv7_instrs::VADDHN(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5676,8 +5671,8 @@ void ARMv7_instrs::VADD_(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5685,8 +5680,8 @@ void ARMv7_instrs::VAND(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5694,8 +5689,8 @@ void ARMv7_instrs::VBIC_IMM(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5703,8 +5698,8 @@ void ARMv7_instrs::VBIC_REG(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5712,8 +5707,8 @@ void ARMv7_instrs::VB__(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5721,8 +5716,8 @@ void ARMv7_instrs::VCEQ_REG(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5730,8 +5725,8 @@ void ARMv7_instrs::VCEQ_ZERO(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5739,8 +5734,8 @@ void ARMv7_instrs::VCGE_REG(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5748,8 +5743,8 @@ void ARMv7_instrs::VCGE_ZERO(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5757,8 +5752,8 @@ void ARMv7_instrs::VCGT_REG(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5766,8 +5761,8 @@ void ARMv7_instrs::VCGT_ZERO(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5775,8 +5770,8 @@ void ARMv7_instrs::VCLE_ZERO(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5784,8 +5779,8 @@ void ARMv7_instrs::VCLS(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5793,8 +5788,8 @@ void ARMv7_instrs::VCLT_ZERO(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5802,8 +5797,8 @@ void ARMv7_instrs::VCLZ(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5811,8 +5806,8 @@ void ARMv7_instrs::VCMP_(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5820,8 +5815,8 @@ void ARMv7_instrs::VCNT(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5829,8 +5824,8 @@ void ARMv7_instrs::VCVT_FIA(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5838,8 +5833,8 @@ void ARMv7_instrs::VCVT_FIF(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5847,8 +5842,8 @@ void ARMv7_instrs::VCVT_FFA(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5856,8 +5851,8 @@ void ARMv7_instrs::VCVT_FFF(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5865,8 +5860,8 @@ void ARMv7_instrs::VCVT_DF(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5874,8 +5869,8 @@ void ARMv7_instrs::VCVT_HFA(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5883,8 +5878,8 @@ void ARMv7_instrs::VCVT_HFF(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5892,8 +5887,8 @@ void ARMv7_instrs::VDIV(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5901,8 +5896,8 @@ void ARMv7_instrs::VDUP_S(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5910,8 +5905,8 @@ void ARMv7_instrs::VDUP_R(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5919,8 +5914,8 @@ void ARMv7_instrs::VEOR(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5928,8 +5923,8 @@ void ARMv7_instrs::VEXT(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5937,8 +5932,8 @@ void ARMv7_instrs::VHADDSUB(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5946,8 +5941,8 @@ void ARMv7_instrs::VLD__MS(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5955,8 +5950,8 @@ void ARMv7_instrs::VLD1_SL(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5964,8 +5959,8 @@ void ARMv7_instrs::VLD1_SAL(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5973,8 +5968,8 @@ void ARMv7_instrs::VLD2_SL(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5982,8 +5977,8 @@ void ARMv7_instrs::VLD2_SAL(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -5991,8 +5986,8 @@ void ARMv7_instrs::VLD3_SL(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6000,8 +5995,8 @@ void ARMv7_instrs::VLD3_SAL(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6009,8 +6004,8 @@ void ARMv7_instrs::VLD4_SL(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6018,8 +6013,8 @@ void ARMv7_instrs::VLD4_SAL(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6027,8 +6022,8 @@ void ARMv7_instrs::VLDM(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6036,8 +6031,8 @@ void ARMv7_instrs::VLDR(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6045,8 +6040,8 @@ void ARMv7_instrs::VMAXMIN(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6054,8 +6049,8 @@ void ARMv7_instrs::VMAXMIN_FP(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6063,8 +6058,8 @@ void ARMv7_instrs::VML__(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6072,8 +6067,8 @@ void ARMv7_instrs::VML__FP(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6081,8 +6076,8 @@ void ARMv7_instrs::VML__S(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6090,8 +6085,8 @@ void ARMv7_instrs::VMOV_IMM(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6099,8 +6094,8 @@ void ARMv7_instrs::VMOV_REG(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6108,8 +6103,8 @@ void ARMv7_instrs::VMOV_RS(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6117,8 +6112,8 @@ void ARMv7_instrs::VMOV_SR(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6126,8 +6121,8 @@ void ARMv7_instrs::VMOV_RF(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6135,8 +6130,8 @@ void ARMv7_instrs::VMOV_2RF(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6144,8 +6139,8 @@ void ARMv7_instrs::VMOV_2RD(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6153,8 +6148,8 @@ void ARMv7_instrs::VMOVL(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6162,8 +6157,8 @@ void ARMv7_instrs::VMOVN(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6171,8 +6166,8 @@ void ARMv7_instrs::VMRS(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6180,8 +6175,8 @@ void ARMv7_instrs::VMSR(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6189,8 +6184,8 @@ void ARMv7_instrs::VMUL_(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6198,8 +6193,8 @@ void ARMv7_instrs::VMUL_FP(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6207,8 +6202,8 @@ void ARMv7_instrs::VMUL_S(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6216,8 +6211,8 @@ void ARMv7_instrs::VMVN_IMM(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6225,8 +6220,8 @@ void ARMv7_instrs::VMVN_REG(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6234,8 +6229,8 @@ void ARMv7_instrs::VNEG(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6243,8 +6238,8 @@ void ARMv7_instrs::VNM__(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6252,8 +6247,8 @@ void ARMv7_instrs::VORN_REG(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6261,8 +6256,8 @@ void ARMv7_instrs::VORR_IMM(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6270,8 +6265,8 @@ void ARMv7_instrs::VORR_REG(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6279,8 +6274,8 @@ void ARMv7_instrs::VPADAL(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6288,8 +6283,8 @@ void ARMv7_instrs::VPADD(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6297,8 +6292,8 @@ void ARMv7_instrs::VPADD_FP(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6306,8 +6301,8 @@ void ARMv7_instrs::VPADDL(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6315,8 +6310,8 @@ void ARMv7_instrs::VPMAXMIN(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6324,8 +6319,8 @@ void ARMv7_instrs::VPMAXMIN_FP(ARMv7Context& context, const ARMv7Code code, cons { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6333,8 +6328,8 @@ void ARMv7_instrs::VPOP(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6342,8 +6337,8 @@ void ARMv7_instrs::VPUSH(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6351,8 +6346,8 @@ void ARMv7_instrs::VQABS(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6360,8 +6355,8 @@ void ARMv7_instrs::VQADD(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6369,8 +6364,8 @@ void ARMv7_instrs::VQDML_L(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6378,8 +6373,8 @@ void ARMv7_instrs::VQDMULH(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6387,8 +6382,8 @@ void ARMv7_instrs::VQDMULL(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6396,8 +6391,8 @@ void ARMv7_instrs::VQMOV_N(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6405,8 +6400,8 @@ void ARMv7_instrs::VQNEG(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6414,8 +6409,8 @@ void ARMv7_instrs::VQRDMULH(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6423,8 +6418,8 @@ void ARMv7_instrs::VQRSHL(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6432,8 +6427,8 @@ void ARMv7_instrs::VQRSHR_N(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6441,8 +6436,8 @@ void ARMv7_instrs::VQSHL_REG(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6450,8 +6445,8 @@ void ARMv7_instrs::VQSHL_IMM(ARMv7Context& context, const ARMv7Code code, const { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6459,8 +6454,8 @@ void ARMv7_instrs::VQSHR_N(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6468,8 +6463,8 @@ void ARMv7_instrs::VQSUB(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6477,8 +6472,8 @@ void ARMv7_instrs::VRADDHN(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6486,8 +6481,8 @@ void ARMv7_instrs::VRECPE(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6495,8 +6490,8 @@ void ARMv7_instrs::VRECPS(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6504,8 +6499,8 @@ void ARMv7_instrs::VREV__(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6513,8 +6508,8 @@ void ARMv7_instrs::VRHADD(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6522,8 +6517,8 @@ void ARMv7_instrs::VRSHL(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6531,8 +6526,8 @@ void ARMv7_instrs::VRSHR(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6540,8 +6535,8 @@ void ARMv7_instrs::VRSHRN(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6549,8 +6544,8 @@ void ARMv7_instrs::VRSQRTE(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6558,8 +6553,8 @@ void ARMv7_instrs::VRSQRTS(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6567,8 +6562,8 @@ void ARMv7_instrs::VRSRA(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6576,8 +6571,8 @@ void ARMv7_instrs::VRSUBHN(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6585,8 +6580,8 @@ void ARMv7_instrs::VSHL_IMM(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6594,8 +6589,8 @@ void ARMv7_instrs::VSHL_REG(ARMv7Context& context, const ARMv7Code code, const A { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6603,8 +6598,8 @@ void ARMv7_instrs::VSHLL(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6612,8 +6607,8 @@ void ARMv7_instrs::VSHR(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6621,8 +6616,8 @@ void ARMv7_instrs::VSHRN(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6630,8 +6625,8 @@ void ARMv7_instrs::VSLI(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6639,8 +6634,8 @@ void ARMv7_instrs::VSQRT(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6648,8 +6643,8 @@ void ARMv7_instrs::VSRA(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6657,8 +6652,8 @@ void ARMv7_instrs::VSRI(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6666,8 +6661,8 @@ void ARMv7_instrs::VST__MS(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6675,8 +6670,8 @@ void ARMv7_instrs::VST1_SL(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6684,8 +6679,8 @@ void ARMv7_instrs::VST2_SL(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6693,8 +6688,8 @@ void ARMv7_instrs::VST3_SL(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6702,8 +6697,8 @@ void ARMv7_instrs::VST4_SL(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6711,8 +6706,8 @@ void ARMv7_instrs::VSTM(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6720,8 +6715,8 @@ void ARMv7_instrs::VSTR(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6729,8 +6724,8 @@ void ARMv7_instrs::VSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6738,8 +6733,8 @@ void ARMv7_instrs::VSUB_FP(ARMv7Context& context, const ARMv7Code code, const AR { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6747,8 +6742,8 @@ void ARMv7_instrs::VSUBHN(ARMv7Context& context, const ARMv7Code code, const ARM { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6756,8 +6751,8 @@ void ARMv7_instrs::VSUB_(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6765,8 +6760,8 @@ void ARMv7_instrs::VSWP(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6774,8 +6769,8 @@ void ARMv7_instrs::VTB_(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6783,8 +6778,8 @@ void ARMv7_instrs::VTRN(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6792,8 +6787,8 @@ void ARMv7_instrs::VTST(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6801,8 +6796,8 @@ void ARMv7_instrs::VUZP(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6810,8 +6805,8 @@ void ARMv7_instrs::VZIP(ARMv7Context& context, const ARMv7Code code, const ARMv7 { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6820,8 +6815,8 @@ void ARMv7_instrs::WFE(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6829,8 +6824,8 @@ void ARMv7_instrs::WFI(ARMv7Context& context, const ARMv7Code code, const ARMv7_ { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } @@ -6838,7 +6833,7 @@ void ARMv7_instrs::YIELD(ARMv7Context& context, const ARMv7Code code, const ARMv { switch (type) { - case A1: throw __FUNCTION__; - default: throw __FUNCTION__; + case A1: throw EXCEPTION(""); + default: throw EXCEPTION(""); } } diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp index b1575eede1..6452fc464c 100644 --- a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp +++ b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp @@ -91,6 +91,7 @@ ARMv7Thread::~ARMv7Thread() cv.notify_one(); join(); + CloseStack(); armv7_free_tls(GetId()); } @@ -202,7 +203,7 @@ void ARMv7Thread::Task() while (true) { - if (m_state.load() && CheckStatus()) return; + if (m_state.load() && CheckStatus()) break; // decode instruction using specified decoder PC += m_dec->DecodeMemory(PC); @@ -219,9 +220,11 @@ void ARMv7Thread::FastCall(u32 addr) auto old_PC = PC; auto old_stack = SP; auto old_LR = LR; + auto old_task = decltype(custom_task)(); PC = addr; LR = Emu.GetCPUThreadStop(); + custom_task.swap(old_task); try { @@ -231,6 +234,8 @@ void ARMv7Thread::FastCall(u32 addr) { } + m_state &= ~CPU_STATE_RETURN; + PC = old_PC; if (SP != old_stack) // SP shouldn't change @@ -239,11 +244,12 @@ void ARMv7Thread::FastCall(u32 addr) } LR = old_LR; + custom_task.swap(old_task); } void ARMv7Thread::FastStop() { - throw CPUThreadReturn{}; + m_state |= CPU_STATE_RETURN; } armv7_thread::armv7_thread(u32 entry, const std::string& name, u32 stack_size, s32 prio) diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp b/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp index c110efee81..bc0d63c2b0 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp @@ -6,22 +6,22 @@ s32 sceAppMgrReceiveEventNum(vm::ptr eventNum) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppMgrReceiveEvent(vm::ptr appEvent) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppMgrAcquireBgmPort() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppMgrReleaseBgmPort() { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp index 83559262c3..f05c91b0ec 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp @@ -6,67 +6,67 @@ s32 sceAppUtilInit(vm::cptr initParam, vm::ptr bootParam) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppUtilShutdown() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppUtilSaveDataSlotCreate(u32 slotId, vm::cptr param, vm::cptr mountPoint) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppUtilSaveDataSlotDelete(u32 slotId, vm::cptr mountPoint) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppUtilSaveDataSlotSetParam(u32 slotId, vm::cptr param, vm::cptr mountPoint) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppUtilSaveDataSlotGetParam(u32 slotId, vm::ptr param, vm::cptr mountPoint) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppUtilSaveDataFileSave(vm::cptr slot, vm::cptr files, u32 fileNum, vm::cptr mountPoint, vm::ptr requiredSizeKB) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppUtilPhotoMount() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppUtilPhotoUmount() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppUtilSystemParamGetInt(u32 paramId, vm::ptr value) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppUtilSystemParamGetString(u32 paramId, vm::ptr buf, u32 bufSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppUtilSaveSafeMemory(vm::cptr buf, u32 bufSize, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAppUtilLoadSafeMemory(vm::ptr buf, u32 bufSize, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp b/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp index 9851652437..c4107eef55 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp @@ -6,42 +6,42 @@ s32 sceAudioOutOpenPort(s32 portType, s32 len, s32 freq, s32 param) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioOutReleasePort(s32 port) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioOutOutput(s32 port, vm::ptr ptr) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioOutSetVolume(s32 port, s32 flag, vm::ptr vol) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioOutSetConfig(s32 port, s32 len, s32 freq, s32 param) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioOutGetConfig(s32 port, s32 configType) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioOutGetRestSample(s32 port) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioOutGetAdopt(s32 portType) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp b/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp index 7c28021604..03523adbd2 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp @@ -6,17 +6,17 @@ s32 sceAudioInOpenPort(s32 portType, s32 grain, s32 freq, s32 param) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioInReleasePort(s32 port) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioInInput(s32 port, vm::ptr destPtr) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp b/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp index 817501e768..abb147a619 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp @@ -6,37 +6,37 @@ s32 sceAudiodecInitLibrary(u32 codecType, vm::ptr pInitParam) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudiodecTermLibrary(u32 codecType) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudiodecCreateDecoder(vm::ptr pCtrl, u32 codecType) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudiodecDeleteDecoder(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudiodecDecode(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudiodecClearContext(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudiodecGetInternalError(vm::ptr pCtrl, vm::ptr pInternalError) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp b/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp index eb586fb556..73cdfe8b5a 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp @@ -6,42 +6,42 @@ s32 sceAudioencInitLibrary(u32 codecType, vm::ptr pInitParam) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioencTermLibrary(u32 codecType) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioencCreateEncoder(vm::ptr pCtrl, u32 codecType) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioencDeleteEncoder(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioencEncode(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioencClearContext(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioencGetOptInfo(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAudioencGetInternalError(vm::ptr pCtrl, vm::ptr pInternalError) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp b/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp index bd4d5dbc04..d5ff9d996d 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp @@ -6,207 +6,207 @@ s32 sceCameraOpen(s32 devnum, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraClose(s32 devnum) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraStart(s32 devnum) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraStop(s32 devnum) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraRead(s32 devnum, vm::ptr pRead) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraIsActive(s32 devnum) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetSaturation(s32 devnum, vm::ptr pLevel) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetSaturation(s32 devnum, s32 level) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetBrightness(s32 devnum, vm::ptr pLevel) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetBrightness(s32 devnum, s32 level) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetContrast(s32 devnum, vm::ptr pLevel) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetContrast(s32 devnum, s32 level) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetSharpness(s32 devnum, vm::ptr pLevel) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetSharpness(s32 devnum, s32 level) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetReverse(s32 devnum, vm::ptr pMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetReverse(s32 devnum, s32 mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetEffect(s32 devnum, vm::ptr pMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetEffect(s32 devnum, s32 mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetEV(s32 devnum, vm::ptr pLevel) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetEV(s32 devnum, s32 level) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetZoom(s32 devnum, vm::ptr pLevel) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetZoom(s32 devnum, s32 level) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetAntiFlicker(s32 devnum, vm::ptr pMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetAntiFlicker(s32 devnum, s32 mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetISO(s32 devnum, vm::ptr pMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetISO(s32 devnum, s32 mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetGain(s32 devnum, vm::ptr pMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetGain(s32 devnum, s32 mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetWhiteBalance(s32 devnum, vm::ptr pMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetWhiteBalance(s32 devnum, s32 mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetBacklight(s32 devnum, vm::ptr pMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetBacklight(s32 devnum, s32 mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetNightmode(s32 devnum, vm::ptr pMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetNightmode(s32 devnum, s32 mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraLedSwitch(s32 devnum, s32 iSwitch) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraLedBlink(s32 devnum, s32 iOnCount, s32 iOffCount, s32 iBlinkCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetNoiseReductionForDebug(s32 devnum, vm::ptr pLevel) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetNoiseReductionForDebug(s32 devnum, s32 level) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraGetSharpnessOffForDebug(s32 devnum, vm::ptr pLevel) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCameraSetSharpnessOffForDebug(s32 devnum, s32 level) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceCameraUseCacheMemoryForTrial(s32 isCache) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp b/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp index 3d821148f3..cfb84e9cfe 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp @@ -6,22 +6,22 @@ s32 sceCodecEnginePmonStart() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCodecEnginePmonStop() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCodecEnginePmonGetProcessorLoad(vm::ptr pProcessorLoad) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCodecEnginePmonReset() { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp b/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp index 24c7a841d3..b63dd9d202 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp @@ -6,202 +6,202 @@ s32 sceCommonDialogUpdate(vm::cptr updateParam) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMsgDialogInit(vm::cptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceCommonDialogStatus sceMsgDialogGetStatus() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMsgDialogAbort() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMsgDialogGetResult(vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMsgDialogTerm() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMsgDialogClose() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMsgDialogProgressBarInc(s32 target, u32 delta) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMsgDialogProgressBarSetValue(s32 target, u32 rate) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCheckDialogInit(vm::ptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceCommonDialogStatus sceNetCheckDialogGetStatus() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCheckDialogAbort() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCheckDialogGetResult(vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCheckDialogTerm() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSaveDataDialogInit(vm::cptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceCommonDialogStatus sceSaveDataDialogGetStatus() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSaveDataDialogAbort() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSaveDataDialogGetResult(vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSaveDataDialogTerm() { - throw __FUNCTION__; + throw EXCEPTION(""); } SceCommonDialogStatus sceSaveDataDialogGetSubStatus() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSaveDataDialogSubClose() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSaveDataDialogContinue(vm::cptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSaveDataDialogFinish(vm::cptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSaveDataDialogProgressBarInc(s32 target, u32 delta) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSaveDataDialogProgressBarSetValue(s32 target, u32 rate) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceImeDialogInit(vm::cptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceCommonDialogStatus sceImeDialogGetStatus() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceImeDialogAbort() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceImeDialogGetResult(vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceImeDialogTerm() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 scePhotoImportDialogInit(vm::cptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceCommonDialogStatus scePhotoImportDialogGetStatus() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 scePhotoImportDialogGetResult(vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 scePhotoImportDialogTerm() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 scePhotoImportDialogAbort() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 scePhotoReviewDialogInit(vm::cptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceCommonDialogStatus scePhotoReviewDialogGetStatus() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 scePhotoReviewDialogGetResult(vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 scePhotoReviewDialogTerm() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 scePhotoReviewDialogAbort() { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp b/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp index 979f94d531..3dc74100c4 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp @@ -6,42 +6,42 @@ s32 sceCtrlSetSamplingMode(u32 uiMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCtrlGetSamplingMode(vm::ptr puiMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCtrlPeekBufferPositive(s32 port, vm::ptr pData, s32 nBufs) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCtrlPeekBufferNegative(s32 port, vm::ptr pData, s32 nBufs) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCtrlReadBufferPositive(s32 port, vm::ptr pData, s32 nBufs) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCtrlReadBufferNegative(s32 port, vm::ptr pData, s32 nBufs) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCtrlSetRapidFire(s32 port, s32 idx, vm::cptr pRule) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceCtrlClearRapidFire(s32 port, s32 idx) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp b/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp index 0211c1f342..d20b8dc818 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp @@ -6,22 +6,22 @@ s32 sceDbgSetMinimumLogLevel(s32 minimumLogLevel) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDbgSetBreakOnErrorState(SceDbgBreakOnErrorState state) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDbgAssertionHandler(vm::cptr pFile, s32 line, bool stop, vm::cptr pComponent, vm::cptr pMessage) // va_args... { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDbgLoggingHandler(vm::cptr pFile, s32 line, s32 severity, vm::cptr pComponent, vm::cptr pMessage) // va_args... { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp b/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp index 6b1e6a5087..1553aa4bf3 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp @@ -6,27 +6,27 @@ s32 sceKernelDeci4pOpen(vm::cptr protoname, u32 protonum, u32 bufsize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelDeci4pClose(s32 socketid) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelDeci4pRead(s32 socketid, vm::ptr buffer, u32 size, u32 reserved) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelDeci4pWrite(s32 socketid, vm::cptr buffer, u32 size, u32 reserved) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelDeci4pRegisterCallback(s32 socketid, s32 cbid) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp b/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp index cce3335a3d..2aa496213c 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp @@ -6,67 +6,67 @@ s32 sceGzipIsValid(vm::cptr pSrcGzip) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGzipGetInfo(vm::cptr pSrcGzip, vm::cpptr ppvExtra, vm::cpptr ppszName, vm::cpptr ppszComment, vm::ptr pusCrc, vm::cpptr ppvData) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceGzipGetName(vm::cptr pSrcGzip) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceGzipGetComment(vm::cptr pSrcGzip) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceGzipGetCompressedData(vm::cptr pSrcGzip) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGzipDecompress(vm::ptr pDst, u32 uiBufSize, vm::cptr pSrcGzip, vm::ptr puiCrc32) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceZlibIsValid(vm::cptr pSrcZlib) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceZlibGetInfo(vm::cptr pSrcZlib, vm::ptr pbCmf, vm::ptr pbFlg, vm::ptr puiDictId, vm::cpptr ppvData) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceZlibGetCompressedData(vm::cptr pSrcZlib) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceZlibDecompress(vm::ptr pDst, u32 uiBufSize, vm::cptr pSrcZlib, vm::ptr puiAdler32) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceZlibAdler32(u32 uiAdler, vm::cptr pSrc, u32 uiSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDeflateDecompress(vm::ptr pDst, u32 uiBufSize, vm::cptr pSrcDeflate, vm::cpptr ppNext) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceZipGetInfo(vm::cptr pSrc, vm::cpptr ppvExtra, vm::ptr puiCrc, vm::cpptr ppvData) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp b/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp index 3e920cde38..48e1eed48a 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp @@ -6,72 +6,72 @@ s32 sceDisplayGetRefreshRate(vm::ptr pFps) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplaySetFrameBuf(vm::cptr pFrameBuf, s32 iUpdateTimingMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplayGetFrameBuf(vm::ptr pFrameBuf, s32 iUpdateTimingMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplayGetVcount() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplayWaitVblankStart() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplayWaitVblankStartCB() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplayWaitVblankStartMulti(u32 vcount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplayWaitVblankStartMultiCB(u32 vcount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplayWaitSetFrameBuf() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplayWaitSetFrameBufCB() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplayWaitSetFrameBufMulti(u32 vcount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplayWaitSetFrameBufMultiCB(u32 vcount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplayRegisterVblankStartCallback(s32 uid) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceDisplayUnregisterVblankStartCallback(s32 uid) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp b/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp index a8984af8ab..44fab30de3 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp @@ -6,42 +6,42 @@ s32 _sceFiberInitializeImpl(vm::ptr fiber, vm::cptr name, vm::ptr entry, u32 argOnInitialize, vm::ptr addrContext, u32 sizeContext, vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiberOptParamInitialize(vm::ptr optParam) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiberFinalize(vm::ptr fiber) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiberRun(vm::ptr fiber, u32 argOnRunTo, vm::ptr argOnReturn) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiberSwitch(vm::ptr fiber, u32 argOnRunTo, vm::ptr argOnRun) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiberGetSelf(vm::pptr fiber) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiberReturnToThread(u32 argOnReturn, vm::ptr argOnRun) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiberGetInfo(vm::ptr fiber, vm::ptr fiberInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp b/rpcs3/Emu/ARMv7/Modules/sceFios.cpp index 2ed780a21f..7581e7ac7f 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceFios.cpp @@ -6,682 +6,682 @@ s32 sceFiosInitialize(vm::cptr pParameters) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosTerminate() { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceFiosIsInitialized(vm::ptr pOutParameters) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosUpdateParameters(vm::cptr pParameters) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosSetGlobalDefaultOpAttr(vm::cptr pAttr) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceFiosGetGlobalDefaultOpAttr(vm::ptr pOutAttr) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosSetThreadDefaultOpAttr(vm::cptr pAttr) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceFiosGetThreadDefaultOpAttr(vm::ptr pOutAttr) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosGetDefaultOpAttr(vm::ptr pOutAttr) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosSuspend() { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceFiosGetSuspendCount() { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceFiosIsSuspended() { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosResume() { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosShutdownAndCancelOps() { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosCancelAllOps() { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosCloseAllFiles() { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceFiosIsIdle() { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceFiosGetAllFHs(vm::ptr pOutArray, u32 arraySize) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceFiosGetAllDHs(vm::ptr pOutArray, u32 arraySize) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceFiosGetAllOps(vm::ptr pOutArray, u32 arraySize) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceFiosIsValidHandle(s32 h) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosPathcmp(vm::cptr pA, vm::cptr pB) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosPathncmp(vm::cptr pA, vm::cptr pB, u32 n) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosPrintf(vm::cptr pFormat) // va_args... { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosVprintf(vm::cptr pFormat) // va_list { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFileExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceFiosFileExistsSync(vm::cptr pAttr, vm::cptr pPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFileGetSize(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFileGetSizeSync(vm::cptr pAttr, vm::cptr pPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFileDelete(vm::cptr pAttr, vm::cptr pPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFileDeleteSync(vm::cptr pAttr, vm::cptr pPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDirectoryExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceFiosDirectoryExistsSync(vm::cptr pAttr, vm::cptr pPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDirectoryCreate(vm::cptr pAttr, vm::cptr pPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDirectoryCreateSync(vm::cptr pAttr, vm::cptr pPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDirectoryDelete(vm::cptr pAttr, vm::cptr pPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDirectoryDeleteSync(vm::cptr pAttr, vm::cptr pPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceFiosExistsSync(vm::cptr pAttr, vm::cptr pPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosStat(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutStatus) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosStatSync(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutStatus) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDelete(vm::cptr pAttr, vm::cptr pPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDeleteSync(vm::cptr pAttr, vm::cptr pPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosResolve(vm::cptr pAttr, vm::cptr pInTuple, vm::ptr pOutTuple) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosResolveSync(vm::cptr pAttr, vm::cptr pInTuple, vm::ptr pOutTuple) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosRename(vm::cptr pAttr, vm::cptr pOldPath, vm::cptr pNewPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosRenameSync(vm::cptr pAttr, vm::cptr pOldPath, vm::cptr pNewPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFileRead(vm::cptr pAttr, vm::cptr pPath, vm::ptr pBuf, s64 length, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFileReadSync(vm::cptr pAttr, vm::cptr pPath, vm::ptr pBuf, s64 length, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFileWrite(vm::cptr pAttr, vm::cptr pPath, vm::cptr pBuf, s64 length, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFileWriteSync(vm::cptr pAttr, vm::cptr pPath, vm::cptr pBuf, s64 length, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFileTruncate(vm::cptr pAttr, vm::cptr pPath, s64 length) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFileTruncateSync(vm::cptr pAttr, vm::cptr pPath, s64 length) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHOpen(vm::cptr pAttr, vm::ptr pOutFH, vm::cptr pPath, vm::cptr pOpenParams) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHOpenSync(vm::cptr pAttr, vm::ptr pOutFH, vm::cptr pPath, vm::cptr pOpenParams) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHStat(vm::cptr pAttr, s32 fh, vm::ptr pOutStatus) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHStatSync(vm::cptr pAttr, s32 fh, vm::ptr pOutStatus) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHTruncate(vm::cptr pAttr, s32 fh, s64 length) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHTruncateSync(vm::cptr pAttr, s32 fh, s64 length) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHSync(vm::cptr pAttr, s32 fh) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHSyncSync(vm::cptr pAttr, s32 fh) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHRead(vm::cptr pAttr, s32 fh, vm::ptr pBuf, s64 length) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFHReadSync(vm::cptr pAttr, s32 fh, vm::ptr pBuf, s64 length) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHWrite(vm::cptr pAttr, s32 fh, vm::cptr pBuf, s64 length) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFHWriteSync(vm::cptr pAttr, s32 fh, vm::cptr pBuf, s64 length) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHReadv(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFHReadvSync(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHWritev(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFHWritevSync(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHPread(vm::cptr pAttr, s32 fh, vm::ptr pBuf, s64 length, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFHPreadSync(vm::cptr pAttr, s32 fh, vm::ptr pBuf, s64 length, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHPwrite(vm::cptr pAttr, s32 fh, vm::cptr pBuf, s64 length, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFHPwriteSync(vm::cptr pAttr, s32 fh, vm::cptr pBuf, s64 length, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHPreadv(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFHPreadvSync(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHPwritev(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFHPwritevSync(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHClose(vm::cptr pAttr, s32 fh) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosFHCloseSync(vm::cptr pAttr, s32 fh) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFHSeek(s32 fh, s64 offset, SceFiosWhence whence) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFHTell(s32 fh) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceFiosFHGetPath(s32 fh) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosFHGetSize(s32 fh) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceFiosFHGetOpenParams(s32 fh) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDHOpen(vm::cptr pAttr, vm::ptr pOutDH, vm::cptr pPath, SceFiosBuffer buf) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDHOpenSync(vm::cptr pAttr, vm::ptr pOutDH, vm::cptr pPath, SceFiosBuffer buf) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDHRead(vm::cptr pAttr, s32 dh, vm::ptr pOutEntry) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDHReadSync(vm::cptr pAttr, s32 dh, vm::ptr pOutEntry) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDHClose(vm::cptr pAttr, s32 dh) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosDHCloseSync(vm::cptr pAttr, s32 dh) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceFiosDHGetPath(s32 dh) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceFiosOpIsDone(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosOpWait(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosOpWaitUntil(s32 op, s64 deadline) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosOpDelete(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosOpSyncWait(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosOpSyncWaitForIO(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosOpGetError(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosOpCancel(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceFiosOpIsCancelled(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceFiosOpGetAttr(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceFiosOpGetPath(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceFiosOpGetBuffer(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosOpGetOffset(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosOpGetRequestCount(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosOpGetActualCount(s32 op) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosOpReschedule(s32 op, s64 newDeadline) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosTimeGetCurrent() { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosTimeIntervalToNanoseconds(s64 interval) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosTimeIntervalFromNanoseconds(s64 ns) { - throw __FUNCTION__; + throw EXCEPTION(""); } u64 sceFiosDateGetCurrent() { - throw __FUNCTION__; + throw EXCEPTION(""); } u64 sceFiosDateFromComponents(vm::cptr pComponents) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceFiosDateToComponents(u64 date, vm::ptr pOutComponents) { - throw __FUNCTION__; + throw EXCEPTION(""); } u64 sceFiosDateFromSceDateTime(vm::cptr pSceDateTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceFiosDateToSceDateTime(u64 date, vm::ptr pSceDateTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosOverlayAdd(vm::cptr pOverlay, vm::ptr pOutID) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosOverlayRemove(s32 id) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosOverlayGetInfo(s32 id, vm::ptr pOutOverlay) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosOverlayModify(s32 id, vm::cptr pNewValue) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosOverlayGetList(vm::ptr pOutIDs, u32 maxIDs, vm::ptr pActualIDs) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosOverlayResolveSync(s32 resolveFlag, vm::cptr pInPath, vm::ptr pOutPath, u32 maxPath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosArchiveGetMountBufferSize(vm::cptr pAttr, vm::cptr pArchivePath, vm::cptr pOpenParams) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceFiosArchiveGetMountBufferSizeSync(vm::cptr pAttr, vm::cptr pArchivePath, vm::cptr pOpenParams) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosArchiveMount(vm::cptr pAttr, vm::ptr pOutFH, vm::cptr pArchivePath, vm::cptr pMountPoint, SceFiosBuffer mountBuffer, vm::cptr pOpenParams) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosArchiveMountSync(vm::cptr pAttr, vm::ptr pOutFH, vm::cptr pArchivePath, vm::cptr pMountPoint, SceFiosBuffer mountBuffer, vm::cptr pOpenParams) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosArchiveUnmount(vm::cptr pAttr, s32 fh) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosArchiveUnmountSync(vm::cptr pAttr, s32 fh) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceFiosDebugDumpError(s32 err, vm::ptr pBuffer, u32 bufferSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceFiosDebugDumpOp(s32 op, vm::ptr pBuffer, u32 bufferSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceFiosDebugDumpFH(s32 fh, vm::ptr pBuffer, u32 bufferSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceFiosDebugDumpDH(s32 dh, vm::ptr pBuffer, u32 bufferSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceFiosDebugDumpDate(u64 date, vm::ptr pBuffer, u32 bufferSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosIOFilterAdd(s32 index, vm::ptr pFilterCallback, vm::ptr pFilterContext) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosIOFilterGetInfo(s32 index, vm::pptr pOutFilterCallback, vm::pptr pOutFilterContext) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceFiosIOFilterRemove(s32 index) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceFiosIOFilterPsarcDearchiver() { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceFios, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceFpu.cpp b/rpcs3/Emu/ARMv7/Modules/sceFpu.cpp index c853461a87..27b7c6e5c7 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceFpu.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceFpu.cpp @@ -6,73 +6,73 @@ float sceFpuSinf(float x) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuCosf(float x) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuTanf(float x) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuAtanf(float x) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuAtan2f(float y, float x) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuAsinf(float x) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuAcosf(float x) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuLogf(float x) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuLog2f(float fs) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuLog10f(float fs) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuExpf(float x) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuExp2f(float x) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuExp10f(float x) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceFpuPowf(float x, float y) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp b/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp index 77233f3082..0a176282a9 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp @@ -6,1064 +6,1064 @@ s32 sceGxmInitialize(vm::cptr params) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTerminate() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceGxmGetNotificationRegion() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmNotificationWait(vm::cptr notification) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmMapMemory(vm::ptr base, u32 size, SceGxmMemoryAttribFlags attr) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmUnmapMemory(vm::ptr base) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmMapVertexUsseMemory(vm::ptr base, u32 size, vm::ptr offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmUnmapVertexUsseMemory(vm::ptr base) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmMapFragmentUsseMemory(vm::ptr base, u32 size, vm::ptr offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmUnmapFragmentUsseMemory(vm::ptr base) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmDisplayQueueAddEntry(vm::ptr oldBuffer, vm::ptr newBuffer, vm::cptr callbackData) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmDisplayQueueFinish() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmSyncObjectCreate(vm::pptr syncObject) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmSyncObjectDestroy(vm::ptr syncObject) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmCreateContext(vm::cptr params, vm::pptr context) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmDestroyContext(vm::ptr context) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetValidationEnable(vm::ptr context, bool enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetVertexProgram(vm::ptr context, vm::cptr vertexProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFragmentProgram(vm::ptr context, vm::cptr fragmentProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmReserveVertexDefaultUniformBuffer(vm::ptr context, vm::pptr uniformBuffer) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmReserveFragmentDefaultUniformBuffer(vm::ptr context, vm::pptr uniformBuffer) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmSetVertexStream(vm::ptr context, u32 streamIndex, vm::cptr streamData) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmSetVertexTexture(vm::ptr context, u32 textureIndex, vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmSetFragmentTexture(vm::ptr context, u32 textureIndex, vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmSetVertexUniformBuffer(vm::ptr context, u32 bufferIndex, vm::cptr bufferData) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmSetFragmentUniformBuffer(vm::ptr context, u32 bufferIndex, vm::cptr bufferData) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmSetAuxiliarySurface(vm::ptr context, u32 surfaceIndex, vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetPrecomputedFragmentState(vm::ptr context, vm::cptr precomputedState) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetPrecomputedVertexState(vm::ptr context, vm::cptr precomputedState) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmDrawPrecomputed(vm::ptr context, vm::cptr precomputedDraw) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmDraw(vm::ptr context, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::cptr indexData, u32 indexCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmDrawInstanced(vm::ptr context, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::cptr indexData, u32 indexCount, u32 indexWrap) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmSetVisibilityBuffer(vm::ptr context, vm::ptr bufferBase, u32 stridePerCore) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmBeginScene(vm::ptr context, u32 flags, vm::cptr renderTarget, vm::cptr validRegion, vm::ptr vertexSyncObject, vm::ptr fragmentSyncObject, vm::cptr colorSurface, vm::cptr depthStencil) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmMidSceneFlush(vm::ptr context, u32 flags, vm::ptr vertexSyncObject, vm::cptr vertexNotification) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmEndScene(vm::ptr context, vm::cptr vertexNotification, vm::cptr fragmentNotification) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFrontDepthFunc(vm::ptr context, SceGxmDepthFunc depthFunc) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetBackDepthFunc(vm::ptr context, SceGxmDepthFunc depthFunc) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFrontFragmentProgramEnable(vm::ptr context, SceGxmFragmentProgramMode enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetBackFragmentProgramEnable(vm::ptr context, SceGxmFragmentProgramMode enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFrontDepthWriteEnable(vm::ptr context, SceGxmDepthWriteMode enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetBackDepthWriteEnable(vm::ptr context, SceGxmDepthWriteMode enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFrontLineFillLastPixelEnable(vm::ptr context, SceGxmLineFillLastPixelMode enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetBackLineFillLastPixelEnable(vm::ptr context, SceGxmLineFillLastPixelMode enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFrontStencilRef(vm::ptr context, u32 sref) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetBackStencilRef(vm::ptr context, u32 sref) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFrontPointLineWidth(vm::ptr context, u32 width) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetBackPointLineWidth(vm::ptr context, u32 width) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFrontPolygonMode(vm::ptr context, SceGxmPolygonMode mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetBackPolygonMode(vm::ptr context, SceGxmPolygonMode mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFrontStencilFunc(vm::ptr context, SceGxmStencilFunc func, SceGxmStencilOp stencilFail, SceGxmStencilOp depthFail, SceGxmStencilOp depthPass, u8 compareMask, u8 writeMask) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetBackStencilFunc(vm::ptr context, SceGxmStencilFunc func, SceGxmStencilOp stencilFail, SceGxmStencilOp depthFail, SceGxmStencilOp depthPass, u8 compareMask, u8 writeMask) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFrontDepthBias(vm::ptr context, s32 factor, s32 units) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetBackDepthBias(vm::ptr context, s32 factor, s32 units) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetTwoSidedEnable(vm::ptr context, SceGxmTwoSidedMode enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetViewport(vm::ptr context, float xOffset, float xScale, float yOffset, float yScale, float zOffset, float zScale) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetWClampValue(vm::ptr context, float clampValue) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetWClampEnable(vm::ptr context, SceGxmWClampMode enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetRegionClip(vm::ptr context, SceGxmRegionClipMode mode, u32 xMin, u32 yMin, u32 xMax, u32 yMax) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetCullMode(vm::ptr context, SceGxmCullMode mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetViewportEnable(vm::ptr context, SceGxmViewportMode enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetWBufferEnable(vm::ptr context, SceGxmWBufferMode enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFrontVisibilityTestIndex(vm::ptr context, u32 index) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetBackVisibilityTestIndex(vm::ptr context, u32 index) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFrontVisibilityTestOp(vm::ptr context, SceGxmVisibilityTestOp op) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetBackVisibilityTestOp(vm::ptr context, SceGxmVisibilityTestOp op) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetFrontVisibilityTestEnable(vm::ptr context, SceGxmVisibilityTestMode enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmSetBackVisibilityTestEnable(vm::ptr context, SceGxmVisibilityTestMode enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmFinish(vm::ptr context) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPushUserMarker(vm::ptr context, vm::cptr tag) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPopUserMarker(vm::ptr context) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmSetUserMarker(vm::ptr context, vm::cptr tag) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPadHeartbeat(vm::cptr displaySurface, vm::ptr displaySyncObject) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPadTriggerGpuPaTrace() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmColorSurfaceInit(vm::ptr surface, SceGxmColorFormat colorFormat, SceGxmColorSurfaceType surfaceType, SceGxmColorSurfaceScaleMode scaleMode, SceGxmOutputRegisterSize outputRegisterSize, u32 width, u32 height, u32 strideInPixels, vm::ptr data) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmColorSurfaceInitDisabled(vm::ptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceGxmColorSurfaceIsEnabled(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmColorSurfaceGetClip(vm::cptr surface, vm::ptr xMin, vm::ptr yMin, vm::ptr xMax, vm::ptr yMax) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmColorSurfaceSetClip(vm::ptr surface, u32 xMin, u32 yMin, u32 xMax, u32 yMax) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmColorSurfaceScaleMode sceGxmColorSurfaceGetScaleMode(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmColorSurfaceSetScaleMode(vm::ptr surface, SceGxmColorSurfaceScaleMode scaleMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceGxmColorSurfaceGetData(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmColorSurfaceSetData(vm::ptr surface, vm::ptr data) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmColorFormat sceGxmColorSurfaceGetFormat(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmColorSurfaceSetFormat(vm::ptr surface, SceGxmColorFormat format) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmColorSurfaceType sceGxmColorSurfaceGetType(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmColorSurfaceGetStrideInPixels(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmDepthStencilSurfaceInit(vm::ptr surface, SceGxmDepthStencilFormat depthStencilFormat, SceGxmDepthStencilSurfaceType surfaceType, u32 strideInSamples, vm::ptr depthData, vm::ptr stencilData) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmDepthStencilSurfaceInitDisabled(vm::ptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceGxmDepthStencilSurfaceGetBackgroundDepth(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmDepthStencilSurfaceSetBackgroundDepth(vm::ptr surface, float backgroundDepth) { - throw __FUNCTION__; + throw EXCEPTION(""); } u8 sceGxmDepthStencilSurfaceGetBackgroundStencil(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmDepthStencilSurfaceSetBackgroundStencil(vm::ptr surface, u8 backgroundStencil) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceGxmDepthStencilSurfaceIsEnabled(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmDepthStencilSurfaceSetForceLoadMode(vm::ptr surface, SceGxmDepthStencilForceLoadMode forceLoad) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmDepthStencilForceLoadMode sceGxmDepthStencilSurfaceGetForceLoadMode(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmDepthStencilSurfaceSetForceStoreMode(vm::ptr surface, SceGxmDepthStencilForceStoreMode forceStore) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmDepthStencilForceStoreMode sceGxmDepthStencilSurfaceGetForceStoreMode(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmColorSurfaceGammaMode sceGxmColorSurfaceGetGammaMode(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmColorSurfaceSetGammaMode(vm::ptr surface, SceGxmColorSurfaceGammaMode gammaMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmColorSurfaceDitherMode sceGxmColorSurfaceGetDitherMode(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmColorSurfaceSetDitherMode(vm::ptr surface, SceGxmColorSurfaceDitherMode ditherMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmDepthStencilFormat sceGxmDepthStencilSurfaceGetFormat(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmDepthStencilSurfaceGetStrideInSamples(vm::cptr surface) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmProgramCheck(vm::cptr program) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmProgramGetSize(vm::cptr program) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmProgramType sceGxmProgramGetType(vm::cptr program) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceGxmProgramIsDiscardUsed(vm::cptr program) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceGxmProgramIsDepthReplaceUsed(vm::cptr program) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceGxmProgramIsSpriteCoordUsed(vm::cptr program) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmProgramGetDefaultUniformBufferSize(vm::cptr program) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmProgramGetParameterCount(vm::cptr program) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceGxmProgramGetParameter(vm::cptr program, u32 index) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceGxmProgramFindParameterByName(vm::cptr program, vm::cptr name) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceGxmProgramFindParameterBySemantic(vm::cptr program, SceGxmParameterSemantic semantic, u32 index) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmProgramParameterGetIndex(vm::cptr program, vm::cptr parameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmParameterCategory sceGxmProgramParameterGetCategory(vm::cptr parameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceGxmProgramParameterGetName(vm::cptr parameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmParameterSemantic sceGxmProgramParameterGetSemantic(vm::cptr parameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmProgramParameterGetSemanticIndex(vm::cptr parameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmParameterType sceGxmProgramParameterGetType(vm::cptr parameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmProgramParameterGetComponentCount(vm::cptr parameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmProgramParameterGetArraySize(vm::cptr parameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmProgramParameterGetResourceIndex(vm::cptr parameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmProgramParameterGetContainerIndex(vm::cptr parameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceGxmProgramParameterIsSamplerCube(vm::cptr parameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceGxmFragmentProgramGetProgram(vm::cptr fragmentProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceGxmVertexProgramGetProgram(vm::cptr vertexProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmShaderPatcherCreate(vm::cptr params, vm::pptr shaderPatcher) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmShaderPatcherSetUserData(vm::ptr shaderPatcher, vm::ptr userData) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceGxmShaderPatcherGetUserData(vm::ptr shaderPatcher) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmShaderPatcherDestroy(vm::ptr shaderPatcher) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmShaderPatcherRegisterProgram(vm::ptr shaderPatcher, vm::cptr programHeader, vm::pptr programId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmShaderPatcherUnregisterProgram(vm::ptr shaderPatcher, vm::ptr programId) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceGxmShaderPatcherGetProgramFromId(vm::ptr programId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmShaderPatcherSetAuxiliarySurface(vm::ptr shaderPatcher, u32 auxSurfaceIndex, vm::cptr auxSurface) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmShaderPatcherCreateVertexProgram(vm::ptr shaderPatcher, vm::ptr programId, vm::cptr attributes, u32 attributeCount, vm::cptr streams, u32 streamCount, vm::pptr vertexProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmShaderPatcherCreateFragmentProgram(vm::ptr shaderPatcher, vm::ptr programId, SceGxmOutputRegisterFormat outputFormat, SceGxmMultisampleMode multisampleMode, vm::cptr blendInfo, vm::cptr vertexProgram, vm::pptr fragmentProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmShaderPatcherAddRefVertexProgram(vm::ptr shaderPatcher, vm::ptr vertexProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmShaderPatcherAddRefFragmentProgram(vm::ptr shaderPatcher, vm::ptr fragmentProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmShaderPatcherReleaseVertexProgram(vm::ptr shaderPatcher, vm::ptr vertexProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmShaderPatcherReleaseFragmentProgram(vm::ptr shaderPatcher, vm::ptr fragmentProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmShaderPatcherGetHostMemAllocated(vm::cptr shaderPatcher) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmShaderPatcherGetBufferMemAllocated(vm::cptr shaderPatcher) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmShaderPatcherGetVertexUsseMemAllocated(vm::cptr shaderPatcher) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmShaderPatcherGetFragmentUsseMemAllocated(vm::cptr shaderPatcher) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureInitSwizzled(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureInitLinear(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureInitLinearStrided(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 byteStride) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureInitTiled(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureInitCube(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmTextureType sceGxmTextureGetType(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetMinFilter(vm::ptr texture, SceGxmTextureFilter minFilter) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmTextureFilter sceGxmTextureGetMinFilter(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetMagFilter(vm::ptr texture, SceGxmTextureFilter magFilter) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmTextureFilter sceGxmTextureGetMagFilter(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetMipFilter(vm::ptr texture, SceGxmTextureMipFilter mipFilter) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmTextureMipFilter sceGxmTextureGetMipFilter(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetAnisoMode(vm::ptr texture, SceGxmTextureAnisoMode anisoMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmTextureAnisoMode sceGxmTextureGetAnisoMode(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetUAddrMode(vm::ptr texture, SceGxmTextureAddrMode addrMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmTextureAddrMode sceGxmTextureGetUAddrMode(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetVAddrMode(vm::ptr texture, SceGxmTextureAddrMode addrMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmTextureAddrMode sceGxmTextureGetVAddrMode(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetFormat(vm::ptr texture, SceGxmTextureFormat texFormat) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmTextureFormat sceGxmTextureGetFormat(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetLodBias(vm::ptr texture, u32 bias) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmTextureGetLodBias(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetStride(vm::ptr texture, u32 byteStride) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmTextureGetStride(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetWidth(vm::ptr texture, u32 width) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmTextureGetWidth(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetHeight(vm::ptr texture, u32 height) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmTextureGetHeight(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetData(vm::ptr texture, vm::cptr data) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceGxmTextureGetData(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetMipmapCount(vm::ptr texture, u32 mipCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmTextureGetMipmapCount(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetPalette(vm::ptr texture, vm::cptr paletteData) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceGxmTextureGetPalette(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } SceGxmTextureGammaMode sceGxmTextureGetGammaMode(vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmTextureSetGammaMode(vm::ptr texture, SceGxmTextureGammaMode gammaMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmGetPrecomputedVertexStateSize(vm::cptr vertexProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedVertexStateInit(vm::ptr precomputedState, vm::cptr vertexProgram, vm::ptr memBlock) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmPrecomputedVertexStateSetDefaultUniformBuffer(vm::ptr precomputedState, vm::ptr defaultBuffer) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceGxmPrecomputedVertexStateGetDefaultUniformBuffer(vm::cptr precomputedState) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedVertexStateSetAllTextures(vm::ptr precomputedState, vm::cptr textures) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedVertexStateSetTexture(vm::ptr precomputedState, u32 textureIndex, vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedVertexStateSetAllUniformBuffers(vm::ptr precomputedState, vm::cptr> bufferDataArray) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedVertexStateSetUniformBuffer(vm::ptr precomputedState, u32 bufferIndex, vm::cptr bufferData) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmGetPrecomputedFragmentStateSize(vm::cptr fragmentProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedFragmentStateInit(vm::ptr precomputedState, vm::cptr fragmentProgram, vm::ptr memBlock) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmPrecomputedFragmentStateSetDefaultUniformBuffer(vm::ptr precomputedState, vm::ptr defaultBuffer) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceGxmPrecomputedFragmentStateGetDefaultUniformBuffer(vm::cptr precomputedState) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedFragmentStateSetAllTextures(vm::ptr precomputedState, vm::cptr textureArray) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedFragmentStateSetTexture(vm::ptr precomputedState, u32 textureIndex, vm::cptr texture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedFragmentStateSetAllUniformBuffers(vm::ptr precomputedState, vm::cptr> bufferDataArray) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedFragmentStateSetUniformBuffer(vm::ptr precomputedState, u32 bufferIndex, vm::cptr bufferData) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedFragmentStateSetAllAuxiliarySurfaces(vm::ptr precomputedState, vm::cptr auxSurfaceArray) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceGxmGetPrecomputedDrawSize(vm::cptr vertexProgram) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedDrawInit(vm::ptr precomputedDraw, vm::cptr vertexProgram, vm::ptr memBlock) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedDrawSetAllVertexStreams(vm::ptr precomputedDraw, vm::cptr> streamDataArray) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmPrecomputedDrawSetVertexStream(vm::ptr precomputedDraw, u32 streamIndex, vm::cptr streamData) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmPrecomputedDrawSetParams(vm::ptr precomputedDraw, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::cptr indexData, u32 indexCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceGxmPrecomputedDrawSetParamsInstanced(vm::ptr precomputedDraw, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::cptr indexData, u32 indexCount, u32 indexWrap) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmGetRenderTargetMemSizes(vm::cptr params, vm::ptr hostMemSize, vm::ptr driverMemSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmCreateRenderTarget(vm::cptr params, vm::pptr renderTarget) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmRenderTargetGetHostMem(vm::cptr renderTarget, vm::pptr hostMem) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmRenderTargetGetDriverMemBlock(vm::cptr renderTarget, vm::ptr driverMemBlock) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmDestroyRenderTarget(vm::ptr renderTarget) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceGxmSetUniformDataF(vm::ptr uniformBuffer, vm::cptr parameter, u32 componentOffset, u32 componentCount, vm::cptr sourceData) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp b/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp index ff731ed7c6..6d7417ffea 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp @@ -6,277 +6,277 @@ s32 sceHttpInit(u32 poolSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpTerm() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpGetMemoryPoolStats(vm::ptr currentStat) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpCreateTemplate(vm::cptr userAgent, s32 httpVer, s32 autoProxyConf) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpDeleteTemplate(s32 tmplId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpCreateConnection(s32 tmplId, vm::cptr serverName, vm::cptr scheme, u16 port, s32 enableKeepalive) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpCreateConnectionWithURL(s32 tmplId, vm::cptr url, s32 enableKeepalive) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpDeleteConnection(s32 connId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpCreateRequest(s32 connId, s32 method, vm::cptr path, u64 contentLength) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpCreateRequestWithURL(s32 connId, s32 method, vm::cptr url, u64 contentLength) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpDeleteRequest(s32 reqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetResponseHeaderMaxSize(s32 id, u32 headerSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetRecvBlockSize(s32 id, u32 blockSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetRequestContentLength(s32 id, u64 contentLength) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSendRequest(s32 reqId, vm::cptr postData, u32 size) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpAbortRequest(s32 reqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpGetResponseContentLength(s32 reqId, vm::ptr contentLength) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpGetStatusCode(s32 reqId, vm::ptr statusCode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpGetAllResponseHeaders(s32 reqId, vm::pptr header, vm::ptr headerSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpReadData(s32 reqId, vm::ptr data, u32 size) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpAddRequestHeader(s32 id, vm::cptr name, vm::cptr value, u32 mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpRemoveRequestHeader(s32 id, vm::cptr name) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpParseResponseHeader(vm::cptr header, u32 headerLen, vm::cptr fieldStr, vm::cpptr fieldValue, vm::ptr valueLen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpParseStatusLine(vm::cptr statusLine, u32 lineLen, vm::ptr httpMajorVer, vm::ptr httpMinorVer, vm::ptr responseCode, vm::cpptr reasonPhrase, vm::ptr phraseLen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetAuthInfoCallback(s32 id, vm::ptr cbfunc, vm::ptr userArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetAuthEnabled(s32 id, s32 enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpGetAuthEnabled(s32 id, vm::ptr enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetRedirectCallback(s32 id, vm::ptr cbfunc, vm::ptr userArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetAutoRedirect(s32 id, s32 enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpGetAutoRedirect(s32 id, vm::ptr enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetResolveTimeOut(s32 id, u32 usec) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetResolveRetry(s32 id, s32 retry) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetConnectTimeOut(s32 id, u32 usec) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetSendTimeOut(s32 id, u32 usec) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetRecvTimeOut(s32 id, u32 usec) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpUriEscape(vm::ptr out, vm::ptr require, u32 prepare, vm::cptr in) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpUriUnescape(vm::ptr out, vm::ptr require, u32 prepare, vm::cptr in) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpUriParse(vm::ptr out, vm::cptr srcUrl, vm::ptr pool, vm::ptr require, u32 prepare) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpUriBuild(vm::ptr out, vm::ptr require, u32 prepare, vm::cptr srcElement, u32 option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpUriMerge(vm::ptr mergedUrl, vm::cptr url, vm::cptr relativeUrl, vm::ptr require, u32 prepare, u32 option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpUriSweepPath(vm::ptr dst, vm::cptr src, u32 srcSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetCookieEnabled(s32 id, s32 enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpGetCookieEnabled(s32 id, vm::ptr enable) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpGetCookie(vm::cptr url, vm::ptr cookie, vm::ptr cookieLength, u32 prepare, s32 secure) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpAddCookie(vm::cptr url, vm::cptr cookie, u32 cookieLength) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetCookieRecvCallback(s32 id, vm::ptr cbfunc, vm::ptr userArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpSetCookieSendCallback(s32 id, vm::ptr cbfunc, vm::ptr userArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpsLoadCert(s32 caCertNum, vm::cpptr caList, vm::cptr cert, vm::cptr privKey) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpsUnloadCert() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpsEnableOption(u32 sslFlags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpsDisableOption(u32 sslFlags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpsGetSslError(s32 id, vm::ptr errNum, vm::ptr detail) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpsSetSslCallback(s32 id, vm::ptr cbfunc, vm::ptr userArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpsGetCaList(vm::ptr caList) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceHttpsFreeCaList(vm::ptr caList) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceIme.cpp b/rpcs3/Emu/ARMv7/Modules/sceIme.cpp index 93ac93ef48..c903c58309 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceIme.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceIme.cpp @@ -6,27 +6,27 @@ s32 sceImeOpen(vm::ptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceImeUpdate() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceImeSetCaret(vm::cptr caret) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceImeSetPreeditGeometry(vm::cptr preedit) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceImeClose() { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp b/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp index 2817a5ff71..c09b1a15ad 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp @@ -6,12 +6,12 @@ s32 sceJpegInitMJpeg(s32 maxSplitDecoder) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegFinishMJpeg() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegDecodeMJpeg( @@ -25,7 +25,7 @@ s32 sceJpegDecodeMJpeg( vm::ptr pCoefBuffer, u32 coefBufferSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegDecodeMJpegYCbCr( @@ -37,7 +37,7 @@ s32 sceJpegDecodeMJpegYCbCr( vm::ptr pCoefBuffer, u32 coefBufferSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegMJpegCsc( @@ -48,7 +48,7 @@ s32 sceJpegMJpegCsc( s32 colorOption, s32 sampling) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegGetOutputInfo( @@ -58,22 +58,22 @@ s32 sceJpegGetOutputInfo( s32 decodeMode, vm::ptr pOutputInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegCreateSplitDecoder(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegDeleteSplitDecoder(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegSplitDecodeMJpeg(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp b/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp index abed16dc2e..ef6bd1bccc 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp @@ -6,7 +6,7 @@ s32 sceJpegEncoderGetContextSize() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegEncoderInit( @@ -17,19 +17,19 @@ s32 sceJpegEncoderInit( vm::ptr pJpeg, u32 oJpegbufSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegEncoderEncode( SceJpegEncoderContext context, vm::cptr pYCbCr) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegEncoderEnd(SceJpegEncoderContext context) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegEncoderSetValidRegion( @@ -37,21 +37,21 @@ s32 sceJpegEncoderSetValidRegion( s32 iFrameWidth, s32 iFrameHeight) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegEncoderSetCompressionRatio( SceJpegEncoderContext context, s32 compratio) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegEncoderSetHeaderMode( SceJpegEncoderContext context, s32 headerMode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegEncoderSetOutputAddr( @@ -59,7 +59,7 @@ s32 sceJpegEncoderSetOutputAddr( vm::ptr pJpeg, u32 oJpegbufSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceJpegEncoderCsc( @@ -69,7 +69,7 @@ s32 sceJpegEncoderCsc( s32 iFrameWidth, s32 inputPixelFormat) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp index 091b577623..8c8c50c4be 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp @@ -16,22 +16,22 @@ s32 sceKernelAllocMemBlock(vm::cptr name, s32 type, u32 vsize, vm::ptr pOpt) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelFreeMemBlock(s32 uid) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetMemBlockBase(s32 uid, vm::pptr ppBase) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetMemBlockInfoByAddr(vm::ptr vbase, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCreateThread( @@ -140,28 +140,28 @@ s32 sceKernelChangeThreadCpuAffinityMask(s32 threadId, s32 cpuAffinityMask) { sceLibKernel.Todo("sceKernelChangeThreadCpuAffinityMask(threadId=0x%x, cpuAffinityMask=0x%x)", threadId, cpuAffinityMask); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetThreadCpuAffinityMask(s32 threadId) { sceLibKernel.Todo("sceKernelGetThreadCpuAffinityMask(threadId=0x%x)", threadId); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelChangeThreadPriority(s32 threadId, s32 priority) { sceLibKernel.Todo("sceKernelChangeThreadPriority(threadId=0x%x, priority=%d)", threadId, priority); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetThreadCurrentPriority() { sceLibKernel.Todo("sceKernelGetThreadCurrentPriority()"); - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceKernelGetThreadId(ARMv7Context& context) @@ -175,84 +175,84 @@ s32 sceKernelChangeCurrentThreadAttr(u32 clearAttr, u32 setAttr) { sceLibKernel.Todo("sceKernelChangeCurrentThreadAttr()"); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetThreadExitStatus(s32 threadId, vm::ptr pExitStatus) { sceLibKernel.Todo("sceKernelGetThreadExitStatus(threadId=0x%x, pExitStatus=*0x%x)", threadId, pExitStatus); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetProcessId() { sceLibKernel.Todo("sceKernelGetProcessId()"); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCheckWaitableStatus() { sceLibKernel.Todo("sceKernelCheckWaitableStatus()"); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetThreadInfo(s32 threadId, vm::ptr pInfo) { sceLibKernel.Todo("sceKernelGetThreadInfo(threadId=0x%x, pInfo=*0x%x)", threadId, pInfo); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetThreadRunStatus(vm::ptr pStatus) { sceLibKernel.Todo("sceKernelGetThreadRunStatus(pStatus=*0x%x)", pStatus); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetSystemInfo(vm::ptr pInfo) { sceLibKernel.Todo("sceKernelGetSystemInfo(pInfo=*0x%x)", pInfo); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetThreadmgrUIDClass(s32 uid) { sceLibKernel.Todo("sceKernelGetThreadmgrUIDClass(uid=0x%x)", uid); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelChangeThreadVfpException(s32 clearMask, s32 setMask) { sceLibKernel.Todo("sceKernelChangeThreadVfpException(clearMask=0x%x, setMask=0x%x)", clearMask, setMask); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetCurrentThreadVfpException() { sceLibKernel.Todo("sceKernelGetCurrentThreadVfpException()"); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelDelayThread(u32 usec) { sceLibKernel.Todo("sceKernelDelayThread()"); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelDelayThreadCB(u32 usec) { sceLibKernel.Todo("sceKernelDelayThreadCB()"); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelWaitThreadEnd(s32 threadId, vm::ptr pExitStatus, vm::ptr pTimeout) @@ -289,96 +289,96 @@ s32 sceKernelWaitThreadEndCB(s32 threadId, vm::ptr pExitStatus, vm::ptr pName, u32 attr, vm::ptr callbackFunc, vm::ptr pCommon) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelDeleteCallback(s32 callbackId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelNotifyCallback(s32 callbackId, s32 notifyArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCancelCallback(s32 callbackId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetCallbackCount(s32 callbackId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCheckCallback() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetCallbackInfo(s32 callbackId, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelRegisterCallbackToEvent(s32 eventId, s32 callbackId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelUnregisterCallbackFromEvent(s32 eventId, s32 callbackId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelUnregisterCallbackFromEventAll(s32 eventId) { - throw __FUNCTION__; + throw EXCEPTION(""); } // Event functions s32 sceKernelWaitEvent(s32 eventId, u32 waitPattern, vm::ptr pResultPattern, vm::ptr pUserData, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelWaitEventCB(s32 eventId, u32 waitPattern, vm::ptr pResultPattern, vm::ptr pUserData, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelPollEvent(s32 eventId, u32 bitPattern, vm::ptr pResultPattern, vm::ptr pUserData) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCancelEvent(s32 eventId, vm::ptr pNumWaitThreads) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetEventInfo(s32 eventId, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelWaitMultipleEvents(vm::ptr pWaitEventList, s32 numEvents, u32 waitMode, vm::ptr pResultEventList, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelWaitMultipleEventsCB(vm::ptr pWaitEventList, s32 numEvents, u32 waitMode, vm::ptr pResultEventList, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } // Event flag functions @@ -397,52 +397,52 @@ s32 sceKernelCreateEventFlag(vm::cptr pName, u32 attr, u32 initPattern, vm s32 sceKernelDeleteEventFlag(s32 evfId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelOpenEventFlag(vm::cptr pName) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCloseEventFlag(s32 evfId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelWaitEventFlag(s32 evfId, u32 bitPattern, u32 waitMode, vm::ptr pResultPat, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelWaitEventFlagCB(s32 evfId, u32 bitPattern, u32 waitMode, vm::ptr pResultPat, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelPollEventFlag(s32 evfId, u32 bitPattern, u32 waitMode, vm::ptr pResultPat) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelSetEventFlag(s32 evfId, u32 bitPattern) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelClearEventFlag(s32 evfId, u32 bitPattern) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCancelEventFlag(s32 evfId, u32 setPattern, vm::ptr pNumWaitThreads) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetEventFlagInfo(s32 evfId, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } // Semaphore functions @@ -480,12 +480,12 @@ s32 sceKernelDeleteSema(s32 semaId) s32 sceKernelOpenSema(vm::cptr pName) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCloseSema(s32 semaId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelWaitSema(s32 semaId, s32 needCount, vm::ptr pTimeout) @@ -506,27 +506,27 @@ s32 sceKernelWaitSema(s32 semaId, s32 needCount, vm::ptr pTimeout) s32 sceKernelWaitSemaCB(s32 semaId, s32 needCount, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelPollSema(s32 semaId, s32 needCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelSignalSema(s32 semaId, s32 signalCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCancelSema(s32 semaId, s32 setCount, vm::ptr pNumWaitThreads) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetSemaInfo(s32 semaId, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } // Mutex functions @@ -545,89 +545,89 @@ s32 sceKernelCreateMutex(vm::cptr pName, u32 attr, s32 initCount, vm::cptr s32 sceKernelDeleteMutex(s32 mutexId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelOpenMutex(vm::cptr pName) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCloseMutex(s32 mutexId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelLockMutex(s32 mutexId, s32 lockCount, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelLockMutexCB(s32 mutexId, s32 lockCount, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelTryLockMutex(s32 mutexId, s32 lockCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelUnlockMutex(s32 mutexId, s32 unlockCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCancelMutex(s32 mutexId, s32 newCount, vm::ptr pNumWaitThreads) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetMutexInfo(s32 mutexId, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } // Lightweight mutex functions s32 sceKernelCreateLwMutex(vm::ptr pWork, vm::cptr pName, u32 attr, s32 initCount, vm::cptr pOptParam) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelDeleteLwMutex(vm::ptr pWork) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelLockLwMutex(vm::ptr pWork, s32 lockCount, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelLockLwMutexCB(vm::ptr pWork, s32 lockCount, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelTryLockLwMutex(vm::ptr pWork, s32 lockCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelUnlockLwMutex(vm::ptr pWork, s32 unlockCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetLwMutexInfo(vm::ptr pWork, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetLwMutexInfoById(s32 lwMutexId, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } // Condition variable functions @@ -646,362 +646,362 @@ s32 sceKernelCreateCond(vm::cptr pName, u32 attr, s32 mutexId, vm::cptr pName) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCloseCond(s32 condId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelWaitCond(s32 condId, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelWaitCondCB(s32 condId, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelSignalCond(s32 condId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelSignalCondAll(s32 condId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelSignalCondTo(s32 condId, s32 threadId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetCondInfo(s32 condId, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } // Lightweight condition variable functions s32 sceKernelCreateLwCond(vm::ptr pWork, vm::cptr pName, u32 attr, vm::ptr pLwMutex, vm::cptr pOptParam) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelDeleteLwCond(vm::ptr pWork) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelWaitLwCond(vm::ptr pWork, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelWaitLwCondCB(vm::ptr pWork, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelSignalLwCond(vm::ptr pWork) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelSignalLwCondAll(vm::ptr pWork) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelSignalLwCondTo(vm::ptr pWork, s32 threadId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetLwCondInfo(vm::ptr pWork, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetLwCondInfoById(s32 lwCondId, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } // Time functions s32 sceKernelGetSystemTime(vm::ptr pClock) { - throw __FUNCTION__; + throw EXCEPTION(""); } u64 sceKernelGetSystemTimeWide() { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceKernelGetSystemTimeLow() { - throw __FUNCTION__; + throw EXCEPTION(""); } // Timer functions s32 sceKernelCreateTimer(vm::cptr pName, u32 attr, vm::cptr pOptParam) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelDeleteTimer(s32 timerId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelOpenTimer(vm::cptr pName) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCloseTimer(s32 timerId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelStartTimer(s32 timerId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelStopTimer(s32 timerId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetTimerBase(s32 timerId, vm::ptr pBase) { - throw __FUNCTION__; + throw EXCEPTION(""); } u64 sceKernelGetTimerBaseWide(s32 timerId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetTimerTime(s32 timerId, vm::ptr pClock) { - throw __FUNCTION__; + throw EXCEPTION(""); } u64 sceKernelGetTimerTimeWide(s32 timerId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelSetTimerTime(s32 timerId, vm::ptr pClock) { - throw __FUNCTION__; + throw EXCEPTION(""); } u64 sceKernelSetTimerTimeWide(s32 timerId, u64 clock) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelSetTimerEvent(s32 timerId, s32 type, vm::ptr pInterval, s32 fRepeat) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCancelTimer(s32 timerId, vm::ptr pNumWaitThreads) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetTimerInfo(s32 timerId, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } // Reader/writer lock functions s32 sceKernelCreateRWLock(vm::cptr pName, u32 attr, vm::cptr pOptParam) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelDeleteRWLock(s32 rwLockId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelOpenRWLock(vm::cptr pName) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCloseRWLock(s32 rwLockId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelLockReadRWLock(s32 rwLockId, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelLockReadRWLockCB(s32 rwLockId, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelTryLockReadRWLock(s32 rwLockId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelUnlockReadRWLock(s32 rwLockId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelLockWriteRWLock(s32 rwLockId, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelLockWriteRWLockCB(s32 rwLockId, vm::ptr pTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelTryLockWriteRWLock(s32 rwLockId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelUnlockWriteRWLock(s32 rwLockId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelCancelRWLock(s32 rwLockId, vm::ptr pNumReadWaitThreads, vm::ptr pNumWriteWaitThreads, s32 flag) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceKernelGetRWLockInfo(s32 rwLockId, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } // IO/File functions s32 sceIoRemove(vm::cptr filename) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoMkdir(vm::cptr dirname, s32 mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoRmdir(vm::cptr dirname) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoRename(vm::cptr oldname, vm::cptr newname) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoDevctl(vm::cptr devname, s32 cmd, vm::cptr arg, u32 arglen, vm::ptr bufp, u32 buflen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoSync(vm::cptr devname, s32 flag) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoOpen(vm::cptr filename, s32 flag, s32 mode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoClose(s32 fd) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoIoctl(s32 fd, s32 cmd, vm::cptr argp, u32 arglen, vm::ptr bufp, u32 buflen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s64 sceIoLseek(s32 fd, s64 offset, s32 whence) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoLseek32(s32 fd, s32 offset, s32 whence) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoRead(s32 fd, vm::ptr buf, u32 nbyte) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoWrite(s32 fd, vm::cptr buf, u32 nbyte) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoPread(s32 fd, vm::ptr buf, u32 nbyte, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoPwrite(s32 fd, vm::cptr buf, u32 nbyte, s64 offset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoDopen(vm::cptr dirname) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoDclose(s32 fd) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoDread(s32 fd, vm::ptr buf) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoChstat(vm::cptr name, vm::cptr buf, u32 cbit) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceIoGetstat(vm::cptr name, vm::ptr buf) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp index e7d26aa01c..82dd811e25 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp @@ -8,17 +8,17 @@ namespace sce_libstdcxx_func { void __aeabi_unwind_cpp_pr0() { - throw __FUNCTION__; + throw EXCEPTION(""); } void __aeabi_unwind_cpp_pr1() { - throw __FUNCTION__; + throw EXCEPTION(""); } void __aeabi_unwind_cpp_pr2() { - throw __FUNCTION__; + throw EXCEPTION(""); } } diff --git a/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp b/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp index b43983de9c..05ef8948e6 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp @@ -6,12 +6,12 @@ s32 sceLiveAreaResourceReplaceAll(vm::cptr dirpath) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLiveAreaResourceGetStatus() { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLiveArea, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp b/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp index 99bca712ba..007a4e742e 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp @@ -6,87 +6,87 @@ s32 sceLocationOpen(vm::ptr handle, SceLocationLocationMethod lmethod, SceLocationHeadingMethod hmethod) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationClose(u8 handle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationReopen(u8 handle, SceLocationLocationMethod lmethod, SceLocationHeadingMethod hmethod) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationGetMethod(u8 handle, vm::ptr lmethod, vm::ptr hmethod) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationGetLocation(u8 handle, vm::ptr linfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationCancelGetLocation(u8 handle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationStartLocationCallback(u8 handle, u32 distance, vm::ptr callback, vm::ptr userdata) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationStopLocationCallback(u8 handle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationGetHeading(u8 handle, vm::ptr hinfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationStartHeadingCallback(u8 handle, u32 difference, vm::ptr callback, vm::ptr userdata) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationStopHeadingCallback(u8 handle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationConfirm(u8 handle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationConfirmGetStatus(u8 handle, vm::ptr status) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationConfirmGetResult(u8 handle, vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationConfirmAbort(u8 handle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationGetPermission(u8 handle, vm::ptr info) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceLocationSetGpsEmulationFile(vm::ptr filename) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp b/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp index 5c51b5a581..8b8172ebf8 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp @@ -6,22 +6,22 @@ s32 sceMd5Digest(vm::cptr plain, u32 len, vm::ptr digest) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMd5BlockInit(vm::ptr pContext) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMd5BlockUpdate(vm::ptr pContext, vm::cptr plain, u32 len) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMd5BlockResult(vm::ptr pContext, vm::ptr digest) { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceMd5, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp b/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp index 63da5aaeef..2b11a2c932 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp @@ -6,82 +6,82 @@ s32 sceMotionGetState(vm::ptr motionState) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionGetSensorState(vm::ptr sensorState, s32 numRecords) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionGetBasicOrientation(vm::ptr basicOrientation) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionRotateYaw(const float radians) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionGetTiltCorrection() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionSetTiltCorrection(s32 setValue) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionGetDeadband() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionSetDeadband(s32 setValue) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionSetAngleThreshold(const float angle) { - throw __FUNCTION__; + throw EXCEPTION(""); } float sceMotionGetAngleThreshold() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionReset() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionMagnetometerOn() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionMagnetometerOff() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionGetMagnetometerState() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionStartSampling() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceMotionStopSampling() { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceMotion, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp b/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp index a7689c49db..885b9c9088 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp @@ -6,12 +6,12 @@ s32 sceMt19937Init(vm::ptr pCtx, u32 seed) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceMt19937UInt(vm::ptr pCtx) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceNet.cpp b/rpcs3/Emu/ARMv7/Modules/sceNet.cpp index f2fcf10fdf..e873854dae 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNet.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNet.cpp @@ -6,292 +6,292 @@ s32 sceNetSetDnsInfo(vm::ptr info, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetClearDnsCache(s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetDumpCreate(vm::cptr name, s32 len, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetDumpRead(s32 id, vm::ptr buf, s32 len, vm::ptr pflags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetDumpDestroy(s32 id) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetDumpAbort(s32 id, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetEpollCreate(vm::cptr name, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetEpollControl(s32 eid, s32 op, s32 id, vm::ptr event) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetEpollWait(s32 eid, vm::ptr events, s32 maxevents, s32 timeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetEpollWaitCB(s32 eid, vm::ptr events, s32 maxevents, s32 timeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetEpollDestroy(s32 eid) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetEpollAbort(s32 eid, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceNetErrnoLoc() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetEtherStrton(vm::cptr str, vm::ptr n) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetEtherNtostr(vm::cptr n, vm::ptr str, u32 len) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetGetMacAddress(vm::ptr addr, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNetInetNtop(s32 af, vm::cptr src, vm::ptr dst, SceNetSocklen_t size) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetInetPton(s32 af, vm::cptr src, vm::ptr dst) { - throw __FUNCTION__; + throw EXCEPTION(""); } u64 sceNetHtonll(u64 host64) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceNetHtonl(u32 host32) { - throw __FUNCTION__; + throw EXCEPTION(""); } u16 sceNetHtons(u16 host16) { - throw __FUNCTION__; + throw EXCEPTION(""); } u64 sceNetNtohll(u64 net64) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceNetNtohl(u32 net32) { - throw __FUNCTION__; + throw EXCEPTION(""); } u16 sceNetNtohs(u16 net16) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetInit(vm::ptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetTerm() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetShowIfconfig() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetShowRoute() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetShowNetstat() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetEmulationSet(vm::ptr param, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetEmulationGet(vm::ptr param, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetResolverCreate(vm::cptr name, vm::ptr param, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetResolverStartNtoa(s32 rid, vm::cptr hostname, vm::ptr addr, s32 timeout, s32 retry, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetResolverStartAton(s32 rid, vm::cptr addr, vm::ptr hostname, s32 len, s32 timeout, s32 retry, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetResolverGetError(s32 rid, vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetResolverDestroy(s32 rid) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetResolverAbort(s32 rid, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetSocket(vm::cptr name, s32 domain, s32 type, s32 protocol) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetAccept(s32 s, vm::ptr addr, vm::ptr addrlen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetBind(s32 s, vm::cptr addr, SceNetSocklen_t addrlen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetConnect(s32 s, vm::cptr name, SceNetSocklen_t namelen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetGetpeername(s32 s, vm::ptr name, vm::ptr namelen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetGetsockname(s32 s, vm::ptr name, vm::ptr namelen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetGetsockopt(s32 s, s32 level, s32 optname, vm::ptr optval, vm::ptr optlen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetListen(s32 s, s32 backlog) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetRecv(s32 s, vm::ptr buf, u32 len, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetRecvfrom(s32 s, vm::ptr buf, u32 len, s32 flags, vm::ptr from, vm::ptr fromlen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetRecvmsg(s32 s, vm::ptr msg, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetSend(s32 s, vm::cptr msg, u32 len, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetSendto(s32 s, vm::cptr msg, u32 len, s32 flags, vm::cptr to, SceNetSocklen_t tolen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetSendmsg(s32 s, vm::cptr msg, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetSetsockopt(s32 s, s32 level, s32 optname, vm::cptr optval, SceNetSocklen_t optlen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetShutdown(s32 s, s32 how) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetSocketClose(s32 s) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetSocketAbort(s32 s, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetGetSockInfo(s32 s, vm::ptr info, s32 n, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetGetSockIdInfo(vm::ptr fds, s32 sockinfoflags, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetGetStatisticsInfo(vm::ptr info, s32 flags) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp b/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp index 800ffd0691..46f3880b59 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp @@ -6,82 +6,82 @@ s32 sceNetCtlInit() { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceNetCtlTerm() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlCheckCallback() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlInetGetResult(s32 eventType, vm::ptr errorCode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlAdhocGetResult(s32 eventType, vm::ptr errorCode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlInetGetInfo(s32 code, vm::ptr info) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlInetGetState(vm::ptr state) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlGetNatInfo(vm::ptr natinfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlInetRegisterCallback(vm::ptr func, vm::ptr arg, vm::ptr cid) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlInetUnregisterCallback(s32 cid) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlAdhocRegisterCallback(vm::ptr func, vm::ptr arg, vm::ptr cid) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlAdhocUnregisterCallback(s32 cid) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlAdhocGetState(vm::ptr state) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlAdhocDisconnect() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlAdhocGetPeerList(vm::ptr buflen, vm::ptr buf) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNetCtlAdhocGetInAddr(vm::ptr inaddr) { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNetCtl, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp b/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp index d4014057e1..6f38a0aff6 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp @@ -6,317 +6,317 @@ s32 sceNgsSystemGetRequiredMemorySize(vm::cptr pSynthParams, vm::ptr pnSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsSystemInit(vm::ptr pSynthSysMemory, const u32 uMemSize, vm::cptr pSynthParams, vm::ptr pSystemHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsSystemUpdate(SceNgsHSynSystem hSystemHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsSystemRelease(SceNgsHSynSystem hSystemHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsSystemLock(SceNgsHSynSystem hSystemHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsSystemUnlock(SceNgsHSynSystem hSystemHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsSystemSetParamErrorCallback(SceNgsHSynSystem hSystemHandle, vm::ptr callbackFuncPtr) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsSystemSetFlags(SceNgsHSynSystem hSystemHandle, const u32 uSystemFlags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsRackGetRequiredMemorySize(SceNgsHSynSystem hSystemHandle, vm::cptr pRackDesc, vm::ptr pnSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsRackInit(SceNgsHSynSystem hSystemHandle, vm::ptr pRackBuffer, vm::cptr pRackDesc, vm::ptr pRackHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsRackGetVoiceHandle(SceNgsHRack hRackHandle, const u32 uIndex, vm::ptr pVoiceHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsRackRelease(SceNgsHRack hRackHandle, vm::ptr callbackFuncPtr) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsRackSetParamErrorCallback(SceNgsHRack hRackHandle, vm::ptr callbackFuncPtr) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceInit(SceNgsHVoice hVoiceHandle, vm::cptr pPreset, const u32 uInitFlags) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoicePlay(SceNgsHVoice hVoiceHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceKeyOff(SceNgsHVoice hVoiceHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceKill(SceNgsHVoice hVoiceHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoicePause(SceNgsHVoice hVoiceHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceResume(SceNgsHVoice hVoiceHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceSetPreset(SceNgsHVoice hVoiceHandle, vm::cptr pVoicePreset) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceLockParams(SceNgsHVoice hVoiceHandle, const u32 uModule, const u32 uParamsInterfaceId, vm::ptr pParamsBuffer) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceUnlockParams(SceNgsHVoice hVoiceHandle, const u32 uModule) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceSetParamsBlock(SceNgsHVoice hVoiceHandle, vm::cptr pParamData, const u32 uSize, vm::ptr pnErrorCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceBypassModule(SceNgsHVoice hVoiceHandle, const u32 uModule, const u32 uBypassFlag) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceSetModuleCallback(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::ptr callbackFuncPtr, vm::ptr pUserData) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceSetFinishedCallback(SceNgsHVoice hVoiceHandle, vm::ptr callbackFuncPtr, vm::ptr pUserData) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceGetStateData(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::ptr pMem, const u32 uMemSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceGetInfo(SceNgsHVoice hVoiceHandle, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceGetModuleType(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::ptr pModuleType) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceGetModuleBypass(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::ptr puBypassFlag) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceGetParamsOutOfRange(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::ptr pszMessageBuffer) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsPatchCreateRouting(vm::cptr pPatchInfo, vm::ptr pPatchHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsPatchGetInfo(SceNgsHPatch hPatchHandle, vm::ptr pRouteInfo, vm::ptr pSetup) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoiceGetOutputPatch(SceNgsHVoice hVoiceHandle, const s32 nOutputIndex, const s32 nSubIndex, vm::ptr pPatchHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsPatchRemoveRouting(SceNgsHPatch hPatchHandle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoicePatchSetVolume(SceNgsHPatch hPatchHandle, const s32 nOutputChannel, const s32 nInputChannel, const float fVol) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoicePatchSetVolumes(SceNgsHPatch hPatchHandle, const s32 nOutputChannel, vm::cptr pVolumes, const s32 nVols) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsVoicePatchSetVolumesMatrix(SceNgsHPatch hPatchHandle, vm::cptr pMatrix) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsModuleGetNumPresets(SceNgsHSynSystem hSystemHandle, const u32 uModuleID, vm::ptr puNumPresets) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNgsModuleGetPreset(SceNgsHSynSystem hSystemHandle, const u32 uModuleID, const u32 uPresetIndex, vm::ptr pParamsBuffer) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetCompressorBuss() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetCompressorSideChainBuss() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetDelayBuss() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetDistortionBuss() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetEnvelopeBuss() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetEqBuss() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetMasterBuss() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetMixerBuss() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetPauserBuss() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetReverbBuss() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetSasEmuVoice() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetSimpleVoice() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetTemplate1() { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::cptr sceNgsVoiceDefGetAtrac9Voice() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaNgsGetDefaultConfig(vm::ptr config) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaNgsGetNeededMemory(vm::cptr config, vm::ptr sizeInBytes) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaNgsInit(vm::cptr config, vm::ptr buffer, u32 sizeInBytes) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaNgsShutdown() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaNgsSetSynthName(SceNgsHSynSystem synthHandle, vm::cptr name) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaNgsSetRackName(SceNgsHRack rackHandle, vm::cptr name) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaNgsSetVoiceName(SceNgsHVoice voiceHandle, vm::cptr name) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaNgsSetSampleName(vm::cptr location, u32 length, vm::cptr name) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaNgsTrace(vm::cptr message) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp index 604a9136cc..578d691725 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp @@ -6,92 +6,92 @@ s32 sceNpBasicInit(vm::ptr opt) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicTerm(ARMv7Context&) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicRegisterHandler(vm::cptr handlers, vm::cptr context, vm::ptr userdata) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicUnregisterHandler(ARMv7Context&) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicCheckCallback() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicGetFriendOnlineStatus(vm::cptr friendId, vm::ptr status) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicGetGamePresenceOfFriend(vm::cptr friendId, vm::ptr presence) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicGetFriendListEntryCount(vm::ptr count) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicGetFriendListEntries(u32 startIndex, vm::ptr entries, u32 numEntries, vm::ptr retrieved) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicGetBlockListEntryCount(vm::ptr count) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicGetBlockListEntries(u32 startIndex, vm::ptr entries, u32 numEntries, vm::ptr retrieved) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicCheckIfPlayerIsBlocked(vm::cptr player, vm::ptr playerIsBlocked) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicSetInGamePresence(vm::cptr presence) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicUnsetInGamePresence() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicSendInGameDataMessage(vm::cptr to, vm::cptr message) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicRecordPlaySessionLog(vm::cptr withWhom, vm::cptr description) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicGetPlaySessionLogSize(SceNpBasicPlaySessionLogType type, vm::ptr size) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBasicGetPlaySessionLog(SceNpBasicPlaySessionLogType type, u32 index, vm::ptr log) { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpBasic, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp index c3c0840178..477cab5523 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp @@ -6,57 +6,57 @@ s32 sceNpAuthInit() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpAuthTerm() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpAuthCreateStartRequest(vm::cptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpAuthDestroyRequest(s32 id) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpAuthAbortRequest(s32 id) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpAuthGetTicket(s32 id, vm::ptr buf, u32 len) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpAuthGetTicketParam(vm::cptr ticket, u32 ticketSize, s32 paramId, vm::ptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpAuthGetEntitlementIdList(vm::cptr ticket, u32 ticketSize, vm::ptr entIdList, u32 entIdListNum) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpAuthGetEntitlementById(vm::cptr ticket, u32 ticketSize, vm::cptr entId, vm::ptr ent) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpCmpNpId(vm::cptr npid1, vm::cptr npid2) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpCmpNpIdInOrder(vm::cptr npid1, vm::cptr npid2, vm::ptr order) { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpCommon, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp index cb6618e5be..aa1551bd30 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp @@ -6,52 +6,52 @@ s32 sceNpInit(vm::cptr commConf, vm::ptr opt) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpTerm(ARMv7Context&) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpCheckCallback() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpGetServiceState(vm::ptr state) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpRegisterServiceStateCallback(vm::ptr callback, vm::ptr userdata) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpUnregisterServiceStateCallback() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpManagerGetNpId(vm::ptr npId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpManagerGetAccountRegion(vm::ptr countryCode, vm::ptr languageCode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpManagerGetContentRatingFlag(vm::ptr isRestricted, vm::ptr age) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpManagerGetChatRestrictionFlag(vm::ptr isRestricted) { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpManager, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp index c285e2b4b1..d267f98bb4 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp @@ -8,12 +8,12 @@ s32 sceNpMatching2Init(u32 poolSize, s32 threadPriority, s32 cpuAffinityMask, u32 threadStackSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2Term() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2CreateContext( @@ -22,67 +22,67 @@ s32 sceNpMatching2CreateContext( vm::cptr passPhrase, vm::ptr ctxId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2DestroyContext(u16 ctxId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2ContextStart(u16 ctxId, u64 timeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2AbortContextStart(u16 ctxId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2ContextStop(u16 ctxId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2SetDefaultRequestOptParam(u16 ctxId, vm::cptr optParam) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2RegisterRoomEventCallback(u16 ctxId, vm::ptr cbFunc, vm::ptr cbFuncArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2RegisterRoomMessageCallback(u16 ctxId, vm::ptr cbFunc, vm::ptr cbFuncArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2RegisterSignalingCallback(u16 ctxId, vm::ptr cbFunc, vm::ptr cbFuncArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2RegisterContextCallback(vm::ptr cbFunc, vm::ptr cbFuncArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2AbortRequest(u16 ctxId, u32 reqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2GetMemoryInfo(vm::ptr memInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2GetServerLocal(u16 ctxId, vm::ptr server) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2GetWorldInfoList( @@ -91,7 +91,7 @@ s32 sceNpMatching2GetWorldInfoList( vm::cptr optParam, vm::ptr assignedReqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2CreateJoinRoom( @@ -100,7 +100,7 @@ s32 sceNpMatching2CreateJoinRoom( vm::cptr optParam, vm::ptr assignedReqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2SearchRoom( @@ -109,7 +109,7 @@ s32 sceNpMatching2SearchRoom( vm::cptr optParam, vm::ptr assignedReqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2JoinRoom( @@ -118,7 +118,7 @@ s32 sceNpMatching2JoinRoom( vm::cptr optParam, vm::ptr assignedReqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2LeaveRoom( @@ -127,7 +127,7 @@ s32 sceNpMatching2LeaveRoom( vm::cptr optParam, vm::ptr assignedReqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2GetSignalingOptParamLocal( @@ -135,7 +135,7 @@ s32 sceNpMatching2GetSignalingOptParamLocal( u64 roomId, vm::ptr signalingOptParam) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2SetRoomDataExternal( @@ -144,7 +144,7 @@ s32 sceNpMatching2SetRoomDataExternal( vm::cptr optParam, vm::ptr assignedReqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2KickoutRoomMember( @@ -153,7 +153,7 @@ s32 sceNpMatching2KickoutRoomMember( vm::cptr optParam, vm::ptr assignedReqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2SendRoomChatMessage( @@ -162,7 +162,7 @@ s32 sceNpMatching2SendRoomChatMessage( vm::cptr optParam, vm::ptr assignedReqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2SendRoomMessage( @@ -171,7 +171,7 @@ s32 sceNpMatching2SendRoomMessage( vm::cptr optParam, vm::ptr assignedReqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2SignalingGetConnectionStatus( @@ -182,7 +182,7 @@ s32 sceNpMatching2SignalingGetConnectionStatus( vm::ptr peerAddr, vm::ptr peerPort) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2SignalingGetConnectionInfo( @@ -192,12 +192,12 @@ s32 sceNpMatching2SignalingGetConnectionInfo( s32 code, vm::ptr info) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2SignalingGetLocalNetInfo(vm::ptr netinfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2SignalingGetPeerNetInfo( @@ -206,14 +206,14 @@ s32 sceNpMatching2SignalingGetPeerNetInfo( u16 memberId, vm::ptr reqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2SignalingCancelPeerNetInfo( u16 ctxId, u32 reqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpMatching2SignalingGetPeerNetInfoResult( @@ -221,7 +221,7 @@ s32 sceNpMatching2SignalingGetPeerNetInfoResult( u32 reqId, vm::ptr netinfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpMatching, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp index 0a708ac9aa..4d3734e517 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp @@ -6,52 +6,52 @@ s32 sceNpScoreInit(s32 threadPriority, s32 cpuAffinityMask, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreTerm(ARMv7Context&) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreCreateTitleCtx(vm::cptr titleId, vm::cptr passphrase, vm::cptr selfNpId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreDeleteTitleCtx(s32 titleCtxId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreCreateRequest(s32 titleCtxId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreDeleteRequest(s32 reqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreAbortRequest(s32 reqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreSetTimeout(s32 id, s32 resolveRetry, s32 resolveTimeout, s32 connTimeout, s32 sendTimeout, s32 recvTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreSetPlayerCharacterId(s32 id, s32 pcId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreGetBoardInfo(s32 reqId, u32 boardId, vm::ptr boardInfo, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreRecordScore( @@ -64,7 +64,7 @@ s32 sceNpScoreRecordScore( vm::cptr compareDate, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreRecordGameData( @@ -76,7 +76,7 @@ s32 sceNpScoreRecordGameData( vm::cptr data, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreGetGameData( @@ -88,7 +88,7 @@ s32 sceNpScoreGetGameData( vm::ptr data, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreGetRankingByNpId( @@ -107,7 +107,7 @@ s32 sceNpScoreGetRankingByNpId( vm::ptr totalRecord, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreGetRankingByRange( @@ -125,7 +125,7 @@ s32 sceNpScoreGetRankingByRange( vm::ptr totalRecord, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } @@ -145,32 +145,32 @@ s32 sceNpScoreGetRankingByNpIdPcId( vm::ptr totalRecord, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreCensorComment(s32 reqId, vm::cptr comment, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreSanitizeComment(s32 reqId, vm::cptr comment, vm::ptr sanitizedComment, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreWaitAsync(s32 id, vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScorePollAsync(s32 reqId, vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreGetBoardInfoAsync(s32 reqId, u32 boardId, vm::ptr boardInfo, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreRecordScoreAsync( @@ -183,7 +183,7 @@ s32 sceNpScoreRecordScoreAsync( vm::cptr compareDate, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreRecordGameDataAsync( @@ -195,7 +195,7 @@ s32 sceNpScoreRecordGameDataAsync( vm::cptr data, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreGetGameDataAsync( @@ -207,7 +207,7 @@ s32 sceNpScoreGetGameDataAsync( vm::ptr data, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreGetRankingByNpIdAsync( @@ -226,7 +226,7 @@ s32 sceNpScoreGetRankingByNpIdAsync( vm::ptr totalRecord, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreGetRankingByRangeAsync( @@ -244,7 +244,7 @@ s32 sceNpScoreGetRankingByRangeAsync( vm::ptr totalRecord, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreGetRankingByNpIdPcIdAsync( @@ -263,17 +263,17 @@ s32 sceNpScoreGetRankingByNpIdPcIdAsync( vm::ptr totalRecord, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreCensorCommentAsync(s32 reqId, vm::cptr comment, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpScoreSanitizeCommentAsync(s32 reqId, vm::cptr comment, vm::ptr sanitizedComment, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpScore, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp index fb1c159a1c..51192366ba 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp @@ -6,62 +6,62 @@ s32 sceNpLookupInit(s32 usesAsync, s32 threadPriority, s32 cpuAffinityMask, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupTerm(ARMv7Context&) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupCreateTitleCtx(vm::cptr titleId, vm::cptr selfNpId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupDeleteTitleCtx(s32 titleCtxId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupCreateRequest(s32 titleCtxId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupDeleteRequest(s32 reqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupAbortRequest(s32 reqId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupSetTimeout(s32 id, s32 resolveRetry, u32 resolveTimeout, u32 connTimeout, u32 sendTimeout, u32 recvTimeout) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupWaitAsync(s32 reqId, vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupPollAsync(s32 reqId, vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupNpId(s32 reqId, vm::cptr onlineId, vm::ptr npId, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupNpIdAsync(s32 reqId, vm::cptr onlineId, vm::ptr npId, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupUserProfile( @@ -77,7 +77,7 @@ s32 sceNpLookupUserProfile( vm::ptr avatarImageDataSize, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupUserProfileAsync( @@ -93,37 +93,37 @@ s32 sceNpLookupUserProfileAsync( vm::ptr avatarImageDataSize, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupAvatarImage(s32 reqId, vm::cptr avatarUrl, vm::ptr avatarImage, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpLookupAvatarImageAsync(s32 reqId, vm::cptr avatarUrl, vm::ptr avatarImage, vm::ptr option) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBandwidthTestInitStart(s32 initPriority, s32 cpuAffinityMask) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBandwidthTestGetStatus() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBandwidthTestShutdown(vm::ptr result) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceNpBandwidthTestAbort() { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpUtility, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp b/rpcs3/Emu/ARMv7/Modules/scePerf.cpp index 11de670fb4..cc6641efeb 100644 --- a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp +++ b/rpcs3/Emu/ARMv7/Modules/scePerf.cpp @@ -12,7 +12,7 @@ s32 scePerfArmPmonReset(ARMv7Context& context, s32 threadId) if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected thread"); } context.counters = {}; @@ -26,7 +26,7 @@ s32 scePerfArmPmonSelectEvent(ARMv7Context& context, s32 threadId, u32 counter, if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected thread"); } if (counter >= 6) @@ -75,7 +75,7 @@ s32 scePerfArmPmonStart(ARMv7Context& context, s32 threadId) if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected thread"); } return SCE_OK; @@ -87,7 +87,7 @@ s32 scePerfArmPmonStop(ARMv7Context& context, s32 threadId) if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected thread"); } return SCE_OK; @@ -99,7 +99,7 @@ s32 scePerfArmPmonGetCounterValue(ARMv7Context& context, s32 threadId, u32 count if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected thread"); } if (counter >= 6 && counter != SCE_PERF_ARM_PMON_CYCLE_COUNTER) @@ -113,7 +113,7 @@ s32 scePerfArmPmonGetCounterValue(ARMv7Context& context, s32 threadId, u32 count } else { - throw "scePerfArmPmonGetCounterValue(): cycle counter requested"; + throw EXCEPTION("Cycle counter requested"); } return SCE_OK; @@ -155,22 +155,22 @@ u32 scePerfGetTimebaseFrequency() s32 _sceRazorCpuInit(vm::cptr pBufferBase, u32 bufferSize, u32 numPerfCounters, vm::pptr psceRazorVars) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRazorCpuPushMarker(vm::cptr szLabel) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRazorCpuPopMarker() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRazorCpuSync() { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &scePerf, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp b/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp index 1027f5f616..a3bb019b95 100644 --- a/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp +++ b/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp @@ -14,7 +14,7 @@ s32 scePhotoExportFromData( vm::ptr exportedPath, s32 exportedPathLength) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 scePhotoExportFromFile( @@ -26,7 +26,7 @@ s32 scePhotoExportFromFile( vm::ptr exportedPath, s32 exportedPathLength) { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &scePhotoExport, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp b/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp index 51145d0101..0bd13559a0 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp @@ -6,17 +6,17 @@ void sceRazorCaptureSetTrigger(u32 frameIndex, vm::cptr captureFilename) { - throw __FUNCTION__; + throw EXCEPTION(""); } void sceRazorCaptureSetTriggerNextFrame(vm::cptr captureFilename) { - throw __FUNCTION__; + throw EXCEPTION(""); } bool sceRazorCaptureIsInProgress() { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceRazorCapture, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp b/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp index 7ed5aac4cd..2464327af3 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp @@ -6,187 +6,187 @@ u32 sceRtcGetTickResolution() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcGetCurrentTick(vm::ptr pTick) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcGetCurrentClock(vm::ptr pTime, s32 iTimeZone) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcGetCurrentClockLocalTime(vm::ptr pTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcGetCurrentNetworkTick(vm::ptr pTick) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcConvertUtcToLocalTime(vm::cptr pUtc, vm::ptr pLocalTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcConvertLocalTimeToUtc(vm::cptr pLocalTime, vm::ptr pUtc) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcIsLeapYear(s32 year) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcGetDaysInMonth(s32 year, s32 month) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcGetDayOfWeek(s32 year, s32 month, s32 day) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcCheckValid(vm::cptr pTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcSetTime_t(vm::ptr pTime, u32 iTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcSetTime64_t(vm::ptr pTime, u64 ullTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcGetTime_t(vm::cptr pTime, vm::ptr piTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcGetTime64_t(vm::cptr pTime, vm::ptr pullTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcSetDosTime(vm::ptr pTime, u32 uiDosTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcGetDosTime(vm::cptr pTime, vm::ptr puiDosTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcSetWin32FileTime(vm::ptr pTime, u64 ulWin32Time) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcGetWin32FileTime(vm::cptr pTime, vm::ptr ulWin32Time) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcSetTick(vm::ptr pTime, vm::cptr pTick) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcGetTick(vm::cptr pTime, vm::ptr pTick) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcCompareTick(vm::cptr pTick1, vm::cptr pTick2) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcTickAddTicks(vm::ptr pTick0, vm::cptr pTick1, u64 lAdd) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcTickAddMicroseconds(vm::ptr pTick0, vm::cptr pTick1, u64 lAdd) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcTickAddSeconds(vm::ptr pTick0, vm::cptr pTick1, u64 lAdd) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcTickAddMinutes(vm::ptr pTick0, vm::cptr pTick1, u64 lAdd) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcTickAddHours(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcTickAddDays(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcTickAddWeeks(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcTickAddMonths(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcTickAddYears(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcFormatRFC2822(vm::ptr pszDateTime, vm::cptr pUtc, s32 iTimeZoneMinutes) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcFormatRFC2822LocalTime(vm::ptr pszDateTime, vm::cptr pUtc) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcFormatRFC3339(vm::ptr pszDateTime, vm::cptr pUtc, s32 iTimeZoneMinutes) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcFormatRFC3339LocalTime(vm::ptr pszDateTime, vm::cptr pUtc) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcParseDateTime(vm::ptr pUtc, vm::cptr pszDateTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceRtcParseRFC3339(vm::ptr pUtc, vm::cptr pszDateTime) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceSas.cpp b/rpcs3/Emu/ARMv7/Modules/sceSas.cpp index e332cc5cf7..40ee51bfaf 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceSas.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceSas.cpp @@ -6,147 +6,147 @@ s32 sceSasGetNeededMemorySize(vm::cptr config, vm::ptr outSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasInit(vm::cptr config, vm::ptr buffer, u32 bufferSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasInitWithGrain(vm::cptr config, u32 grain, vm::ptr buffer, u32 bufferSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasExit(vm::pptr outBuffer, vm::ptr outBufferSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetGrain(u32 grain) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasGetGrain() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetOutputmode(u32 outputmode) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasGetOutputmode() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasCore(vm::ptr out) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasCoreWithMix(vm::ptr inOut, s32 lvol, s32 rvol) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetVoice(s32 iVoiceNum, vm::cptr vagBuf, u32 size, u32 loopflag) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetVoicePCM(s32 iVoiceNum, vm::cptr pcmBuf, u32 size, s32 loopsize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetNoise(s32 iVoiceNum, u32 uClk) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetVolume(s32 iVoiceNum, s32 l, s32 r, s32 wl, s32 wr) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetPitch(s32 iVoiceNum, s32 pitch) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetADSR(s32 iVoiceNum, u32 flag, u32 ar, u32 dr, u32 sr, u32 rr) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetADSRmode(s32 iVoiceNum, u32 flag, u32 am, u32 dm, u32 sm, u32 rm) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetSL(s32 iVoiceNum, u32 sl) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetSimpleADSR(s32 iVoiceNum, u16 adsr1, u16 adsr2) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetKeyOn(s32 iVoiceNum) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetKeyOff(s32 iVoiceNum) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetPause(s32 iVoiceNum, u32 pauseFlag) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasGetPauseState(s32 iVoiceNum) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasGetEndState(s32 iVoiceNum) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasGetEnvelope(s32 iVoiceNum) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetEffect(s32 drySwitch, s32 wetSwitch) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetEffectType(s32 type) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetEffectVolume(s32 valL, s32 valR) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSasSetEffectParam(u32 delayTime, u32 feedback) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp b/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp index fb5ad71876..62e4c88e00 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp @@ -6,22 +6,22 @@ s32 sceScreenShotSetParam(vm::cptr param) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceScreenShotSetOverlayImage(vm::cptr filePath, s32 offsetX, s32 offsetY) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceScreenShotDisable() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceScreenShotEnable() { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp b/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp index 193b6e4bc3..75e72e4717 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp @@ -6,57 +6,57 @@ s32 sceSslInit(u32 poolSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSslTerm() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSslGetMemoryPoolStats(vm::ptr currentStat) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSslGetSerialNumber(vm::ptr sslCert, vm::cpptr sboData, vm::ptr sboLen) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceSslGetSubjectName(vm::ptr sslCert) { - throw __FUNCTION__; + throw EXCEPTION(""); } vm::ptr sceSslGetIssuerName(vm::ptr sslCert) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSslGetNotBefore(vm::ptr sslCert, vm::ptr begin) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSslGetNotAfter(vm::ptr sslCert, vm::ptr limit) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSslGetNameEntryCount(vm::ptr certName) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSslGetNameEntryInfo(vm::ptr certName, s32 entryNum, vm::ptr oidname, u32 maxOidnameLen, vm::ptr value, u32 maxValueLen, vm::ptr valueLen) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSslFreeSslCertName(vm::ptr certName) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp b/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp index 2f23e1f251..eabbe2c065 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp @@ -6,67 +6,67 @@ s32 sceSulphaNetworkInit() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaNetworkShutdown() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaGetDefaultConfig(vm::ptr config) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaGetNeededMemory(vm::cptr config, vm::ptr sizeInBytes) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaInit(vm::cptr config, vm::ptr buffer, u32 sizeInBytes) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaShutdown() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaUpdate() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaFileConnect(vm::cptr filename) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaFileDisconnect() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaSetBookmark(vm::cptr name, s32 id) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaAgentsGetNeededMemory(vm::cptr config, vm::ptr sizeInBytes) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaAgentsRegister(vm::cptr config, vm::ptr buffer, u32 sizeInBytes, vm::ptr handles) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSulphaAgentsUnregister(vm::cptr handles, u32 agentCount) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp b/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp index 76ab420216..f9e9c0f318 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp @@ -6,87 +6,87 @@ s32 sceSystemGestureInitializePrimitiveTouchRecognizer(vm::ptr parameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureFinalizePrimitiveTouchRecognizer() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureResetPrimitiveTouchRecognizer() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureUpdatePrimitiveTouchRecognizer(vm::cptr pFrontData, vm::cptr pBackData) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureGetPrimitiveTouchEvents(vm::ptr primitiveEventBuffer, const u32 capacityOfBuffer, vm::ptr numberOfEvent) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureGetPrimitiveTouchEventsCount() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureGetPrimitiveTouchEventByIndex(const u32 index, vm::ptr primitiveTouchEvent) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureGetPrimitiveTouchEventByPrimitiveID(const u16 primitiveID, vm::ptr primitiveTouchEvent) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureCreateTouchRecognizer(vm::ptr touchRecognizer, const SceSystemGestureType gestureType, const u8 touchPanelPortID, vm::cptr rectangle, vm::cptr touchRecognizerParameter) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureGetTouchRecognizerInformation(vm::cptr touchRecognizer, vm::ptr information) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureResetTouchRecognizer(vm::ptr touchRecognizer) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureUpdateTouchRecognizer(vm::ptr touchRecognizer) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureUpdateTouchRecognizerRectangle(vm::ptr touchRecognizer, vm::cptr rectangle) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureGetTouchEvents(vm::cptr touchRecognizer, vm::ptr eventBuffer, const u32 capacityOfBuffer, vm::ptr numberOfEvent) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureGetTouchEventsCount(vm::cptr touchRecognizer) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureGetTouchEventByIndex(vm::cptr touchRecognizer, const u32 index, vm::ptr touchEvent) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceSystemGestureGetTouchEventByEventID(vm::cptr touchRecognizer, const u32 eventID, vm::ptr touchEvent) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp b/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp index 0836a407c1..07f74f710d 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp @@ -6,27 +6,27 @@ s32 sceTouchGetPanelInfo(u32 port, vm::ptr pPanelInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceTouchRead(u32 port, vm::ptr pData, u32 nBufs) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceTouchPeek(u32 port, vm::ptr pData, u32 nBufs) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceTouchSetSamplingState(u32 port, u32 state) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceTouchGetSamplingState(u32 port, vm::ptr pState) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp b/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp index f1d3b29a6b..4b47e74181 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp @@ -8,12 +8,12 @@ s32 _sceUltWaitingQueueResourcePoolOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceUltWaitingQueueResourcePoolGetWorkAreaSize(u32 numThreads, u32 numSyncObjects) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltWaitingQueueResourcePoolCreate( @@ -25,22 +25,22 @@ s32 _sceUltWaitingQueueResourcePoolCreate( vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltWaitingQueueResourcePoolDestroy(vm::ptr pool) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltQueueDataResourcePoolOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceUltQueueDataResourcePoolGetWorkAreaSize(u32 numData, u32 dataSize, u32 numQueueObject) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltQueueDataResourcePoolCreate( @@ -54,22 +54,22 @@ s32 _sceUltQueueDataResourcePoolCreate( vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltQueueDataResourcePoolDestroy(vm::ptr pool) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceUltMutexGetStandaloneWorkAreaSize(u32 waitingQueueDepth, u32 numConditionVariable) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltMutexOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltMutexCreate( @@ -79,7 +79,7 @@ s32 _sceUltMutexCreate( vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltMutexCreateStandalone( @@ -91,32 +91,32 @@ s32 _sceUltMutexCreateStandalone( vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltMutexLock(vm::ptr mutex) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltMutexTryLock(vm::ptr mutex) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltMutexUnlock(vm::ptr mutex) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltMutexDestroy(vm::ptr mutex) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltConditionVariableOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltConditionVariableCreate( @@ -126,39 +126,39 @@ s32 _sceUltConditionVariableCreate( vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltConditionVariableSignal(vm::ptr conditionVariable) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltConditionVariableSignalAll(vm::ptr conditionVariable) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltConditionVariableWait(vm::ptr conditionVariable) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltConditionVariableDestroy(vm::ptr conditionVariable) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltQueueOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceUltQueueGetStandaloneWorkAreaSize(u32 queueDepth, u32 dataSize, u32 waitingQueueLength) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltQueueCreate( @@ -170,7 +170,7 @@ s32 _sceUltQueueCreate( vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltQueueCreateStandalone( @@ -183,37 +183,37 @@ s32 _sceUltQueueCreateStandalone( vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltQueuePush(vm::ptr queue, vm::cptr data) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltQueueTryPush(vm::ptr queue, vm::cptr data) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltQueuePop(vm::ptr queue, vm::ptr data) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltQueueTryPop(vm::ptr queue, vm::ptr data) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltQueueDestroy(vm::ptr queue) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltReaderWriterLockOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltReaderWriterLockCreate( @@ -223,7 +223,7 @@ s32 _sceUltReaderWriterLockCreate( vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltReaderWriterLockCreateStandalone( @@ -234,52 +234,52 @@ s32 _sceUltReaderWriterLockCreateStandalone( vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceUltReaderWriterLockGetStandaloneWorkAreaSize(u32 waitingQueueDepth) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltReaderWriterLockLockRead(vm::ptr rwlock) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltReaderWriterLockTryLockRead(vm::ptr rwlock) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltReaderWriterLockUnlockRead(vm::ptr rwlock) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltReaderWriterLockLockWrite(vm::ptr rwlock) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltReaderWriterLockTryLockWrite(vm::ptr rwlock) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltReaderWriterLockUnlockWrite(vm::ptr rwlock) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltReaderWriterLockDestroy(vm::ptr rwlock) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltSemaphoreOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltSemaphoreCreate( @@ -290,37 +290,37 @@ s32 _sceUltSemaphoreCreate( vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltSemaphoreAcquire(vm::ptr semaphore, s32 numResource) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltSemaphoreTryAcquire(vm::ptr semaphore, s32 numResource) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltSemaphoreRelease(vm::ptr semaphore, s32 numResource) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltSemaphoreDestroy(vm::ptr semaphore) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltUlthreadRuntimeOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } u32 sceUltUlthreadRuntimeGetWorkAreaSize(u32 numMaxUlthread, u32 numWorkerThread) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltUlthreadRuntimeCreate( @@ -332,17 +332,17 @@ s32 _sceUltUlthreadRuntimeCreate( vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltUlthreadRuntimeDestroy(vm::ptr runtime) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltUlthreadOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _sceUltUlthreadCreate( @@ -356,32 +356,32 @@ s32 _sceUltUlthreadCreate( vm::cptr optParam, u32 buildVersion) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltUlthreadYield() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltUlthreadExit(s32 status) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltUlthreadJoin(vm::ptr ulthread, vm::ptr status) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltUlthreadTryJoin(vm::ptr ulthread, vm::ptr status) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceUltUlthreadGetSelf(vm::pptr ulthread) { - throw __FUNCTION__; + throw EXCEPTION(""); } #define REG_FUNC(nid, name) reg_psv_func(nid, &sceUlt, #name, name) diff --git a/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp b/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp index 1f1402bd38..190645df00 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp @@ -6,47 +6,47 @@ s32 sceVideodecInitLibrary(u32 codecType, vm::cptr pInitInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVideodecTermLibrary(u32 codecType) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAvcdecQueryDecoderMemSize(u32 codecType, vm::cptr pDecoderInfo, vm::ptr pMemInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAvcdecCreateDecoder(u32 codecType, vm::ptr pCtrl, vm::cptr pDecoderInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAvcdecDeleteDecoder(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAvcdecDecodeAvailableSize(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAvcdecDecode(vm::ptr pCtrl, vm::cptr pAu, vm::ptr pArrayPicture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAvcdecDecodeStop(vm::ptr pCtrl, vm::ptr pArrayPicture) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceAvcdecDecodeFlush(vm::ptr pCtrl) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp b/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp index fd4a7df39a..a76177503e 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp @@ -6,127 +6,127 @@ s32 sceVoiceInit(vm::ptr pArg, SceVoiceVersion version) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceEnd() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceStart(vm::ptr pArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceStop() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceResetPort(u32 portId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceCreatePort(vm::ptr portId, vm::cptr pArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceUpdatePort(u32 portId, vm::cptr pArg) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceConnectIPortToOPort(u32 ips, u32 ops) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceDisconnectIPortFromOPort(u32 ips, u32 ops) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceDeletePort(u32 portId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceWriteToIPort(u32 ips, vm::cptr data, vm::ptr size, s16 frameGaps) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceReadFromOPort(u32 ops, vm::ptr data, vm::ptr size) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceSetMuteFlagAll(u16 bMuted) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceSetMuteFlag(u32 portId, u16 bMuted) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceGetMuteFlag(u32 portId, vm::ptr bMuted) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceSetVolume(u32 portId, float volume) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceGetVolume(u32 portId, vm::ptr volume) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceSetBitRate(u32 portId, SceVoiceBitRate bitrate) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceGetBitRate(u32 portId, vm::ptr bitrate) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceGetPortInfo(u32 portId, vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoicePausePort(u32 portId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceResumePort(u32 portId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoicePausePortAll() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceResumePortAll() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceGetResourceInfo(vm::ptr pInfo) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp b/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp index 46448f486b..0adead3bfc 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp @@ -6,87 +6,87 @@ s32 sceVoiceQoSInit() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSEnd() { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSCreateLocalEndpoint(vm::ptr pLocalId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSDeleteLocalEndpoint(s32 localId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSCreateRemoteEndpoint(vm::ptr pRemoteId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSDeleteRemoteEndpoint(s32 remoteId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSConnect(vm::ptr pConnectionId, s32 localId, s32 remoteId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSDisconnect(s32 connectionId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSGetLocalEndpoint(s32 connectionId, vm::ptr pLocalId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSGetRemoteEndpoint(s32 connectionId, vm::ptr pRemoteId) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSSetLocalEndpointAttribute(s32 localId, SceVoiceQoSAttributeId attributeId, vm::cptr pAttributeValue, s32 attributeSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSGetLocalEndpointAttribute(s32 localId, SceVoiceQoSAttributeId attributeId, vm::ptr pAttributeValue, s32 attributeSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSSetConnectionAttribute(s32 connectionId, SceVoiceQoSAttributeId attributeId, vm::cptr pAttributeValue, s32 attributeSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSGetConnectionAttribute(s32 connectionId, SceVoiceQoSAttributeId attributeId, vm::ptr pAttributeValue, s32 attributeSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSGetStatus(s32 connectionId, SceVoiceQoSStatusId statusId, vm::ptr pStatusValue, s32 statusSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSWritePacket(s32 connectionId, vm::cptr pData, vm::ptr pSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } s32 sceVoiceQoSReadPacket(s32 connectionId, vm::ptr pData, vm::ptr pSize) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp index 5738417e99..7d24a08bbe 100644 --- a/rpcs3/Emu/CPU/CPUThread.cpp +++ b/rpcs3/Emu/CPU/CPUThread.cpp @@ -11,13 +11,15 @@ #include "CPUThread.h" CPUThread::CPUThread(CPUThreadType type, const std::string& name, std::function thread_name) - : m_state({ CPU_STATE_STOP }) + : m_state({ CPU_STATE_STOPPED }) , m_id(Emu.GetIdManager().get_current_id()) , m_type(type) , m_name(name) { start(thread_name, [this] { + SendDbgCommand(DID_CREATE_THREAD, this); + std::unique_lock lock(mutex); // check thread status @@ -39,7 +41,7 @@ CPUThread::CPUThread(CPUThreadType type, const std::string& name, std::function< } catch (CPUThreadStop) { - m_state |= CPU_STATE_STOP; + m_state |= CPU_STATE_STOPPED; } catch (CPUThreadExit) { @@ -47,6 +49,7 @@ CPUThread::CPUThread(CPUThreadType type, const std::string& name, std::function< break; } + m_state &= ~CPU_STATE_RETURN; cv.notify_one(); continue; } @@ -58,8 +61,6 @@ CPUThread::CPUThread(CPUThreadType type, const std::string& name, std::function< cv.notify_all(); }); - - SendDbgCommand(DID_CREATE_THREAD, this); } CPUThread::~CPUThread() @@ -74,7 +75,7 @@ CPUThread::~CPUThread() bool CPUThread::IsPaused() const { - return (m_state.load() & CPU_STATE_PAUSE) != 0 || Emu.IsPaused(); + return (m_state.load() & CPU_STATE_PAUSED) != 0 || Emu.IsPaused(); } void CPUThread::DumpInformation() const @@ -97,7 +98,7 @@ void CPUThread::Resume() { SendDbgCommand(DID_RESUME_THREAD, this); - m_state &= ~CPU_STATE_PAUSE; + m_state &= ~CPU_STATE_PAUSED; cv.notify_one(); @@ -108,7 +109,7 @@ void CPUThread::Pause() { SendDbgCommand(DID_PAUSE_THREAD, this); - m_state |= CPU_STATE_PAUSE; + m_state |= CPU_STATE_PAUSED; cv.notify_one(); @@ -125,7 +126,7 @@ void CPUThread::Stop() } else { - m_state |= CPU_STATE_STOP; + m_state |= CPU_STATE_STOPPED; cv.notify_one(); } @@ -137,7 +138,7 @@ void CPUThread::Exec() { SendDbgCommand(DID_EXEC_THREAD, this); - m_state &= ~CPU_STATE_STOP; + m_state &= ~CPU_STATE_STOPPED; cv.notify_one(); } @@ -159,7 +160,7 @@ void CPUThread::Step() m_state.atomic_op([](u64& state) { state |= CPU_STATE_STEP; - state &= ~CPU_STATE_PAUSE; + state &= ~CPU_STATE_PAUSED; }); cv.notify_one(); @@ -194,7 +195,7 @@ bool CPUThread::CheckStatus() cv.wait_for(lock, std::chrono::milliseconds(1)); } - if (IsStopped()) + if (m_state.load() & CPU_STATE_RETURN || IsStopped()) { return true; } @@ -202,7 +203,7 @@ bool CPUThread::CheckStatus() if (m_state.load() & CPU_STATE_STEP) { // set PAUSE, but allow to execute once - m_state |= CPU_STATE_PAUSE; + m_state |= CPU_STATE_PAUSED; m_state &= ~CPU_STATE_STEP; } diff --git a/rpcs3/Emu/CPU/CPUThread.h b/rpcs3/Emu/CPU/CPUThread.h index 31ea8a8e77..94202fb4ab 100644 --- a/rpcs3/Emu/CPU/CPUThread.h +++ b/rpcs3/Emu/CPU/CPUThread.h @@ -13,11 +13,12 @@ enum CPUThreadType // CPU Thread State Flags enum : u64 { - CPU_STATE_STOP = (1ull << 0), // basic execution state (stopped by default), removed by Exec() - CPU_STATE_PAUSE = (1ull << 1), // paused by debugger (manually or after step execution) - CPU_STATE_SLEEP = (1ull << 2), - CPU_STATE_STEP = (1ull << 3), - CPU_STATE_DEAD = (1ull << 4), + CPU_STATE_STOPPED = (1ull << 0), // basic execution state (stopped by default), removed by Exec() + CPU_STATE_PAUSED = (1ull << 1), // paused by debugger (manually or after step execution) + CPU_STATE_SLEEP = (1ull << 2), + CPU_STATE_STEP = (1ull << 3), + CPU_STATE_DEAD = (1ull << 4), + CPU_STATE_RETURN = (1ull << 5), }; // "HLE return" exception event @@ -57,7 +58,7 @@ public: std::string GetName() const { return m_name; } bool IsActive() const { return (m_state.load() & CPU_STATE_DEAD) == 0; } - bool IsStopped() const { return (m_state.load() & CPU_STATE_STOP) != 0; } + bool IsStopped() const { return (m_state.load() & CPU_STATE_STOPPED) != 0; } virtual bool IsPaused() const; virtual void DumpInformation() const; @@ -79,7 +80,7 @@ public: void Step(); // set STEP status, don't use void Sleep(); // flip SLEEP status, don't use void Awake(); // flip SLEEP status, don't use - bool CheckStatus(); // process m_state flags, returns true if must return from Task() + bool CheckStatus(); // process m_state flags, returns true if the checker must return std::string GetFName() const { diff --git a/rpcs3/Emu/Cell/PPUInterpreter.cpp b/rpcs3/Emu/Cell/PPUInterpreter.cpp index b5cc3da03e..c38b110078 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/PPUInterpreter.cpp @@ -53,7 +53,7 @@ void ppu_interpreter::TDI(PPUThread& CPU, ppu_opcode_t op) ((op.bo & 0x2) && a_ < b_) || ((op.bo & 0x1) && a_ > b_)) { - throw __FUNCTION__; + throw EXCEPTION(""); } } @@ -68,14 +68,14 @@ void ppu_interpreter::TWI(PPUThread& CPU, ppu_opcode_t op) ((op.bo & 0x2) && a_ < b_) || ((op.bo & 0x1) && a_ > b_)) { - throw __FUNCTION__; + throw EXCEPTION(""); } } void ppu_interpreter::MFVSCR(PPUThread& CPU, ppu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION(""); } void ppu_interpreter::MTVSCR(PPUThread& CPU, ppu_opcode_t op) @@ -1478,7 +1478,7 @@ void ppu_interpreter::SC(PPUThread& CPU, ppu_opcode_t op) { case 0x0: SysCalls::DoSyscall(CPU, CPU.GPR[11]); break; case 0x3: CPU.FastStop(); break; - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } } @@ -1698,7 +1698,7 @@ void ppu_interpreter::TW(PPUThread& CPU, ppu_opcode_t op) ((u32)a < (u32)b && (op.bo & 0x2)) || ((u32)a >(u32)b && (op.bo & 0x1))) { - throw __FUNCTION__; + throw EXCEPTION(""); } } @@ -1923,7 +1923,7 @@ void ppu_interpreter::ANDC(PPUThread& CPU, ppu_opcode_t op) void ppu_interpreter::TD(PPUThread& CPU, ppu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION(""); } void ppu_interpreter::LVEWX(PPUThread& CPU, ppu_opcode_t op) @@ -2233,7 +2233,7 @@ void ppu_interpreter::EQV(PPUThread& CPU, ppu_opcode_t op) void ppu_interpreter::ECIWX(PPUThread& CPU, ppu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION(""); } void ppu_interpreter::LHZUX(PPUThread& CPU, ppu_opcode_t op) @@ -2274,7 +2274,7 @@ void ppu_interpreter::MFSPR(PPUThread& CPU, ppu_opcode_t op) case 0x117: CPU.GPR[op.rd] = CPU.SPRG[n - 0x110]; return; } - throw __FUNCTION__; + throw EXCEPTION(""); } void ppu_interpreter::LWAX(PPUThread& CPU, ppu_opcode_t op) @@ -2308,7 +2308,7 @@ void ppu_interpreter::MFTB(PPUThread& CPU, ppu_opcode_t op) { case 0x10C: CPU.GPR[op.rd] = CPU.TB; break; case 0x10D: CPU.GPR[op.rd] = CPU.TB >> 32; break; - default: throw __FUNCTION__; + default: throw EXCEPTION(""); } } @@ -2344,7 +2344,7 @@ void ppu_interpreter::ORC(PPUThread& CPU, ppu_opcode_t op) void ppu_interpreter::ECOWX(PPUThread& CPU, ppu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION(""); } void ppu_interpreter::STHUX(PPUThread& CPU, ppu_opcode_t op) @@ -2419,7 +2419,7 @@ void ppu_interpreter::MTSPR(PPUThread& CPU, ppu_opcode_t op) case 0x117: CPU.SPRG[n - 0x110] = CPU.GPR[op.rs]; return; } - throw __FUNCTION__; + throw EXCEPTION(""); } void ppu_interpreter::DCBI(PPUThread& CPU, ppu_opcode_t op) @@ -3324,5 +3324,5 @@ void ppu_interpreter::FCFID(PPUThread& CPU, ppu_opcode_t op) void ppu_interpreter::UNK(PPUThread& CPU, ppu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION(""); } diff --git a/rpcs3/Emu/Cell/PPUInterpreter.h b/rpcs3/Emu/Cell/PPUInterpreter.h index 76bb8dc008..5b5fb408b6 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.h +++ b/rpcs3/Emu/Cell/PPUInterpreter.h @@ -2886,7 +2886,7 @@ private: } void ECIWX(u32 rd, u32 ra, u32 rb) { - throw __FUNCTION__; + throw EXCEPTION("Privileged instruction"); } void LHZUX(u32 rd, u32 ra, u32 rb) { @@ -2960,7 +2960,7 @@ private: } void ECOWX(u32 rs, u32 ra, u32 rb) { - throw __FUNCTION__; + throw EXCEPTION("Privileged instruction"); } void STHUX(u32 rs, u32 ra, u32 rb) { diff --git a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp index f3e161c054..119be09b8a 100644 --- a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp +++ b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp @@ -5596,15 +5596,15 @@ std::mutex RecompilationEngine::s_mutex; std::shared_ptr RecompilationEngine::s_the_instance = nullptr; RecompilationEngine::RecompilationEngine() - : ThreadBase("PPU Recompilation Engine") - , m_log(nullptr) + : m_log(nullptr) , m_next_ordinal(0) , m_compiler(*this, ExecutionEngine::ExecuteFunction, ExecutionEngine::ExecuteTillReturn, ExecutionEngine::PollStatus) { m_compiler.RunAllTests(); } RecompilationEngine::~RecompilationEngine() { - Stop(); + cv.notify_one(); + join(); } u32 RecompilationEngine::AllocateOrdinal(u32 address, bool is_function) { @@ -5648,11 +5648,11 @@ void RecompilationEngine::NotifyTrace(ExecutionTrace * execution_trace) { m_pending_execution_traces.push_back(execution_trace); } - if (!IsAlive()) { - Start(); + if (!joinable()) { + start(WRAP_EXPR("PPU Recompilation Engine"), WRAP_EXPR(Task())); } - Notify(); + cv.notify_one(); // TODO: Increase the priority of the recompilation engine thread } @@ -5672,7 +5672,7 @@ void RecompilationEngine::Task() { std::chrono::nanoseconds recompiling_time(0); auto start = std::chrono::high_resolution_clock::now(); - while (!TestDestroy() && !Emu.IsStopped()) { + while (joinable() && !Emu.IsStopped()) { bool work_done_this_iteration = false; ExecutionTrace * execution_trace = nullptr; @@ -5729,7 +5729,8 @@ void RecompilationEngine::Task() { // Wait a few ms for something to happen auto idling_start = std::chrono::high_resolution_clock::now(); - WaitForAnySignal(250); + std::unique_lock lock(mutex); + cv.wait_for(lock, std::chrono::milliseconds(250)); auto idling_end = std::chrono::high_resolution_clock::now(); idling_time += std::chrono::duration_cast(idling_end - idling_start); } @@ -6027,8 +6028,8 @@ u32 ppu_recompiler_llvm::ExecutionEngine::ExecuteTillReturn(PPUThread * ppu_stat execution_engine->m_tracer.Trace(Tracer::TraceType::Instruction, ppu_state->PC, 0); u32 instruction = vm::ps3::read32(ppu_state->PC); execution_engine->m_decoder.Decode(instruction); - branch_type = ppu_state->m_is_branch ? GetBranchTypeFromInstruction(instruction) : BranchType::NonBranch; - ppu_state->NextPc(4); + branch_type = GetBranchTypeFromInstruction(instruction); + ppu_state->PC += 4; switch (branch_type) { case BranchType::Return: @@ -6055,15 +6056,7 @@ u32 ppu_recompiler_llvm::ExecutionEngine::ExecuteTillReturn(PPUThread * ppu_stat } bool ppu_recompiler_llvm::ExecutionEngine::PollStatus(PPUThread * ppu_state) { - while (Emu.IsPaused() || ppu_state->IsPaused()) { - std::this_thread::sleep_for(std::chrono::milliseconds(50)); - } - - if (Emu.IsStopped() || ppu_state->IsStopped()) { - return true; - } - - return false; + return ppu_state->CheckStatus(); } BranchType ppu_recompiler_llvm::GetBranchTypeFromInstruction(u32 instruction) { diff --git a/rpcs3/Emu/Cell/PPULLVMRecompiler.h b/rpcs3/Emu/Cell/PPULLVMRecompiler.h index 5ab812e8b6..0627332c72 100644 --- a/rpcs3/Emu/Cell/PPULLVMRecompiler.h +++ b/rpcs3/Emu/Cell/PPULLVMRecompiler.h @@ -948,9 +948,9 @@ namespace ppu_recompiler_llvm { static void InitRotateMask(); }; - class RecompilationEngine : public ThreadBase { + class RecompilationEngine final : protected thread_t { public: - virtual ~RecompilationEngine(); + virtual ~RecompilationEngine() override; /// Allocate an ordinal u32 AllocateOrdinal(u32 address, bool is_function); @@ -970,7 +970,7 @@ namespace ppu_recompiler_llvm { /// Log llvm::raw_fd_ostream & Log(); - void Task() override; + void Task(); /// Get a pointer to the instance of this class static std::shared_ptr GetInstance(); diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index c329e9c8d1..ce050847a8 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -501,6 +501,7 @@ PPUThread::~PPUThread() cv.notify_one(); join(); + CloseStack(); ppu_free_tls(m_id); } @@ -578,7 +579,6 @@ void PPUThread::DoRun() case 2: { #ifdef PPU_LLVM_RECOMPILER - SetCallStackTracing(false); m_dec.reset(new ppu_recompiler_llvm::ExecutionEngine(*this)); #else LOG_ERROR(PPU, "This image does not include PPU JIT (LLVM)"); @@ -663,6 +663,8 @@ void PPUThread::FastCall2(u32 addr, u32 rtoc) { } + m_state &= ~CPU_STATE_RETURN; + PC = old_PC; if (GPR[1] != old_stack) // GPR[1] shouldn't change @@ -677,7 +679,7 @@ void PPUThread::FastCall2(u32 addr, u32 rtoc) void PPUThread::FastStop() { - throw CPUThreadReturn{}; + m_state |= CPU_STATE_RETURN; } void PPUThread::Task() @@ -695,7 +697,7 @@ void PPUThread::Task() { while (true) { - if (m_state.load() && CheckStatus()) return; + if (m_state.load() && CheckStatus()) break; // decode instruction using specified decoder m_dec->DecodeMemory(PC); @@ -708,7 +710,7 @@ void PPUThread::Task() { while (true) { - if (m_state.load() && CheckStatus()) return; + if (m_state.load() && CheckStatus()) break; // get interpreter function const auto func = g_ppu_inter_func_list[*(u32*)((u8*)g_ppu_exec_map + PC)]; diff --git a/rpcs3/Emu/Cell/SPUInterpreter.cpp b/rpcs3/Emu/Cell/SPUInterpreter.cpp index 3a55e89559..b498573b1b 100644 --- a/rpcs3/Emu/Cell/SPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/SPUInterpreter.cpp @@ -274,7 +274,7 @@ void spu_interpreter::BIZ(SPUThread& CPU, spu_opcode_t op) { if (op.d || op.e) { - throw __FUNCTION__; + throw EXCEPTION("Unimplemented interrupt flags (d=%d, e=%d)", op.d, op.e); } if (CPU.GPR[op.rt]._u32[3] == 0) @@ -287,7 +287,7 @@ void spu_interpreter::BINZ(SPUThread& CPU, spu_opcode_t op) { if (op.d || op.e) { - throw __FUNCTION__; + throw EXCEPTION("Unimplemented interrupt flags (d=%d, e=%d)", op.d, op.e); } if (CPU.GPR[op.rt]._u32[3] != 0) @@ -300,7 +300,7 @@ void spu_interpreter::BIHZ(SPUThread& CPU, spu_opcode_t op) { if (op.d || op.e) { - throw __FUNCTION__; + throw EXCEPTION("Unimplemented interrupt flags (d=%d, e=%d)", op.d, op.e); } if (CPU.GPR[op.rt]._u16[6] == 0) @@ -313,7 +313,7 @@ void spu_interpreter::BIHNZ(SPUThread& CPU, spu_opcode_t op) { if (op.d || op.e) { - throw __FUNCTION__; + throw EXCEPTION("Unimplemented interrupt flags (d=%d, e=%d)", op.d, op.e); } if (CPU.GPR[op.rt]._u16[6] != 0) @@ -324,7 +324,7 @@ void spu_interpreter::BIHNZ(SPUThread& CPU, spu_opcode_t op) void spu_interpreter::STOPD(SPUThread& CPU, spu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected instruction"); } void spu_interpreter::STQX(SPUThread& CPU, spu_opcode_t op) @@ -336,7 +336,7 @@ void spu_interpreter::BI(SPUThread& CPU, spu_opcode_t op) { if (op.d || op.e) { - throw __FUNCTION__; + throw EXCEPTION("Unimplemented interrupt flags (d=%d, e=%d)", op.d, op.e); } CPU.PC = SPUOpcodes::branchTarget(CPU.GPR[op.ra]._u32[3], 0) - 4; @@ -346,7 +346,7 @@ void spu_interpreter::BISL(SPUThread& CPU, spu_opcode_t op) { if (op.d || op.e) { - throw __FUNCTION__; + throw EXCEPTION("Unimplemented interrupt flags (d=%d, e=%d)", op.d, op.e); } const u32 target = SPUOpcodes::branchTarget(CPU.GPR[op.ra]._u32[3], 0); @@ -356,12 +356,12 @@ void spu_interpreter::BISL(SPUThread& CPU, spu_opcode_t op) void spu_interpreter::IRET(SPUThread& CPU, spu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected instruction"); } void spu_interpreter::BISLED(SPUThread& CPU, spu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected instruction"); } void spu_interpreter::HBR(SPUThread& CPU, spu_opcode_t op) @@ -656,7 +656,7 @@ void spu_interpreter::FCGT(SPUThread& CPU, spu_opcode_t op) void spu_interpreter::DFCGT(SPUThread& CPU, spu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected instruction"); } void spu_interpreter::FA(SPUThread& CPU, spu_opcode_t op) @@ -692,7 +692,7 @@ void spu_interpreter::FCMGT(SPUThread& CPU, spu_opcode_t op) void spu_interpreter::DFCMGT(SPUThread& CPU, spu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected instruction"); } void spu_interpreter::DFA(SPUThread& CPU, spu_opcode_t op) @@ -818,7 +818,7 @@ void spu_interpreter::FSCRWR(SPUThread& CPU, spu_opcode_t op) void spu_interpreter::DFTSV(SPUThread& CPU, spu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected instruction"); } void spu_interpreter::FCEQ(SPUThread& CPU, spu_opcode_t op) @@ -828,7 +828,7 @@ void spu_interpreter::FCEQ(SPUThread& CPU, spu_opcode_t op) void spu_interpreter::DFCEQ(SPUThread& CPU, spu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected instruction"); } void spu_interpreter::MPY(SPUThread& CPU, spu_opcode_t op) @@ -865,7 +865,7 @@ void spu_interpreter::FCMEQ(SPUThread& CPU, spu_opcode_t op) void spu_interpreter::DFCMEQ(SPUThread& CPU, spu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected instruction"); } void spu_interpreter::MPYU(SPUThread& CPU, spu_opcode_t op) @@ -1250,5 +1250,5 @@ void spu_interpreter::FMS(SPUThread& CPU, spu_opcode_t op) void spu_interpreter::UNK(SPUThread& CPU, spu_opcode_t op) { - throw __FUNCTION__; + throw EXCEPTION("Unknown instruction (op=0x%08x)", op.opcode); } diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 6bb876acf5..c81432a022 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -110,14 +110,14 @@ void SPUThread::Task() { if (CheckStatus()) return; - m_custom_task(*this); + return m_custom_task(*this); } if (m_dec) { while (true) { - if (m_state.load() && CheckStatus()) return; + if (m_state.load() && CheckStatus()) break; // decode instruction using specified decoder m_dec->DecodeMemory(PC + offset); @@ -130,7 +130,7 @@ void SPUThread::Task() { while (true) { - if (m_state.load() && CheckStatus()) return; + if (m_state.load() && CheckStatus()) break; // read opcode const spu_opcode_t opcode = { vm::read32(PC + offset) }; @@ -254,6 +254,8 @@ void SPUThread::FastCall(u32 ls_addr) { } + m_state &= ~CPU_STATE_RETURN; + PC = old_PC; GPR[0]._u32[3] = old_LR; GPR[1]._u32[3] = old_stack; @@ -291,14 +293,12 @@ void SPUThread::do_dma_transfer(u32 cmd, spu_mfc_arg_t args) } else { - LOG_ERROR(SPU, "do_dma_transfer(cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x): invalid MMIO offset", cmd, args.lsa, args.ea, args.tag, args.size); - throw __FUNCTION__; + throw EXCEPTION("Invalid MMIO offset (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)", cmd, args.lsa, args.ea, args.tag, args.size); } } else { - LOG_ERROR(SPU, "do_dma_transfer(cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x): invalid thread type", cmd, args.lsa, args.ea, args.tag, args.size); - throw __FUNCTION__; + throw EXCEPTION("Invalid thread type (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)", cmd, args.lsa, args.ea, args.tag, args.size); } } @@ -318,16 +318,14 @@ void SPUThread::do_dma_transfer(u32 cmd, spu_mfc_arg_t args) } } - LOG_ERROR(SPU, "do_dma_transfer(cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x): invalid cmd (%s)", cmd, args.lsa, args.ea, args.tag, args.size, get_mfc_cmd_name(cmd)); - throw __FUNCTION__; + throw EXCEPTION("Invalid command %s (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)", get_mfc_cmd_name(cmd), cmd, args.lsa, args.ea, args.tag, args.size); } void SPUThread::do_dma_list_cmd(u32 cmd, spu_mfc_arg_t args) { if (!(cmd & MFC_LIST_MASK)) { - LOG_ERROR(SPU, "do_dma_list_cmd(cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x): invalid cmd (%s)", cmd, args.lsa, args.ea, args.tag, args.size, get_mfc_cmd_name(cmd)); - throw __FUNCTION__; + throw EXCEPTION("Invalid command %s (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)", get_mfc_cmd_name(cmd), cmd, args.lsa, args.ea, args.tag, args.size); } const u32 list_addr = args.ea & 0x3ffff; @@ -476,8 +474,7 @@ void SPUThread::process_mfc_cmd(u32 cmd) } } - LOG_ERROR(SPU, "Unknown DMA %s: cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x", get_mfc_cmd_name(cmd), cmd, ch_mfc_args.lsa, ch_mfc_args.ea, ch_mfc_args.tag, ch_mfc_args.size); - throw __FUNCTION__; + throw EXCEPTION("Unknown command %s (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)", get_mfc_cmd_name(cmd), cmd, ch_mfc_args.lsa, ch_mfc_args.ea, ch_mfc_args.tag, ch_mfc_args.size); } u32 SPUThread::get_ch_count(u32 ch) @@ -504,8 +501,7 @@ u32 SPUThread::get_ch_count(u32 ch) case SPU_RdEventStat: return ch_event_stat.load() & ch_event_mask ? 1 : 0; break; } - LOG_ERROR(SPU, "get_ch_count(ch=%d [%s]): unknown/illegal channel", ch, ch < 128 ? spu_ch_name[ch] : "???"); - throw __FUNCTION__; + throw EXCEPTION("Unknown/illegal channel (ch=%d [%s])", ch, ch < 128 ? spu_ch_name[ch] : "???"); } u32 SPUThread::get_ch_value(u32 ch) @@ -624,8 +620,7 @@ u32 SPUThread::get_ch_value(u32 ch) } } - LOG_ERROR(SPU, "get_ch_value(ch=%d [%s]): unknown/illegal channel", ch, ch < 128 ? spu_ch_name[ch] : "???"); - throw __FUNCTION__; + throw EXCEPTION("Unknown/illegal channel (ch=%d [%s])", ch, ch < 128 ? spu_ch_name[ch] : "???"); } void SPUThread::set_ch_value(u32 ch, u32 value) @@ -664,8 +659,7 @@ void SPUThread::set_ch_value(u32 ch, u32 value) u32 data; if (!ch_out_mbox.pop(data)) { - LOG_ERROR(SPU, "sys_spu_thread_send_event(value=0x%x, spup=%d): Out_MBox is empty", value, spup); - throw __FUNCTION__; + throw EXCEPTION("sys_spu_thread_send_event(value=0x%x, spup=%d): Out_MBox is empty", value, spup); } if (Ini.HLELogging.GetValue()) @@ -701,8 +695,7 @@ void SPUThread::set_ch_value(u32 ch, u32 value) u32 data; if (!ch_out_mbox.pop(data)) { - LOG_ERROR(SPU, "sys_spu_thread_throw_event(value=0x%x, spup=%d): Out_MBox is empty", value, spup); - throw __FUNCTION__; + throw EXCEPTION("sys_spu_thread_throw_event(value=0x%x, spup=%d): Out_MBox is empty", value, spup); } if (Ini.HLELogging.GetValue()) @@ -738,14 +731,12 @@ void SPUThread::set_ch_value(u32 ch, u32 value) u32 data; if (!ch_out_mbox.pop(data)) { - LOG_ERROR(SPU, "sys_event_flag_set_bit(value=0x%x (flag=%d)): Out_MBox is empty", value, flag); - throw __FUNCTION__; + throw EXCEPTION("sys_event_flag_set_bit(value=0x%x (flag=%d)): Out_MBox is empty", value, flag); } if (flag > 63) { - LOG_ERROR(SPU, "sys_event_flag_set_bit(id=%d, value=0x%x): flag > 63", data, value, flag); - throw __FUNCTION__; + throw EXCEPTION("sys_event_flag_set_bit(id=%d, value=0x%x): flag > 63", data, value, flag); } if (Ini.HLELogging.GetValue()) @@ -784,14 +775,12 @@ void SPUThread::set_ch_value(u32 ch, u32 value) u32 data; if (!ch_out_mbox.pop(data)) { - LOG_ERROR(SPU, "sys_event_flag_set_bit_impatient(value=0x%x (flag=%d)): Out_MBox is empty", value, flag); - throw __FUNCTION__; + throw EXCEPTION("sys_event_flag_set_bit_impatient(value=0x%x (flag=%d)): Out_MBox is empty", value, flag); } if (flag > 63) { - LOG_ERROR(SPU, "sys_event_flag_set_bit_impatient(id=%d, value=0x%x): flag > 63", data, value, flag); - throw __FUNCTION__; + throw EXCEPTION("sys_event_flag_set_bit_impatient(id=%d, value=0x%x): flag > 63", data, value, flag); } if (Ini.HLELogging.GetValue()) @@ -826,14 +815,12 @@ void SPUThread::set_ch_value(u32 ch, u32 value) { if (ch_out_mbox.get_count()) { - LOG_ERROR(SPU, "SPU_WrOutIntrMbox: unknown data (value=0x%x); Out_MBox = 0x%x", value, ch_out_mbox.get_value()); + throw EXCEPTION("SPU_WrOutIntrMbox: unknown data (value=0x%x); Out_MBox = 0x%x", value, ch_out_mbox.get_value()); } else { - LOG_ERROR(SPU, "SPU_WrOutIntrMbox: unknown data (value=0x%x)", value); + throw EXCEPTION("SPU_WrOutIntrMbox: unknown data (value=0x%x)", value); } - - throw __FUNCTION__; } } } @@ -972,8 +959,7 @@ void SPUThread::set_ch_value(u32 ch, u32 value) } } - LOG_ERROR(SPU, "set_ch_value(ch=%d [%s], value=0x%x): unknown/illegal channel", ch, ch < 128 ? spu_ch_name[ch] : "???", value); - throw __FUNCTION__; + throw EXCEPTION("Unknown/illegal channel (ch=%d [%s], value=0x%x)", ch, ch < 128 ? spu_ch_name[ch] : "???", value); } void SPUThread::stop_and_signal(u32 code) @@ -1007,7 +993,8 @@ void SPUThread::stop_and_signal(u32 code) case 0x002: { - throw CPUThreadReturn{}; + m_state |= CPU_STATE_RETURN; + return; } case 0x003: @@ -1030,8 +1017,7 @@ void SPUThread::stop_and_signal(u32 code) u32 spuq = 0; if (!ch_out_mbox.pop(spuq)) { - LOG_ERROR(SPU, "sys_spu_thread_receive_event(): cannot read Out_MBox"); - throw __FUNCTION__; + throw EXCEPTION("sys_spu_thread_receive_event(): cannot read Out_MBox"); } if (ch_in_mbox.get_count()) @@ -1112,8 +1098,7 @@ void SPUThread::stop_and_signal(u32 code) u32 value; if (!ch_out_mbox.pop(value)) { - LOG_ERROR(SPU, "sys_spu_thread_group_exit(): cannot read Out_MBox"); - throw __FUNCTION__; + throw EXCEPTION("sys_spu_thread_group_exit(): cannot read Out_MBox"); } if (Ini.HLELogging.GetValue()) @@ -1127,8 +1112,7 @@ void SPUThread::stop_and_signal(u32 code) if (!group) { - LOG_ERROR(SPU, "sys_spu_thread_group_exit(status=0x%x): invalid group", value); - throw __FUNCTION__; + throw EXCEPTION("sys_spu_thread_group_exit(status=0x%x): invalid group", value); } for (auto t : group->threads) @@ -1153,8 +1137,7 @@ void SPUThread::stop_and_signal(u32 code) if (!ch_out_mbox.get_count()) { - LOG_ERROR(SPU, "sys_spu_thread_exit(): Out_MBox is empty"); - throw __FUNCTION__; + throw EXCEPTION("sys_spu_thread_exit(): Out_MBox is empty"); } if (Ini.HLELogging.GetValue()) @@ -1172,14 +1155,12 @@ void SPUThread::stop_and_signal(u32 code) if (!ch_out_mbox.get_count()) { - LOG_ERROR(SPU, "Unknown STOP code: 0x%x", code); + throw EXCEPTION("Unknown STOP code: 0x%x", code); } else { - LOG_ERROR(SPU, "Unknown STOP code: 0x%x; Out_MBox=0x%x", code, ch_out_mbox.get_value()); + throw EXCEPTION("Unknown STOP code: 0x%x; Out_MBox=0x%x", code, ch_out_mbox.get_value()); } - - throw __FUNCTION__; } void SPUThread::halt() diff --git a/rpcs3/Emu/Event.cpp b/rpcs3/Emu/Event.cpp index 531d974fe7..107474b0a6 100644 --- a/rpcs3/Emu/Event.cpp +++ b/rpcs3/Emu/Event.cpp @@ -12,7 +12,7 @@ void EventManager::Init() void EventManager::Clear() { - eq_map.clear(); + m_map.clear(); } bool EventManager::CheckKey(u64 key) @@ -23,29 +23,9 @@ bool EventManager::CheckKey(u64 key) return false; } - std::lock_guard lock(m_lock); + std::lock_guard lock(m_mutex); - return eq_map.find(key) != eq_map.end(); -} - -bool EventManager::RegisterKey(const std::shared_ptr& data) -{ - if (!data->key) - { - // always ok - return true; - } - - std::lock_guard lock(m_lock); - - if (eq_map.find(data->key) != eq_map.end()) - { - return false; - } - - eq_map[data->key] = data; - - return true; + return m_map.find(key) != m_map.end(); } bool EventManager::UnregisterKey(u64 key) @@ -56,12 +36,12 @@ bool EventManager::UnregisterKey(u64 key) return true; } - std::lock_guard lock(m_lock); + std::lock_guard lock(m_mutex); - auto f = eq_map.find(key); - if (f != eq_map.end()) + auto f = m_map.find(key); + if (f != m_map.end()) { - eq_map.erase(f); + m_map.erase(f); return true; } @@ -76,10 +56,10 @@ std::shared_ptr EventManager::GetEventQueue(u64 key) return nullptr; } - std::lock_guard lock(m_lock); + std::lock_guard lock(m_mutex); - auto f = eq_map.find(key); - if (f != eq_map.end()) + auto f = m_map.find(key); + if (f != m_map.end()) { return f->second; } diff --git a/rpcs3/Emu/Event.h b/rpcs3/Emu/Event.h index 6569f54a55..b4099938c9 100644 --- a/rpcs3/Emu/Event.h +++ b/rpcs3/Emu/Event.h @@ -1,24 +1,37 @@ #pragma once +#include "Emu/IdManager.h" + struct lv2_event_queue_t; class EventManager { - std::mutex m_lock; - std::unordered_map> eq_map; + std::mutex m_mutex; + std::unordered_map> m_map; public: void Init(); void Clear(); bool CheckKey(u64 key); - bool RegisterKey(const std::shared_ptr& data); bool UnregisterKey(u64 key); - template std::shared_ptr MakeEventQueue(Args&&... args) + template::value>> std::shared_ptr MakeEventQueue(u64 key, Args&&... args) { - const auto queue = std::make_shared(args...); + std::lock_guard lock(m_mutex); - return RegisterKey(queue) ? queue : nullptr; + if (key && m_map.find(key) != m_map.end()) + { + return nullptr; + } + + auto queue = Emu.GetIdManager().make_ptr(std::forward(args)...); + + if (key) + { + m_map[key] = queue; + } + + return queue; } std::shared_ptr GetEventQueue(u64 key); diff --git a/rpcs3/Emu/IdManager.h b/rpcs3/Emu/IdManager.h index cce6ded71a..f0050d3df5 100644 --- a/rpcs3/Emu/IdManager.h +++ b/rpcs3/Emu/IdManager.h @@ -92,15 +92,15 @@ public: m_cur_id = 1; // first ID } - // add new ID using existing std::shared_ptr (not recommended, use make() instead) - template u32 add(std::shared_ptr data, u32 type = ID_type::type) - { - std::lock_guard lock(m_mutex); + //// add new ID using existing std::shared_ptr (not recommended, use make() instead) + //template u32 add(std::shared_ptr data, u32 type = ID_type::type) + //{ + // std::lock_guard lock(m_mutex); - m_id_map.emplace(m_cur_id, ID_data_t(std::move(data), type)); + // m_id_map.emplace(m_cur_id, ID_data_t(std::move(data), type)); - return m_cur_id++; - } + // return m_cur_id++; + //} // add new ID of specified type with specified constructor arguments (returns object) template::value>> std::shared_ptr make_ptr(Args&&... args) diff --git a/rpcs3/Emu/Memory/Memory.cpp b/rpcs3/Emu/Memory/Memory.cpp index 94e99f4bc6..c3feff6e35 100644 --- a/rpcs3/Emu/Memory/Memory.cpp +++ b/rpcs3/Emu/Memory/Memory.cpp @@ -4,8 +4,6 @@ MemoryBase Memory; -std::mutex g_memory_mutex; - void MemoryBase::Init(MemoryType type) { if (m_inited) return; @@ -70,7 +68,7 @@ bool MemoryBase::Map(const u32 addr, const u32 size) { assert(size && (size | addr) % 4096 == 0); - std::lock_guard lock(g_memory_mutex); + std::lock_guard lock(Memory.mutex); for (u32 i = addr / 4096; i < addr / 4096 + size / 4096; i++) { @@ -88,7 +86,7 @@ bool MemoryBase::Map(const u32 addr, const u32 size) bool MemoryBase::Unmap(const u32 addr) { - std::lock_guard lock(g_memory_mutex); + std::lock_guard lock(Memory.mutex); for (u32 i = 0; i < MemoryBlocks.size(); i++) { @@ -175,7 +173,7 @@ DynamicMemoryBlockBase::DynamicMemoryBlockBase() const u32 DynamicMemoryBlockBase::GetUsedSize() const { - std::lock_guard lock(g_memory_mutex); + std::lock_guard lock(Memory.mutex); u32 size = 0; @@ -194,7 +192,7 @@ bool DynamicMemoryBlockBase::IsInMyRange(const u32 addr, const u32 size) MemoryBlock* DynamicMemoryBlockBase::SetRange(const u32 start, const u32 size) { - std::lock_guard lock(g_memory_mutex); + std::lock_guard lock(Memory.mutex); m_max_size = PAGE_4K(size); if (!MemoryBlock::SetRange(start, 0)) @@ -208,7 +206,7 @@ MemoryBlock* DynamicMemoryBlockBase::SetRange(const u32 start, const u32 size) void DynamicMemoryBlockBase::Delete() { - std::lock_guard lock(g_memory_mutex); + std::lock_guard lock(Memory.mutex); m_allocated.clear(); m_max_size = 0; @@ -230,7 +228,7 @@ bool DynamicMemoryBlockBase::AllocFixed(u32 addr, u32 size) return false; } - std::lock_guard lock(g_memory_mutex); + std::lock_guard lock(Memory.mutex); for (u32 i = 0; i lock(g_memory_mutex); + std::lock_guard lock(Memory.mutex); for (u32 addr = MemoryBlock::GetStartAddr(); addr <= MemoryBlock::GetEndAddr() - exsize;) { @@ -312,7 +310,7 @@ bool DynamicMemoryBlockBase::Alloc() bool DynamicMemoryBlockBase::Free(u32 addr) { - std::lock_guard lock(g_memory_mutex); + std::lock_guard lock(Memory.mutex); for (u32 num = 0; num < m_allocated.size(); num++) { diff --git a/rpcs3/Emu/Memory/Memory.h b/rpcs3/Emu/Memory/Memory.h index 061ef6a8ed..01d0713f8f 100644 --- a/rpcs3/Emu/Memory/Memory.h +++ b/rpcs3/Emu/Memory/Memory.h @@ -14,6 +14,8 @@ class MemoryBase std::vector MemoryBlocks; public: + std::mutex mutex; + MemoryBlock* UserMemory; DynamicMemoryBlock MainMem; diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp index 9f3fe8fece..3e71b537b9 100644 --- a/rpcs3/Emu/Memory/vm.cpp +++ b/rpcs3/Emu/Memory/vm.cpp @@ -102,7 +102,7 @@ namespace vm if (old == owner) { - throw __FUNCTION__; + throw EXCEPTION("Deadlock"); } old = nullptr; @@ -117,7 +117,7 @@ namespace vm if (!m_owner.compare_and_swap_test(owner, nullptr)) { - throw __FUNCTION__; + throw EXCEPTION("Lost lock"); } if (do_notify) diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index 51bcf3e6de..224128473a 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -819,8 +819,11 @@ extern CellGcmContextData current_context; void GLGSRender::Close() { - cv.notify_one(); - join(); + if (joinable()) + { + cv.notify_one(); + join(); + } if (m_frame->IsShown()) { diff --git a/rpcs3/Emu/SysCalls/Callback.cpp b/rpcs3/Emu/SysCalls/Callback.cpp index cdec2cd762..d29ceb5cf1 100644 --- a/rpcs3/Emu/SysCalls/Callback.cpp +++ b/rpcs3/Emu/SysCalls/Callback.cpp @@ -125,6 +125,9 @@ void CallbackManager::Clear() m_cb_list.clear(); m_async_list.clear(); + m_pause_cb_list.clear(); + + m_cb_thread.reset(); } u64 CallbackManager::AddPauseCallback(std::function func) diff --git a/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp b/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp index e7c34a0e25..76578bb0e3 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp @@ -769,12 +769,10 @@ s32 cellAudioCreateNotifyEventQueue(vm::ptr id, vm::ptr key) { const u64 key_value = 0x80004d494f323221ull + k; - auto queue = std::make_shared(SYS_SYNC_FIFO, SYS_PPU_QUEUE, 0, key_value, 32); - // register key if not used yet - if (Emu.GetEventManager().RegisterKey(queue)) + if (const auto queue = Emu.GetEventManager().MakeEventQueue(key_value, SYS_SYNC_FIFO, SYS_PPU_QUEUE, 0, key_value, 32)) { - *id = Emu.GetIdManager().add(std::move(queue)); + *id = queue->id; *key = key_value; return CELL_OK; diff --git a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp index f4efac8868..af788cf209 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp @@ -84,6 +84,7 @@ PesHeader::PesHeader(DemuxerStream& stream) ElementaryStream::ElementaryStream(Demuxer* dmux, u32 addr, u32 size, u32 fidMajor, u32 fidMinor, u32 sup1, u32 sup2, vm::ptr cbFunc, u32 cbArg, u32 spec) : dmux(dmux) + , id(Emu.GetIdManager().get_current_id()) , memAddr(align(addr, 128)) , memSize(size - (addr - memAddr)) , fidMajor(fidMajor) @@ -995,19 +996,17 @@ s32 cellDmuxEnableEs(u32 handle, vm::cptr esFilterId, vm::c // TODO: check esFilterId, esResourceInfo, esCb and esSpecificInfo correctly - auto es = std::make_shared(dmux.get(), esResourceInfo->memAddr, esResourceInfo->memSize, + const auto es = Emu.GetIdManager().make_ptr(dmux.get(), esResourceInfo->memAddr, esResourceInfo->memSize, esFilterId->filterIdMajor, esFilterId->filterIdMinor, esFilterId->supplementalInfo1, esFilterId->supplementalInfo2, esCb->cbEsMsgFunc, esCb->cbArg, esSpecificInfo); - u32 id = Emu.GetIdManager().add(es); - es->id = id; - *esHandle = id; + *esHandle = es->id; - cellDmux.Warning("*** New ES(dmux=0x%x, addr=0x%x, size=0x%x, filter={0x%x, 0x%x, 0x%x, 0x%x}, cb=0x%x, arg=0x%x, spec=0x%x): id = %d", - handle, es->memAddr, es->memSize, es->fidMajor, es->fidMinor, es->sup1, es->sup2, es->cbFunc, es->cbArg, es->spec, id); + cellDmux.Warning("*** New ES(dmux=0x%x, addr=0x%x, size=0x%x, filter={0x%x, 0x%x, 0x%x, 0x%x}, cb=0x%x, arg=0x%x, spec=0x%x): id = 0x%x", + handle, es->memAddr, es->memSize, es->fidMajor, es->fidMinor, es->sup1, es->sup2, es->cbFunc, es->cbArg, es->spec, es->id); DemuxerTask task(dmuxEnableEs); - task.es.es = id; + task.es.es = es->id; task.es.es_ptr = es.get(); dmux->job.push(task, &dmux->is_closed); diff --git a/rpcs3/Emu/SysCalls/Modules/cellDmux.h b/rpcs3/Emu/SysCalls/Modules/cellDmux.h index 6c03ba8b3c..ea7d3cc83b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellDmux.h +++ b/rpcs3/Emu/SysCalls/Modules/cellDmux.h @@ -440,7 +440,7 @@ public: ElementaryStream(Demuxer* dmux, u32 addr, u32 size, u32 fidMajor, u32 fidMinor, u32 sup1, u32 sup2, vm::ptr cbFunc, u32 cbArg, u32 spec); Demuxer* dmux; - u32 id; + const u32 id; const u32 memAddr; const u32 memSize; const u32 fidMajor; diff --git a/rpcs3/Emu/SysCalls/Modules/cellFs.cpp b/rpcs3/Emu/SysCalls/Modules/cellFs.cpp index da6f33e92d..1efdc9b1d9 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFs.cpp @@ -223,7 +223,7 @@ s32 cellFsGetDirectoryEntries(u32 fd, vm::ptr entries, u32 for (; count < entries_size; count++) { - if (const auto info = directory->Read()) + if (const auto info = directory->dir->Read()) { entries[count].attribute.mode = info->flags & DirEntry_TypeDir ? CELL_FS_S_IFDIR | 0777 : CELL_FS_S_IFREG | 0666; entries[count].attribute.uid = 1; // ??? diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp index 3937e2485b..1e332cdab0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp @@ -46,14 +46,14 @@ s32 cellGifDecOpen( { cellGifDec.Warning("cellGifDecOpen(mainHandle=0x%x, subHandle=*0x%x, src=*0x%x, openInfo=*0x%x)", mainHandle, subHandle, src, openInfo); - auto current_subHandle = std::make_shared(); - current_subHandle->fd = 0; - current_subHandle->src = *src; + GifStream current_subHandle; + current_subHandle.fd = 0; + current_subHandle.src = *src; switch (src->srcSelect.value()) { case CELL_GIFDEC_BUFFER: - current_subHandle->fileSize = src->streamSize; + current_subHandle.fileSize = src->streamSize; break; case CELL_GIFDEC_FILE: @@ -62,14 +62,14 @@ s32 cellGifDecOpen( std::shared_ptr file_s(Emu.GetVFS().OpenFile(src->fileName.get_ptr(), vfsRead)); if (!file_s) return CELL_GIFDEC_ERROR_OPEN_FILE; - current_subHandle->fd = Emu.GetIdManager().make(file_s, 0, 0); - current_subHandle->fileSize = file_s->GetSize(); + current_subHandle.fd = Emu.GetIdManager().make(file_s, 0, 0); + current_subHandle.fileSize = file_s->GetSize(); break; } } // From now, every u32 subHandle argument is a pointer to a CellGifDecSubHandle struct. - *subHandle = Emu.GetIdManager().add(std::move(current_subHandle)); + *subHandle = Emu.GetIdManager().make(current_subHandle); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp index 896e25b3c0..0548d82ac0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp @@ -39,15 +39,15 @@ s32 cellJpgDecOpen(u32 mainHandle, vm::ptr subHandle, vm::ptr(); + CellJpgDecSubHandle current_subHandle; - current_subHandle->fd = 0; - current_subHandle->src = *src; + current_subHandle.fd = 0; + current_subHandle.src = *src; switch(src->srcSelect.value()) { case CELL_JPGDEC_BUFFER: - current_subHandle->fileSize = src->streamSize; + current_subHandle.fileSize = src->streamSize; break; case CELL_JPGDEC_FILE: @@ -56,14 +56,14 @@ s32 cellJpgDecOpen(u32 mainHandle, vm::ptr subHandle, vm::ptr file_s(Emu.GetVFS().OpenFile(src->fileName.get_ptr(), vfsRead)); if (!file_s) return CELL_JPGDEC_ERROR_OPEN_FILE; - current_subHandle->fd = Emu.GetIdManager().make(file_s, 0, 0); - current_subHandle->fileSize = file_s->GetSize(); + current_subHandle.fd = Emu.GetIdManager().make(file_s, 0, 0); + current_subHandle.fileSize = file_s->GetSize(); break; } } // From now, every u32 subHandle argument is a pointer to a CellJpgDecSubHandle struct. - *subHandle = Emu.GetIdManager().add(std::move(current_subHandle)); + *subHandle = Emu.GetIdManager().make(current_subHandle); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp index 6d03aa6f08..7ecd823501 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp @@ -329,7 +329,7 @@ never_inline s32 savedata_op( } else { - throw __FUNCTION__; + throw EXCEPTION("Invalid savedata selected"); } } } diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp index 1dced04abf..484642bc2b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp @@ -272,9 +272,9 @@ u32 spursGetSdkVersion() { s32 version; - if (process_get_sdk_version(process_getpid(), version) != CELL_OK) + if (s32 rc = process_get_sdk_version(process_getpid(), version)) { - throw __FUNCTION__; + throw EXCEPTION("process_get_sdk_version() failed (0x%x)", rc); } return version == -1 ? 0x465000 : version; @@ -426,7 +426,7 @@ void spursHandlerWaitReady(PPUThread& CPU, vm::ptr spurs) { if (s32 rc = sys_lwmutex_lock(CPU, spurs.of(&CellSpurs::mutex), 0)) { - throw __FUNCTION__; + throw EXCEPTION("sys_lwmutex_lock() failed (0x%x)", rc); } while (true) @@ -440,7 +440,7 @@ void spursHandlerWaitReady(PPUThread& CPU, vm::ptr spurs) { if (s32 rc = sys_lwmutex_unlock(CPU, spurs.of(&CellSpurs::mutex))) { - throw __FUNCTION__; + throw EXCEPTION("sys_lwmutex_unlock() failed (0x%x)", rc); } spursPpuThreadExit(CPU, 0); @@ -500,7 +500,7 @@ void spursHandlerWaitReady(PPUThread& CPU, vm::ptr spurs) { if (s32 rc = sys_lwcond_wait(CPU, spurs.of(&CellSpurs::cond), 0)) { - throw __FUNCTION__; + throw EXCEPTION("sys_lwcond_wait() failed (0x%x)", rc); } } @@ -510,7 +510,7 @@ void spursHandlerWaitReady(PPUThread& CPU, vm::ptr spurs) // If we reach here then a runnable workload was found if (s32 rc = sys_lwmutex_unlock(CPU, spurs.of(&CellSpurs::mutex))) { - throw __FUNCTION__; + throw EXCEPTION("sys_lwmutex_unlock() failed (0x%x)", rc); } } @@ -535,7 +535,7 @@ void spursHandlerEntry(PPUThread& CPU) if (s32 rc = sys_spu_thread_group_start(spurs->spuTG)) { - throw __FUNCTION__; + throw EXCEPTION("sys_spu_thread_group_start() failed (0x%x)", rc); } if (s32 rc = sys_spu_thread_group_join(spurs->spuTG, vm::null, vm::null)) @@ -545,7 +545,7 @@ void spursHandlerEntry(PPUThread& CPU) spursPpuThreadExit(CPU, 0); } - throw __FUNCTION__; + throw EXCEPTION("sys_spu_thread_group_join() failed (0x%x)", rc); } if (Emu.IsStopped()) @@ -658,7 +658,7 @@ void spursEventHelperEntry(PPUThread& CPU) { if (s32 rc = sys_event_queue_receive(CPU, spurs->eventQueue, vm::null, 0 /*timeout*/)) { - throw __FUNCTION__; + throw EXCEPTION("sys_event_queue_receive() failed (0x%x)", rc); } const u64 event_src = CPU.GPR[4]; @@ -709,7 +709,7 @@ void spursEventHelperEntry(PPUThread& CPU) { if (s32 rc = spursWakeUpShutdownCompletionWaiter(CPU, spurs, wid)) { - throw __FUNCTION__; + throw EXCEPTION("spursWakeUpShutdownCompletionWaiter() failed (0x%x)", rc); } } @@ -717,7 +717,7 @@ void spursEventHelperEntry(PPUThread& CPU) { if (s32 rc = spursWakeUpShutdownCompletionWaiter(CPU, spurs, wid + 0x10)) { - throw __FUNCTION__; + throw EXCEPTION("spursWakeUpShutdownCompletionWaiter() failed (0x%x)", rc); } } } @@ -726,19 +726,19 @@ void spursEventHelperEntry(PPUThread& CPU) { if (s32 rc = sys_semaphore_post((u32)spurs->semPrv, 1)) { - throw __FUNCTION__; + throw EXCEPTION("sys_semaphore_post() failed (0x%x)", rc); } } else if (data0 == 3) { if (s32 rc = spursInvokeEventHandlers(CPU, spurs.of(&CellSpurs::eventPortMux))) { - throw __FUNCTION__; + throw EXCEPTION("spursInvokeEventHandlers() failed (0x%x)", rc); } } else { - throw __FUNCTION__; + throw EXCEPTION("Unexpected value (data0=0x%x)", data0); } } } @@ -826,14 +826,14 @@ s32 spursFinalizeSpu(vm::ptr spurs) { if (s32 rc = sys_spu_thread_group_join(spurs->spuTG, vm::null, vm::null)) { - throw __FUNCTION__; + throw EXCEPTION("sys_spu_thread_group_join() failed (0x%x)", rc); } if (s32 rc = sys_spu_thread_group_destroy(spurs->spuTG)) { if (rc != CELL_EBUSY) { - throw __FUNCTION__; + throw EXCEPTION("sys_spu_thread_group_destroy() failed (0x%x)", rc); } continue; @@ -852,7 +852,7 @@ s32 spursFinalizeSpu(vm::ptr spurs) if (s32 rc = sys_spu_image_close(spurs.of(&CellSpurs::spuImg))) { - throw __FUNCTION__; + throw EXCEPTION("sys_spu_image_close() failed (0x%x)", rc); } return CELL_OK; @@ -880,22 +880,22 @@ s32 spursStopEventHelper(PPUThread& CPU, vm::ptr spurs) if (s32 rc = sys_event_port_disconnect(spurs->eventPort)) { - throw __FUNCTION__; + throw EXCEPTION("sys_event_port_disconnect() failed (0x%x)", rc); } if (s32 rc = sys_event_port_destroy(spurs->eventPort)) { - throw __FUNCTION__; + throw EXCEPTION("sys_event_port_destroy() failed (0x%x)", rc); } if (s32 rc = spursDetachLv2EventQueue(spurs, spurs->spuPort, true /*spursCreated*/)) { - throw __FUNCTION__; + throw EXCEPTION("spursDetachLv2EventQueue() failed (0x%x)", rc); } if (s32 rc = sys_event_queue_destroy(spurs->eventQueue, SYS_EVENT_QUEUE_DESTROY_FORCE)) { - throw __FUNCTION__; + throw EXCEPTION("sys_event_queue_destroy() failed (0x%x)", rc); } return CELL_OK; @@ -906,17 +906,17 @@ s32 spursSignalToHandlerThread(PPUThread& CPU, vm::ptr spurs) { if (s32 rc = sys_lwmutex_lock(CPU, spurs.of(&CellSpurs::mutex), 0 /* forever */)) { - throw __FUNCTION__; + throw EXCEPTION("sys_lwmutex_lock() failed (0x%x)", rc); } if (s32 rc = sys_lwcond_signal(CPU, spurs.of(&CellSpurs::cond))) { - throw __FUNCTION__; + throw EXCEPTION("sys_lwcond_signal() failed (0x%x)", rc); } if (s32 rc = sys_lwmutex_unlock(CPU, spurs.of(&CellSpurs::mutex))) { - throw __FUNCTION__; + throw EXCEPTION("sys_lwmutex_unlock() failed (0x%x)", rc); } return CELL_OK; @@ -932,7 +932,7 @@ s32 spursJoinHandlerThread(PPUThread& CPU, vm::ptr spurs) if (s32 rc = sys_ppu_thread_join(CPU, spurs->ppu0, vm::stackvar>(CPU))) { - throw __FUNCTION__; + throw EXCEPTION("sys_ppu_thread_join() failed (0x%x)", rc); } spurs->ppu0 = 0xFFFFFFFF; @@ -1268,7 +1268,7 @@ s32 spursInit( { if (s32 rc = spursAddDefaultSystemWorkload(spurs, swlPriority, swlMaxSpu, swlIsPreem)) { - throw __FUNCTION__; + throw EXCEPTION("spursAddDefaultSystemWorkload() failed (0x%x)", rc); } return CELL_OK; @@ -1895,7 +1895,7 @@ void spursTraceStatusUpdate(vm::ptr spurs) if (s32 rc = sys_semaphore_wait((u32)spurs->semPrv, 0)) { - throw __FUNCTION__; + throw EXCEPTION("sys_semaphore_wait() failed (0x%x)", rc); } } } @@ -2871,7 +2871,7 @@ s32 cellSpursEventFlagSet(PPUThread& CPU, vm::ptr eventFlag, eventFlag->pendingRecvTaskEvents[ppuWaitSlot] = ppuEvents; if (s32 rc = sys_event_port_send(eventFlag->eventPortId, 0, 0, 0)) { - throw __FUNCTION__; + throw EXCEPTION("sys_event_port_send() failed (0x%x)", rc); } } @@ -2901,7 +2901,7 @@ s32 cellSpursEventFlagSet(PPUThread& CPU, vm::ptr eventFlag, if (rc != CELL_OK) { - throw __FUNCTION__; + throw EXCEPTION(""); } } } @@ -3051,7 +3051,7 @@ s32 spursEventFlagWait(PPUThread& CPU, vm::ptr eventFlag, vm // Block till something happens if (s32 rc = sys_event_queue_receive(CPU, eventFlag->eventQueueId, vm::null, 0)) { - throw __FUNCTION__; + throw EXCEPTION("sys_event_queue_receive() failed (0x%x)", rc); } int i = 0; @@ -3619,7 +3619,7 @@ s32 spursTaskStart(PPUThread& CPU, vm::ptr taskset, u32 taskId } else { - throw __FUNCTION__; + throw EXCEPTION("cellSpursWakeUp() failed (0x%x)", rc); } } diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp index 2a1201b0ec..93c6217184 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp @@ -606,7 +606,7 @@ bool spursSysServiceEntry(SPUThread & spu) { void spursSysServiceIdleHandler(SPUThread & spu, SpursKernelContext * ctxt) { bool shouldExit; - std::unique_lock lock(spu.mutex, std::defer_lock); + std::unique_lock lock(spu.mutex, std::defer_lock); while (true) { vm::reservation_acquire(vm::get_ptr(spu.offset + 0x100), vm::cast(ctxt->spurs.addr()), 128, [&spu](){ spu.cv.notify_one(); }); @@ -677,9 +677,9 @@ void spursSysServiceIdleHandler(SPUThread & spu, SpursKernelContext * ctxt) { if (spuIdling && shouldExit == false && foundReadyWorkload == false) { // The system service blocks by making a reservation and waiting on the lock line reservation lost event. if (Emu.IsStopped()) throw SpursModuleExit(); - if (!lock) lock.lock(); - spu.cv.wait_for(lock, std::chrono::milliseconds(1)); - continue; + if (!lock) lock.lock(); + spu.cv.wait_for(lock, std::chrono::milliseconds(1)); + continue; } if (vm::reservation_update(vm::cast(ctxt->spurs.addr()), vm::get_ptr(spu.offset + 0x100), 128) && (shouldExit || foundReadyWorkload)) { @@ -1131,7 +1131,7 @@ bool spursTasksetSyscallEntry(SPUThread & spu) { spu.GPR[3]._u32[3] = spursTasksetProcessSyscall(spu, spu.GPR[3]._u32[3], spu.GPR[4]._u32[3]); // Resume the previously executing task if the syscall did not cause a context switch - throw __FUNCTION__; + throw EXCEPTION("Broken (TODO)"); //if (spu.m_is_branch == false) { // spursTasksetResumeTask(spu); //} diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp index 3568c1fe2b..0ea3343297 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp @@ -905,7 +905,7 @@ s32 _cellSyncLFQueueGetPushPointer(PPUThread& CPU, vm::ptr queu if (s32 res = sys_event_queue_receive(CPU, queue->m_eq_id, vm::null, 0)) { - throw __FUNCTION__; + throw EXCEPTION(""); } var1 = 1; } @@ -916,7 +916,7 @@ s32 _cellSyncLFQueueGetPushPointer2(PPUThread& CPU, vm::ptr que // arguments copied from _cellSyncLFQueueGetPushPointer cellSync.Todo("_cellSyncLFQueueGetPushPointer2(queue=*0x%x, pointer=*0x%x, isBlocking=%d, useEventQueue=%d)", queue, pointer, isBlocking, useEventQueue); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _cellSyncLFQueueCompletePushPointer(PPUThread& CPU, vm::ptr queue, s32 pointer, vm::ptr fpSendSignal) @@ -1060,7 +1060,7 @@ s32 _cellSyncLFQueueCompletePushPointer2(PPUThread& CPU, vm::ptr queue, vm::cptr buffer, u32 isBlocking) @@ -1218,7 +1218,7 @@ s32 _cellSyncLFQueueGetPopPointer(PPUThread& CPU, vm::ptr queue if (s32 res = sys_event_queue_receive(CPU, queue->m_eq_id, vm::null, 0)) { - throw __FUNCTION__; + throw EXCEPTION(""); } var1 = 1; } @@ -1229,7 +1229,7 @@ s32 _cellSyncLFQueueGetPopPointer2(PPUThread& CPU, vm::ptr queu // arguments copied from _cellSyncLFQueueGetPopPointer cellSync.Todo("_cellSyncLFQueueGetPopPointer2(queue=*0x%x, pointer=*0x%x, isBlocking=%d, useEventQueue=%d)", queue, pointer, isBlocking, useEventQueue); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _cellSyncLFQueueCompletePopPointer(PPUThread& CPU, vm::ptr queue, s32 pointer, vm::ptr fpSendSignal, u32 noQueueFull) @@ -1373,7 +1373,7 @@ s32 _cellSyncLFQueueCompletePopPointer2(PPUThread& CPU, vm::ptr // arguments copied from _cellSyncLFQueueCompletePopPointer cellSync.Todo("_cellSyncLFQueueCompletePopPointer2(queue=*0x%x, pointer=%d, fpSendSignal=*0x%x, noQueueFull=%d)", queue, pointer, fpSendSignal, noQueueFull); - throw __FUNCTION__; + throw EXCEPTION(""); } s32 _cellSyncLFQueuePopBody(PPUThread& CPU, vm::ptr queue, vm::ptr buffer, u32 isBlocking) @@ -1606,14 +1606,14 @@ s32 _cellSyncLFQueueAttachLv2EventQueue(vm::ptr spus, u32 num, vm::ptr spus, u32 num, vm::ptr queue) { cellSync.Todo("_cellSyncLFQueueDetachLv2EventQueue(spus=*0x%x, num=%d, queue=*0x%x)", spus, num, queue); - throw __FUNCTION__; + throw EXCEPTION(""); } Module cellSync("cellSync", []() diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.h b/rpcs3/Emu/SysCalls/Modules/cellSync.h index 6b65baebee..1025f5a85c 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync.h +++ b/rpcs3/Emu/SysCalls/Modules/cellSync.h @@ -260,7 +260,7 @@ struct set_alignment(32) CellSyncQueue if ((data.m_v1 & 0xffffff) > depth || (data.m_v2 & 0xffffff) > depth) { - throw __FUNCTION__; + throw EXCEPTION("Invalid queue pointers"); } return depth; diff --git a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp index bea916b194..cd6c28b5e1 100644 --- a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp @@ -239,7 +239,7 @@ s32 sys_lwmutex_lock(PPUThread& CPU, vm::ptr lwmutex, u64 timeout if (res == CELL_EBUSY && lwmutex->attribute & SYS_SYNC_RETRY) { // TODO (protocol is ignored in current implementation) - throw __FUNCTION__; + throw EXCEPTION(""); } return res; @@ -892,7 +892,7 @@ s32 sys_raw_spu_load(s32 id, vm::cptr path, vm::ptr entry) return CELL_OK; } -s32 sys_raw_spu_image_load(s32 id, vm::ptr img) +s32 sys_raw_spu_image_load(PPUThread& CPU, s32 id, vm::ptr img) { sysPrxForUser.Warning("sys_raw_spu_image_load(id=%d, img=*0x%x)", id, img); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp b/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp index 0f3ca75a48..c0eaac84a6 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp @@ -34,7 +34,7 @@ s32 sys_cond_create(vm::ptr cond_id, u32 mutex_id, vm::ptrcond_count) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected cond_count"); } *cond_id = Emu.GetIdManager().make(mutex, attr->name_u64); @@ -62,7 +62,7 @@ s32 sys_cond_destroy(u32 cond_id) if (!cond->mutex->cond_count--) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected cond_count"); } Emu.GetIdManager().remove(cond_id); @@ -197,7 +197,7 @@ s32 sys_cond_wait(PPUThread& CPU, u32 cond_id, u64 timeout) if (!cond->waiters.erase(CPU.GetId())) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected"); } return CELL_ETIMEDOUT; diff --git a/rpcs3/Emu/SysCalls/lv2/sys_event.cpp b/rpcs3/Emu/SysCalls/lv2/sys_event.cpp index 35609ab554..cb31f7be07 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_event.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_event.cpp @@ -13,6 +13,18 @@ SysCallBase sys_event("sys_event"); +lv2_event_queue_t::lv2_event_queue_t(u32 protocol, s32 type, u64 name, u64 key, s32 size) + : id(Emu.GetIdManager().get_current_id()) + , protocol(protocol) + , type(type) + , name(name) + , key(key) + , size(size) + , cancelled(false) + , waiters(0) +{ +} + s32 sys_event_queue_create(vm::ptr equeue_id, vm::ptr attr, u64 event_queue_key, s32 size) { sys_event.Warning("sys_event_queue_create(equeue_id=*0x%x, attr=*0x%x, event_queue_key=0x%llx, size=%d)", equeue_id, attr, event_queue_key, size); @@ -40,14 +52,14 @@ s32 sys_event_queue_create(vm::ptr equeue_id, vm::ptr default: sys_event.Error("sys_event_queue_create(): unknown type (0x%x)", type); return CELL_EINVAL; } - auto queue = Emu.GetEventManager().MakeEventQueue(protocol, type, attr->name_u64, event_queue_key, size); + const auto queue = Emu.GetEventManager().MakeEventQueue(event_queue_key, protocol, type, attr->name_u64, event_queue_key, size); if (!queue) { return CELL_EEXIST; } - *equeue_id = Emu.GetIdManager().add(std::move(queue)); + *equeue_id = queue->id; return CELL_OK; } @@ -77,7 +89,7 @@ s32 sys_event_queue_destroy(u32 equeue_id, s32 mode) if (queue->cancelled.exchange(true)) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected value"); } if (queue->waiters) @@ -106,7 +118,7 @@ s32 sys_event_queue_tryreceive(u32 equeue_id, vm::ptr event_array, if (size < 0) { - throw __FUNCTION__; + throw EXCEPTION("Negative size"); } if (queue->type != SYS_PPU_QUEUE) diff --git a/rpcs3/Emu/SysCalls/lv2/sys_event.h b/rpcs3/Emu/SysCalls/lv2/sys_event.h index e20a6a15b3..ebaa17456f 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_event.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_event.h @@ -86,6 +86,7 @@ struct event_t struct lv2_event_queue_t { + const u32 id; const u32 protocol; const s32 type; const u64 name; @@ -99,16 +100,7 @@ struct lv2_event_queue_t std::condition_variable cv; std::atomic waiters; - lv2_event_queue_t(u32 protocol, s32 type, u64 name, u64 key, s32 size) - : protocol(protocol) - , type(type) - , name(name) - , key(key) - , size(size) - , cancelled(false) - , waiters(0) - { - } + lv2_event_queue_t(u32 protocol, s32 type, u64 name, u64 key, s32 size); void push(lv2_lock_type& lv2_lock, u64 source, u64 data1, u64 data2, u64 data3) { diff --git a/rpcs3/Emu/SysCalls/lv2/sys_fs.cpp b/rpcs3/Emu/SysCalls/lv2/sys_fs.cpp index cdc95245c7..9c28eff974 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_fs.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_fs.cpp @@ -114,7 +114,7 @@ s32 sys_fs_open(vm::cptr path, s32 flags, vm::ptr fd, s32 mode, vm::c return CELL_FS_ENOENT; } - *fd = Emu.GetIdManager().make(file, mode, flags); + *fd = Emu.GetIdManager().make(std::move(file), mode, flags); return CELL_OK; } @@ -180,15 +180,15 @@ s32 sys_fs_opendir(vm::cptr path, vm::ptr fd) sys_fs.Warning("sys_fs_opendir(path=*0x%x, fd=*0x%x)", path, fd); sys_fs.Warning("*** path = '%s'", path.get_ptr()); - std::shared_ptr directory(Emu.GetVFS().OpenDir(path.get_ptr())); + std::shared_ptr dir(Emu.GetVFS().OpenDir(path.get_ptr())); - if (!directory || !directory->IsOpened()) + if (!dir || !dir->IsOpened()) { sys_fs.Error("sys_fs_opendir('%s'): failed to open directory", path.get_ptr()); return CELL_FS_ENOENT; } - *fd = Emu.GetIdManager().add(std::move(directory)); + *fd = Emu.GetIdManager().make(std::move(dir)); return CELL_OK; } @@ -204,7 +204,7 @@ s32 sys_fs_readdir(u32 fd, vm::ptr dir, vm::ptr nread) return CELL_FS_EBADF; } - const DirEntryInfo* info = directory->Read(); + const DirEntryInfo* info = directory->dir->Read(); if (info) { diff --git a/rpcs3/Emu/SysCalls/lv2/sys_fs.h b/rpcs3/Emu/SysCalls/lv2/sys_fs.h index abe6bb0f04..9af6417019 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_fs.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_fs.h @@ -193,8 +193,8 @@ struct lv2_file_t atomic st_callback; - lv2_file_t(const std::shared_ptr& file, s32 mode, s32 flags) - : file(file) + lv2_file_t(std::shared_ptr file, s32 mode, s32 flags) + : file(std::move(file)) , mode(mode) , flags(flags) , st_status({ SSS_NOT_INITIALIZED }) @@ -207,7 +207,15 @@ REG_ID_TYPE(lv2_file_t, 0x73); // SYS_FS_FD_OBJECT class vfsDirBase; -using lv2_dir_t = vfsDirBase; +struct lv2_dir_t +{ + const std::shared_ptr dir; + + lv2_dir_t(std::shared_ptr dir) + : dir(std::move(dir)) + { + } +}; REG_ID_TYPE(lv2_dir_t, 0x73); // SYS_FS_FD_OBJECT diff --git a/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp b/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp index 6463a7d4d3..eaae6b7467 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp @@ -114,14 +114,8 @@ s32 sys_interrupt_thread_establish(vm::ptr ih, u32 intrtag, u32 intrthread, // call interrupt handler until int status is clear if (tag.stat.load()) { - try - { - CPU.GPR[3] = arg; - CPU.FastCall2(pc, rtoc); - } - catch (CPUThreadReturn) - { - } + CPU.GPR[3] = arg; + CPU.FastCall2(pc, rtoc); } tag.cond.wait_for(cond_lock, std::chrono::milliseconds(1)); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_lwcond.cpp b/rpcs3/Emu/SysCalls/lv2/sys_lwcond.cpp index 9a9d9ba87a..744f907863 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_lwcond.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_lwcond.cpp @@ -200,7 +200,7 @@ s32 _sys_lwcond_queue_wait(PPUThread& CPU, u32 lwcond_id, u32 lwmutex_id, u64 ti } else { - throw __FUNCTION__; + throw EXCEPTION("Unexpected values"); } } diff --git a/rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp b/rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp index c94b214f56..32c280a7c1 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp @@ -206,7 +206,7 @@ s32 sys_mutex_unlock(PPUThread& CPU, u32 mutex_id) { if (!mutex->recursive) { - throw __FUNCTION__; + throw EXCEPTION("Unexpected recursive_count"); } mutex->recursive_count--; diff --git a/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp b/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp index 2374e1ade3..0c199ebcb8 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp @@ -18,6 +18,11 @@ SysCallBase sys_prx("sys_prx"); extern void fill_ppu_exec_map(u32 addr, u32 size); +lv2_prx_t::lv2_prx_t() + : id(Emu.GetIdManager().get_current_id()) +{ +} + s32 prx_load_module(std::string path, u64 flags, vm::ptr pOpt) { sys_prx.Warning("prx_load_module(path='%s', flags=0x%llx, pOpt=*0x%x)", path.c_str(), flags, pOpt); @@ -34,7 +39,7 @@ s32 prx_load_module(std::string path, u64 flags, vm::ptr(); + auto prx = Emu.GetIdManager().make_ptr(); auto meta = info.modules[""]; prx->start.set(meta.exports[0xBC9A0086]); @@ -130,7 +135,7 @@ s32 prx_load_module(std::string path, u64 flags, vm::ptrid; } s32 sys_prx_load_module(vm::cptr path, u64 flags, vm::ptr pOpt) diff --git a/rpcs3/Emu/SysCalls/lv2/sys_prx.h b/rpcs3/Emu/SysCalls/lv2/sys_prx.h index 60d87cc82a..8702126a41 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_prx.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_prx.h @@ -155,15 +155,15 @@ struct sys_prx_unload_module_option_t // Auxiliary data types struct lv2_prx_t { + const u32 id; + bool is_started = false; vm::ptr argv)> start = vm::null; vm::ptr argv)> stop = vm::null; vm::ptr exit = vm::null; - lv2_prx_t() - { - } + lv2_prx_t(); }; REG_ID_TYPE(lv2_prx_t, 0x23); // SYS_PRX_OBJECT diff --git a/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp b/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp index aa8bbb2818..f685863e1f 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp @@ -463,11 +463,6 @@ s32 sys_spu_thread_group_terminate(u32 id, s32 value) if (thread) { - if (group) - { - throw __FUNCTION__; - } - group = spu.tg.lock(); for (auto& t : group->threads) @@ -584,7 +579,10 @@ s32 sys_spu_thread_group_join(u32 id, vm::ptr cause, vm::ptr status) if (cause) *cause = SYS_SPU_THREAD_GROUP_JOIN_TERMINATED; break; } - default: throw __FUNCTION__; + default: + { + throw EXCEPTION("Unexpected join_state"); + } } if (status)