From a7e808b35bca478e3bbb848ae440a46b8b302fb2 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Mon, 8 Aug 2016 19:01:06 +0300 Subject: [PATCH] EXCEPTION macro removed fmt::throw_exception<> implemented ::narrow improved Minor fixes --- Utilities/Atomic.h | 6 - Utilities/Config.cpp | 18 +- Utilities/Config.h | 14 +- Utilities/File.cpp | 63 +- Utilities/JIT.cpp | 4 +- Utilities/Log.cpp | 2 +- Utilities/Log.h | 2 +- Utilities/Macro.h | 43 +- Utilities/StrFmt.cpp | 53 +- Utilities/StrFmt.h | 53 +- Utilities/types.h | 90 ++- Utilities/version.cpp | 2 +- rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellAdec.cpp | 24 +- rpcs3/Emu/Cell/Modules/cellAudio.cpp | 10 +- rpcs3/Emu/Cell/Modules/cellAudioOut.cpp | 4 +- rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp | 26 +- rpcs3/Emu/Cell/Modules/cellDaisy.cpp | 104 ++-- rpcs3/Emu/Cell/Modules/cellDmux.cpp | 50 +- rpcs3/Emu/Cell/Modules/cellFont.cpp | 66 +- rpcs3/Emu/Cell/Modules/cellFs.cpp | 24 +- rpcs3/Emu/Cell/Modules/cellGame.cpp | 16 +- rpcs3/Emu/Cell/Modules/cellGameExec.cpp | 8 +- rpcs3/Emu/Cell/Modules/cellGcmSys.cpp | 28 +- rpcs3/Emu/Cell/Modules/cellGifDec.cpp | 8 +- rpcs3/Emu/Cell/Modules/cellJpgDec.cpp | 8 +- rpcs3/Emu/Cell/Modules/cellL10n.cpp | 310 ++++----- rpcs3/Emu/Cell/Modules/cellMic.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp | 6 +- rpcs3/Emu/Cell/Modules/cellMusic.cpp | 42 +- rpcs3/Emu/Cell/Modules/cellNetCtl.cpp | 18 +- rpcs3/Emu/Cell/Modules/cellOskDialog.cpp | 58 +- rpcs3/Emu/Cell/Modules/cellPad.cpp | 4 +- rpcs3/Emu/Cell/Modules/cellPngDec.cpp | 60 +- rpcs3/Emu/Cell/Modules/cellPngDec.h | 2 +- rpcs3/Emu/Cell/Modules/cellRec.cpp | 14 +- rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp | 16 +- rpcs3/Emu/Cell/Modules/cellRudp.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSail.cpp | 10 +- rpcs3/Emu/Cell/Modules/cellSaveData.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSpudll.cpp | 4 +- rpcs3/Emu/Cell/Modules/cellSpurs.cpp | 4 +- rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellStorage.cpp | 6 +- rpcs3/Emu/Cell/Modules/cellSync.cpp | 12 +- rpcs3/Emu/Cell/Modules/cellSync.h | 2 +- rpcs3/Emu/Cell/Modules/cellSysconf.cpp | 6 +- rpcs3/Emu/Cell/Modules/cellSysutil.cpp | 14 +- rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp | 84 +-- rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp | 104 ++-- rpcs3/Emu/Cell/Modules/cellVdec.cpp | 36 +- rpcs3/Emu/Cell/Modules/cellVideoExport.cpp | 12 +- rpcs3/Emu/Cell/Modules/cellVideoOut.cpp | 8 +- rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp | 92 +-- rpcs3/Emu/Cell/Modules/libmixer.cpp | 10 +- rpcs3/Emu/Cell/Modules/libsnd3.cpp | 30 +- rpcs3/Emu/Cell/Modules/libsynth2.cpp | 10 +- rpcs3/Emu/Cell/Modules/sceNp.cpp | 18 +- rpcs3/Emu/Cell/Modules/sceNp2.cpp | 126 ++-- rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp | 10 +- rpcs3/Emu/Cell/Modules/sceNpSns.cpp | 8 +- rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp | 4 +- rpcs3/Emu/Cell/Modules/sys_game.cpp | 16 +- rpcs3/Emu/Cell/Modules/sys_heap.cpp | 8 +- rpcs3/Emu/Cell/Modules/sys_io.cpp | 12 +- rpcs3/Emu/Cell/Modules/sys_libc_.cpp | 30 +- rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp | 70 +-- rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp | 6 +- rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp | 6 +- rpcs3/Emu/Cell/Modules/sys_mempool.cpp | 2 +- rpcs3/Emu/Cell/Modules/sys_net.cpp | 4 +- rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp | 4 +- rpcs3/Emu/Cell/Modules/sys_prx_.cpp | 2 +- rpcs3/Emu/Cell/Modules/sys_spu_.cpp | 2 +- rpcs3/Emu/Cell/PPUInterpreter.cpp | 24 +- rpcs3/Emu/Cell/PPUModule.cpp | 12 +- rpcs3/Emu/Cell/PPUThread.cpp | 18 +- rpcs3/Emu/Cell/PPUTranslator.cpp | 2 +- rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp | 40 +- rpcs3/Emu/Cell/SPUAnalyser.cpp | 2 +- rpcs3/Emu/Cell/SPUInterpreter.cpp | 36 +- rpcs3/Emu/Cell/SPURecompiler.cpp | 6 +- rpcs3/Emu/Cell/SPUThread.cpp | 70 +-- rpcs3/Emu/Cell/SPUThread.h | 2 +- rpcs3/Emu/Cell/lv2/lv2.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_cond.cpp | 6 +- rpcs3/Emu/Cell/lv2/sys_event.cpp | 6 +- rpcs3/Emu/Cell/lv2/sys_event_flag.h | 4 +- rpcs3/Emu/Cell/lv2/sys_fs.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_lwcond.cpp | 4 +- rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp | 4 +- rpcs3/Emu/Cell/lv2/sys_mutex.cpp | 4 +- rpcs3/Emu/Cell/lv2/sys_process.cpp | 12 +- rpcs3/Emu/Cell/lv2/sys_rwlock.cpp | 10 +- rpcs3/Emu/Cell/lv2/sys_spu.cpp | 24 +- rpcs3/Emu/Cell/lv2/sys_time.cpp | 12 +- rpcs3/Emu/Cell/lv2/sys_tty.cpp | 2 +- rpcs3/Emu/IdManager.h | 4 +- rpcs3/Emu/Memory/vm.cpp | 56 +- rpcs3/Emu/Memory/vm.h | 2 +- rpcs3/Emu/PSP2/ARMv7Interpreter.cpp | 588 +++++++++--------- rpcs3/Emu/PSP2/ARMv7Interpreter.h | 4 +- rpcs3/Emu/PSP2/ARMv7Module.cpp | 4 +- rpcs3/Emu/PSP2/ARMv7Thread.cpp | 8 +- rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp | 8 +- rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp | 26 +- rpcs3/Emu/PSP2/Modules/sceAudio.cpp | 16 +- rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp | 6 +- rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp | 14 +- rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp | 16 +- rpcs3/Emu/PSP2/Modules/sceCamera.cpp | 82 +-- rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp | 8 +- rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp | 80 +-- rpcs3/Emu/PSP2/Modules/sceCtrl.cpp | 16 +- rpcs3/Emu/PSP2/Modules/sceDbg.cpp | 8 +- rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp | 10 +- rpcs3/Emu/PSP2/Modules/sceDeflt.cpp | 26 +- rpcs3/Emu/PSP2/Modules/sceDisplay.cpp | 28 +- rpcs3/Emu/PSP2/Modules/sceFiber.cpp | 16 +- rpcs3/Emu/PSP2/Modules/sceFios.cpp | 272 ++++---- rpcs3/Emu/PSP2/Modules/sceFpu.cpp | 28 +- rpcs3/Emu/PSP2/Modules/sceGxm.cpp | 422 ++++++------- rpcs3/Emu/PSP2/Modules/sceHttp.cpp | 110 ++-- rpcs3/Emu/PSP2/Modules/sceIme.cpp | 10 +- rpcs3/Emu/PSP2/Modules/sceJpeg.cpp | 18 +- rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp | 18 +- rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp | 258 ++++---- rpcs3/Emu/PSP2/Modules/sceLibc.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp | 6 +- rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp | 4 +- rpcs3/Emu/PSP2/Modules/sceLocation.cpp | 34 +- rpcs3/Emu/PSP2/Modules/sceMd5.cpp | 8 +- rpcs3/Emu/PSP2/Modules/sceMotion.cpp | 32 +- rpcs3/Emu/PSP2/Modules/sceMt19937.cpp | 4 +- rpcs3/Emu/PSP2/Modules/sceNet.cpp | 116 ++-- rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp | 32 +- rpcs3/Emu/PSP2/Modules/sceNgs.cpp | 126 ++-- rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp | 36 +- rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp | 22 +- rpcs3/Emu/PSP2/Modules/sceNpManager.cpp | 20 +- rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp | 62 +- rpcs3/Emu/PSP2/Modules/sceNpScore.cpp | 58 +- rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp | 40 +- rpcs3/Emu/PSP2/Modules/scePerf.cpp | 12 +- rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp | 4 +- rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp | 6 +- rpcs3/Emu/PSP2/Modules/sceRtc.cpp | 74 +-- rpcs3/Emu/PSP2/Modules/sceSas.cpp | 58 +- rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp | 8 +- rpcs3/Emu/PSP2/Modules/sceSsl.cpp | 22 +- rpcs3/Emu/PSP2/Modules/sceSulpha.cpp | 26 +- rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp | 34 +- rpcs3/Emu/PSP2/Modules/sceTouch.cpp | 10 +- rpcs3/Emu/PSP2/Modules/sceUlt.cpp | 118 ++-- rpcs3/Emu/PSP2/Modules/sceVideodec.cpp | 18 +- rpcs3/Emu/PSP2/Modules/sceVoice.cpp | 50 +- rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp | 34 +- rpcs3/Emu/RSX/Common/BufferUtils.cpp | 12 +- rpcs3/Emu/RSX/Common/ProgramStateCache.h | 6 +- rpcs3/Emu/RSX/Common/TextureUtils.cpp | 10 +- rpcs3/Emu/RSX/Common/ring_buffer_helper.h | 2 +- rpcs3/Emu/RSX/Common/surface_store.cpp | 6 +- rpcs3/Emu/RSX/Common/surface_store.h | 20 +- rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp | 12 +- rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp | 46 +- rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp | 2 +- rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h | 4 +- rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp | 10 +- rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.h | 4 +- rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp | 6 +- rpcs3/Emu/RSX/D3D12/D3D12Utils.h | 2 +- rpcs3/Emu/RSX/GL/GLCommonDecompiler.cpp | 2 +- rpcs3/Emu/RSX/GL/GLGSRender.cpp | 6 +- rpcs3/Emu/RSX/GL/gl_helpers.cpp | 6 +- rpcs3/Emu/RSX/GL/gl_helpers.h | 10 +- rpcs3/Emu/RSX/GL/gl_render_targets.cpp | 2 +- rpcs3/Emu/RSX/GL/gl_render_targets.h | 2 +- rpcs3/Emu/RSX/GL/gl_texture_cache.h | 8 +- rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp | 12 +- rpcs3/Emu/RSX/GL/vertex_buffer.cpp | 14 +- rpcs3/Emu/RSX/RSXThread.cpp | 22 +- rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp | 4 +- rpcs3/Emu/RSX/VK/VKFormats.cpp | 14 +- rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp | 2 +- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 20 +- rpcs3/Emu/RSX/VK/VKHelpers.cpp | 6 +- rpcs3/Emu/RSX/VK/VKHelpers.h | 22 +- rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp | 4 +- rpcs3/Emu/RSX/VK/VKTexture.cpp | 10 +- rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp | 8 +- rpcs3/Emu/RSX/VK/VKVertexProgram.cpp | 2 +- rpcs3/Emu/RSX/gcm_enums.cpp | 68 +- rpcs3/Emu/RSX/rsx_methods.cpp | 2 +- rpcs3/Gui/RSXDebugger.cpp | 2 +- rpcs3/Loader/PSF.cpp | 4 +- rpcs3/rpcs3.cpp | 2 +- rpcs3/stdafx.h | 3 - 198 files changed, 3025 insertions(+), 2956 deletions(-) diff --git a/Utilities/Atomic.h b/Utilities/Atomic.h index 2b03bfae0e..42e786a660 100644 --- a/Utilities/Atomic.h +++ b/Utilities/Atomic.h @@ -951,12 +951,6 @@ public: return atomic_op(atomic_post_dec{}); } - template - auto test(const T2& rhs) const - { - return load().test(rhs); - } - template auto test_and_set(const T2& rhs) { diff --git a/Utilities/Config.cpp b/Utilities/Config.cpp index dd84f8dff6..d313bb6193 100644 --- a/Utilities/Config.cpp +++ b/Utilities/Config.cpp @@ -12,7 +12,7 @@ namespace cfg { if (_type != type::node) { - throw std::logic_error("Invalid root node"); + fmt::throw_exception("Invalid root node" HERE); } } @@ -21,7 +21,7 @@ namespace cfg { if (!owner.m_nodes.emplace(name, this).second) { - throw std::logic_error("Node already exists"); + fmt::throw_exception("Node already exists: %s" HERE, name); } } @@ -32,7 +32,7 @@ namespace cfg return *static_cast(*this).m_nodes.at(name); } - throw std::logic_error("Invalid node type"); + fmt::throw_exception("Invalid node type" HERE); } entry_base& entry_base::operator[](const char* name) const @@ -42,7 +42,17 @@ namespace cfg return *static_cast(*this).m_nodes.at(name); } - throw std::logic_error("Invalid node type"); + fmt::throw_exception("Invalid node type" HERE); + } + + bool entry_base::from_string(const std::string&) + { + fmt::throw_exception("from_string() purecall" HERE); + } + + bool entry_base::from_list(std::vector&&) + { + fmt::throw_exception("from_list() purecall" HERE); } // Emit YAML diff --git a/Utilities/Config.h b/Utilities/Config.h index 3a69e3c75a..f88d19af84 100644 --- a/Utilities/Config.h +++ b/Utilities/Config.h @@ -69,10 +69,7 @@ namespace cfg } // Try to convert from string (optional) - virtual bool from_string(const std::string&) - { - throw std::logic_error("from_string() not specified"); - } + virtual bool from_string(const std::string&); // Get string list (optional) virtual std::vector to_list() const @@ -81,10 +78,7 @@ namespace cfg } // Set multiple values. Implementation-specific, optional. - virtual bool from_list(std::vector&&) - { - throw std::logic_error("from_list() not specified"); - } + virtual bool from_list(std::vector&&); }; // Config tree node which contains another nodes @@ -223,7 +217,7 @@ namespace cfg } map_entry(node& owner, const std::string& name, std::size_t def_index, init_type init) - : map_entry(owner, name, def_index < init.size() ? (init.begin() + def_index)->first : throw std::logic_error("Invalid default value index"), init) + : map_entry(owner, name, (init.begin() + (def_index < init.size() ? def_index : 0))->first, init) { } @@ -358,7 +352,7 @@ namespace cfg { if (value < Min || value > Max) { - throw fmt::exception("Value out of the valid range: %lld" HERE, s64{ value }); + fmt::throw_exception("Value out of the valid range: %lld" HERE, s64{ value }); } m_value = value; diff --git a/Utilities/File.cpp b/Utilities/File.cpp index a1010be805..f451df5ad0 100644 --- a/Utilities/File.cpp +++ b/Utilities/File.cpp @@ -18,13 +18,13 @@ static std::unique_ptr to_wchar(const std::string& source) { const auto buf_size = source.size() + 1; // size + null terminator - const int size = source.size() < INT_MAX ? static_cast(buf_size) : throw fmt::exception("to_wchar(): invalid source length (0x%llx)", source.size()); + const int size = source.size() < INT_MAX ? static_cast(buf_size) : (fmt::throw_exception("to_wchar(): invalid source length (0x%llx)", source.size()), 0); std::unique_ptr buffer(new wchar_t[buf_size]); // allocate buffer assuming that length is the max possible size if (!MultiByteToWideChar(CP_UTF8, 0, source.c_str(), size, buffer.get(), size)) { - throw fmt::exception("to_wchar(): MultiByteToWideChar() failed: error %u.", GetLastError()); + fmt::throw_exception("to_wchar(): MultiByteToWideChar() failed: error %u.", GetLastError()); } return buffer; @@ -34,7 +34,7 @@ static void to_utf8(std::string& result, const wchar_t* source) { const auto length = std::wcslen(source); - const int buf_size = length <= INT_MAX / 3 ? static_cast(length) * 3 + 1 : throw fmt::exception("to_utf8(): invalid source length (0x%llx)", length); + const int buf_size = length <= INT_MAX / 3 ? static_cast(length) * 3 + 1 : (fmt::throw_exception("to_utf8(): invalid source length (0x%llx)", length), 0); result.resize(buf_size); // set max possible length for utf-8 + null terminator @@ -44,7 +44,7 @@ static void to_utf8(std::string& result, const wchar_t* source) } else { - throw fmt::exception("to_utf8(): WideCharToMultiByte() failed: error %u.", GetLastError()); + fmt::throw_exception("to_utf8(): WideCharToMultiByte() failed: error %u.", GetLastError()); } } @@ -82,7 +82,7 @@ static fs::error to_error(DWORD e) case ERROR_NEGATIVE_SEEK: return fs::error::inval; case ERROR_DIRECTORY: return fs::error::inval; case ERROR_INVALID_NAME: return fs::error::inval; - default: throw fmt::exception("Unknown Win32 error: %u.", e); + default: fmt::throw_exception("Unknown Win32 error: %u.", e); } } @@ -111,7 +111,7 @@ static fs::error to_error(int e) case ENOENT: return fs::error::noent; case EEXIST: return fs::error::exist; case EINVAL: return fs::error::inval; - default: throw fmt::exception("Unknown system error: %d.", e); + default: fmt::throw_exception("Unknown system error: %d.", e); } } @@ -465,7 +465,7 @@ bool fs::rename(const std::string& from, const std::string& to) if (device != get_virtual_device(to)) { - throw fmt::exception("fs::rename() between different devices not implemented.\nFrom: %s\nTo: %s", from, to); + fmt::throw_exception("fs::rename() between different devices not implemented.\nFrom: %s\nTo: %s", from, to); } if (device) @@ -498,7 +498,7 @@ bool fs::copy_file(const std::string& from, const std::string& to, bool overwrit if (device != get_virtual_device(to) || device) // TODO { - throw fmt::exception("fs::copy_file() for virtual devices not implemented.\nFrom: %s\nTo: %s", from, to); + fmt::throw_exception("fs::copy_file() for virtual devices not implemented.\nFrom: %s\nTo: %s", from, to); } #ifdef _WIN32 @@ -622,12 +622,12 @@ bool fs::truncate_file(const std::string& path, u64 length) void fs::file::xnull() const { - throw std::logic_error("fs::file is null"); + fmt::throw_exception("fs::file is null"); } void fs::file::xfail() const { - throw fmt::exception("Unexpected fs::error %s", g_tls_error); + fmt::throw_exception("Unexpected fs::error %s", g_tls_error); } bool fs::file::open(const std::string& path, bs_t mode) @@ -694,7 +694,7 @@ bool fs::file::open(const std::string& path, bs_t mode) FILE_BASIC_INFO basic_info; if (!GetFileInformationByHandleEx(m_handle, FileBasicInfo, &basic_info, sizeof(FILE_BASIC_INFO))) { - throw fmt::exception("Win32 error: %u." HERE, GetLastError()); + fmt::throw_exception("Win32 error: %u." HERE, GetLastError()); } stat_t info; @@ -730,7 +730,7 @@ bool fs::file::open(const std::string& path, bs_t mode) if (!result || !SetFilePointerEx(m_handle, old, NULL, FILE_BEGIN)) // restore position { - throw fmt::exception("Win32 error: %u." HERE, GetLastError()); + fmt::throw_exception("Win32 error: %u." HERE, GetLastError()); } return result != FALSE; @@ -745,7 +745,7 @@ bool fs::file::open(const std::string& path, bs_t mode) DWORD nread; if (!ReadFile(m_handle, buffer, size, &nread, NULL)) { - throw fmt::exception("Win32 error: %u." HERE, GetLastError()); + fmt::throw_exception("Win32 error: %u." HERE, GetLastError()); } return nread; @@ -760,7 +760,7 @@ bool fs::file::open(const std::string& path, bs_t mode) DWORD nwritten; if (!WriteFile(m_handle, buffer, size, &nwritten, NULL)) { - throw fmt::exception("Win32 error: %u." HERE, GetLastError()); + fmt::throw_exception("Win32 error: %u." HERE, GetLastError()); } return nwritten; @@ -775,11 +775,11 @@ bool fs::file::open(const std::string& path, bs_t mode) whence == seek_set ? FILE_BEGIN : whence == seek_cur ? FILE_CURRENT : whence == seek_end ? FILE_END : - throw fmt::exception("Invalid whence (0x%x)" HERE, whence); + (fmt::throw_exception("Invalid whence (0x%x)" HERE, whence), 0); if (!SetFilePointerEx(m_handle, pos, &pos, mode)) { - throw fmt::exception("Win32 error: %u." HERE, GetLastError()); + fmt::throw_exception("Win32 error: %u." HERE, GetLastError()); } return pos.QuadPart; @@ -790,7 +790,7 @@ bool fs::file::open(const std::string& path, bs_t mode) LARGE_INTEGER size; if (!GetFileSizeEx(m_handle, &size)) { - throw fmt::exception("Win32 error: %u." HERE, GetLastError()); + fmt::throw_exception("Win32 error: %u." HERE, GetLastError()); } return size.QuadPart; @@ -838,7 +838,7 @@ bool fs::file::open(const std::string& path, bs_t mode) struct ::stat file_info; if (::fstat(m_fd, &file_info) != 0) { - throw fmt::exception("System error: %d." HERE, errno); + fmt::throw_exception("System error: %d." HERE, errno); } stat_t info; @@ -868,7 +868,7 @@ bool fs::file::open(const std::string& path, bs_t mode) const auto result = ::read(m_fd, buffer, count); if (result == -1) { - throw fmt::exception("System error: %d." HERE, errno); + fmt::throw_exception("System error: %d." HERE, errno); } return result; @@ -879,7 +879,7 @@ bool fs::file::open(const std::string& path, bs_t mode) const auto result = ::write(m_fd, buffer, count); if (result == -1) { - throw fmt::exception("System error: %d." HERE, errno); + fmt::throw_exception("System error: %d." HERE, errno); } return result; @@ -891,12 +891,12 @@ bool fs::file::open(const std::string& path, bs_t mode) whence == seek_set ? SEEK_SET : whence == seek_cur ? SEEK_CUR : whence == seek_end ? SEEK_END : - throw fmt::exception("Invalid whence (0x%x)" HERE, whence); + (fmt::throw_exception("Invalid whence (0x%x)" HERE, whence), 0); const auto result = ::lseek(m_fd, offset, mode); if (result == -1) { - throw fmt::exception("System error: %d." HERE, errno); + fmt::throw_exception("System error: %d." HERE, errno); } return result; @@ -907,7 +907,7 @@ bool fs::file::open(const std::string& path, bs_t mode) struct ::stat file_info; if (::fstat(m_fd, &file_info) != 0) { - throw fmt::exception("System error: %d." HERE, errno); + fmt::throw_exception("System error: %d." HERE, errno); } return file_info.st_size; @@ -938,26 +938,27 @@ fs::file::file(const void* ptr, std::size_t size) fs::stat_t stat() override { - throw std::logic_error("Not supported" HERE); + fmt::throw_exception("Not supported" HERE); } bool trunc(u64 length) override { - throw std::logic_error("Not allowed" HERE); + fmt::throw_exception("Not allowed" HERE); } u64 read(void* buffer, u64 count) override { const u64 start = m_pos; const u64 end = seek(count, fs::seek_cur); - const u64 read_size = end >= start ? end - start : throw std::logic_error("Stream overflow" HERE); + if (end < start) fmt::throw_exception("Stream overflow" HERE); + const u64 read_size = end - start; std::memcpy(buffer, m_ptr + start, read_size); return read_size; } u64 write(const void* buffer, u64 count) override { - throw std::logic_error("Not allowed" HERE); + fmt::throw_exception("Not allowed" HERE); } u64 seek(s64 offset, fs::seek_mode whence) override @@ -966,7 +967,7 @@ fs::file::file(const void* ptr, std::size_t size) whence == fs::seek_set ? m_pos = std::min(offset, m_size) : whence == fs::seek_cur ? m_pos = std::min(offset + m_pos, m_size) : whence == fs::seek_end ? m_pos = std::min(offset + m_size, m_size) : - throw fmt::exception("Invalid whence (0x%x)" HERE, whence); + (fmt::throw_exception("Invalid whence (0x%x)" HERE, whence), 0); } u64 size() override @@ -980,7 +981,7 @@ fs::file::file(const void* ptr, std::size_t size) void fs::dir::xnull() const { - throw std::logic_error("fs::dir is null"); + fmt::throw_exception("fs::dir is null"); } bool fs::dir::open(const std::string& path) @@ -1052,7 +1053,7 @@ bool fs::dir::open(const std::string& path) return false; } - throw fmt::exception("Win32 error: %u." HERE, GetLastError()); + fmt::throw_exception("Win32 error: %u." HERE, GetLastError()); } add_entry(found); @@ -1104,7 +1105,7 @@ bool fs::dir::open(const std::string& path) struct ::stat file_info; if (::fstatat(::dirfd(m_dd), found->d_name, &file_info, 0) != 0) { - throw fmt::exception("System error: %d." HERE, errno); + fmt::throw_exception("System error: %d." HERE, errno); } info.name = found->d_name; diff --git a/Utilities/JIT.cpp b/Utilities/JIT.cpp index 8f69e68c90..6d928c2502 100644 --- a/Utilities/JIT.cpp +++ b/Utilities/JIT.cpp @@ -80,7 +80,7 @@ struct MemoryManager final : llvm::RTDyldMemoryManager [[noreturn]] static void null() { - throw std::runtime_error("Null function" HERE); + fmt::throw_exception("Null function" HERE); } virtual u64 getSymbolAddress(const std::string& name) override @@ -237,7 +237,7 @@ jit_compiler::jit_compiler(std::unique_ptr&& _module, std::unorder if (!m_engine) { - throw fmt::exception("LLVM: Failed to create ExecutionEngine: %s", result); + fmt::throw_exception("LLVM: Failed to create ExecutionEngine: %s", result); } m_engine->setProcessAllSections(true); // ??? diff --git a/Utilities/Log.cpp b/Utilities/Log.cpp index 80234afafe..2140aff035 100644 --- a/Utilities/Log.cpp +++ b/Utilities/Log.cpp @@ -112,7 +112,7 @@ logs::file_writer::file_writer(const std::string& name) { if (!m_file.open(fs::get_config_dir() + name, fs::rewrite + fs::append)) { - throw fmt::exception("Can't create log file %s (error %s)", name, fs::g_tls_error); + fmt::throw_exception("Can't create log file %s (error %s)", name, fs::g_tls_error); } } catch (...) diff --git a/Utilities/Log.h b/Utilities/Log.h index fec55e3fba..e48b7d656a 100644 --- a/Utilities/Log.h +++ b/Utilities/Log.h @@ -71,7 +71,7 @@ namespace logs { if (UNLIKELY(sev <= enabled)) { - message{this, sev}.broadcast(fmt, fmt_type_info::get...>(), fmt_args_t{fmt_unveil::get(args)...}); + message{this, sev}.broadcast(fmt, fmt::get_type_info...>(), fmt_args_t{fmt_unveil::get(args)...}); } } diff --git a/Utilities/Macro.h b/Utilities/Macro.h index 13ed979921..2aa9651140 100644 --- a/Utilities/Macro.h +++ b/Utilities/Macro.h @@ -1,41 +1,6 @@ #pragma once -#include -#include - -template::value>> -constexpr T align(const T& value, std::uint64_t align) -{ - return static_cast((value + (align - 1)) & ~(align - 1)); -} - -template -constexpr To narrow_impl(const To& result, const From& value, const char* message) -{ - return static_cast(result) != value ? throw std::runtime_error(message) : result; -} - -// Narrow cast (similar to gsl::narrow) with fixed message -template -constexpr auto narrow(const From& value, const char* fixed_msg = "::narrow() failed") -> decltype(static_cast(static_cast(std::declval()))) -{ - return narrow_impl(static_cast(value), value, fixed_msg); -} - -// Return 32 bit .size() for container -template -constexpr auto size32(const CT& container, const char* fixed_msg = "::size32() failed") -> decltype(static_cast(container.size())) -{ - return narrow(container.size(), fixed_msg); -} - -// Return 32 bit size for an array -template -constexpr std::uint32_t size32(const T(&)[Size]) -{ - static_assert(Size <= UINT32_MAX, "size32() error: too big"); - return static_cast(Size); -} +#include "types.h" #define CHECK_SIZE(type, size) static_assert(sizeof(type) == size, "Invalid " #type " type size") #define CHECK_ALIGN(type, align) static_assert(alignof(type) == align, "Invalid " #type " type alignment") @@ -71,12 +36,12 @@ constexpr std::uint32_t size32(const T(&)[Size]) #define HERE "\n(in file " __FILE__ ":" STRINGIZE(__LINE__) ")" // Ensure that the expression is evaluated to true. Always evaluated and allowed to have side effects (unlike assert() macro). -#define VERIFY(expr) do { if (!(expr)) throw std::runtime_error("Verification failed: " #expr HERE); } while (0) +#define VERIFY(expr) do { if (!(expr)) fmt::raw_error("Verification failed: " #expr HERE); } while (0) // EXPECTS() and ENSURES() are intended to check function arguments and results. // Expressions are not guaranteed to evaluate. -#define EXPECTS(expr) do { if (!(expr)) throw std::runtime_error("Precondition failed: " #expr HERE); } while (0) -#define ENSURES(expr) do { if (!(expr)) throw std::runtime_error("Postcondition failed: " #expr HERE); } while (0) +#define EXPECTS(expr) do { if (!(expr)) fmt::raw_error("Precondition failed: " #expr HERE); } while (0) +#define ENSURES(expr) do { if (!(expr)) fmt::raw_error("Postcondition failed: " #expr HERE); } while (0) #define DECLARE(...) decltype(__VA_ARGS__) __VA_ARGS__ diff --git a/Utilities/StrFmt.cpp b/Utilities/StrFmt.cpp index a3a5dff484..b65c56395b 100644 --- a/Utilities/StrFmt.cpp +++ b/Utilities/StrFmt.cpp @@ -128,6 +128,52 @@ void fmt_class_string::format(std::string& out, u64 arg) namespace fmt { + void raw_error(const char* msg) + { + std::string out; + + out += "Error: "; + out += msg; + + throw std::runtime_error(out); + } + + void raw_narrow_error(const char* msg, const fmt_type_info* sup, u64 arg) + { + std::string out; + + out += "Narrow error: ("; + sup->fmt_string(out, arg); // Print value + out += ")"; + + if (msg) + { + out += " "; + out += msg; + } + + throw std::range_error(out); + } + + // Hidden template + template + void raw_throw_exception(const char* fmt, const fmt_type_info* sup, const u64* args) + { + std::string out; + raw_append(out, fmt, sup, args); + throw T{out}; + } + + // Explicit instantiations (not exhaustive) + template void raw_throw_exception(const char*, const fmt_type_info*, const u64*); + template void raw_throw_exception(const char*, const fmt_type_info*, const u64*); + template void raw_throw_exception(const char*, const fmt_type_info*, const u64*); + template void raw_throw_exception(const char*, const fmt_type_info*, const u64*); + template void raw_throw_exception(const char*, const fmt_type_info*, const u64*); + template void raw_throw_exception(const char*, const fmt_type_info*, const u64*); + template void raw_throw_exception(const char*, const fmt_type_info*, const u64*); + template void raw_throw_exception(const char*, const fmt_type_info*, const u64*); + struct cfmt_src; } @@ -191,13 +237,6 @@ void fmt::raw_append(std::string& out, const char* fmt, const fmt_type_info* sup cfmt_append(out, fmt, cfmt_src{sup, args}); } -char* fmt::alloc_format(const char* fmt, const fmt_type_info* sup, const u64* args) noexcept -{ - std::string str; - raw_append(str, fmt, sup, args); - return static_cast(std::memcpy(std::malloc(str.size() + 1), str.data(), str.size() + 1)); -} - std::string fmt::replace_first(const std::string& src, const std::string& from, const std::string& to) { auto pos = src.find(from); diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h index 88825cb99b..c90db59914 100644 --- a/Utilities/StrFmt.h +++ b/Utilities/StrFmt.h @@ -2,7 +2,6 @@ #include #include -#include #include "Platform.h" #include "types.h" @@ -212,18 +211,6 @@ struct fmt_type_info &fmt_class_string::format, }; } - - template - static inline const fmt_type_info* get() - { - // Constantly initialized null-terminated list of type-specific information - static constexpr fmt_type_info result[sizeof...(Args) + 1] - { - make()... - }; - - return result; - } }; template @@ -235,6 +222,18 @@ using fmt_args_t = const u64(&&)[sizeof...(Args) + 1]; namespace fmt { + template + const fmt_type_info* get_type_info() + { + // Constantly initialized null-terminated list of type-specific information + static constexpr fmt_type_info result[sizeof...(Args) + 1] + { + fmt_type_info::make()... + }; + + return result; + } + // Internal formatting function void raw_append(std::string& out, const char*, const fmt_type_info*, const u64*) noexcept; @@ -242,7 +241,7 @@ namespace fmt template static SAFE_BUFFERS void append(std::string& out, const char* fmt, const Args&... args) { - raw_append(out, fmt, fmt_type_info::get...>(), fmt_args_t{fmt_unveil::get(args)...}); + raw_append(out, fmt, fmt::get_type_info...>(), fmt_args_t{fmt_unveil::get(args)...}); } // Formatting function @@ -254,24 +253,14 @@ namespace fmt return result; } - // Internal helper function - char* alloc_format(const char*, const fmt_type_info*, const u64*) noexcept; + // Internal exception message formatting template, must be explicitly specialized or instantiated in cpp to minimize code bloat + template + [[noreturn]] void raw_throw_exception(const char*, const fmt_type_info*, const u64*); - // Exception type with formatting constructor - template - class exception_t : public Base + // Throw exception with formatting + template + [[noreturn]] SAFE_BUFFERS FORCE_INLINE void throw_exception(const char* fmt, const Args&... args) { - using base = Base; - - public: - template - SAFE_BUFFERS exception_t(const char* fmt, const Args&... args) - : base((fmt = alloc_format(fmt, fmt_type_info::get...>(), fmt_args_t{fmt_unveil::get(args)...}))) - { - std::free(const_cast(fmt)); - } - }; - - // Exception type derived from std::runtime_error with formatting constructor - using exception = exception_t; + raw_throw_exception(fmt, fmt::get_type_info...>(), fmt_args_t{fmt_unveil::get(args)...}); + } } diff --git a/Utilities/types.h b/Utilities/types.h index cac29175dd..89c8dadef5 100644 --- a/Utilities/types.h +++ b/Utilities/types.h @@ -27,14 +27,18 @@ namespace gsl enum class byte : u8; } -namespace fmt -{ -} - // Formatting helper, type-specific preprocessing for improving safety and functionality template struct fmt_unveil; +struct fmt_type_info; + +namespace fmt +{ + template + const fmt_type_info* get_type_info(); +} + template struct se_storage; @@ -410,6 +414,84 @@ struct ignore } }; +template::value>> +constexpr T align(const T& value, std::uint64_t align) +{ + return static_cast((value + (align - 1)) & ~(align - 1)); +} + +namespace fmt +{ + [[noreturn]] void raw_error(const char* msg); + + [[noreturn]] void raw_narrow_error(const char* msg, const fmt_type_info* sup, u64 arg); +} + +// Narrow cast (throws on failure) +template(std::declval()))> +inline To narrow(const From& value, const char* msg = nullptr) +{ + // Allow "narrowing to void" and ensure it always fails in this case + auto&& result = static_cast::value, From, To>>(value); + if (std::is_void::value || static_cast(result) != value) + { + // Pack value as formatting argument + fmt::raw_narrow_error(msg, fmt::get_type_info::type>(), fmt_unveil::get(value)); + } + + return static_cast::value, void, decltype(result)>>(result); +} + +// Returns u32 size() for container +template(std::declval().size()))> +inline u32 size32(const CT& container, const char* msg = nullptr) +{ + return narrow(container.size(), msg); +} + +// Returns u32 size for an array +template +constexpr u32 size32(const T(&)[Size], const char* msg = nullptr) +{ + return static_cast(Size); +} + +template::value>> +constexpr bool test(const T1& value) +{ + return value != 0; +} + +template::value && std::is_integral::value>> +constexpr bool test(const T1& lhs, const T2& rhs) +{ + return (lhs & rhs) != 0; +} + +template::value && std::is_integral::value>> +inline bool test_and_set(T& lhs, const T2& rhs) +{ + const bool result = (lhs & rhs) != 0; + lhs |= rhs; + return result; +} + +template::value && std::is_integral::value>> +inline bool test_and_reset(T& lhs, const T2& rhs) +{ + const bool result = (lhs & rhs) != 0; + lhs &= ~rhs; + return result; +} + +template::value && std::is_integral::value>> +inline bool test_and_complement(T& lhs, const T2& rhs) +{ + const bool result = (lhs & rhs) != 0; + lhs ^= rhs; + return result; +} + // Simplified hash algorithm for pointers. May be used in std::unordered_(map|set). template struct pointer_hash diff --git a/Utilities/version.cpp b/Utilities/version.cpp index 3f722109cf..f1262f31c1 100644 --- a/Utilities/version.cpp +++ b/Utilities/version.cpp @@ -14,7 +14,7 @@ namespace utils case version_type::release: return "Release"; } - throw type; + return "Unknown"; } uint version::to_hex() const diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp index 0eda52ea00..1ffd343b80 100644 --- a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp +++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp @@ -59,7 +59,7 @@ XAudio2Thread::XAudio2Thread() return; } - throw fmt::exception("No supported XAudio2 library found"); + fmt::throw_exception("No supported XAudio2 library found"); } XAudio2Thread::~XAudio2Thread() diff --git a/rpcs3/Emu/Cell/Modules/cellAdec.cpp b/rpcs3/Emu/Cell/Modules/cellAdec.cpp index c2ad292319..8b43d87dd3 100644 --- a/rpcs3/Emu/Cell/Modules/cellAdec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAdec.cpp @@ -106,28 +106,28 @@ public: } default: { - throw EXCEPTION("Unknown type (0x%x)", type); + fmt::throw_exception("Unknown type (0x%x)" HERE, type); } } if (!codec) { - throw EXCEPTION("avcodec_find_decoder() failed"); + fmt::throw_exception("avcodec_find_decoder() failed" HERE); } if (!input_format) { - throw EXCEPTION("av_find_input_format() failed"); + fmt::throw_exception("av_find_input_format() failed" HERE); } fmt = avformat_alloc_context(); if (!fmt) { - throw EXCEPTION("avformat_alloc_context() failed"); + fmt::throw_exception("avformat_alloc_context() failed" HERE); } io_buf = (u8*)av_malloc(4096); fmt->pb = avio_alloc_context(io_buf, 256, 0, this, adecRead, NULL, NULL); if (!fmt->pb) { - throw EXCEPTION("avio_alloc_context() failed"); + fmt::throw_exception("avio_alloc_context() failed" HERE); } } @@ -260,7 +260,7 @@ public: err = avformat_open_input(&fmt, NULL, input_format, &opts); if (err || opts) { - throw EXCEPTION("avformat_open_input() failed (err=0x%x, opts=%d)", err, opts ? 1 : 0); + fmt::throw_exception("avformat_open_input() failed (err=0x%x, opts=%d)" HERE, err, opts ? 1 : 0); } //err = avformat_find_stream_info(fmt, NULL); //if (err || !fmt->nb_streams) @@ -269,7 +269,7 @@ public: //} if (!avformat_new_stream(fmt, codec)) { - throw EXCEPTION("avformat_new_stream() failed"); + fmt::throw_exception("avformat_new_stream() failed" HERE); } ctx = fmt->streams[0]->codec; // TODO: check data @@ -282,7 +282,7 @@ public: } if (err || opts) { - throw EXCEPTION("avcodec_open2() failed (err=0x%x, opts=%d)", err, opts ? 1 : 0); + fmt::throw_exception("avcodec_open2() failed (err=0x%x, opts=%d)" HERE, err, opts ? 1 : 0); } just_started = false; } @@ -326,7 +326,7 @@ public: if (!frame.data) { - throw EXCEPTION("av_frame_alloc() failed"); + fmt::throw_exception("av_frame_alloc() failed" HERE); } int got_frame = 0; @@ -360,7 +360,7 @@ public: case AV_SAMPLE_FMT_S16P: break; default: { - throw EXCEPTION("Unsupported frame format(%d)", frame.data->format); + fmt::throw_exception("Unsupported frame format(%d)" HERE, frame.data->format); } } frame.auAddr = task.au.addr; @@ -390,7 +390,7 @@ public: default: { - throw EXCEPTION("Unknown task(%d)", (u32)task.type); + fmt::throw_exception("Unknown task(%d)" HERE, (u32)task.type); } } } @@ -817,7 +817,7 @@ s32 cellAdecGetPcm(u32 handle, vm::ptr outBuffer) } else { - throw EXCEPTION("Unsupported frame format (channels=%d, format=%d)", frame->channels, frame->format); + fmt::throw_exception("Unsupported frame format (channels=%d, format=%d)" HERE, frame->channels, frame->format); } } diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.cpp b/rpcs3/Emu/Cell/Modules/cellAudio.cpp index 152a713c36..193d9c003d 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudio.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAudio.cpp @@ -208,7 +208,7 @@ void audio_config::on_task() } else { - throw EXCEPTION("Unknown channel count (port=%u, channel=%d)", port.number, port.channel); + fmt::throw_exception("Unknown channel count (port=%u, channel=%d)" HERE, port.number, port.channel); } memset(buf, 0, block_size * sizeof(float)); @@ -461,7 +461,7 @@ s32 cellAudioGetPortConfig(u32 portNum, vm::ptr portConfig) case audio_port_state::closed: portConfig->status = CELL_AUDIO_STATUS_CLOSE; break; case audio_port_state::opened: portConfig->status = CELL_AUDIO_STATUS_READY; break; case audio_port_state::started: portConfig->status = CELL_AUDIO_STATUS_RUN; break; - default: throw fmt::exception("Invalid port state (%d: %d)", portNum, (u32)state); + default: fmt::throw_exception("Invalid port state (%d: %d)", portNum, (u32)state); } portConfig->nChannel = port.channel; @@ -492,7 +492,7 @@ s32 cellAudioPortStart(u32 portNum) case audio_port_state::closed: return CELL_AUDIO_ERROR_PORT_NOT_OPEN; case audio_port_state::started: return CELL_AUDIO_ERROR_PORT_ALREADY_RUN; case audio_port_state::opened: return CELL_OK; - default: throw fmt::exception("Invalid port state (%d: %d)", portNum, (u32)state); + default: fmt::throw_exception("Invalid port state (%d: %d)", portNum, (u32)state); } } @@ -517,7 +517,7 @@ s32 cellAudioPortClose(u32 portNum) case audio_port_state::closed: return CELL_AUDIO_ERROR_PORT_NOT_OPEN; case audio_port_state::started: return CELL_OK; case audio_port_state::opened: return CELL_OK; - default: throw fmt::exception("Invalid port state (%d: %d)", portNum, (u32)state); + default: fmt::throw_exception("Invalid port state (%d: %d)", portNum, (u32)state); } } @@ -542,7 +542,7 @@ s32 cellAudioPortStop(u32 portNum) case audio_port_state::closed: return CELL_AUDIO_ERROR_PORT_NOT_RUN; case audio_port_state::started: return CELL_OK; case audio_port_state::opened: return CELL_AUDIO_ERROR_PORT_NOT_RUN; - default: throw fmt::exception("Invalid port state (%d: %d)", portNum, (u32)state); + default: fmt::throw_exception("Invalid port state (%d: %d)", portNum, (u32)state); } } diff --git a/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp b/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp index 0472272b0a..776d2ed1c9 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp @@ -230,12 +230,12 @@ s32 cellAudioOutSetCopyControl(u32 audioOut, u32 control) s32 cellAudioOutRegisterCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellAudioOutUnregisterCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp b/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp index fc7bb16c26..b2d0f11a7b 100644 --- a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp @@ -12,32 +12,32 @@ vm::gvar g_gamma; // TODO s32 cellAudioOutUnregisterDevice() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellAudioOutGetDeviceInfo2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoOutSetXVColor() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoOutSetupDisplay() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellAudioInGetDeviceInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoOutConvertCursorColor() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoOutGetGamma(u32 videoOut, vm::ptr gamma) @@ -56,12 +56,12 @@ s32 cellVideoOutGetGamma(u32 videoOut, vm::ptr gamma) s32 cellAudioInGetAvailableDeviceInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellAudioOutGetAvailableDeviceInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoOutSetGamma(u32 videoOut, f32 gamma) @@ -85,27 +85,27 @@ s32 cellVideoOutSetGamma(u32 videoOut, f32 gamma) s32 cellAudioOutRegisterDevice() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellAudioOutSetDeviceMode() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellAudioInSetDeviceMode() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellAudioInRegisterDevice() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellAudioInUnregisterDevice() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoOutGetScreenSize(u32 videoOut, vm::ptr screenSize) diff --git a/rpcs3/Emu/Cell/Modules/cellDaisy.cpp b/rpcs3/Emu/Cell/Modules/cellDaisy.cpp index 968446f933..81e7ecfbd7 100644 --- a/rpcs3/Emu/Cell/Modules/cellDaisy.cpp +++ b/rpcs3/Emu/Cell/Modules/cellDaisy.cpp @@ -7,262 +7,262 @@ logs::channel cellDaisy("cellDaisy", logs::level::notice); s32 _ZN4cell5Daisy17LFQueue2PushCloseEPNS0_8LFQueue2EPFiPvjE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy21LFQueue2GetPopPointerEPNS0_8LFQueue2EPij() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy4Lock15completeConsumeEj() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy9_snprintfEPcjPKcz() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy4Lock7popOpenEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy26LFQueue2CompletePopPointerEPNS0_8LFQueue2EiPFiPvjEj() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy22ScatterGatherInterlock7releaseEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy4Lock7popOpenEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy22ScatterGatherInterlockC1EPVNS0_16_AtomicInterlockEjPjjh() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy22ScatterGatherInterlockC1EPVNS0_16_AtomicInterlockEjPjjh() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy9_snprintfEPcjPKcz() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy29LFQueue2HasUnfinishedConsumerEPNS0_8LFQueue2Ej() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy4Lock18getNextHeadPointerEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy4Lock10initializeEj() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy22ScatterGatherInterlockC1EPVNS0_16_AtomicInterlockEjPvPFiS5_jE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy22ScatterGatherInterlockC2EPVNS0_16_AtomicInterlockEjPjjh() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy4Lock15completeProduceEj() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy16LFQueue2PushOpenEPNS0_8LFQueue2E() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy16LFQueue2PopCloseEPNS0_8LFQueue2EPFiPvjE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy4Lock8popCloseEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy4Lock8popCloseEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy22ScatterGatherInterlockD2Ev() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy21LFQueue2GetPopPointerEPNS0_8LFQueue2EPij() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy4Lock18getNextTailPointerEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy4Lock8pushOpenEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy29LFQueue2HasUnfinishedConsumerEPNS0_8LFQueue2Ej() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy4Lock9pushCloseEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy22ScatterGatherInterlockD2Ev() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy15LFQueue2PopOpenEPNS0_8LFQueue2E() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy22ScatterGatherInterlockC1EPVNS0_16_AtomicInterlockEjPvPFiS5_jE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy22ScatterGatherInterlockD1Ev() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy4Lock10initializeEj() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy4Lock15completeProduceEj() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy16LFQueue2PopCloseEPNS0_8LFQueue2EPFiPvjE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy15LFQueue2PopOpenEPNS0_8LFQueue2E() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy17LFQueue2PushCloseEPNS0_8LFQueue2EPFiPvjE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy22ScatterGatherInterlockC2EPVNS0_16_AtomicInterlockEjPvPFiS5_jE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy22ScatterGatherInterlock21proceedSequenceNumberEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy22ScatterGatherInterlockC2EPVNS0_16_AtomicInterlockEjPvPFiS5_jE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy22ScatterGatherInterlockC2EPVNS0_16_AtomicInterlockEjPjjh() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy4Lock15completeConsumeEj() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy22ScatterGatherInterlock21proceedSequenceNumberEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy4Lock18getNextHeadPointerEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy4Lock9pushCloseEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy26LFQueue2CompletePopPointerEPNS0_8LFQueue2EiPFiPvjEj() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy22ScatterGatherInterlock5probeEj() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy4Lock8pushOpenEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy22ScatterGatherInterlock5probeEj() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy22ScatterGatherInterlockD1Ev() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _ZN4cell5Daisy16LFQueue2PushOpenEPNS0_8LFQueue2E() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy4Lock18getNextTailPointerEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _QN4cell5Daisy22ScatterGatherInterlock7releaseEv() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellDmux.cpp b/rpcs3/Emu/Cell/Modules/cellDmux.cpp index c67e3abf98..c0d3559d2b 100644 --- a/rpcs3/Emu/Cell/Modules/cellDmux.cpp +++ b/rpcs3/Emu/Cell/Modules/cellDmux.cpp @@ -252,7 +252,7 @@ public: { if (!stream.check(14)) { - throw EXCEPTION("End of stream (PACK_START_CODE)"); + fmt::throw_exception("End of stream (PACK_START_CODE)" HERE); } stream.skip(14); break; @@ -262,7 +262,7 @@ public: { if (!stream.check(18)) { - throw EXCEPTION("End of stream (SYSTEM_HEADER_START_CODE)"); + fmt::throw_exception("End of stream (SYSTEM_HEADER_START_CODE)" HERE); } stream.skip(18); break; @@ -272,14 +272,14 @@ public: { if (!stream.check(6)) { - throw EXCEPTION("End of stream (PADDING_STREAM)"); + fmt::throw_exception("End of stream (PADDING_STREAM)" HERE); } stream.skip(4); stream.get(len); if (!stream.check(len)) { - throw EXCEPTION("End of stream (PADDING_STREAM, len=%d)", len); + fmt::throw_exception("End of stream (PADDING_STREAM, len=%d)" HERE, len); } stream.skip(len); break; @@ -289,7 +289,7 @@ public: { if (!stream.check(6)) { - throw EXCEPTION("End of stream (PRIVATE_STREAM_2)"); + fmt::throw_exception("End of stream (PRIVATE_STREAM_2)" HERE); } stream.skip(4); stream.get(len); @@ -298,7 +298,7 @@ public: if (!stream.check(len)) { - throw EXCEPTION("End of stream (PRIVATE_STREAM_2, len=%d)", len); + fmt::throw_exception("End of stream (PRIVATE_STREAM_2, len=%d)" HERE, len); } stream.skip(len); break; @@ -311,32 +311,32 @@ public: if (!stream.check(6)) { - throw EXCEPTION("End of stream (PRIVATE_STREAM_1)"); + fmt::throw_exception("End of stream (PRIVATE_STREAM_1)" HERE); } stream.skip(4); stream.get(len); if (!stream.check(len)) { - throw EXCEPTION("End of stream (PRIVATE_STREAM_1, len=%d)", len); + fmt::throw_exception("End of stream (PRIVATE_STREAM_1, len=%d)" HERE, len); } const PesHeader pes(stream); if (!pes.is_ok) { - throw EXCEPTION("PesHeader error (PRIVATE_STREAM_1, len=%d)", len); + fmt::throw_exception("PesHeader error (PRIVATE_STREAM_1, len=%d)" HERE, len); } if (len < pes.size + 4) { - throw EXCEPTION("End of block (PRIVATE_STREAM_1, PesHeader + fid_minor, len=%d)", len); + fmt::throw_exception("End of block (PRIVATE_STREAM_1, PesHeader + fid_minor, len=%d)" HERE, len); } len -= pes.size + 4; u8 fid_minor; if (!stream.get(fid_minor)) { - throw EXCEPTION("End of stream (PRIVATE_STREAM1, fid_minor)"); + fmt::throw_exception("End of stream (PRIVATE_STREAM1, fid_minor)" HERE); } const u32 ch = fid_minor % 16; @@ -352,7 +352,7 @@ public: if (len < 3 || !stream.check(3)) { - throw EXCEPTION("End of block (ATX, unknown header, len=%d)", len); + fmt::throw_exception("End of block (ATX, unknown header, len=%d)" HERE, len); } len -= 3; stream.skip(3); @@ -374,7 +374,7 @@ public: if (data[0] != 0x0f || data[1] != 0xd0) { - throw EXCEPTION("ATX: 0x0fd0 header not found (ats=0x%llx)", *(be_t*)data); + fmt::throw_exception("ATX: 0x0fd0 header not found (ats=0x%llx)" HERE, *(be_t*)data); } u32 frame_size = ((((u32)data[2] & 0x3) << 8) | (u32)data[3]) * 8 + 8; @@ -411,25 +411,25 @@ public: if (!stream.check(6)) { - throw EXCEPTION("End of stream (video, code=0x%x)", code); + fmt::throw_exception("End of stream (video, code=0x%x)" HERE, code); } stream.skip(4); stream.get(len); if (!stream.check(len)) { - throw EXCEPTION("End of stream (video, code=0x%x, len=%d)", code, len); + fmt::throw_exception("End of stream (video, code=0x%x, len=%d)" HERE, code, len); } const PesHeader pes(stream); if (!pes.is_ok) { - throw EXCEPTION("PesHeader error (video, code=0x%x, len=%d)", code, len); + fmt::throw_exception("PesHeader error (video, code=0x%x, len=%d)" HERE, code, len); } if (len < pes.size + 3) { - throw EXCEPTION("End of block (video, code=0x%x, PesHeader)", code); + fmt::throw_exception("End of block (video, code=0x%x, PesHeader)" HERE, code); } len -= pes.size + 3; @@ -482,7 +482,7 @@ public: { if ((code & PACKET_START_CODE_MASK) == PACKET_START_CODE_PREFIX) { - throw EXCEPTION("Unknown code found (0x%x)", code); + fmt::throw_exception("Unknown code found (0x%x)" HERE, code); } // search @@ -572,7 +572,7 @@ public: //} //else { - throw EXCEPTION("dmuxEnableEs: unknown filter (0x%x, 0x%x, 0x%x, 0x%x)", es.fidMajor, es.fidMinor, es.sup1, es.sup2); + fmt::throw_exception("dmuxEnableEs: unknown filter (0x%x, 0x%x, 0x%x, 0x%x)" HERE, es.fidMajor, es.fidMinor, es.sup1, es.sup2); } es.dmux = this; break; @@ -583,7 +583,7 @@ public: ElementaryStream& es = *task.es.es_ptr; if (es.dmux != this) { - throw EXCEPTION("dmuxDisableEs: invalid elementary stream"); + fmt::throw_exception("dmuxDisableEs: invalid elementary stream" HERE); } for (u32 i = 0; i < sizeof(esALL) / sizeof(esALL[0]); i++) @@ -648,7 +648,7 @@ public: default: { - throw EXCEPTION("Demuxer thread error: unknown task (0x%x)", (u32)task.type); + fmt::throw_exception("Demuxer thread error: unknown task (0x%x)" HERE, (u32)task.type); } } } @@ -668,15 +668,15 @@ PesHeader::PesHeader(DemuxerStream& stream) u16 header; if (!stream.get(header)) { - throw EXCEPTION("End of stream (header)"); + fmt::throw_exception("End of stream (header)" HERE); } if (!stream.get(size)) { - throw EXCEPTION("End of stream (size)"); + fmt::throw_exception("End of stream (size)" HERE); } if (!stream.check(size)) { - throw EXCEPTION("End of stream (size=%d)", size); + fmt::throw_exception("End of stream (size=%d)" HERE, size); } u8 pos = 0; @@ -760,7 +760,7 @@ bool ElementaryStream::is_full(u32 space) u32 first = 0; if (!entries.peek(first, 0, &dmux->is_closed) || !first) { - throw std::runtime_error("entries.peek() failed" HERE); + fmt::throw_exception("entries.peek() failed" HERE); } else if (first >= put) { diff --git a/rpcs3/Emu/Cell/Modules/cellFont.cpp b/rpcs3/Emu/Cell/Modules/cellFont.cpp index 28bf5953a4..a705e4a112 100644 --- a/rpcs3/Emu/Cell/Modules/cellFont.cpp +++ b/rpcs3/Emu/Cell/Modules/cellFont.cpp @@ -577,167 +577,167 @@ s32 cellFontGetCharGlyphMetricsVertical() s32 cellFontGetRenderEffectWeight() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGraphicsGetDrawType() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetKerning() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetRenderScaledKerning() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetRenderScalePixel() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGlyphGetScalePixel() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGlyphGetHorizontalShift() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontRenderCharGlyphImageHorizontal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetEffectWeight() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetScalePixel() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontClearFileCache() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontAdjustFontScaling() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontSetupRenderScalePoint() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGlyphGetVerticalShift() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetGlyphExpandBufferInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetLibrary() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontVertexesGlyphRelocate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetInitializedRevisionFlags() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetResolutionDpi() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGlyphRenderImageVertical() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGlyphRenderImageHorizontal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontAdjustGlyphExpandBuffer() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetRenderScalePoint() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGraphicsGetFontRGBA() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGlyphGetOutlineVertexes() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontDelete() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontPatchWorks() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGlyphRenderImage() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetBindingRenderer() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGenerateCharGlyphVertical() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetRenderEffectSlant() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGetScalePoint() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFontGraphicsGetLineRGBA() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellFs.cpp b/rpcs3/Emu/Cell/Modules/cellFs.cpp index 5d23b6dfec..792d53ded2 100644 --- a/rpcs3/Emu/Cell/Modules/cellFs.cpp +++ b/rpcs3/Emu/Cell/Modules/cellFs.cpp @@ -843,42 +843,42 @@ s32 cellFsSetIoBufferFromDefaultContainer(u32 fd, u32 buffer_size, u32 page_type s32 cellFsUtime() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFsArcadeHddSerialNumber() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFsAllocateFileAreaWithInitialData() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFsAllocateFileAreaByFdWithoutZeroFill() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFsSetIoBuffer() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFsAllocateFileAreaByFdWithInitialData() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFsTruncate2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFsChangeFileSizeWithoutAllocation() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFsAllocateFileAreaWithoutZeroFill(vm::cptr path, u64 size) @@ -890,22 +890,22 @@ s32 cellFsAllocateFileAreaWithoutZeroFill(vm::cptr path, u64 size) s32 cellFsChangeFileSizeByFdWithoutAllocation() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFsSetDiscReadRetrySetting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFsRegisterConversionCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellFsUnregisterL10nCallbacks() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellGame.cpp b/rpcs3/Emu/Cell/Modules/cellGame.cpp index d2bd32dad0..d6877986e9 100644 --- a/rpcs3/Emu/Cell/Modules/cellGame.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGame.cpp @@ -118,38 +118,38 @@ s32 cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr dirName, u32 e s32 cellHddGameCheck2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellHddGameGetSizeKB() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellHddGameSetSystemVer() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellHddGameExitBroken() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameDataGetSizeKB() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameDataSetSystemVer() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameDataExitBroken() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } @@ -311,7 +311,7 @@ ppu_error_code cellGameContentPermit(vm::ptr contentIn } else { - throw fmt::exception("cellGameContentPermit(): failed to rename to %s", dir); + fmt::throw_exception("cellGameContentPermit(): failed to rename to %s", dir); } // Create PARAM.SFO diff --git a/rpcs3/Emu/Cell/Modules/cellGameExec.cpp b/rpcs3/Emu/Cell/Modules/cellGameExec.cpp index 411f51043a..62cbc5efb9 100644 --- a/rpcs3/Emu/Cell/Modules/cellGameExec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGameExec.cpp @@ -7,7 +7,7 @@ logs::channel cellGameExec("cellGameExec", logs::level::notice); s32 cellGameSetExitParam() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameGetHomeDataExportPath(vm::ptr exportPath) @@ -21,17 +21,17 @@ s32 cellGameGetHomeDataExportPath(vm::ptr exportPath) s32 cellGameGetHomePath() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameGetHomeDataImportPath() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameGetHomeLaunchOptionPath() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameGetBootGameInfo(vm::ptr type, vm::ptr dirName, vm::ptr execData) diff --git a/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp b/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp index 3e8112aa95..155467f30a 100644 --- a/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp @@ -617,7 +617,7 @@ void cellGcmSetUserHandler(vm::ptr handler) s32 cellGcmSetUserCommand() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void cellGcmSetVBlankHandler(vm::ptr handler) @@ -638,7 +638,7 @@ s32 cellGcmSetWaitFlip(vm::ptr ctxt) s32 cellGcmSetWaitFlipUnsafe() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart, u32 zFormat, u32 aaFormat, u32 zCullDir, u32 zCullFormat, u32 sFunc, u32 sRef, u32 sMask) @@ -725,7 +725,7 @@ s32 cellGcmGetCurrentDisplayBufferId(vm::ptr id) if ((*id = fxm::get()->gcm_current_buffer) > UINT8_MAX) { - throw EXCEPTION("Unexpected"); + fmt::throw_exception("Unexpected" HERE); } return CELL_OK; @@ -739,7 +739,7 @@ s32 cellGcmSetInvalidateTile() s32 cellGcmTerminate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGcmDumpGraphicsError() @@ -776,7 +776,7 @@ u64 cellGcmGetVBlankCount() s32 cellGcmSysGetLastVBlankTime() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGcmInitSystemMode(u64 mode) @@ -1136,7 +1136,7 @@ void cellGcmSetDefaultCommandBuffer() s32 cellGcmSetDefaultCommandBufferAndSegmentWordSize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } //------------------------------------------------------------------------ @@ -1205,42 +1205,42 @@ s32 cellGcmSetTile(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 co s32 _cellGcmFunc2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _cellGcmFunc3() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _cellGcmFunc4() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _cellGcmFunc13() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _cellGcmFunc38() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGcmGpadGetStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGcmGpadNotifyCaptureSurface() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGcmGpadCaptureSnapshot() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellGifDec.cpp b/rpcs3/Emu/Cell/Modules/cellGifDec.cpp index c52c816762..d768869076 100644 --- a/rpcs3/Emu/Cell/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGifDec.cpp @@ -75,7 +75,7 @@ s32 cellGifDecOpen(PMainHandle mainHandle, PPSubHandle subHandle, PSrc src, POpe s32 cellGifDecExtOpen() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGifDecReadHeader(PMainHandle mainHandle, PSubHandle subHandle, PInfo info) @@ -127,7 +127,7 @@ s32 cellGifDecReadHeader(PMainHandle mainHandle, PSubHandle subHandle, PInfo inf s32 cellGifDecExtReadHeader() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGifDecSetParameter(PMainHandle mainHandle, PSubHandle subHandle, PInParam inParam, POutParam outParam) @@ -157,7 +157,7 @@ s32 cellGifDecSetParameter(PMainHandle mainHandle, PSubHandle subHandle, PInPara s32 cellGifDecExtSetParameter() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGifDecDecodeData(PMainHandle mainHandle, PSubHandle subHandle, vm::ptr data, PDataCtrlParam dataCtrlParam, PDataOutInfo dataOutInfo) @@ -276,7 +276,7 @@ s32 cellGifDecDecodeData(PMainHandle mainHandle, PSubHandle subHandle, vm::ptr subHandle, vm::ptr s32 cellJpgDecExtReadHeader() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr data, vm::cptr dataCtrlParam, vm::ptr dataOutInfo) @@ -299,7 +299,7 @@ s32 cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr data, vm::cp s32 cellJpgDecExtDecodeData() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellJpgDecSetParameter(u32 mainHandle, u32 subHandle, vm::cptr inParam, vm::ptr outParam) @@ -349,7 +349,7 @@ s32 cellJpgDecSetParameter(u32 mainHandle, u32 subHandle, vm::cptr src, vm::cptr src_len, vm::ptr dst, vm::ptr dst_len) @@ -480,102 +480,102 @@ s32 SJISstoUTF8s(vm::cptr src, vm::cptr src_len, vm::ptr dst, v s32 sjiszen2han() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 ToEucJpLower() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 MSJIStoUTF8() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2stoMSJISs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EUCJPtoUTF8() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 eucjp2sjis() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 ToEucJpHira() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UHCstoUCS2s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 ToEucJpKata() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 HZstoUTF8s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8toMSJIS() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 BIG5toUTF8() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EUCJPstoSJISs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8stoBIG5s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF16stoUCS2s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2stoGB18030s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EUCJPtoSJIS() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EUCJPtoUCS2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2stoGBKs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EUCKRtoUHC() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2toSJIS(u16 ch, vm::ptr dst) @@ -586,137 +586,137 @@ s32 UCS2toSJIS(u16 ch, vm::ptr dst) s32 MSJISstoUTF8s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EUCJPstoUTF8s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2toBIG5() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8stoEUCKRs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UHCstoUTF8s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 GB18030stoUCS2s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 SJIStoUTF8() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 JISstoSJISs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8toUTF16() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8stoMSJISs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EUCKRtoUTF8() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 SjisHan2Zen() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2toUTF16() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2toMSJIS() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sjis2kuten() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2toUHC() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF32toUCS2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 ToSjisUpper() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8toEUCJP() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2stoEUCJPs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF16toUCS2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2stoUTF16s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2stoEUCCNs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 SBCSstoUTF8s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 SJISstoJISs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 SBCStoUTF8() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8toUTF32() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 jstrchk(vm::cptr jstr) @@ -729,77 +729,77 @@ s32 jstrchk(vm::cptr jstr) s32 UHCtoEUCKR() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 kuten2jis() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8toEUCCN() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EUCCNtoUTF8() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EucJpZen2Han() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF32stoUTF16s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 GBKtoUTF8() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 ToEucJpUpper() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2stoJISs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8stoGB18030s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EUCKRstoUHCs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8stoUTF32s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8stoEUCCNs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EUCJPstoUCS2s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UHCtoUCS2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 L10nConvertStr(s32 src_code, vm::cptr src, vm::ptr src_len, s32 dst_code, vm::ptr dst, vm::ptr dst_len) @@ -810,82 +810,82 @@ s32 L10nConvertStr(s32 src_code, vm::cptr src, vm::ptr src_len, s32 d s32 GBKstoUTF8s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8toUHC() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF32toUTF8() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sjis2eucjp() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2toEUCCN() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8stoUHCs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EUCKRtoUCS2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF32toUTF16() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 EUCCNstoUCS2s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 SBCSstoUCS2s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8stoJISs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 ToSjisKata() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 jis2eucjp() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 BIG5toUCS2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2toGBK() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF16toUTF32() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 l10n_convert_str(s32 cd, vm::cptr src, vm::ptr src_len, vm::ptr dst, vm::ptr dst_len) @@ -900,102 +900,102 @@ s32 l10n_convert_str(s32 cd, vm::cptr src, vm::ptr src_len, vm::ptr utf16, vm::ref utf16_len, vm::ptr utf8, vm::ref utf8_len) @@ -1103,12 +1103,12 @@ s32 UTF16stoUTF8s(vm::cptr utf16, vm::ref utf16_len, vm::ptr utf8, s32 JISstoUCS2s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 GB18030toUTF8() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8toSJIS(u8 ch, vm::ptr dst, vm::ptr dst_len) @@ -1119,32 +1119,32 @@ s32 UTF8toSJIS(u8 ch, vm::ptr dst, vm::ptr dst_len) s32 ARIBstoUCS2s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2stoUTF32s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2stoSBCSs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2stoBIG5s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UCS2stoUHCs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 SJIStoEUCJP() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8stoUTF16s(vm::cptr src, vm::cptr src_len, vm::ptr dst, vm::ptr dst_len) @@ -1161,12 +1161,12 @@ s32 SJISstoUCS2s(vm::cptr src, vm::cptr src_len, vm::ptr dst, v s32 BIG5stoUCS2s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 UTF8stoUCS2s() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/Emu/Cell/Modules/cellMic.cpp index 059d508642..5e36df9ff9 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMic.cpp @@ -190,7 +190,7 @@ s32 cellMicGetStatus() s32 cellMicStopEx() { - throw EXCEPTION("Unexpected function"); + fmt::throw_exception("Unexpected function" HERE); } s32 cellMicSysShareClose() diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp index a4bd28430c..16df4adb45 100644 --- a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp @@ -12,7 +12,7 @@ extern logs::channel cellSysutil; s32 cellMsgDialogOpen() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMsgDialogOpen2(u32 type, vm::cptr msgString, vm::ptr callback, vm::ptr userData, vm::ptr extParam) @@ -200,7 +200,7 @@ s32 cellMsgDialogOpenErrorCode(ppu_thread& ppu, u32 errorCode, vm::ptr()) { - throw EXCEPTION("Failed to remove MsgDialog object"); + fmt::throw_exception("Failed to remove MsgDialog object" HERE); } return CELL_OK; diff --git a/rpcs3/Emu/Cell/Modules/cellMusic.cpp b/rpcs3/Emu/Cell/Modules/cellMusic.cpp index f2b61e49bc..14e00c5261 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusic.cpp @@ -16,97 +16,97 @@ struct music2_t s32 cellMusicGetSelectionContext() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicSetSelectionContext2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicSetVolume2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicGetContentsId() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicSetSelectionContext() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicInitialize2SystemWorkload() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicGetPlaybackStatus2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicGetContentsId2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicFinalize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicInitializeSystemWorkload() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicInitialize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicFinalize2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicGetSelectionContext2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicGetVolume() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicGetPlaybackStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicSetPlaybackCommand2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicSetPlaybackCommand() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicSelectContents2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicSelectContents() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicInitialize2(s32 mode, s32 spuPriority, vm::ptr func, vm::ptr userData) @@ -134,12 +134,12 @@ s32 cellMusicInitialize2(s32 mode, s32 spuPriority, vm::ptr s32 cellMusicSetVolume() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellMusicGetVolume2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp b/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp index b1e2a21363..2646942bc2 100644 --- a/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp +++ b/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp @@ -139,48 +139,48 @@ s32 cellNetCtlGetNatInfo(vm::ptr natInfo) s32 cellGameUpdateInit() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameUpdateTerm() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameUpdateCheckStartAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameUpdateCheckFinishAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameUpdateCheckStartWithoutDialogAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameUpdateCheckAbort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameUpdateCheckStartAsyncEx() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameUpdateCheckFinishAsyncEx() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellGameUpdateCheckStartWithoutDialogAsyncEx() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp index 605d59578a..e9f65134f2 100644 --- a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp +++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp @@ -5,148 +5,148 @@ logs::channel cellOskDialog("cellOskDialog", logs::level::notice); s32 cellOskDialogLoadAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogUnloadAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogGetSize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogAbort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogSetDeviceMask() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogSetSeparateWindowOption() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogSetInitialInputDevice() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogSetInitialKeyLayout() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogDisableDimmer() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogSetKeyLayoutOption() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogAddSupportLanguage() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogSetLayoutMode() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogGetInputText() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtInputDeviceUnlock() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtRegisterKeyboardEventHookCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtAddJapaneseOptionDictionary() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtEnableClipboard() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtSendFinishMessage() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtAddOptionDictionary() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtSetInitialScale() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtInputDeviceLock() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtSetBaseColor() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtRegisterConfirmWordFilterCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtUpdateInputText() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtDisableHalfByteKana() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtSetPointerEnable() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtUpdatePointerDisplayPos() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtEnableHalfByteKana() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellOskDialogExtRegisterForceFinishCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellPad.cpp b/rpcs3/Emu/Cell/Modules/cellPad.cpp index bed38f18de..0dc2b5db1f 100644 --- a/rpcs3/Emu/Cell/Modules/cellPad.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPad.cpp @@ -108,7 +108,7 @@ s32 cellPadPeriphGetInfo(vm::ptr info) s32 cellPadPeriphGetData() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPadGetData(u32 port_no, vm::ptr data) @@ -294,7 +294,7 @@ s32 cellPadGetData(u32 port_no, vm::ptr data) s32 cellPadGetRawData(u32 port_no, vm::ptr data) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPadGetDataExtra(u32 port_no, vm::ptr device_type, vm::ptr data) diff --git a/rpcs3/Emu/Cell/Modules/cellPngDec.cpp b/rpcs3/Emu/Cell/Modules/cellPngDec.cpp index a15af64369..43982a9571 100644 --- a/rpcs3/Emu/Cell/Modules/cellPngDec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPngDec.cpp @@ -249,7 +249,7 @@ s32 pngDecCreate(ppu_thread& ppu, PPHandle png_handle, PThreadInParam thread_in_ // Check if partial image decoding is used if (extra_thread_out_param) { - throw EXCEPTION("Partial image decoding is not supported."); + fmt::throw_exception("Partial image decoding is not supported." HERE); } // Allocate memory for the decoder handle @@ -294,7 +294,7 @@ s32 pngDecOpen(ppu_thread& ppu, PHandle handle, PPStream png_stream, PSrc source // Check if partial image decoding is used if (control_stream || open_param) { - throw EXCEPTION("Partial image decoding is not supported."); + fmt::throw_exception("Partial image decoding is not supported." HERE); } // Allocate memory for the stream structure @@ -325,7 +325,7 @@ s32 pngDecOpen(ppu_thread& ppu, PHandle handle, PPStream png_stream, PSrc source // Check for if the buffer structure allocation failed if (!buffer) { - throw EXCEPTION("Memory allocation for the PNG buffer structure failed."); + fmt::throw_exception("Memory allocation for the PNG buffer structure failed." HERE); } // We might not be reading from a file stream @@ -340,7 +340,7 @@ s32 pngDecOpen(ppu_thread& ppu, PHandle handle, PPStream png_stream, PSrc source // Need to test it somewhere if (stream->source.fileOffset != 0) { - throw EXCEPTION("Non-0 file offset not supported."); + fmt::throw_exception("Non-0 file offset not supported." HERE); } // Depending on the source type, get the first 8 bytes @@ -398,13 +398,13 @@ s32 pngDecOpen(ppu_thread& ppu, PHandle handle, PPStream png_stream, PSrc source // Check if the creation of the structure failed if (!stream->info_ptr) { - throw EXCEPTION("Creation of png_infop failed."); + fmt::throw_exception("Creation of png_infop failed." HERE); } // Set a point to return to when an error occurs in libpng if (setjmp(png_jmpbuf(stream->png_ptr))) { - throw EXCEPTION("Fatal error in libpng."); + fmt::throw_exception("Fatal error in libpng." HERE); } // We must indicate, that we allocated more memory @@ -492,12 +492,12 @@ s32 pngDecSetParameter(PStream stream, PInParam in_param, POutParam out_param, P // Partial image decoding is not supported. Need to find games to test with. if (extra_in_param || extra_out_param) { - throw EXCEPTION("Partial image decoding is not supported"); + fmt::throw_exception("Partial image decoding is not supported" HERE); } if (in_param->outputPackFlag == CELL_PNGDEC_1BYTE_PER_NPIXEL) { - throw EXCEPTION("Packing not supported! (%d)", in_param->outputPackFlag); + fmt::throw_exception("Packing not supported! (%d)" HERE, in_param->outputPackFlag); } // We already grab the basic info, when opening the stream, so we simply need to pass most of the values @@ -559,7 +559,7 @@ s32 pngDecodeData(ppu_thread& ppu, PHandle handle, PStream stream, vm::ptr d { if (cb_control_disp || disp_param) { - throw EXCEPTION("Partial image decoding is not supported"); + fmt::throw_exception("Partial image decoding is not supported" HERE); } // Indicate, that the PNG decoding is stopped/failed. This is incase, we return an error code in the middle of decoding @@ -568,12 +568,12 @@ s32 pngDecodeData(ppu_thread& ppu, PHandle handle, PStream stream, vm::ptr d // Possibilities for decoding in different sizes aren't tested, so if anyone finds any of these cases, we'll know about it. if (stream->info.imageWidth != stream->out_param.outputWidth) { - throw EXCEPTION("Image width doesn't match output width! (%d/%d)", stream->out_param.outputWidth, stream->info.imageWidth); + fmt::throw_exception("Image width doesn't match output width! (%d/%d)" HERE, stream->out_param.outputWidth, stream->info.imageWidth); } if (stream->info.imageHeight != stream->out_param.outputHeight) { - throw EXCEPTION("Image width doesn't match output height! (%d/%d)", stream->out_param.outputHeight, stream->info.imageHeight); + fmt::throw_exception("Image width doesn't match output height! (%d/%d)" HERE, stream->out_param.outputHeight, stream->info.imageHeight); } // Get the amount of output bytes per line @@ -589,7 +589,7 @@ s32 pngDecodeData(ppu_thread& ppu, PHandle handle, PStream stream, vm::ptr d // Check if the packing is really 1 byte per 1 pixel if (stream->packing != CELL_PNGDEC_1BYTE_PER_1PIXEL) { - throw EXCEPTION("Unexpected packing value! (%d)", stream->packing); + fmt::throw_exception("Unexpected packing value! (%d)" HERE, stream->packing); } // Scale 16 bit depth down to 8 bit depth. PS3 uses png_set_strip_16, since png_set_scale_16 wasn't available back then. @@ -685,7 +685,7 @@ s32 pngDecodeData(ppu_thread& ppu, PHandle handle, PStream stream, vm::ptr d break; } - default: throw EXCEPTION("Unsupported color space (%d)", stream->out_param.outputColorSpace); + default: fmt::throw_exception("Unsupported color space (%d)" HERE, stream->out_param.outputColorSpace); } // Get the number of iTXt, tEXt and zTXt chunks @@ -777,87 +777,87 @@ s32 cellPngDecExtDecodeData(ppu_thread& ppu, PHandle handle, PStream stream, vm: s32 cellPngDecGetUnknownChunks(PHandle handle, PStream stream, vm::pptr unknownChunk, vm::ptr unknownChunkNumber) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetpCAL(PHandle handle, PStream stream, vm::ptr pcal) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetcHRM(PHandle handle, PStream stream, vm::ptr chrm) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetsCAL(PHandle handle, PStream stream, vm::ptr scal) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetpHYs(PHandle handle, PStream stream, vm::ptr phys) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetoFFs(PHandle handle, PStream stream, vm::ptr offs) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetsPLT(PHandle handle, PStream stream, vm::ptr splt) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetbKGD(PHandle handle, PStream stream, vm::ptr bkgd) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGettIME(PHandle handle, PStream stream, vm::ptr time) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGethIST(PHandle handle, PStream stream, vm::ptr hist) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGettRNS(PHandle handle, PStream stream, vm::ptr trns) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetsBIT(PHandle handle, PStream stream, vm::ptr sbit) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetiCCP(PHandle handle, PStream stream, vm::ptr iccp) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetsRGB(PHandle handle, PStream stream, vm::ptr srgb) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetgAMA(PHandle handle, PStream stream, vm::ptr gama) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetPLTE(PHandle handle, PStream stream, vm::ptr plte) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellPngDecGetTextChunk(PHandle handle, PStream stream, vm::ptr textInfoNum, vm::pptr textInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } DECLARE(ppu_module_manager::cellPngDec)("cellPngDec", []() diff --git a/rpcs3/Emu/Cell/Modules/cellPngDec.h b/rpcs3/Emu/Cell/Modules/cellPngDec.h index d542aacf20..4cd24a2904 100644 --- a/rpcs3/Emu/Cell/Modules/cellPngDec.h +++ b/rpcs3/Emu/Cell/Modules/cellPngDec.h @@ -317,6 +317,6 @@ static s32 getPngDecColourType(u8 type) case PNG_COLOR_TYPE_PALETTE: return CELL_PNGDEC_PALETTE; case PNG_COLOR_TYPE_GRAY: return CELL_PNGDEC_GRAYSCALE; case PNG_COLOR_TYPE_GRAY_ALPHA: return CELL_PNGDEC_GRAYSCALE_ALPHA; - default: throw EXCEPTION("Unknown colour type: %d", type); + default: fmt::throw_exception("Unknown colour type: %d" HERE, type); } } diff --git a/rpcs3/Emu/Cell/Modules/cellRec.cpp b/rpcs3/Emu/Cell/Modules/cellRec.cpp index 5d61b2d8c8..443c8b7dab 100644 --- a/rpcs3/Emu/Cell/Modules/cellRec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRec.cpp @@ -5,37 +5,37 @@ logs::channel cellRec("cellRec", logs::level::notice); s32 cellRecOpen() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRecClose() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRecGetInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRecStop() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRecStart() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRecQueryMemSize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRecSetInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp b/rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp index fdd9c072cb..a11e9d74a7 100644 --- a/rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp @@ -5,42 +5,42 @@ logs::channel cellRemotePlay("cellRemotePlay", logs::level::notice); s32 cellRemotePlayGetStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRemotePlaySetComparativeVolume() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRemotePlayGetPeerInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRemotePlayGetSharedMemory() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRemotePlayEncryptAllData() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRemotePlayStopPeerVideoOut() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRemotePlayGetComparativeVolume() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellRemotePlayBreak() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellRudp.cpp b/rpcs3/Emu/Cell/Modules/cellRudp.cpp index d3c3195db3..c5dc9b20e1 100644 --- a/rpcs3/Emu/Cell/Modules/cellRudp.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRudp.cpp @@ -45,7 +45,7 @@ s32 cellRudpInit(vm::ptr allocator) { if (!vm::dealloc(ptr.addr(), vm::main)) { - throw EXCEPTION("Memory deallocation failed (ptr=0x%x)", ptr); + fmt::throw_exception("Memory deallocation failed (ptr=0x%x)" HERE, ptr); } }; } diff --git a/rpcs3/Emu/Cell/Modules/cellSail.cpp b/rpcs3/Emu/Cell/Modules/cellSail.cpp index 63acd78d40..c5cd84ceff 100644 --- a/rpcs3/Emu/Cell/Modules/cellSail.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSail.cpp @@ -464,22 +464,22 @@ s32 cellSailSourceNotifyMediaStateChanged() s32 cellSailSourceNotifyOpenCompleted() { - throw EXCEPTION("Unexpected function"); + fmt::throw_exception("Unexpected function" HERE); } s32 cellSailSourceNotifyStartCompleted() { - throw EXCEPTION("Unexpected function"); + fmt::throw_exception("Unexpected function" HERE); } s32 cellSailSourceNotifyStopCompleted() { - throw EXCEPTION("Unexpected function"); + fmt::throw_exception("Unexpected function" HERE); } s32 cellSailSourceNotifyReadCompleted() { - throw EXCEPTION("Unexpected function"); + fmt::throw_exception("Unexpected function" HERE); } s32 cellSailSourceSetDiagHandler() @@ -490,7 +490,7 @@ s32 cellSailSourceSetDiagHandler() s32 cellSailSourceNotifyCloseCompleted() { - throw EXCEPTION("Unexpected function"); + fmt::throw_exception("Unexpected function" HERE); } s32 cellSailMp4MovieGetBrand() diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp index bef14daea6..dcc6c92a60 100644 --- a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp @@ -325,7 +325,7 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version, } else { - throw EXCEPTION("Invalid savedata selected"); + fmt::throw_exception("Invalid savedata selected" HERE); } } } diff --git a/rpcs3/Emu/Cell/Modules/cellSpudll.cpp b/rpcs3/Emu/Cell/Modules/cellSpudll.cpp index 9d7b095223..cc264e93a0 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpudll.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpudll.cpp @@ -5,12 +5,12 @@ logs::channel cellSpudll("cellSpudll", logs::level::notice); s32 cellSpudllGetImageSize(vm::ptr psize, vm::cptr so_elf, vm::cptr config) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSpudllHandleConfigSetDefaultValues(vm::ptr config) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } DECLARE(ppu_module_manager::cellSpudll)("cellSpudll", []() diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp index 22a9d43540..5a1ce6c9d9 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp @@ -28,7 +28,7 @@ struct cell_error_t } }; -#define CHECK_SUCCESS(expr) if (cell_error_t error{expr}) throw fmt::exception("Failure: %s -> 0x%x" HERE, #expr, error.value) +#define CHECK_SUCCESS(expr) if (cell_error_t error{expr}) fmt::throw_exception("Failure: %s -> 0x%x" HERE, #expr, error.value) //---------------------------------------------------------------------------- // Function prototypes @@ -757,7 +757,7 @@ void _spurs::event_helper_entry(ppu_thread& ppu, vm::ptr spurs) } else { - throw fmt::exception("data0=0x%x" HERE, data0); + fmt::throw_exception("data0=0x%x" HERE, data0); } } } diff --git a/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp b/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp index 8f177b0d01..817d333298 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp @@ -1388,7 +1388,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 EXCEPTION("Broken (TODO)"); + fmt::throw_exception("Broken (TODO)" HERE); //if (spu.m_is_branch == false) { // spursTasksetResumeTask(spu); //} diff --git a/rpcs3/Emu/Cell/Modules/cellStorage.cpp b/rpcs3/Emu/Cell/Modules/cellStorage.cpp index cc498d6471..f210b2a4c9 100644 --- a/rpcs3/Emu/Cell/Modules/cellStorage.cpp +++ b/rpcs3/Emu/Cell/Modules/cellStorage.cpp @@ -5,17 +5,17 @@ extern logs::channel cellSysutil; s32 cellStorageDataImportMove() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellStorageDataImport() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellStorageDataExport() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellSync.cpp b/rpcs3/Emu/Cell/Modules/cellSync.cpp index c6397e9545..defe374f1f 100644 --- a/rpcs3/Emu/Cell/Modules/cellSync.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSync.cpp @@ -918,7 +918,7 @@ ppu_error_code _cellSyncLFQueueGetPushPointer2(ppu_thread& ppu, vm::ptr queue, s32 pointer, vm::ptr fpSendSignal) @@ -1058,7 +1058,7 @@ ppu_error_code _cellSyncLFQueueCompletePushPointer2(ppu_thread& ppu, vm::ptr queue, vm::cptr buffer, u32 isBlocking) @@ -1217,7 +1217,7 @@ ppu_error_code _cellSyncLFQueueGetPopPointer2(ppu_thread& ppu, vm::ptr queue, s32 pointer, vm::ptr fpSendSignal, u32 noQueueFull) @@ -1357,7 +1357,7 @@ ppu_error_code _cellSyncLFQueueCompletePopPointer2(ppu_thread& ppu, vm::ptr queue, vm::ptr buffer, u32 isBlocking) @@ -1586,14 +1586,14 @@ ppu_error_code _cellSyncLFQueueAttachLv2EventQueue(vm::ptr spus, u32 num, v { cellSync.todo("_cellSyncLFQueueAttachLv2EventQueue(spus=*0x%x, num=%d, queue=*0x%x)", spus, num, queue); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } ppu_error_code _cellSyncLFQueueDetachLv2EventQueue(vm::ptr spus, u32 num, vm::ptr queue) { cellSync.todo("_cellSyncLFQueueDetachLv2EventQueue(spus=*0x%x, num=%d, queue=*0x%x)", spus, num, queue); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } DECLARE(ppu_module_manager::cellSync)("cellSync", []() diff --git a/rpcs3/Emu/Cell/Modules/cellSync.h b/rpcs3/Emu/Cell/Modules/cellSync.h index bae86aecc4..45b778fc8d 100644 --- a/rpcs3/Emu/Cell/Modules/cellSync.h +++ b/rpcs3/Emu/Cell/Modules/cellSync.h @@ -293,7 +293,7 @@ struct alignas(32) CellSyncQueue if (data.next > depth || data.count > depth) { - throw EXCEPTION("Invalid queue pointers"); + fmt::throw_exception("Invalid queue pointers" HERE); } return depth; diff --git a/rpcs3/Emu/Cell/Modules/cellSysconf.cpp b/rpcs3/Emu/Cell/Modules/cellSysconf.cpp index c43d66f9eb..75d6c98a1b 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysconf.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysconf.cpp @@ -5,17 +5,17 @@ logs::channel cellSysconf("cellSysconf", logs::level::notice); s32 cellSysconfAbort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysconfOpen() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysconfBtGetDeviceList() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void cellSysutil_Sysconf_init() diff --git a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp b/rpcs3/Emu/Cell/Modules/cellSysutil.cpp index 4873376ad6..4a61922c90 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysutil.cpp @@ -380,37 +380,37 @@ s32 cellSysutilSetBgmPlaybackExtraParam() s32 cellSysutilRegisterCallbackDispatcher() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilPacketWrite() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilGameDataAssignVmc() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilGameDataExit() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilGameExit_I() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilGamePowerOff_I() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilGameReboot_I() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } extern void cellSysutil_SaveData_init(); diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp b/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp index fee4207eee..607ca0daee 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp @@ -5,213 +5,213 @@ logs::channel cellSysutilAvc("cellSysutilAvc", logs::level::notice); s32 cellSysutilAvcByeRequest() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcCancelByeRequest() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcCancelJoinRequest() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcEnumPlayers() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcGetAttribute() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcGetLayoutMode() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcGetShowStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcGetSpeakerVolumeLevel() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcGetVideoMuting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcGetVoiceMuting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcHidePanel() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcJoinRequest() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcLoadAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcSetAttribute() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcSetLayoutMode() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcSetSpeakerVolumeLevel() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcSetVideoMuting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcSetVoiceMuting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcShowPanel() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcUnloadAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtInitOptionParam() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtSetHideNamePlate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtSetShowNamePlate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtHideWindow() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtShowWindow() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtGetWindowAlpha() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtGetWindowSize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtGetWindowRotation() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtGetWindowPosition() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtSetWindowAlpha() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtSetWindowSize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtSetWindowRotation() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtSetWindowPosition() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtLoadAsyncEx() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtHidePanelEx() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtShowPanelEx() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtGetNamePlateShowStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtStopVoiceDetection() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtStartVoiceDetection() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtGetSurfacePointer() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtSetWindowZorder() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvcExtGetWindowShowStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp b/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp index 1acf10e32d..1d52b4f00b 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp @@ -9,122 +9,122 @@ logs::channel cellSysutilAvc2("cellSysutilAvc2", logs::level::notice); s32 cellSysutilAvc2GetPlayerInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2JoinChat() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2StopStreaming() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2ChangeVideoResolution() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2ShowScreen() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2GetVideoMuting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2GetWindowAttribute() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2StopStreaming2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2SetVoiceMuting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2StartVoiceDetection() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2UnloadAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2StopVoiceDetection() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2GetAttribute() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2LoadAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2SetSpeakerVolumeLevel() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2SetWindowString() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2EstimateMemoryContainerSize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2SetVideoMuting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2SetPlayerVoiceMuting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2SetStreamingTarget() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2Unload() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2DestroyWindow() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2SetWindowPosition() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2GetSpeakerVolumeLevel() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2IsCameraAttached(vm::ptr status) @@ -137,32 +137,32 @@ s32 cellSysutilAvc2IsCameraAttached(vm::ptr status) s32 cellSysutilAvc2MicRead() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2GetPlayerVoiceMuting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2JoinChatRequest() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2StartStreaming() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2SetWindowAttribute() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2GetWindowShowStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2InitParam(u16 version, vm::ptr option) @@ -214,112 +214,112 @@ s32 cellSysutilAvc2InitParam(u16 version, vm::ptr opti s32 cellSysutilAvc2GetWindowSize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2SetStreamPriority() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2LeaveChatRequest() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2IsMicAttached() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2CreateWindow() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2GetSpeakerMuting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2ShowWindow() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2SetWindowSize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2EnumPlayers() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2GetWindowString() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2LeaveChat() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2SetSpeakerMuting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2Load() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2SetAttribute() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2UnloadAsync2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2StartStreaming2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2HideScreen() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2HideWindow() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2GetVoiceMuting() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2GetScreenShowStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2Unload2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSysutilAvc2GetWindowPosition() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellVdec.cpp b/rpcs3/Emu/Cell/Modules/cellVdec.cpp index d15054eb81..4d297e0f19 100644 --- a/rpcs3/Emu/Cell/Modules/cellVdec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVdec.cpp @@ -107,20 +107,20 @@ struct vdec_thread : ppu_thread } default: { - throw fmt::exception("Unknown video decoder type (0x%x)" HERE, type); + fmt::throw_exception("Unknown video decoder type (0x%x)" HERE, type); } } if (!codec) { - throw fmt::exception("avcodec_find_decoder() failed (type=0x%x)" HERE, type); + fmt::throw_exception("avcodec_find_decoder() failed (type=0x%x)" HERE, type); } ctx = avcodec_alloc_context3(codec); if (!ctx) { - throw fmt::exception("avcodec_alloc_context3() failed (type=0x%x)" HERE, type); + fmt::throw_exception("avcodec_alloc_context3() failed (type=0x%x)" HERE, type); } AVDictionary* opts{}; @@ -132,7 +132,7 @@ struct vdec_thread : ppu_thread if (err || opts) { avcodec_free_context(&ctx); - throw fmt::exception("avcodec_open2() failed (err=0x%x, opts=%d)" HERE, err, opts ? 1 : 0); + fmt::throw_exception("avcodec_open2() failed (err=0x%x, opts=%d)" HERE, err, opts ? 1 : 0); } } @@ -214,7 +214,7 @@ struct vdec_thread : ppu_thread if (!frame.avf) { - throw fmt::exception("av_frame_alloc() failed" HERE); + fmt::throw_exception("av_frame_alloc() failed" HERE); } int got_picture = 0; @@ -223,7 +223,7 @@ struct vdec_thread : ppu_thread if (decode < 0) { - throw fmt::exception("AU decoding error(0x%x)" HERE, decode); + fmt::throw_exception("AU decoding error(0x%x)" HERE, decode); } if (got_picture == 0) @@ -240,12 +240,12 @@ struct vdec_thread : ppu_thread { if (frame->interlaced_frame) { - throw fmt::exception("Interlaced frames not supported (0x%x)", frame->interlaced_frame); + fmt::throw_exception("Interlaced frames not supported (0x%x)", frame->interlaced_frame); } if (frame->repeat_pict) { - throw fmt::exception("Repeated frames not supported (0x%x)", frame->repeat_pict); + fmt::throw_exception("Repeated frames not supported (0x%x)", frame->repeat_pict); } if (frc_set) @@ -264,7 +264,7 @@ struct vdec_thread : ppu_thread case CELL_VDEC_FRC_60: amend = 90000 / 60; break; default: { - throw EXCEPTION("Invalid frame rate code set (0x%x)", frc_set); + fmt::throw_exception("Invalid frame rate code set (0x%x)" HERE, frc_set); } } @@ -289,7 +289,7 @@ struct vdec_thread : ppu_thread case 60: case 0x100000000ull + 120: frame.frc = CELL_VDEC_FRC_60; break; default: { - throw EXCEPTION("Unsupported time_base.den (%d/1, tpf=%d)", ctx->time_base.den, ctx->ticks_per_frame); + fmt::throw_exception("Unsupported time_base.den (%d/1, tpf=%d)" HERE, ctx->time_base.den, ctx->ticks_per_frame); } } } @@ -309,12 +309,12 @@ struct vdec_thread : ppu_thread } else { - throw EXCEPTION("Unsupported time_base.den (%d/1001, tpf=%d)", ctx->time_base.den, ctx->ticks_per_frame); + fmt::throw_exception("Unsupported time_base.den (%d/1001, tpf=%d)" HERE, ctx->time_base.den, ctx->ticks_per_frame); } } else { - throw EXCEPTION("Unsupported time_base.num (%d)", ctx->time_base.num); + fmt::throw_exception("Unsupported time_base.num (%d)" HERE, ctx->time_base.num); } } @@ -355,7 +355,7 @@ struct vdec_thread : ppu_thread default: { - throw fmt::exception("Unknown command (0x%x)" HERE, (u32)vcmd); + fmt::throw_exception("Unknown command (0x%x)" HERE, (u32)vcmd); } } } @@ -487,7 +487,7 @@ s32 cellVdecDecodeAu(u32 handle, CellVdecDecodeMode mode, vm::cptr format, vm::ptrcolorMatrixType != CELL_VDEC_COLOR_MATRIX_TYPE_BT709) { - throw fmt::exception("Unknown colorMatrixType (%d)" HERE, format->colorMatrixType); + fmt::throw_exception("Unknown colorMatrixType (%d)" HERE, format->colorMatrixType); } if (alpha_plane) @@ -572,7 +572,7 @@ s32 cellVdecGetPicture(u32 handle, vm::cptr format, vm::ptrformat); + fmt::throw_exception("Unknown format (%d)" HERE, frame->format); } } @@ -614,7 +614,7 @@ s32 cellVdecGetPictureExt(u32 handle, vm::cptr format2, vm:: if (arg4 || format2->unk0 || format2->unk1) { - throw EXCEPTION("Unknown arguments (arg4=*0x%x, unk0=0x%x, unk1=0x%x)", arg4, format2->unk0, format2->unk1); + fmt::throw_exception("Unknown arguments (arg4=*0x%x, unk0=0x%x, unk1=0x%x)" HERE, arg4, format2->unk0, format2->unk1); } vm::var format; diff --git a/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp b/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp index 90034a357f..b817edef33 100644 --- a/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp @@ -5,32 +5,32 @@ logs::channel cellVideoExport("cellVideoExport", logs::level::notice); s32 cellVideoExportProgress() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoExportInitialize2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoExportInitialize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoExportFromFileWithCopy() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoExportFromFile() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoExportFinalize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp b/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp index 27aa431d0b..c9ada71a10 100644 --- a/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp @@ -205,22 +205,22 @@ ppu_error_code cellVideoOutGetResolutionAvailability(u32 videoOut, u32 resolutio s32 cellVideoOutGetConvertCursorColorInfo(vm::ptr rgbOutputRange) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoOutDebugSetMonitorType(u32 videoOut, u32 monitorType) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoOutRegisterCallback(u32 slot, vm::ptr function, vm::ptr userData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellVideoOutUnregisterCallback(u32 slot) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp b/rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp index 5ab0c7ba5c..73a4c89e30 100644 --- a/rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp @@ -5,7 +5,7 @@ logs::channel cellVideoUpload("cellVideoUpload", logs::level::notice); s32 cellVideoUploadInitialize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } DECLARE(ppu_module_manager::cellVideoUpload)("cellVideoUpload", []() diff --git a/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp b/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp index 999056a52d..940303ca9e 100644 --- a/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp +++ b/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp @@ -7,177 +7,177 @@ extern logs::channel cellSysutil; s32 cellWebBrowserActivate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfig() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfig2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigGetHeapSize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigGetHeapSize2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetCustomExit() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetDisableTabs() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetErrorHook2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetFullScreen2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetFullVersion2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetFunction() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetFunction2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetHeapSize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetHeapSize2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetMimeSet() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetNotifyHook2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetRequestHook2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetStatusHook2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetTabCount2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetUnknownMIMETypeHook2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetVersion() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetViewCondition2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigSetViewRect2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserConfigWithVer() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserCreate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserCreate2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserCreateRender2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserCreateRenderWithRect2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserCreateWithConfig() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserCreateWithConfigFull() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserCreateWithRect2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserDeactivate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserDestroy() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserDestroy2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserEstimate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserEstimate2(vm::cptr config, vm::ptr memSize) @@ -192,57 +192,57 @@ s32 cellWebBrowserEstimate2(vm::cptr config, vm::ptr s32 cellWebBrowserGetUsrdataOnGameExit() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserInitialize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserNavigate2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserSetLocalContentsAdditionalTitleID() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserSetSystemCallbackUsrdata() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserShutdown() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserUpdatePointerDisplayPos2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebBrowserWakeupWithGameExit() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebComponentCreate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebComponentCreateAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellWebComponentDestroy() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/libmixer.cpp b/rpcs3/Emu/Cell/Modules/libmixer.cpp index b9db1c6443..d27c082f61 100644 --- a/rpcs3/Emu/Cell/Modules/libmixer.cpp +++ b/rpcs3/Emu/Cell/Modules/libmixer.cpp @@ -516,7 +516,7 @@ s32 cellSurMixerSetNotifyCallback(vm::ptr fu if (g_surmx.cb) { - throw EXCEPTION("Callback already set"); + fmt::throw_exception("Callback already set" HERE); } g_surmx.cb = func; @@ -531,7 +531,7 @@ s32 cellSurMixerRemoveNotifyCallback(vm::ptr if (g_surmx.cb != func) { - throw EXCEPTION("Callback not set"); + fmt::throw_exception("Callback not set" HERE); } g_surmx.cb = vm::null; @@ -648,19 +648,19 @@ void cellSurMixerBeep(u32 arg) f32 cellSurMixerUtilGetLevelFromDB(f32 dB) { libmixer.todo("cellSurMixerUtilGetLevelFromDB(dB=%f)", dB); - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } f32 cellSurMixerUtilGetLevelFromDBIndex(s32 index) { libmixer.todo("cellSurMixerUtilGetLevelFromDBIndex(index=%d)", index); - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } f32 cellSurMixerUtilNoteToRatio(u8 refNote, u8 note) { libmixer.todo("cellSurMixerUtilNoteToRatio(refNote=%d, note=%d)", refNote, note); - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } DECLARE(ppu_module_manager::libmixer)("libmixer", []() diff --git a/rpcs3/Emu/Cell/Modules/libsnd3.cpp b/rpcs3/Emu/Cell/Modules/libsnd3.cpp index f76ffdc839..fa95e7ac03 100644 --- a/rpcs3/Emu/Cell/Modules/libsnd3.cpp +++ b/rpcs3/Emu/Cell/Modules/libsnd3.cpp @@ -19,12 +19,12 @@ s32 cellSnd3Exit() u16 cellSnd3Note2Pitch(u16 center_note, u16 center_fine, u16 note, s16 fine) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u16 cellSnd3Pitch2Note(u16 center_note, u16 center_fine, u16 pitch) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3SetOutputMode(u32 mode) @@ -59,22 +59,22 @@ s32 cellSnd3UnbindSoundData(u32 hd3ID) s32 cellSnd3NoteOnByTone(u32 hd3ID, u32 toneIndex, u32 note, u32 keyOnID, vm::ptr keyOnParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3KeyOnByTone(u32 hd3ID, u32 toneIndex, u32 pitch, u32 keyOnID, vm::ptr keyOnParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3VoiceNoteOnByTone(u32 hd3ID, u32 voiceNum, u32 toneIndex, u32 note, u32 keyOnID, vm::ptr keyOnParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3VoiceKeyOnByTone(u32 hd3ID, u32 voiceNum, u32 toneIndex, u32 pitch, u32 keyOnID, vm::ptr keyOnParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3VoiceSetReserveMode(u32 voiceNum, u32 reserveMode) @@ -139,7 +139,7 @@ s32 cellSnd3VoiceGetEnvelope(u32 voiceNum) s32 cellSnd3VoiceGetStatus(u32 voiceNum) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 cellSnd3KeyOffByID(u32 keyOnID) @@ -186,12 +186,12 @@ s32 cellSnd3SetEffectType(u16 effectType, s16 returnVol, u16 delay, u16 feedback s32 cellSnd3SMFBind(vm::ptr smfCtx, vm::ptr smf, u32 hd3ID) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3SMFUnbind(u32 smfID) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3SMFPlay(u32 smfID, u32 playVelocity, u32 playPan, u32 playCount) @@ -232,7 +232,7 @@ s32 cellSnd3SMFAddTempo(u32 smfID, s32 addTempo) s32 cellSnd3SMFGetTempo(u32 smfID) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3SMFSetPlayVelocity(u32 smfID, u32 playVelocity) @@ -243,7 +243,7 @@ s32 cellSnd3SMFSetPlayVelocity(u32 smfID, u32 playVelocity) s32 cellSnd3SMFGetPlayVelocity(u32 smfID) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3SMFSetPlayPanpot(u32 smfID, u32 playPanpot) @@ -260,17 +260,17 @@ s32 cellSnd3SMFSetPlayPanpotEx(u32 smfID, u32 playPanpotEx) s32 cellSnd3SMFGetPlayPanpot(u32 smfID) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3SMFGetPlayPanpotEx(u32 smfID) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3SMFGetPlayStatus(u32 smfID) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3SMFSetPlayChannel(u32 smfID, u32 playChannelBit) @@ -281,7 +281,7 @@ s32 cellSnd3SMFSetPlayChannel(u32 smfID, u32 playChannelBit) s32 cellSnd3SMFGetPlayChannel(u32 smfID, vm::ptr playChannelBit) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSnd3SMFGetKeyOnID(u32 smfID, u32 midiChannel, vm::ptr keyOnID) diff --git a/rpcs3/Emu/Cell/Modules/libsynth2.cpp b/rpcs3/Emu/Cell/Modules/libsynth2.cpp index 98d123487e..39ee322d85 100644 --- a/rpcs3/Emu/Cell/Modules/libsynth2.cpp +++ b/rpcs3/Emu/Cell/Modules/libsynth2.cpp @@ -31,7 +31,7 @@ void cellSoundSynth2SetParam(u16 reg, u16 value) u16 cellSoundSynth2GetParam(u16 reg) { libsynth2.todo("cellSoundSynth2GetParam(register=0x%x)", reg); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void cellSoundSynth2SetSwitch(u16 reg, u32 value) @@ -42,7 +42,7 @@ void cellSoundSynth2SetSwitch(u16 reg, u32 value) u32 cellSoundSynth2GetSwitch(u16 reg) { libsynth2.todo("cellSoundSynth2GetSwitch(register=0x%x)", reg); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSoundSynth2SetAddr(u16 reg, u32 value) @@ -54,7 +54,7 @@ s32 cellSoundSynth2SetAddr(u16 reg, u32 value) u32 cellSoundSynth2GetAddr(u16 reg) { libsynth2.todo("cellSoundSynth2GetAddr(register=0x%x)", reg); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 cellSoundSynth2SetEffectAttr(s16 bus, vm::ptr attr) @@ -95,13 +95,13 @@ s32 cellSoundSynth2VoiceTransStatus(s16 channel, s16 flag) u16 cellSoundSynth2Note2Pitch(u16 center_note, u16 center_fine, u16 note, s16 fine) { libsynth2.todo("cellSoundSynth2Note2Pitch(center_note=0x%x, center_fine=0x%x, note=0x%x, fine=%d)", center_note, center_fine, note, fine); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u16 cellSoundSynth2Pitch2Note(u16 center_note, u16 center_fine, u16 pitch) { libsynth2.todo("cellSoundSynth2Pitch2Note(center_note=0x%x, center_fine=0x%x, pitch=0x%x)", center_note, center_fine, pitch); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp index 0b5cdfd94b..2892df0e21 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp @@ -1478,47 +1478,47 @@ s32 _sceNpSysutilClientFree() s32 _Z33_sce_np_sysutil_send_empty_packetiPN16sysutil_cxmlutil11FixedMemoryEPKcS3_() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _Z27_sce_np_sysutil_send_packetiRN4cxml8DocumentE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _Z36_sce_np_sysutil_recv_packet_fixedmemiPN16sysutil_cxmlutil11FixedMemoryERN4cxml8DocumentERNS2_7ElementE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _Z40_sce_np_sysutil_recv_packet_fixedmem_subiPN16sysutil_cxmlutil11FixedMemoryERN4cxml8DocumentERNS2_7ElementE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _Z27_sce_np_sysutil_recv_packetiRN4cxml8DocumentERNS_7ElementE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _Z29_sce_np_sysutil_cxml_set_npidRN4cxml8DocumentERNS_7ElementEPKcPK7SceNpId() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _Z31_sce_np_sysutil_send_packet_subiRN4cxml8DocumentE() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _Z37sce_np_matching_set_matching2_runningb() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _Z32_sce_np_sysutil_cxml_prepare_docPN16sysutil_cxmlutil11FixedMemoryERN4cxml8DocumentEPKcRNS2_7ElementES6_i() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/sceNp2.cpp b/rpcs3/Emu/Cell/Modules/sceNp2.cpp index 6b0b42caf1..70c3256481 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp2.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp2.cpp @@ -69,317 +69,317 @@ s32 sceNpMatching2Term2() s32 sceNpMatching2DestroyContext() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2LeaveLobby() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2RegisterLobbyMessageCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetWorldInfoList() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2RegisterLobbyEventCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetLobbyMemberDataInternalList() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SearchRoom() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SignalingGetConnectionStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SetUserInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetClanLobbyId() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetLobbyMemberDataInternal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2ContextStart() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2CreateServerContext() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetMemoryInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2LeaveRoom() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SetRoomDataExternal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SignalingGetConnectionInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SendRoomMessage() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2JoinLobby() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetRoomMemberDataExternalList() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2AbortRequest() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetServerInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetEventData() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetRoomSlotInfoLocal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SendLobbyChatMessage() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2AbortContextStart() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetRoomMemberIdListLocal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2JoinRoom() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetRoomMemberDataInternalLocal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetCbQueueInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2KickoutRoomMember() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2ContextStartAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SetSignalingOptParam() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2RegisterContextCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SendRoomChatMessage() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SetRoomDataInternal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetRoomDataInternal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SignalingGetPingInfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetServerIdListLocal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpUtilBuildCdnUrl() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GrantRoomOwner() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2CreateContext() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetSignalingOptParamLocal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2RegisterSignalingCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2ClearEventData() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetUserInfoList() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetRoomMemberDataInternal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SetRoomMemberDataInternal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2JoinProhibitiveRoom() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SignalingSetCtxOpt() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2DeleteServerContext() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SetDefaultRequestOptParam() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2RegisterRoomEventCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetRoomPasswordLocal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetRoomDataExternalList() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2CreateJoinRoom() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SignalingGetCtxOpt() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetLobbyInfoList() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetLobbyMemberIdListLocal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SendLobbyInvitation() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2ContextStop() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SetLobbyMemberDataInternal() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2RegisterRoomMessageCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp index 5b9b9e50d0..38074b00d6 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp @@ -45,17 +45,17 @@ s32 sceNpCommerce2DestroyCtx() s32 sceNpCommerce2EmptyStoreCheckStart() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpCommerce2EmptyStoreCheckAbort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpCommerce2EmptyStoreCheckFinish() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpCommerce2CreateSessionStart() @@ -306,12 +306,12 @@ s32 sceNpCommerce2DestroyReq() s32 sceNpCommerce2DoServiceListStartAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpCommerce2DoServiceListFinishAsync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } DECLARE(ppu_module_manager::sceNpCommerce2)("sceNpCommerce2", []() diff --git a/rpcs3/Emu/Cell/Modules/sceNpSns.cpp b/rpcs3/Emu/Cell/Modules/sceNpSns.cpp index 552b69807a..092539a53c 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpSns.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpSns.cpp @@ -47,22 +47,22 @@ s32 sceNpSnsFbGetAccessToken() s32 sceNpSnsFbStreamPublish() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpSnsFbCheckThrottle() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpSnsFbCheckConfig() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpSnsFbLoadThrottle() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp b/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp index 036555bee3..284c970b90 100644 --- a/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp +++ b/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp @@ -156,12 +156,12 @@ s32 sys_get_random_number(vm::ptr addr, u64 size) s32 console_getc() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 console_putc() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 console_write(vm::ptr data, u32 len) diff --git a/rpcs3/Emu/Cell/Modules/sys_game.cpp b/rpcs3/Emu/Cell/Modules/sys_game.cpp index 974ad7d3ee..87c2047988 100644 --- a/rpcs3/Emu/Cell/Modules/sys_game.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_game.cpp @@ -148,42 +148,42 @@ void sys_game_process_exitspawn2(vm::cptr path, u32 argv_addr, u32 envp_ad s32 sys_game_board_storage_read() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_game_board_storage_write() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_game_get_rtc_status() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_game_get_system_sw_version() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_game_get_temperature() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_game_watchdog_clear() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_game_watchdog_start() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_game_watchdog_stop() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/sys_heap.cpp b/rpcs3/Emu/Cell/Modules/sys_heap.cpp index 7d711f0f22..96287fffc4 100644 --- a/rpcs3/Emu/Cell/Modules/sys_heap.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_heap.cpp @@ -58,22 +58,22 @@ s32 _sys_heap_free(u32 heap, u32 addr) s32 _sys_heap_alloc_heap_memory() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sys_heap_get_mallinfo() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sys_heap_get_total_free_size() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sys_heap_stats() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sysPrxForUser_sys_heap_init() diff --git a/rpcs3/Emu/Cell/Modules/sys_io.cpp b/rpcs3/Emu/Cell/Modules/sys_io.cpp index 7a5dad63b0..3b212433d4 100644 --- a/rpcs3/Emu/Cell/Modules/sys_io.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_io.cpp @@ -10,32 +10,32 @@ extern void cellMouse_init(); s32 sys_config_start() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_config_stop() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_config_add_service_listener() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_config_remove_service_listener() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_config_register_service() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_config_unregister_service() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/Cell/Modules/sys_libc_.cpp b/rpcs3/Emu/Cell/Modules/sys_libc_.cpp index c7ea6fed01..0d3861c56d 100644 --- a/rpcs3/Emu/Cell/Modules/sys_libc_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_libc_.cpp @@ -139,7 +139,7 @@ static std::string ps3_fmt(ppu_thread& context, vm::cptr fmt, u32 g_count) } } - throw EXCEPTION("Unknown formatting: '%s'", start.get_ptr()); + fmt::throw_exception("Unknown formatting: '%s'" HERE, start.get_ptr()); } } @@ -176,7 +176,7 @@ s32 _sys_memcmp(vm::cptr buf1, vm::cptr buf2, u32 size) s32 _sys_memchr() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr _sys_memmove(vm::ptr dst, vm::cptr src, u32 size) @@ -215,7 +215,7 @@ vm::ptr _sys_strcat(vm::ptr dest, vm::cptr source) if (strcat(dest.get_ptr(), source.get_ptr()) != dest.get_ptr()) { - throw EXCEPTION("Unexpected strcat() result"); + fmt::throw_exception("Unexpected strcat() result" HERE); } return dest; @@ -234,7 +234,7 @@ vm::ptr _sys_strncat(vm::ptr dest, vm::cptr source, u32 len) if (strncat(dest.get_ptr(), source.get_ptr(), len) != dest.get_ptr()) { - throw EXCEPTION("Unexpected strncat() result"); + fmt::throw_exception("Unexpected strncat() result" HERE); } return dest; @@ -246,7 +246,7 @@ vm::ptr _sys_strcpy(vm::ptr dest, vm::cptr source) if (strcpy(dest.get_ptr(), source.get_ptr()) != dest.get_ptr()) { - throw EXCEPTION("Unexpected strcpy() result"); + fmt::throw_exception("Unexpected strcpy() result" HERE); } return dest; @@ -263,7 +263,7 @@ vm::ptr _sys_strncpy(vm::ptr dest, vm::cptr source, u32 len) if (strncpy(dest.get_ptr(), source.get_ptr(), len) != dest.get_ptr()) { - throw EXCEPTION("Unexpected strncpy() result"); + fmt::throw_exception("Unexpected strncpy() result" HERE); } return dest; @@ -271,22 +271,22 @@ vm::ptr _sys_strncpy(vm::ptr dest, vm::cptr source, u32 len) s32 _sys_strncasecmp() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sys_strrchr() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sys_tolower() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sys_toupper() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 _sys_malloc(u32 size) @@ -348,27 +348,27 @@ s32 _sys_printf(ppu_thread& ppu, vm::cptr fmt, ppu_va_args_t va_args) s32 _sys_sprintf() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sys_vprintf() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sys_vsnprintf() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sys_vsprintf() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sys_qsort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sysPrxForUser_sys_libc_init() diff --git a/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp b/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp index eaa1c38f26..bf318d83bc 100644 --- a/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp @@ -9,184 +9,184 @@ logs::channel sys_lv2dbg("sys_lv2dbg", logs::level::notice); s32 sys_dbg_read_ppu_thread_context(u64 id, vm::ptr ppu_context) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_read_spu_thread_context(u32 id, vm::ptr spu_context) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_read_spu_thread_context2(u32 id, vm::ptr spu_context) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_set_stacksize_ppu_exception_handler(u32 stacksize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_initialize_ppu_exception_handler(s32 prio) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_finalize_ppu_exception_handler() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_register_ppu_exception_handler(vm::ptr callback, u64 ctrl_flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_unregister_ppu_exception_handler() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_signal_to_ppu_exception_handler(u64 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_mutex_information(u32 id, vm::ptr info) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_cond_information(u32 id, vm::ptr info) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_rwlock_information(u32 id, vm::ptr info) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_event_queue_information(u32 id, vm::ptr info) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_semaphore_information(u32 id, vm::ptr info) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_lwmutex_information(u32 id, vm::ptr info) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_lwcond_information(u32 id, vm::ptr info) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_event_flag_information(u32 id, vm::ptr info) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_ppu_thread_ids(vm::ptr ids, vm::ptr ids_num, vm::ptr all_ids_num) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_spu_thread_group_ids(vm::ptr ids, vm::ptr ids_num, vm::ptr all_ids_num) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_spu_thread_ids(u32 group_id, vm::ptr ids, vm::ptr ids_num, vm::ptr all_ids_num) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_ppu_thread_name(u64 id, vm::ptr name) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_spu_thread_name(u32 id, vm::ptr name) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_spu_thread_group_name(u32 id, vm::ptr name) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_ppu_thread_status(u64 id, vm::ptr status) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_spu_thread_group_status(u32 id, vm::ptr status) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_enable_floating_point_enabled_exception(u64 id, u64 flags, u64 opt1, u64 opt2) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_disable_floating_point_enabled_exception(u64 id, u64 flags, u64 opt1, u64 opt2) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_vm_get_page_information(u32 addr, u32 num, vm::ptr pageinfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_set_address_to_dabr(u64 addr, u64 ctrl_flag) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_address_from_dabr(vm::ptr addr, vm::ptr ctrl_flag) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_signal_to_coredump_handler(u64 data1, u64 data2, u64 data3) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_mat_set_condition(u32 addr, u64 cond) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_mat_get_condition(u32 addr, vm::ptr condp) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_get_coredump_params(vm::ptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_dbg_set_mask_to_ppu_exception_handler(u64 mask, u64 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } DECLARE(ppu_module_manager::sys_lv2dbg)("sys_lv2dbg", [] diff --git a/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp b/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp index d505e07f68..af60d1bda3 100644 --- a/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp @@ -243,7 +243,7 @@ s32 sys_lwcond_wait(ppu_thread& ppu, vm::ptr lwcond, u64 timeout) if (old != lwmutex_reserved) { - throw EXCEPTION("Locking failed (lwmutex=*0x%x, owner=0x%x)", lwmutex, old); + fmt::throw_exception("Locking failed (lwmutex=*0x%x, owner=0x%x)" HERE, lwmutex, old); } return res; @@ -272,13 +272,13 @@ s32 sys_lwcond_wait(ppu_thread& ppu, vm::ptr lwcond, u64 timeout) if (old != lwmutex_reserved) { - throw EXCEPTION("Locking failed (lwmutex=*0x%x, owner=0x%x)", lwmutex, old); + fmt::throw_exception("Locking failed (lwmutex=*0x%x, owner=0x%x)" HERE, lwmutex, old); } return CELL_ETIMEDOUT; } - throw EXCEPTION("Unexpected syscall result (lwcond=*0x%x, result=0x%x)", lwcond, res); + fmt::throw_exception("Unexpected syscall result (lwcond=*0x%x, result=0x%x)" HERE, lwcond, res); } void sysPrxForUser_sys_lwcond_init() diff --git a/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp b/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp index 6edc64ea9e..4fd6cb4f23 100644 --- a/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp @@ -149,7 +149,7 @@ s32 sys_lwmutex_lock(ppu_thread& ppu, vm::ptr lwmutex, u64 timeou if (old != lwmutex_reserved) { - throw EXCEPTION("Locking failed (lwmutex=*0x%x, owner=0x%x)", lwmutex, old); + fmt::throw_exception("Locking failed (lwmutex=*0x%x, owner=0x%x)" HERE, lwmutex, old); } return CELL_OK; @@ -158,7 +158,7 @@ s32 sys_lwmutex_lock(ppu_thread& ppu, vm::ptr lwmutex, u64 timeou if (res == CELL_EBUSY && lwmutex->attribute & SYS_SYNC_RETRY) { // TODO (protocol is ignored in current implementation) - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } return res; @@ -220,7 +220,7 @@ s32 sys_lwmutex_trylock(ppu_thread& ppu, vm::ptr lwmutex) if (old != lwmutex_reserved) { - throw EXCEPTION("Locking failed (lwmutex=*0x%x, owner=0x%x)", lwmutex, old); + fmt::throw_exception("Locking failed (lwmutex=*0x%x, owner=0x%x)" HERE, lwmutex, old); } } diff --git a/rpcs3/Emu/Cell/Modules/sys_mempool.cpp b/rpcs3/Emu/Cell/Modules/sys_mempool.cpp index b4f748485b..07d6ad666a 100644 --- a/rpcs3/Emu/Cell/Modules/sys_mempool.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_mempool.cpp @@ -20,7 +20,7 @@ struct memory_pool_t s32 sys_mempool_allocate_block() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_mempool_create(vm::ptr mempool, vm::ptr chunk, const u64 chunk_size, const u64 block_size, const u64 ralignment) diff --git a/rpcs3/Emu/Cell/Modules/sys_net.cpp b/rpcs3/Emu/Cell/Modules/sys_net.cpp index 9cf524147f..c26f3399d2 100644 --- a/rpcs3/Emu/Cell/Modules/sys_net.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_net.cpp @@ -499,7 +499,7 @@ namespace sys_net if (level != SOL_SOCKET && level != IPPROTO_TCP) { - throw EXCEPTION("Invalid socket option level!"); + fmt::throw_exception("Invalid socket option level!" HERE); } s32 ret; @@ -598,7 +598,7 @@ namespace sys_net if (flags < 0) { - throw EXCEPTION("Failed to obtain socket flags."); + fmt::throw_exception("Failed to obtain socket flags." HERE); } u32 mode = *(u32*)optval.get_ptr(); diff --git a/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp b/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp index 08cd2f3dc8..0ac57c6d6b 100644 --- a/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp @@ -103,12 +103,12 @@ void sys_ppu_thread_once(ppu_thread& ppu, vm::ptr> once_ctrl, v s32 sys_ppu_thread_register_atexit() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sys_ppu_thread_unregister_atexit() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sysPrxForUser_sys_ppu_thread_init() diff --git a/rpcs3/Emu/Cell/Modules/sys_prx_.cpp b/rpcs3/Emu/Cell/Modules/sys_prx_.cpp index 70ba08027c..1d8ddc7aa9 100644 --- a/rpcs3/Emu/Cell/Modules/sys_prx_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_prx_.cpp @@ -15,7 +15,7 @@ s64 sys_prx_exitspawn_with_level() s32 sys_prx_load_module_list_on_memcontainer() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sysPrxForUser_sys_prx_init() diff --git a/rpcs3/Emu/Cell/Modules/sys_spu_.cpp b/rpcs3/Emu/Cell/Modules/sys_spu_.cpp index 397c3a331f..bd15dcec3f 100644 --- a/rpcs3/Emu/Cell/Modules/sys_spu_.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_spu_.cpp @@ -80,7 +80,7 @@ s32 sys_raw_spu_load(s32 id, vm::cptr path, vm::ptr entry) if (hdr.CheckMagic()) { - throw fmt::exception("sys_raw_spu_load() error: '%s' is encrypted! Try to decrypt it manually and try again.", path.get_ptr()); + fmt::throw_exception("sys_raw_spu_load() error: '%s' is encrypted! Try to decrypt it manually and try again.", path.get_ptr()); } f.seek(0); diff --git a/rpcs3/Emu/Cell/PPUInterpreter.cpp b/rpcs3/Emu/Cell/PPUInterpreter.cpp index 92ba076da7..b3e5cfb1ea 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/PPUInterpreter.cpp @@ -292,7 +292,7 @@ const g_ppu_scale_table; bool ppu_interpreter::MFVSCR(ppu_thread& ppu, ppu_opcode_t op) { - throw std::runtime_error("MFVSCR" HERE); + fmt::throw_exception("MFVSCR instruction at 0x%x (%s)", ppu.cia, Emu.GetTitleID()); } bool ppu_interpreter::MTVSCR(ppu_thread& ppu, ppu_opcode_t op) @@ -1817,7 +1817,7 @@ bool ppu_interpreter::TDI(ppu_thread& ppu, ppu_opcode_t op) ((op.bo & 0x2) && a_ < b_) || ((op.bo & 0x1) && a_ > b_)) { - throw std::runtime_error("Trap!" HERE); + fmt::throw_exception("Trap!" HERE); } return true; @@ -1834,7 +1834,7 @@ bool ppu_interpreter::TWI(ppu_thread& ppu, ppu_opcode_t op) ((op.bo & 0x2) && a_ < b_) || ((op.bo & 0x1) && a_ > b_)) { - throw std::runtime_error("Trap!" HERE); + fmt::throw_exception("Trap!" HERE); } return true; @@ -1941,7 +1941,7 @@ bool ppu_interpreter::SC(ppu_thread& ppu, ppu_opcode_t op) switch (u32 lv = op.lev) { case 0x0: ppu_execute_syscall(ppu, ppu.gpr[11]); break; - default: throw fmt::exception("SC lv%u", lv); + default: fmt::throw_exception("SC lv%u", lv); } return true; @@ -2181,7 +2181,7 @@ bool ppu_interpreter::TW(ppu_thread& ppu, ppu_opcode_t op) ((u32)a < (u32)b && (op.bo & 0x2)) || ((u32)a >(u32)b && (op.bo & 0x1))) { - throw std::runtime_error("Trap!" HERE); + fmt::throw_exception("Trap!" HERE); } return true; @@ -2402,7 +2402,7 @@ bool ppu_interpreter::TD(ppu_thread& ppu, ppu_opcode_t op) ((op.bo & 0x2) && a_ < b_) || ((op.bo & 0x1) && a_ > b_)) { - throw std::runtime_error("Trap!" HERE); + fmt::throw_exception("Trap!" HERE); } return true; @@ -2742,7 +2742,7 @@ bool ppu_interpreter::EQV(ppu_thread& ppu, ppu_opcode_t op) bool ppu_interpreter::ECIWX(ppu_thread& ppu, ppu_opcode_t op) { - throw std::runtime_error("ECIWX" HERE); + fmt::throw_exception("ECIWX" HERE); } bool ppu_interpreter::LHZUX(ppu_thread& ppu, ppu_opcode_t op) @@ -2773,7 +2773,7 @@ bool ppu_interpreter::MFSPR(ppu_thread& ppu, ppu_opcode_t op) case 0x10C: ppu.gpr[op.rd] = get_timebased_time() & 0xffffffff; break; case 0x10D: ppu.gpr[op.rd] = get_timebased_time() >> 32; break; - default: throw fmt::exception("MFSPR 0x%x" HERE, n); + default: fmt::throw_exception("MFSPR 0x%x" HERE, n); } return true; @@ -2813,7 +2813,7 @@ bool ppu_interpreter::MFTB(ppu_thread& ppu, ppu_opcode_t op) { case 0x10C: ppu.gpr[op.rd] = get_timebased_time() & 0xffffffff; break; case 0x10D: ppu.gpr[op.rd] = get_timebased_time() >> 32; break; - default: throw fmt::exception("MFSPR 0x%x" HERE, n); + default: fmt::throw_exception("MFSPR 0x%x" HERE, n); } return true; @@ -2856,7 +2856,7 @@ bool ppu_interpreter::ORC(ppu_thread& ppu, ppu_opcode_t op) bool ppu_interpreter::ECOWX(ppu_thread& ppu, ppu_opcode_t op) { - throw std::runtime_error("ECOWX" HERE); + fmt::throw_exception("ECOWX" HERE); } bool ppu_interpreter::STHUX(ppu_thread& ppu, ppu_opcode_t op) @@ -2912,7 +2912,7 @@ bool ppu_interpreter::MTSPR(ppu_thread& ppu, ppu_opcode_t op) case 0x008: ppu.lr = ppu.gpr[op.rs]; break; case 0x009: ppu.ctr = ppu.gpr[op.rs]; break; case 0x100: ppu.vrsave = (u32)ppu.gpr[op.rs]; break; - default: throw fmt::exception("MTSPR 0x%x" HERE, n); + default: fmt::throw_exception("MTSPR 0x%x" HERE, n); } return true; @@ -3850,5 +3850,5 @@ bool ppu_interpreter::FCFID(ppu_thread& ppu, ppu_opcode_t op) bool ppu_interpreter::UNK(ppu_thread& ppu, ppu_opcode_t op) { - throw fmt::exception("Unknown/Illegal opcode: 0x%08x at 0x%x" HERE, op.opcode, ppu.cia); + fmt::throw_exception("Unknown/Illegal opcode: 0x%08x at 0x%x" HERE, op.opcode, ppu.cia); } diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index 57944fa6c4..cba5e0b3ba 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -154,7 +154,7 @@ extern void ppu_execute_function(ppu_thread& ppu, u32 index) } } - throw fmt::exception("Function not registered (index %u)" HERE, index); + fmt::throw_exception("Function not registered (index %u)" HERE, index); } extern ppu_function_t ppu_get_function(u32 index) @@ -757,7 +757,7 @@ std::shared_ptr ppu_load_prx(const ppu_prx_object& elf) if (!addr) { - throw fmt::exception("vm::alloc() failed (size=0x%x)", mem_size); + fmt::throw_exception("vm::alloc() failed (size=0x%x)", mem_size); } // Copy data @@ -970,10 +970,10 @@ void ppu_load_exec(const ppu_exec_object& elf) if (prog.p_type == 0x1 /* LOAD */ && prog.p_memsz) { if (prog.bin.size() > size || prog.bin.size() != prog.p_filesz) - throw fmt::exception("Invalid binary size (0x%llx, memsz=0x%x)", prog.bin.size(), size); + fmt::throw_exception("Invalid binary size (0x%llx, memsz=0x%x)", prog.bin.size(), size); if (!vm::falloc(addr, size, vm::main)) - throw fmt::exception("vm::falloc() failed (addr=0x%x, memsz=0x%x)", addr, size); + fmt::throw_exception("vm::falloc() failed (addr=0x%x, memsz=0x%x)", addr, size); std::memcpy(vm::base(addr), prog.bin.data(), prog.bin.size()); @@ -1083,7 +1083,7 @@ void ppu_load_exec(const ppu_exec_object& elf) if (proc_prx_param.magic != 0x1b434cec) { - throw fmt::exception("Bad magic! (0x%x)", proc_prx_param.magic); + fmt::throw_exception("Bad magic! (0x%x)", proc_prx_param.magic); } ppu_load_exports(link, proc_prx_param.libent_start, proc_prx_param.libent_end); @@ -1114,7 +1114,7 @@ void ppu_load_exec(const ppu_exec_object& elf) } else { - throw fmt::exception("Failed to load liblv2.sprx: %s", obj.get_error()); + fmt::throw_exception("Failed to load liblv2.sprx: %s", obj.get_error()); } } else diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 6499dc76ff..513869a162 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -134,7 +134,7 @@ void ppu_thread::cpu_task() { if (arg >= 32) { - throw fmt::exception("Invalid ppu_cmd::set_gpr arg (0x%x)" HERE, arg); + fmt::throw_exception("Invalid ppu_cmd::set_gpr arg (0x%x)" HERE, arg); } gpr[arg % 32] = cmd_queue[pos].load().as(); @@ -145,7 +145,7 @@ void ppu_thread::cpu_task() { if (arg > 8) { - throw fmt::exception("Unsupported ppu_cmd::set_args size (0x%x)" HERE, arg); + fmt::throw_exception("Unsupported ppu_cmd::set_args size (0x%x)" HERE, arg); } for (u32 i = 0; i < arg; i++) @@ -169,7 +169,7 @@ void ppu_thread::cpu_task() } default: { - throw fmt::exception("Unknown ppu_cmd(0x%x)" HERE, type); + fmt::throw_exception("Unknown ppu_cmd(0x%x)" HERE, type); } } } @@ -188,7 +188,7 @@ void ppu_thread::exec_task() const auto& table = *( g_cfg_ppu_decoder.get() == ppu_decoder_type::precise ? &s_ppu_interpreter_precise.get_table() : g_cfg_ppu_decoder.get() == ppu_decoder_type::fast ? &s_ppu_interpreter_fast.get_table() : - throw std::logic_error("Invalid PPU decoder")); + (fmt::throw_exception("Invalid PPU decoder"), nullptr)); v128 _op; decltype(&ppu_interpreter::UNK) func0, func1, func2, func3; @@ -257,7 +257,7 @@ ppu_thread::ppu_thread(const std::string& name, u32 prio, u32 stack) { if (!stack_addr) { - throw fmt::exception("Out of stack memory (size=0x%x)" HERE, stack_size); + fmt::throw_exception("Out of stack memory (size=0x%x)" HERE, stack_size); } gpr[1] = ::align(stack_addr + stack_size, 0x200) - 0x200; @@ -336,7 +336,7 @@ ppu_cmd ppu_thread::cmd_wait() be_t* ppu_thread::get_stack_arg(s32 i, u64 align) { - if (align != 1 && align != 2 && align != 4 && align != 8 && align != 16) throw fmt::exception("Unsupported alignment: 0x%llx" HERE, align); + if (align != 1 && align != 2 && align != 4 && align != 8 && align != 16) fmt::throw_exception("Unsupported alignment: 0x%llx" HERE, align); return vm::_ptr(vm::cast((gpr[1] + 0x30 + 0x8 * (i - 1)) & (0 - align), HERE)); } @@ -367,7 +367,7 @@ void ppu_thread::fast_call(u32 addr, u32 rtoc) if (gpr[1] != old_stack && !test(state, cpu_state::ret + cpu_state::exit)) // gpr[1] shouldn't change { - throw fmt::exception("Stack inconsistency (addr=0x%x, rtoc=0x%x, SP=0x%llx, old=0x%llx)", addr, rtoc, gpr[1], old_stack); + fmt::throw_exception("Stack inconsistency (addr=0x%x, rtoc=0x%x, SP=0x%llx, old=0x%llx)", addr, rtoc, gpr[1], old_stack); } } catch (cpu_state _s) @@ -418,12 +418,12 @@ extern void sse_cellbe_stvrx(u64 addr, __m128i a); [[noreturn]] static void ppu_trap(u64 addr) { - throw fmt::exception("Trap! (0x%llx)", addr); + fmt::throw_exception("Trap! (0x%llx)", addr); } [[noreturn]] static void ppu_unreachable(u64 addr) { - throw fmt::exception("Unreachable! (0x%llx)", addr); + fmt::throw_exception("Unreachable! (0x%llx)", addr); } static void ppu_trace(u64 addr) diff --git a/rpcs3/Emu/Cell/PPUTranslator.cpp b/rpcs3/Emu/Cell/PPUTranslator.cpp index 856cb4798b..459ed31626 100644 --- a/rpcs3/Emu/Cell/PPUTranslator.cpp +++ b/rpcs3/Emu/Cell/PPUTranslator.cpp @@ -100,7 +100,7 @@ void PPUTranslator::AddFunction(u64 addr, Function* func, FunctionType* type) { if (!m_func_types.emplace(addr, type).second || !m_func_list.emplace(addr, func).second) { - throw fmt::exception("AddFunction(0x%08llx: %s) failed: function already exists", addr, func->getName().data()); + fmt::throw_exception("AddFunction(0x%08llx: %s) failed: function already exists", addr, func->getName().data()); } } diff --git a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp index 20f560fa66..e614e626e0 100644 --- a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp @@ -46,7 +46,7 @@ void spu_recompiler::compile(spu_function_t& f) if (f.addr >= 0x40000 || f.addr % 4 || f.size == 0 || f.size > 0x40000 - f.addr || f.size % 4) { - throw EXCEPTION("Invalid SPU function (addr=0x%05x, size=0x%x)", f.addr, f.size); + fmt::throw_exception("Invalid SPU function (addr=0x%05x, size=0x%x)" HERE, f.addr, f.size); } using namespace asmjit; @@ -104,7 +104,7 @@ void spu_recompiler::compile(spu_function_t& f) { if (addr < f.addr || addr >= f.addr + f.size || addr % 4) { - throw EXCEPTION("Invalid function block entry (0x%05x)", addr); + fmt::throw_exception("Invalid function block entry (0x%05x)" HERE, addr); } pos_labels[addr / 4] = compiler.newLabel(); @@ -121,7 +121,7 @@ void spu_recompiler::compile(spu_function_t& f) { if (addr < f.addr || addr >= f.addr + f.size || addr % 4) { - throw EXCEPTION("Invalid jump table entry (0x%05x)", addr); + fmt::throw_exception("Invalid jump table entry (0x%05x)" HERE, addr); } } @@ -226,7 +226,7 @@ spu_recompiler::XmmLink spu_recompiler::XmmAlloc() // get empty xmm register if (v) return{ v }; } - throw EXCEPTION("Out of Xmm Vars"); + fmt::throw_exception("Out of Xmm Vars" HERE); } spu_recompiler::XmmLink spu_recompiler::XmmGet(s8 reg, XmmType type) // get xmm register with specific SPU reg @@ -238,7 +238,7 @@ spu_recompiler::XmmLink spu_recompiler::XmmGet(s8 reg, XmmType type) // get xmm case XmmType::Int: c->movdqa(result, SPU_OFF_128(gpr[reg])); break; case XmmType::Float: c->movaps(result, SPU_OFF_128(gpr[reg])); break; case XmmType::Double: c->movapd(result, SPU_OFF_128(gpr[reg])); break; - default: throw EXCEPTION("Invalid XmmType"); + default: fmt::throw_exception("Invalid XmmType" HERE); } return result; @@ -319,7 +319,7 @@ void spu_recompiler::FunctionCall() { if (_spu->pc & 0x8000000) { - throw EXCEPTION("Undefined behaviour"); + fmt::throw_exception("Undefined behaviour" HERE); } _spu->set_interrupt_status(true); @@ -917,12 +917,12 @@ void spu_recompiler::BISL(spu_opcode_t op) void spu_recompiler::IRET(spu_opcode_t op) { - throw EXCEPTION("Unimplemented instruction"); + fmt::throw_exception("Unimplemented instruction" HERE); } void spu_recompiler::BISLED(spu_opcode_t op) { - throw EXCEPTION("Unimplemented instruction"); + fmt::throw_exception("Unimplemented instruction" HERE); } void spu_recompiler::HBR(spu_opcode_t op) @@ -1561,7 +1561,7 @@ void spu_recompiler::FCGT(spu_opcode_t op) void spu_recompiler::DFCGT(spu_opcode_t op) { - throw EXCEPTION("Unexpected instruction"); + fmt::throw_exception("Unexpected instruction" HERE); } void spu_recompiler::FA(spu_opcode_t op) @@ -1619,7 +1619,7 @@ void spu_recompiler::FCMGT(spu_opcode_t op) void spu_recompiler::DFCMGT(spu_opcode_t op) { - throw EXCEPTION("Unexpected instruction"); + fmt::throw_exception("Unexpected instruction" HERE); } void spu_recompiler::DFA(spu_opcode_t op) @@ -1841,7 +1841,7 @@ void spu_recompiler::FSCRWR(spu_opcode_t op) void spu_recompiler::DFTSV(spu_opcode_t op) { - throw EXCEPTION("Unexpected instruction"); + fmt::throw_exception("Unexpected instruction" HERE); } void spu_recompiler::FCEQ(spu_opcode_t op) @@ -1854,7 +1854,7 @@ void spu_recompiler::FCEQ(spu_opcode_t op) void spu_recompiler::DFCEQ(spu_opcode_t op) { - throw EXCEPTION("Unexpected instruction"); + fmt::throw_exception("Unexpected instruction" HERE); } void spu_recompiler::MPY(spu_opcode_t op) @@ -1919,7 +1919,7 @@ void spu_recompiler::FCMEQ(spu_opcode_t op) void spu_recompiler::DFCMEQ(spu_opcode_t op) { - throw EXCEPTION("Unexpected instruction"); + fmt::throw_exception("Unexpected instruction" HERE); } void spu_recompiler::MPYU(spu_opcode_t op) @@ -2020,7 +2020,7 @@ void spu_recompiler::BRZ(spu_opcode_t op) { const u32 target = spu_branch_target(m_pos, op.i16); - if (target == m_pos) throw EXCEPTION("Branch-to-self (0x%05x)", target); + if (target == m_pos) fmt::throw_exception("Branch-to-self (0x%05x)" HERE, target); c->cmp(SPU_OFF_32(gpr[op.rt]._u32[3]), 0); @@ -2052,7 +2052,7 @@ void spu_recompiler::BRNZ(spu_opcode_t op) { const u32 target = spu_branch_target(m_pos, op.i16); - if (target == m_pos) throw EXCEPTION("Branch-to-self (0x%05x)", target); + if (target == m_pos) fmt::throw_exception("Branch-to-self (0x%05x)" HERE, target); c->cmp(SPU_OFF_32(gpr[op.rt]._u32[3]), 0); @@ -2077,7 +2077,7 @@ void spu_recompiler::BRHZ(spu_opcode_t op) { const u32 target = spu_branch_target(m_pos, op.i16); - if (target == m_pos) throw EXCEPTION("Branch-to-self (0x%05x)", target); + if (target == m_pos) fmt::throw_exception("Branch-to-self (0x%05x)" HERE, target); c->cmp(SPU_OFF_16(gpr[op.rt]._u16[6]), 0); @@ -2102,7 +2102,7 @@ void spu_recompiler::BRHNZ(spu_opcode_t op) { const u32 target = spu_branch_target(m_pos, op.i16); - if (target == m_pos) throw EXCEPTION("Branch-to-self (0x%05x)", target); + if (target == m_pos) fmt::throw_exception("Branch-to-self (0x%05x)" HERE, target); c->cmp(SPU_OFF_16(gpr[op.rt]._u16[6]), 0); @@ -2134,7 +2134,7 @@ void spu_recompiler::BRA(spu_opcode_t op) { const u32 target = spu_branch_target(0, op.i16); - if (target == m_pos) throw EXCEPTION("Branch-to-self (0x%05x)", target); + if (target == m_pos) fmt::throw_exception("Branch-to-self (0x%05x)" HERE, target); if (labels[target / 4].isInitialized()) { @@ -2165,7 +2165,7 @@ void spu_recompiler::BRASL(spu_opcode_t op) { const u32 target = spu_branch_target(0, op.i16); - if (target == m_pos) throw EXCEPTION("Branch-to-self (0x%05x)", target); + if (target == m_pos) fmt::throw_exception("Branch-to-self (0x%05x)" HERE, target); const XmmLink& vr = XmmAlloc(); c->movdqa(vr, XmmConst(_mm_set_epi32(spu_branch_target(m_pos + 4), 0, 0, 0))); @@ -2220,7 +2220,7 @@ void spu_recompiler::BRSL(spu_opcode_t op) { const u32 target = spu_branch_target(m_pos, op.i16); - if (target == m_pos) throw EXCEPTION("Branch-to-self (0x%05x)", target); + if (target == m_pos) fmt::throw_exception("Branch-to-self (0x%05x)" HERE, target); const XmmLink& vr = XmmAlloc(); c->movdqa(vr, XmmConst(_mm_set_epi32(spu_branch_target(m_pos + 4), 0, 0, 0))); diff --git a/rpcs3/Emu/Cell/SPUAnalyser.cpp b/rpcs3/Emu/Cell/SPUAnalyser.cpp index 3a47e28863..0917df3bb6 100644 --- a/rpcs3/Emu/Cell/SPUAnalyser.cpp +++ b/rpcs3/Emu/Cell/SPUAnalyser.cpp @@ -38,7 +38,7 @@ std::shared_ptr SPUDatabase::analyse(const be_t* ls, u32 en // Check arguments (bounds and alignment) if (max_limit > 0x40000 || entry >= max_limit || entry % 4 || max_limit % 4) { - throw EXCEPTION("Invalid arguments (entry=0x%05x, limit=0x%05x)", entry, max_limit); + fmt::throw_exception("Invalid arguments (entry=0x%05x, limit=0x%05x)" HERE, entry, max_limit); } // Key for multimap diff --git a/rpcs3/Emu/Cell/SPUInterpreter.cpp b/rpcs3/Emu/Cell/SPUInterpreter.cpp index 139c91319f..5a7e2cd223 100644 --- a/rpcs3/Emu/Cell/SPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/SPUInterpreter.cpp @@ -30,7 +30,7 @@ inline __m128i sse_cmpgt_epu32(__m128i A, __m128i B) void spu_interpreter::UNK(SPUThread& spu, spu_opcode_t op) { - throw EXCEPTION("Unknown/Illegal instruction (0x%08x)", op.opcode); + fmt::throw_exception("Unknown/Illegal instruction (0x%08x)" HERE, op.opcode); } @@ -40,7 +40,7 @@ void spu_interpreter::set_interrupt_status(SPUThread& spu, spu_opcode_t op) { if (op.d) { - throw EXCEPTION("Undefined behaviour"); + fmt::throw_exception("Undefined behaviour" HERE); } spu.set_interrupt_status(true); @@ -347,7 +347,7 @@ void spu_interpreter::BIHNZ(SPUThread& spu, spu_opcode_t op) void spu_interpreter::STOPD(SPUThread& spu, spu_opcode_t op) { - throw EXCEPTION("Unimplemented instruction"); + fmt::throw_exception("Unimplemented instruction" HERE); } void spu_interpreter::STQX(SPUThread& spu, spu_opcode_t op) @@ -371,12 +371,12 @@ void spu_interpreter::BISL(SPUThread& spu, spu_opcode_t op) void spu_interpreter::IRET(SPUThread& spu, spu_opcode_t op) { - throw EXCEPTION("Unimplemented instruction"); + fmt::throw_exception("Unimplemented instruction" HERE); } void spu_interpreter::BISLED(SPUThread& spu, spu_opcode_t op) { - throw EXCEPTION("Unimplemented instruction"); + fmt::throw_exception("Unimplemented instruction" HERE); } void spu_interpreter::HBR(SPUThread& spu, spu_opcode_t op) @@ -448,7 +448,7 @@ void spu_interpreter::CBX(SPUThread& spu, spu_opcode_t op) { if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF)) { - throw EXCEPTION("Unexpected SP value: LS:0x%05x", spu.gpr[1]._u32[3]); + fmt::throw_exception("Unexpected SP value: LS:0x%05x" HERE, spu.gpr[1]._u32[3]); } const s32 t = ~(spu.gpr[op.rb]._u32[3] + spu.gpr[op.ra]._u32[3]) & 0xf; @@ -460,7 +460,7 @@ void spu_interpreter::CHX(SPUThread& spu, spu_opcode_t op) { if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF)) { - throw EXCEPTION("Unexpected SP value: LS:0x%05x", spu.gpr[1]._u32[3]); + fmt::throw_exception("Unexpected SP value: LS:0x%05x" HERE, spu.gpr[1]._u32[3]); } const s32 t = (~(spu.gpr[op.rb]._u32[3] + spu.gpr[op.ra]._u32[3]) & 0xe) >> 1; @@ -472,7 +472,7 @@ void spu_interpreter::CWX(SPUThread& spu, spu_opcode_t op) { if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF)) { - throw EXCEPTION("Unexpected SP value: LS:0x%05x", spu.gpr[1]._u32[3]); + fmt::throw_exception("Unexpected SP value: LS:0x%05x" HERE, spu.gpr[1]._u32[3]); } const s32 t = (~(spu.gpr[op.rb]._u32[3] + spu.gpr[op.ra]._u32[3]) & 0xc) >> 2; @@ -484,7 +484,7 @@ void spu_interpreter::CDX(SPUThread& spu, spu_opcode_t op) { if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF)) { - throw EXCEPTION("Unexpected SP value: LS:0x%05x", spu.gpr[1]._u32[3]); + fmt::throw_exception("Unexpected SP value: LS:0x%05x" HERE, spu.gpr[1]._u32[3]); } const s32 t = (~(spu.gpr[op.rb]._u32[3] + spu.gpr[op.ra]._u32[3]) & 0x8) >> 3; @@ -537,7 +537,7 @@ void spu_interpreter::CBD(SPUThread& spu, spu_opcode_t op) { if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF)) { - throw EXCEPTION("Unexpected SP value: LS:0x%05x", spu.gpr[1]._u32[3]); + fmt::throw_exception("Unexpected SP value: LS:0x%05x" HERE, spu.gpr[1]._u32[3]); } const s32 t = ~(op.i7 + spu.gpr[op.ra]._u32[3]) & 0xf; @@ -549,7 +549,7 @@ void spu_interpreter::CHD(SPUThread& spu, spu_opcode_t op) { if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF)) { - throw EXCEPTION("Unexpected SP value: LS:0x%05x", spu.gpr[1]._u32[3]); + fmt::throw_exception("Unexpected SP value: LS:0x%05x" HERE, spu.gpr[1]._u32[3]); } const s32 t = (~(op.i7 + spu.gpr[op.ra]._u32[3]) & 0xe) >> 1; @@ -561,7 +561,7 @@ void spu_interpreter::CWD(SPUThread& spu, spu_opcode_t op) { if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF)) { - throw EXCEPTION("Unexpected SP value: LS:0x%05x", spu.gpr[1]._u32[3]); + fmt::throw_exception("Unexpected SP value: LS:0x%05x" HERE, spu.gpr[1]._u32[3]); } const s32 t = (~(op.i7 + spu.gpr[op.ra]._u32[3]) & 0xc) >> 2; @@ -573,7 +573,7 @@ void spu_interpreter::CDD(SPUThread& spu, spu_opcode_t op) { if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF)) { - throw EXCEPTION("Unexpected SP value: LS:0x%05x", spu.gpr[1]._u32[3]); + fmt::throw_exception("Unexpected SP value: LS:0x%05x" HERE, spu.gpr[1]._u32[3]); } const s32 t = (~(op.i7 + spu.gpr[op.ra]._u32[3]) & 0x8) >> 3; @@ -711,7 +711,7 @@ void spu_interpreter_fast::FCGT(SPUThread& spu, spu_opcode_t op) void spu_interpreter::DFCGT(SPUThread& spu, spu_opcode_t op) { - throw EXCEPTION("Unexpected instruction"); + fmt::throw_exception("Unexpected instruction" HERE); } void spu_interpreter_fast::FA(SPUThread& spu, spu_opcode_t op) @@ -747,7 +747,7 @@ void spu_interpreter_fast::FCMGT(SPUThread& spu, spu_opcode_t op) void spu_interpreter::DFCMGT(SPUThread& spu, spu_opcode_t op) { - throw EXCEPTION("Unexpected instruction"); + fmt::throw_exception("Unexpected instruction" HERE); } void spu_interpreter_fast::DFA(SPUThread& spu, spu_opcode_t op) @@ -873,7 +873,7 @@ void spu_interpreter_fast::FSCRWR(SPUThread& spu, spu_opcode_t op) void spu_interpreter::DFTSV(SPUThread& spu, spu_opcode_t op) { - throw EXCEPTION("Unexpected instruction"); + fmt::throw_exception("Unexpected instruction" HERE); } void spu_interpreter_fast::FCEQ(SPUThread& spu, spu_opcode_t op) @@ -883,7 +883,7 @@ void spu_interpreter_fast::FCEQ(SPUThread& spu, spu_opcode_t op) void spu_interpreter::DFCEQ(SPUThread& spu, spu_opcode_t op) { - throw EXCEPTION("Unexpected instruction"); + fmt::throw_exception("Unexpected instruction" HERE); } void spu_interpreter::MPY(SPUThread& spu, spu_opcode_t op) @@ -920,7 +920,7 @@ void spu_interpreter_fast::FCMEQ(SPUThread& spu, spu_opcode_t op) void spu_interpreter::DFCMEQ(SPUThread& spu, spu_opcode_t op) { - throw EXCEPTION("Unexpected instruction"); + fmt::throw_exception("Unexpected instruction" HERE); } void spu_interpreter::MPYU(SPUThread& spu, spu_opcode_t op) diff --git a/rpcs3/Emu/Cell/SPURecompiler.cpp b/rpcs3/Emu/Cell/SPURecompiler.cpp index b6e635bfb2..8d1669e58b 100644 --- a/rpcs3/Emu/Cell/SPURecompiler.cpp +++ b/rpcs3/Emu/Cell/SPURecompiler.cpp @@ -12,7 +12,7 @@ void spu_recompiler_base::enter(SPUThread& spu) { if (spu.pc >= 0x40000 || spu.pc % 4) { - throw fmt::exception("Invalid PC: 0x%05x", spu.pc); + fmt::throw_exception("Invalid PC: 0x%05x", spu.pc); } // Get SPU LS pointer @@ -37,7 +37,7 @@ void spu_recompiler_base::enter(SPUThread& spu) spu.spu_rec->compile(*func); - if (!func->compiled) throw std::runtime_error("Compilation failed" HERE); + if (!func->compiled) fmt::throw_exception("Compilation failed" HERE); } const u32 res = func->compiled(&spu, _ls); @@ -61,7 +61,7 @@ void spu_recompiler_base::enter(SPUThread& spu) { if (res & 0x8000000) { - throw std::logic_error("Invalid interrupt status set" HERE); + fmt::throw_exception("Invalid interrupt status set (0x%x)" HERE, res); } spu.set_interrupt_status(true); diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index f7dcf57f98..159cdc9e5b 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -206,7 +206,7 @@ void SPUThread::cpu_task() const auto& table = *( g_cfg_spu_decoder.get() == spu_decoder_type::precise ? &s_spu_interpreter_precise.get_table() : g_cfg_spu_decoder.get() == spu_decoder_type::fast ? &s_spu_interpreter_fast.get_table() : - throw std::logic_error("Invalid SPU decoder")); + (fmt::throw_exception("Invalid SPU decoder"), nullptr)); // LS base address const auto base = vm::_ptr(offset); @@ -300,12 +300,12 @@ void SPUThread::do_dma_transfer(u32 cmd, spu_mfc_arg_t args) } else { - 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); + fmt::throw_exception("Invalid MMIO offset (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)" HERE, cmd, args.lsa, args.ea, args.tag, args.size); } } else { - 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); + fmt::throw_exception("Invalid thread type (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)" HERE, cmd, args.lsa, args.ea, args.tag, args.size); } } @@ -325,14 +325,14 @@ void SPUThread::do_dma_transfer(u32 cmd, spu_mfc_arg_t args) } } - 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); + fmt::throw_exception("Invalid command %s (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)" HERE, 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)) { - 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); + fmt::throw_exception("Invalid command %s (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)" HERE, get_mfc_cmd_name(cmd), cmd, args.lsa, args.ea, args.tag, args.size); } const u32 list_addr = args.ea & 0x3ffff; @@ -444,7 +444,7 @@ void SPUThread::process_mfc_cmd(u32 cmd) { if (std::exchange(last_raddr, 0) == 0) { - throw std::runtime_error("PUTLLC succeeded without GETLLAR" HERE); + fmt::throw_exception("PUTLLC succeeded without GETLLAR" HERE); } return ch_atomic_stat.set_value(MFC_PUTLLC_SUCCESS); @@ -495,7 +495,7 @@ void SPUThread::process_mfc_cmd(u32 cmd) return; } - throw EXCEPTION("Unknown command %s (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)", + fmt::throw_exception("Unknown command %s (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)" HERE, get_mfc_cmd_name(cmd), cmd, ch_mfc_args.lsa, ch_mfc_args.ea, ch_mfc_args.tag, ch_mfc_args.size); } @@ -536,7 +536,7 @@ void SPUThread::set_events(u32 mask) { if (u32 unimpl = mask & ~SPU_EVENT_IMPLEMENTED) { - throw EXCEPTION("Unimplemented events (0x%x)", unimpl); + fmt::throw_exception("Unimplemented events (0x%x)" HERE, unimpl); } // Set new events, get old event mask @@ -556,7 +556,7 @@ void SPUThread::set_interrupt_status(bool enable) // detect enabling interrupts with events masked if (u32 mask = ch_event_mask) { - throw EXCEPTION("SPU Interrupts not implemented (mask=0x%x)", mask); + fmt::throw_exception("SPU Interrupts not implemented (mask=0x%x)" HERE, mask); } ch_event_stat |= SPU_EVENT_INTR_ENABLED; @@ -588,7 +588,7 @@ u32 SPUThread::get_ch_count(u32 ch) case SPU_RdEventStat: return get_events() ? 1 : 0; break; } - throw EXCEPTION("Unknown/illegal channel (ch=%d [%s])", ch, ch < 128 ? spu_ch_name[ch] : "???"); + fmt::throw_exception("Unknown/illegal channel (ch=%d [%s])" HERE, ch, ch < 128 ? spu_ch_name[ch] : "???"); } bool SPUThread::get_ch_value(u32 ch, u32& out) @@ -737,7 +737,7 @@ bool SPUThread::get_ch_value(u32 ch, u32& out) } } - throw EXCEPTION("Unknown/illegal channel (ch=%d [%s])", ch, ch < 128 ? spu_ch_name[ch] : "???"); + fmt::throw_exception("Unknown/illegal channel (ch=%d [%s])" HERE, ch, ch < 128 ? spu_ch_name[ch] : "???"); } bool SPUThread::set_ch_value(u32 ch, u32 value) @@ -789,12 +789,12 @@ bool SPUThread::set_ch_value(u32 ch, u32 value) if (!ch_out_mbox.get_count()) { - throw EXCEPTION("sys_spu_thread_send_event(value=0x%x, spup=%d): Out_MBox is empty", value, spup); + fmt::throw_exception("sys_spu_thread_send_event(value=0x%x, spup=%d): Out_MBox is empty" HERE, value, spup); } if (u32 count = ch_in_mbox.get_count()) { - throw EXCEPTION("sys_spu_thread_send_event(value=0x%x, spup=%d): In_MBox is not empty (count=%d)", value, spup, count); + fmt::throw_exception("sys_spu_thread_send_event(value=0x%x, spup=%d): In_MBox is not empty (count=%d)" HERE, value, spup, count); } const u32 data = ch_out_mbox.get_value(); @@ -830,7 +830,7 @@ bool SPUThread::set_ch_value(u32 ch, u32 value) if (!ch_out_mbox.get_count()) { - throw EXCEPTION("sys_spu_thread_throw_event(value=0x%x, spup=%d): Out_MBox is empty", value, spup); + fmt::throw_exception("sys_spu_thread_throw_event(value=0x%x, spup=%d): Out_MBox is empty" HERE, value, spup); } const u32 data = ch_out_mbox.get_value(); @@ -867,12 +867,12 @@ bool SPUThread::set_ch_value(u32 ch, u32 value) if (!ch_out_mbox.get_count()) { - throw EXCEPTION("sys_event_flag_set_bit(value=0x%x (flag=%d)): Out_MBox is empty", value, flag); + fmt::throw_exception("sys_event_flag_set_bit(value=0x%x (flag=%d)): Out_MBox is empty" HERE, value, flag); } if (u32 count = ch_in_mbox.get_count()) { - throw EXCEPTION("sys_event_flag_set_bit(value=0x%x (flag=%d)): In_MBox is not empty (%d)", value, flag, count); + fmt::throw_exception("sys_event_flag_set_bit(value=0x%x (flag=%d)): In_MBox is not empty (%d)" HERE, value, flag, count); } const u32 data = ch_out_mbox.get_value(); @@ -881,7 +881,7 @@ bool SPUThread::set_ch_value(u32 ch, u32 value) if (flag > 63) { - throw EXCEPTION("sys_event_flag_set_bit(id=%d, value=0x%x (flag=%d)): Invalid flag", data, value, flag); + fmt::throw_exception("sys_event_flag_set_bit(id=%d, value=0x%x (flag=%d)): Invalid flag" HERE, data, value, flag); } LOG_TRACE(SPU, "sys_event_flag_set_bit(id=%d, value=0x%x (flag=%d))", data, value, flag); @@ -913,7 +913,7 @@ bool SPUThread::set_ch_value(u32 ch, u32 value) if (!ch_out_mbox.get_count()) { - throw EXCEPTION("sys_event_flag_set_bit_impatient(value=0x%x (flag=%d)): Out_MBox is empty", value, flag); + fmt::throw_exception("sys_event_flag_set_bit_impatient(value=0x%x (flag=%d)): Out_MBox is empty" HERE, value, flag); } const u32 data = ch_out_mbox.get_value(); @@ -922,7 +922,7 @@ bool SPUThread::set_ch_value(u32 ch, u32 value) if (flag > 63) { - throw EXCEPTION("sys_event_flag_set_bit_impatient(id=%d, value=0x%x (flag=%d)): Invalid flag", data, value, flag); + fmt::throw_exception("sys_event_flag_set_bit_impatient(id=%d, value=0x%x (flag=%d)): Invalid flag" HERE, data, value, flag); } LOG_TRACE(SPU, "sys_event_flag_set_bit_impatient(id=%d, value=0x%x (flag=%d))", data, value, flag); @@ -948,11 +948,11 @@ bool SPUThread::set_ch_value(u32 ch, u32 value) { if (ch_out_mbox.get_count()) { - throw EXCEPTION("SPU_WrOutIntrMbox: unknown data (value=0x%x); Out_MBox = 0x%x", value, ch_out_mbox.get_value()); + fmt::throw_exception("SPU_WrOutIntrMbox: unknown data (value=0x%x); Out_MBox = 0x%x" HERE, value, ch_out_mbox.get_value()); } else { - throw EXCEPTION("SPU_WrOutIntrMbox: unknown data (value=0x%x)", value); + fmt::throw_exception("SPU_WrOutIntrMbox: unknown data (value=0x%x)" HERE, value); } } } @@ -1094,7 +1094,7 @@ bool SPUThread::set_ch_value(u32 ch, u32 value) // detect masking events with enabled interrupt status if (value && ch_event_stat & SPU_EVENT_INTR_ENABLED) { - throw EXCEPTION("SPU Interrupts not implemented (mask=0x%x)", value); + fmt::throw_exception("SPU Interrupts not implemented (mask=0x%x)" HERE, value); } // detect masking unimplemented events @@ -1119,7 +1119,7 @@ bool SPUThread::set_ch_value(u32 ch, u32 value) } } - throw EXCEPTION("Unknown/illegal channel (ch=%d [%s], value=0x%x)", ch, ch < 128 ? spu_ch_name[ch] : "???", value); + fmt::throw_exception("Unknown/illegal channel (ch=%d [%s], value=0x%x)" HERE, ch, ch < 128 ? spu_ch_name[ch] : "???", value); } bool SPUThread::stop_and_signal(u32 code) @@ -1160,7 +1160,7 @@ bool SPUThread::stop_and_signal(u32 code) if (found == m_addr_to_hle_function_map.end()) { - throw EXCEPTION("HLE function not registered (PC=0x%05x)", pc); + fmt::throw_exception("HLE function not registered (PC=0x%05x)" HERE, pc); } if (const auto return_to_caller = found->second(*this)) @@ -1179,7 +1179,7 @@ bool SPUThread::stop_and_signal(u32 code) if (!ch_out_mbox.get_count()) { - throw EXCEPTION("sys_spu_thread_receive_event(): Out_MBox is empty"); + fmt::throw_exception("sys_spu_thread_receive_event(): Out_MBox is empty" HERE); } if (u32 count = ch_in_mbox.get_count()) @@ -1198,7 +1198,7 @@ bool SPUThread::stop_and_signal(u32 code) if (!group) { - throw EXCEPTION("Invalid SPU Thread Group"); + fmt::throw_exception("Invalid SPU Thread Group" HERE); } if (group->type & SYS_SPU_THREAD_GROUP_TYPE_EXCLUSIVE_NON_CONTEXT) // this check may be inaccurate @@ -1254,7 +1254,7 @@ bool SPUThread::stop_and_signal(u32 code) } else { - throw EXCEPTION("Unexpected SPU Thread Group state (%d)", (u32)group->state); + fmt::throw_exception("Unexpected SPU Thread Group state (%d)" HERE, (u32)group->state); } if (queue->events()) @@ -1294,7 +1294,7 @@ bool SPUThread::stop_and_signal(u32 code) } else { - throw EXCEPTION("Unexpected SPU Thread Group state (%d)", (u32)group->state); + fmt::throw_exception("Unexpected SPU Thread Group state (%d)" HERE, (u32)group->state); } for (auto& thread : group->threads) @@ -1320,7 +1320,7 @@ bool SPUThread::stop_and_signal(u32 code) if (!ch_out_mbox.get_count()) { - throw EXCEPTION("sys_spu_thread_group_exit(): Out_MBox is empty"); + fmt::throw_exception("sys_spu_thread_group_exit(): Out_MBox is empty" HERE); } const u32 value = ch_out_mbox.get_value(); @@ -1333,7 +1333,7 @@ bool SPUThread::stop_and_signal(u32 code) if (!group) { - throw EXCEPTION("Invalid SPU Thread Group"); + fmt::throw_exception("Invalid SPU Thread Group" HERE); } for (auto& thread : group->threads) @@ -1362,7 +1362,7 @@ bool SPUThread::stop_and_signal(u32 code) if (!ch_out_mbox.get_count()) { - throw EXCEPTION("sys_spu_thread_exit(): Out_MBox is empty"); + fmt::throw_exception("sys_spu_thread_exit(): Out_MBox is empty" HERE); } LOG_TRACE(SPU, "sys_spu_thread_exit(status=0x%x)", ch_out_mbox.get_value()); @@ -1371,7 +1371,7 @@ bool SPUThread::stop_and_signal(u32 code) if (!group) { - throw EXCEPTION("Invalid SPU Thread Group"); + fmt::throw_exception("Invalid SPU Thread Group" HERE); } status |= SPU_STATUS_STOPPED_BY_STOP; @@ -1384,11 +1384,11 @@ bool SPUThread::stop_and_signal(u32 code) if (!ch_out_mbox.get_count()) { - throw EXCEPTION("Unknown STOP code: 0x%x (Out_MBox is empty)", code); + fmt::throw_exception("Unknown STOP code: 0x%x (Out_MBox is empty)" HERE, code); } else { - throw EXCEPTION("Unknown STOP code: 0x%x (Out_MBox=0x%x)", code, ch_out_mbox.get_value()); + fmt::throw_exception("Unknown STOP code: 0x%x (Out_MBox=0x%x)" HERE, code, ch_out_mbox.get_value()); } } @@ -1410,7 +1410,7 @@ void SPUThread::halt() } status |= SPU_STATUS_STOPPED_BY_HALT; - throw EXCEPTION("Halt"); + fmt::throw_exception("Halt" HERE); } void SPUThread::fast_call(u32 ls_addr) diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h index 07581f3183..2c0543e903 100644 --- a/rpcs3/Emu/Cell/SPUThread.h +++ b/rpcs3/Emu/Cell/SPUThread.h @@ -442,7 +442,7 @@ public: return this->_u32[3] >> 10 & 0x3; default: - throw EXCEPTION("Unexpected slice value (%d)", slice); + fmt::throw_exception("Unexpected slice value (%d)" HERE, slice); } } diff --git a/rpcs3/Emu/Cell/lv2/lv2.cpp b/rpcs3/Emu/Cell/lv2/lv2.cpp index 3f05d43aed..965a80c580 100644 --- a/rpcs3/Emu/Cell/lv2/lv2.cpp +++ b/rpcs3/Emu/Cell/lv2/lv2.cpp @@ -929,7 +929,7 @@ extern void ppu_execute_syscall(ppu_thread& ppu, u64 code) return; } - throw fmt::exception("Invalid syscall number (%llu)", code); + fmt::throw_exception("Invalid syscall number (%llu)", code); } extern ppu_function_t ppu_get_syscall(u64 code) diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.cpp b/rpcs3/Emu/Cell/lv2/sys_cond.cpp index 46e84e667a..3e0d750a36 100644 --- a/rpcs3/Emu/Cell/lv2/sys_cond.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_cond.cpp @@ -51,7 +51,7 @@ s32 sys_cond_create(vm::ptr cond_id, u32 mutex_id, vm::ptrcond_count) { - throw EXCEPTION("Unexpected cond_count"); + fmt::throw_exception("Unexpected cond_count" HERE); } *cond_id = idm::make(mutex, attr->name_u64); @@ -79,7 +79,7 @@ s32 sys_cond_destroy(u32 cond_id) if (!cond->mutex->cond_count--) { - throw EXCEPTION("Unexpected cond_count"); + fmt::throw_exception("Unexpected cond_count" HERE); } idm::remove(cond_id); @@ -233,7 +233,7 @@ s32 sys_cond_wait(ppu_thread& ppu, u32 cond_id, u64 timeout) // mutex owner is restored after notification or unlocking if (cond->mutex->owner.get() != &ppu) { - throw EXCEPTION("Unexpected mutex owner"); + fmt::throw_exception("Unexpected mutex owner" HERE); } // restore the recursive value diff --git a/rpcs3/Emu/Cell/lv2/sys_event.cpp b/rpcs3/Emu/Cell/lv2/sys_event.cpp index ccdfb8a91e..59f62411ea 100644 --- a/rpcs3/Emu/Cell/lv2/sys_event.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_event.cpp @@ -80,7 +80,7 @@ void lv2_event_queue_t::push(lv2_lock_t, u64 source, u64 data1, u64 data2, u64 d } else { - throw fmt::exception("Unexpected (queue type=%d, thread type=%d)" HERE, type, (s32)thread->type); + fmt::throw_exception("Unexpected (queue type=%d, thread type=%d)" HERE, type, (s32)thread->type); } VERIFY(!thread->state.test_and_set(cpu_state::signal)); @@ -173,7 +173,7 @@ s32 sys_event_queue_destroy(u32 equeue_id, s32 mode) } else { - throw fmt::exception("Unexpected (queue.type=%d, thread.type=%d)" HERE, queue->type, thread->type); + fmt::throw_exception("Unexpected (queue.type=%d, thread.type=%d)" HERE, queue->type, thread->type); } thread->state += cpu_state::signal; @@ -198,7 +198,7 @@ s32 sys_event_queue_tryreceive(u32 equeue_id, vm::ptr event_array, if (size < 0) { - throw fmt::exception("Negative size (%d)" HERE, size); + fmt::throw_exception("Negative size (%d)" HERE, size); } if (queue->type != SYS_PPU_QUEUE) diff --git a/rpcs3/Emu/Cell/lv2/sys_event_flag.h b/rpcs3/Emu/Cell/lv2/sys_event_flag.h index 4a74176b0d..7f9a2bf29a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_event_flag.h +++ b/rpcs3/Emu/Cell/lv2/sys_event_flag.h @@ -79,7 +79,7 @@ struct lv2_event_flag_t } else { - throw EXCEPTION("Unknown mode (0x%x)", mode); + fmt::throw_exception("Unknown mode (0x%x)" HERE, mode); } } @@ -99,7 +99,7 @@ struct lv2_event_flag_t } else { - throw EXCEPTION("Unknown mode (0x%x)", mode); + fmt::throw_exception("Unknown mode (0x%x)" HERE, mode); } } diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.cpp b/rpcs3/Emu/Cell/lv2/sys_fs.cpp index a5e2e4903a..308dc4ce75 100644 --- a/rpcs3/Emu/Cell/lv2/sys_fs.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_fs.cpp @@ -127,7 +127,7 @@ ppu_error_code sys_fs_open(vm::cptr path, s32 flags, vm::ptr fd, s32 if (!test(open_mode)) { - throw EXCEPTION("Invalid or unimplemented flags (%#o): '%s'", flags, path.get_ptr()); + fmt::throw_exception("Invalid or unimplemented flags (%#o): '%s'" HERE, flags, path.get_ptr()); } fs::file file(local_path, open_mode); diff --git a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp index 3ceba748dc..ab40749756 100644 --- a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp @@ -82,7 +82,7 @@ s32 _sys_lwcond_signal(u32 lwcond_id, u32 lwmutex_id, u32 ppu_thread_id, u32 mod if (mode != 1 && mode != 2 && mode != 3) { - throw EXCEPTION("Unknown mode (%d)", mode); + fmt::throw_exception("Unknown mode (%d)" HERE, mode); } // mode 1: lightweight mutex was initially owned by the calling thread @@ -135,7 +135,7 @@ s32 _sys_lwcond_signal_all(u32 lwcond_id, u32 lwmutex_id, u32 mode) if (mode != 1 && mode != 2) { - throw EXCEPTION("Unknown mode (%d)", mode); + fmt::throw_exception("Unknown mode (%d)" HERE, mode); } // mode 1: lightweight mutex was initially owned by the calling thread diff --git a/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp b/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp index 2454f93f16..dafe153c90 100644 --- a/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp @@ -15,7 +15,7 @@ void lv2_lwmutex_t::unlock(lv2_lock_t) { if (signaled) { - throw EXCEPTION("Unexpected"); + fmt::throw_exception("Unexpected" HERE); } if (sq.size()) @@ -44,7 +44,7 @@ s32 _sys_lwmutex_create(vm::ptr lwmutex_id, u32 protocol, vm::ptr(protocol, name); diff --git a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp b/rpcs3/Emu/Cell/lv2/sys_mutex.cpp index 1a2a722625..1ae9cd13cc 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_mutex.cpp @@ -159,7 +159,7 @@ s32 sys_mutex_lock(ppu_thread& ppu, u32 mutex_id, u64 timeout) // new owner must be set when unlocked if (mutex->owner.get() != &ppu) { - throw EXCEPTION("Unexpected mutex owner"); + fmt::throw_exception("Unexpected mutex owner" HERE); } return CELL_OK; @@ -230,7 +230,7 @@ s32 sys_mutex_unlock(ppu_thread& ppu, u32 mutex_id) { if (!mutex->recursive) { - throw EXCEPTION("Unexpected recursive_count"); + fmt::throw_exception("Unexpected recursive_count" HERE); } mutex->recursive_count--; diff --git a/rpcs3/Emu/Cell/lv2/sys_process.cpp b/rpcs3/Emu/Cell/lv2/sys_process.cpp index b7062ed581..23ad117250 100644 --- a/rpcs3/Emu/Cell/lv2/sys_process.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_process.cpp @@ -84,10 +84,10 @@ s32 sys_process_get_number_of_object(u32 object, vm::ptr nump) case SYS_INTR_SERVICE_HANDLE_OBJECT: *nump = idm::get_count(); break; case SYS_EVENT_QUEUE_OBJECT: *nump = idm::get_count(); break; case SYS_EVENT_PORT_OBJECT: *nump = idm::get_count(); break; - case SYS_TRACE_OBJECT: throw EXCEPTION("SYS_TRACE_OBJECT"); - case SYS_SPUIMAGE_OBJECT: throw EXCEPTION("SYS_SPUIMAGE_OBJECT"); + case SYS_TRACE_OBJECT: fmt::throw_exception("SYS_TRACE_OBJECT" HERE); + case SYS_SPUIMAGE_OBJECT: fmt::throw_exception("SYS_SPUIMAGE_OBJECT" HERE); case SYS_PRX_OBJECT: *nump = idm::get_count(); break; - case SYS_SPUPORT_OBJECT: throw EXCEPTION("SYS_SPUPORT_OBJECT"); + case SYS_SPUPORT_OBJECT: fmt::throw_exception("SYS_SPUPORT_OBJECT" HERE); case SYS_LWMUTEX_OBJECT: *nump = idm::get_count(); break; case SYS_TIMER_OBJECT: *nump = idm::get_count(); break; case SYS_SEMAPHORE_OBJECT: *nump = idm::get_count(); break; @@ -131,10 +131,10 @@ s32 sys_process_get_id(u32 object, vm::ptr buffer, u32 size, vm::ptr s case SYS_INTR_SERVICE_HANDLE_OBJECT: idm_get_set(objects); break; case SYS_EVENT_QUEUE_OBJECT: idm_get_set(objects); break; case SYS_EVENT_PORT_OBJECT: idm_get_set(objects); break; - case SYS_TRACE_OBJECT: throw EXCEPTION("SYS_TRACE_OBJECT"); - case SYS_SPUIMAGE_OBJECT: throw EXCEPTION("SYS_SPUIMAGE_OBJECT"); + case SYS_TRACE_OBJECT: fmt::throw_exception("SYS_TRACE_OBJECT" HERE); + case SYS_SPUIMAGE_OBJECT: fmt::throw_exception("SYS_SPUIMAGE_OBJECT" HERE); case SYS_PRX_OBJECT: idm_get_set(objects); break; - case SYS_SPUPORT_OBJECT: throw EXCEPTION("SYS_SPUPORT_OBJECT"); + case SYS_SPUPORT_OBJECT: fmt::throw_exception("SYS_SPUPORT_OBJECT" HERE); case SYS_LWMUTEX_OBJECT: idm_get_set(objects); break; case SYS_TIMER_OBJECT: idm_get_set(objects); break; case SYS_SEMAPHORE_OBJECT: idm_get_set(objects); break; diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp index 776e23d52c..292f505206 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp @@ -109,7 +109,7 @@ s32 sys_rwlock_rlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout) { if (!++rwlock->readers) { - throw EXCEPTION("Too many readers"); + fmt::throw_exception("Too many readers" HERE); } return CELL_OK; @@ -141,7 +141,7 @@ s32 sys_rwlock_rlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout) if (rwlock->writer || !rwlock->readers) { - throw EXCEPTION("Unexpected"); + fmt::throw_exception("Unexpected" HERE); } return CELL_OK; @@ -167,7 +167,7 @@ s32 sys_rwlock_tryrlock(u32 rw_lock_id) if (!++rwlock->readers) { - throw EXCEPTION("Too many readers"); + fmt::throw_exception("Too many readers" HERE); } return CELL_OK; @@ -244,7 +244,7 @@ s32 sys_rwlock_wlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout) { if (rwlock->wsq.front() != &ppu) { - throw EXCEPTION("Unexpected"); + fmt::throw_exception("Unexpected" HERE); } rwlock->wsq.clear(); @@ -264,7 +264,7 @@ s32 sys_rwlock_wlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout) if (rwlock->readers || rwlock->writer.get() != &ppu) { - throw EXCEPTION("Unexpected"); + fmt::throw_exception("Unexpected" HERE); } return CELL_OK; diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/Emu/Cell/lv2/sys_spu.cpp index 78629998c5..e4b9a87f2c 100644 --- a/rpcs3/Emu/Cell/lv2/sys_spu.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_spu.cpp @@ -19,7 +19,7 @@ void LoadSpuImage(const fs::file& stream, u32& spu_ep, u32 addr) if (obj != elf_error::ok) { - throw fmt::exception("Failed to load SPU image: %s" HERE, obj.get_error()); + fmt::throw_exception("Failed to load SPU image: %s" HERE, obj.get_error()); } for (const auto& prog : obj.progs) @@ -70,7 +70,7 @@ s32 sys_spu_image_open(vm::ptr img, vm::cptr path) if (hdr.CheckMagic()) { - throw fmt::exception("sys_spu_image_open() error: '%s' is encrypted! Try to decrypt it manually and try again.", path.get_ptr()); + fmt::throw_exception("sys_spu_image_open() error: '%s' is encrypted! Try to decrypt it manually and try again.", path.get_ptr()); } f.seek(0); @@ -116,7 +116,7 @@ u32 spu_thread_initialize(u32 group_id, u32 spu_num, vm::ptr im if (count > group->num) { - throw EXCEPTION("Unexpected thread count (%d)", count); + fmt::throw_exception("Unexpected thread count (%d)" HERE, count); } if (count == group->num) @@ -171,12 +171,12 @@ s32 sys_spu_thread_set_argument(u32 id, vm::ptr arg) if (!group) { - throw EXCEPTION("Invalid SPU thread group"); + fmt::throw_exception("Invalid SPU thread group" HERE); } if (thread->index >= group->threads.size() || group->threads[thread->index] != thread) { - throw EXCEPTION("Unexpected SPU thread index (%d)", thread->index); + fmt::throw_exception("Unexpected SPU thread index (%d)" HERE, thread->index); } group->args[thread->index].arg1 = arg->arg1; @@ -292,7 +292,7 @@ s32 sys_spu_thread_group_start(u32 id) { if (t->index >= group->threads.size()) { - throw EXCEPTION("Unexpected SPU thread index (%d)", t->index); + fmt::throw_exception("Unexpected SPU thread index (%d)" HERE, t->index); } auto& args = group->args[t->index]; @@ -583,7 +583,7 @@ s32 sys_spu_thread_group_join(u32 id, vm::ptr cause, vm::ptr status) } default: { - throw EXCEPTION("Unexpected join_state"); + fmt::throw_exception("Unexpected join_state" HERE); } } @@ -619,7 +619,7 @@ s32 sys_spu_thread_write_ls(u32 id, u32 lsa, u64 value, u32 type) if (!group) { - throw EXCEPTION("Invalid SPU thread group"); + fmt::throw_exception("Invalid SPU thread group" HERE); } if (group->state < SPU_THREAD_GROUP_STATUS_WAITING || group->state > SPU_THREAD_GROUP_STATUS_RUNNING) @@ -661,7 +661,7 @@ s32 sys_spu_thread_read_ls(u32 id, u32 lsa, vm::ptr value, u32 type) if (!group) { - throw EXCEPTION("Invalid SPU thread group"); + fmt::throw_exception("Invalid SPU thread group" HERE); } if (group->state < SPU_THREAD_GROUP_STATUS_WAITING || group->state > SPU_THREAD_GROUP_STATUS_RUNNING) @@ -698,7 +698,7 @@ s32 sys_spu_thread_write_spu_mb(u32 id, u32 value) if (!group) { - throw EXCEPTION("Invalid SPU thread group"); + fmt::throw_exception("Invalid SPU thread group" HERE); } if (group->state < SPU_THREAD_GROUP_STATUS_WAITING || group->state > SPU_THREAD_GROUP_STATUS_RUNNING) @@ -774,7 +774,7 @@ s32 sys_spu_thread_write_snr(u32 id, u32 number, u32 value) if (!group) { - throw EXCEPTION("Invalid SPU thread group"); + fmt::throw_exception("Invalid SPU thread group" HERE); } //if (group->state < SPU_THREAD_GROUP_STATUS_WAITING || group->state > SPU_THREAD_GROUP_STATUS_RUNNING) // ??? @@ -1328,7 +1328,7 @@ s32 sys_raw_spu_set_spu_cfg(u32 id, u32 value) if (value > 3) { - throw EXCEPTION("Unexpected value (0x%x)", value); + fmt::throw_exception("Unexpected value (0x%x)" HERE, value); } const auto thread = idm::get(id); diff --git a/rpcs3/Emu/Cell/lv2/sys_time.cpp b/rpcs3/Emu/Cell/lv2/sys_time.cpp index e9a60295de..d07b6fa73a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_time.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_time.cpp @@ -55,7 +55,7 @@ u64 get_timebased_time() LARGE_INTEGER count; if (!QueryPerformanceCounter(&count)) { - throw EXCEPTION("Unexpected"); + fmt::throw_exception("Unexpected" HERE); } const u64 time = count.QuadPart; @@ -66,7 +66,7 @@ u64 get_timebased_time() struct timespec ts; if (::clock_gettime(CLOCK_MONOTONIC, &ts)) { - throw EXCEPTION("System error %d", errno); + fmt::throw_exception("System error %d" HERE, errno); } return static_cast(ts.tv_sec) * g_timebase_freq + static_cast(ts.tv_nsec) * g_timebase_freq / 1000000000u; @@ -82,7 +82,7 @@ u64 get_system_time() LARGE_INTEGER count; if (!QueryPerformanceCounter(&count)) { - throw EXCEPTION("Unexpected"); + fmt::throw_exception("Unexpected" HERE); } const u64 time = count.QuadPart; @@ -93,7 +93,7 @@ u64 get_system_time() struct timespec ts; if (::clock_gettime(CLOCK_MONOTONIC, &ts)) { - throw EXCEPTION("System error %d", errno); + fmt::throw_exception("System error %d" HERE, errno); } const u64 result = static_cast(ts.tv_sec) * 1000000u + static_cast(ts.tv_nsec) / 1000u; @@ -122,7 +122,7 @@ s32 sys_time_get_current_time(vm::ptr sec, vm::ptr nsec) LARGE_INTEGER count; if (!QueryPerformanceCounter(&count)) { - throw EXCEPTION("Unexpected"); + fmt::throw_exception("Unexpected" HERE); } // get time difference in nanoseconds @@ -137,7 +137,7 @@ s32 sys_time_get_current_time(vm::ptr sec, vm::ptr nsec) struct timespec ts; if (::clock_gettime(CLOCK_REALTIME, &ts)) { - throw EXCEPTION("System error %d", errno); + fmt::throw_exception("System error %d" HERE, errno); } *sec = ts.tv_sec; diff --git a/rpcs3/Emu/Cell/lv2/sys_tty.cpp b/rpcs3/Emu/Cell/lv2/sys_tty.cpp index bb991d3d82..d7a427ab9b 100644 --- a/rpcs3/Emu/Cell/lv2/sys_tty.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_tty.cpp @@ -12,7 +12,7 @@ ppu_error_code sys_tty_read(s32 ch, vm::ptr buf, u32 len, vm::ptr pre sys_tty.fatal("sys_tty_read(ch=%d, buf=*0x%x, len=%d, preadlen=*0x%x)", ch, buf, len, preadlen); // We currently do not support reading from the Console - throw std::runtime_error("Unimplemented" HERE); + fmt::throw_exception("Unimplemented" HERE); } ppu_error_code sys_tty_write(s32 ch, vm::cptr buf, u32 len, vm::ptr pwritelen) diff --git a/rpcs3/Emu/IdManager.h b/rpcs3/Emu/IdManager.h index 1f0ad12ac5..2854b49dae 100644 --- a/rpcs3/Emu/IdManager.h +++ b/rpcs3/Emu/IdManager.h @@ -302,7 +302,7 @@ public: return pair->first.id(); } - throw EXCEPTION("Out of IDs ('%s')", typeid(T).name()); + fmt::throw_exception("Out of IDs ('%s')" HERE, typeid(T).name()); } // Add a new ID for an existing object provided (returns new id) @@ -316,7 +316,7 @@ public: return pair->first.id(); } - throw EXCEPTION("Out of IDs ('%s')", typeid(T).name()); + fmt::throw_exception("Out of IDs ('%s')" HERE, typeid(T).name()); } // Add a new ID for an object returned by provider() diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp index 580a2ad60c..03c2b696be 100644 --- a/rpcs3/Emu/Memory/vm.cpp +++ b/rpcs3/Emu/Memory/vm.cpp @@ -96,7 +96,7 @@ namespace vm std::vector> g_locations; // memory locations access_violation::access_violation(u64 addr, const char* cause) - : std::runtime_error(fmt::exception("Access violation %s address 0x%llx", cause, addr)) + : std::runtime_error(fmt::format("Access violation %s address 0x%llx", cause, addr)) { g_tls_fault_count &= ~(1ull << 63); } @@ -121,7 +121,7 @@ namespace vm if (::mprotect(vm::base(addr & ~0xfff), 4096, no_access ? PROT_NONE : PROT_READ)) #endif { - throw EXCEPTION("System failure (addr=0x%x)", addr); + fmt::throw_exception("System failure (addr=0x%x)" HERE, addr); } } @@ -136,7 +136,7 @@ namespace vm if (::mprotect(vm::base(addr & ~0xfff), 4096, PROT_READ | PROT_WRITE)) #endif { - throw EXCEPTION("System failure (addr=0x%x)", addr); + fmt::throw_exception("System failure (addr=0x%x)" HERE, addr); } g_reservation_addr = 0; @@ -170,14 +170,14 @@ namespace vm if (!size || !addr || size > 4096 || size != align || addr & (align - 1)) { - throw EXCEPTION("Invalid arguments (addr=0x%x, size=0x%x)", addr, size); + fmt::throw_exception("Invalid arguments (addr=0x%x, size=0x%x)" HERE, addr, size); } const u8 flags = g_pages[addr >> 12]; if (!(flags & page_writable) || !(flags & page_allocated) || (flags & page_no_reservations)) { - throw EXCEPTION("Invalid page flags (addr=0x%x, size=0x%x, flags=0x%x)", addr, size, flags); + fmt::throw_exception("Invalid page flags (addr=0x%x, size=0x%x, flags=0x%x)" HERE, addr, size, flags); } // break the reservation @@ -206,7 +206,7 @@ namespace vm if (!size || !addr || size > 4096 || size != align || addr & (align - 1)) { - throw EXCEPTION("Invalid arguments (addr=0x%x, size=0x%x)", addr, size); + fmt::throw_exception("Invalid arguments (addr=0x%x, size=0x%x)" HERE, addr, size); } if (g_reservation_owner != thread_ctrl::get_current() || g_reservation_addr != addr || g_reservation_size != size) @@ -293,7 +293,7 @@ namespace vm if (!size || !addr || size > 4096 || size != align || addr & (align - 1)) { - throw EXCEPTION("Invalid arguments (addr=0x%x, size=0x%x)", addr, size); + fmt::throw_exception("Invalid arguments (addr=0x%x, size=0x%x)" HERE, addr, size); } g_tls_did_break_reservation = false; @@ -334,14 +334,14 @@ namespace vm { if (!size || (size | addr) % 4096 || flags & page_allocated) { - throw EXCEPTION("Invalid arguments (addr=0x%x, size=0x%x)", addr, size); + fmt::throw_exception("Invalid arguments (addr=0x%x, size=0x%x)" HERE, addr, size); } for (u32 i = addr / 4096; i < addr / 4096 + size / 4096; i++) { if (g_pages[i]) { - throw EXCEPTION("Memory already mapped (addr=0x%x, size=0x%x, flags=0x%x, current_addr=0x%x)", addr, size, flags, i * 4096); + fmt::throw_exception("Memory already mapped (addr=0x%x, size=0x%x, flags=0x%x, current_addr=0x%x)" HERE, addr, size, flags, i * 4096); } } @@ -356,14 +356,14 @@ namespace vm if (::mprotect(priv_addr, size, PROT_READ | PROT_WRITE) || ::mprotect(real_addr, size, protection)) #endif { - throw EXCEPTION("System failure (addr=0x%x, size=0x%x, flags=0x%x)", addr, size, flags); + fmt::throw_exception("System failure (addr=0x%x, size=0x%x, flags=0x%x)" HERE, addr, size, flags); } for (u32 i = addr / 4096; i < addr / 4096 + size / 4096; i++) { if (g_pages[i].exchange(flags | page_allocated)) { - throw EXCEPTION("Concurrent access (addr=0x%x, size=0x%x, flags=0x%x, current_addr=0x%x)", addr, size, flags, i * 4096); + fmt::throw_exception("Concurrent access (addr=0x%x, size=0x%x, flags=0x%x, current_addr=0x%x)" HERE, addr, size, flags, i * 4096); } } @@ -376,7 +376,7 @@ namespace vm if (!size || (size | addr) % 4096) { - throw EXCEPTION("Invalid arguments (addr=0x%x, size=0x%x)", addr, size); + fmt::throw_exception("Invalid arguments (addr=0x%x, size=0x%x)" HERE, addr, size); } const u8 flags_inv = flags_set & flags_clear; @@ -418,7 +418,7 @@ namespace vm if (::mprotect(real_addr, 4096, protection)) #endif { - throw EXCEPTION("System failure (addr=0x%x, size=0x%x, flags_test=0x%x, flags_set=0x%x, flags_clear=0x%x)", addr, size, flags_test, flags_set, flags_clear); + fmt::throw_exception("System failure (addr=0x%x, size=0x%x, flags_test=0x%x, flags_set=0x%x, flags_clear=0x%x)" HERE, addr, size, flags_test, flags_set, flags_clear); } } } @@ -430,14 +430,14 @@ namespace vm { if (!size || (size | addr) % 4096) { - throw EXCEPTION("Invalid arguments (addr=0x%x, size=0x%x)", addr, size); + fmt::throw_exception("Invalid arguments (addr=0x%x, size=0x%x)" HERE, addr, size); } for (u32 i = addr / 4096; i < addr / 4096 + size / 4096; i++) { if ((g_pages[i] & page_allocated) == 0) { - throw EXCEPTION("Memory not mapped (addr=0x%x, size=0x%x, current_addr=0x%x)", addr, size, i * 4096); + fmt::throw_exception("Memory not mapped (addr=0x%x, size=0x%x, current_addr=0x%x)" HERE, addr, size, i * 4096); } } @@ -447,7 +447,7 @@ namespace vm if (!(g_pages[i].exchange(0) & page_allocated)) { - throw EXCEPTION("Concurrent access (addr=0x%x, size=0x%x, current_addr=0x%x)", addr, size, i * 4096); + fmt::throw_exception("Concurrent access (addr=0x%x, size=0x%x, current_addr=0x%x)" HERE, addr, size, i * 4096); } } @@ -462,7 +462,7 @@ namespace vm if (::mprotect(real_addr, size, PROT_NONE) || ::mprotect(priv_addr, size, PROT_NONE)) #endif { - throw EXCEPTION("System failure (addr=0x%x, size=0x%x)", addr, size); + fmt::throw_exception("System failure (addr=0x%x, size=0x%x)" HERE, addr, size); } } @@ -490,7 +490,7 @@ namespace vm if (!block) { - throw fmt::exception("Invalid memory location (%u)" HERE, (uint)location); + fmt::throw_exception("Invalid memory location (%u)" HERE, (uint)location); } return block->alloc(size, align, sup); @@ -502,7 +502,7 @@ namespace vm if (!block) { - throw fmt::exception("Invalid memory location (%u, addr=0x%x)" HERE, (uint)location, addr); + fmt::throw_exception("Invalid memory location (%u, addr=0x%x)" HERE, (uint)location, addr); } return block->falloc(addr, size, sup); @@ -514,7 +514,7 @@ namespace vm if (!block) { - throw fmt::exception("Invalid memory location (%u, addr=0x%x)" HERE, (uint)location, addr); + fmt::throw_exception("Invalid memory location (%u, addr=0x%x)" HERE, (uint)location, addr); } return block->dealloc(addr, sup_out); @@ -588,7 +588,7 @@ namespace vm // Check alignment (it's page allocation, so passing small values there is just silly) if (align < 4096 || align != (0x80000000u >> cntlz32(align))) { - throw EXCEPTION("Invalid alignment (size=0x%x, align=0x%x)", size, align); + fmt::throw_exception("Invalid alignment (size=0x%x, align=0x%x)" HERE, size, align); } // Return if size is invalid @@ -678,7 +678,7 @@ namespace vm if (!size || (size | addr) % 4096) { - throw EXCEPTION("Invalid arguments (addr=0x%x, size=0x%x)", addr, size); + fmt::throw_exception("Invalid arguments (addr=0x%x, size=0x%x)" HERE, addr, size); } for (auto& block : g_locations) @@ -698,7 +698,7 @@ namespace vm { if (g_pages[i]) { - throw EXCEPTION("Unexpected pages allocated (current_addr=0x%x)", i * 4096); + fmt::throw_exception("Unexpected pages allocated (current_addr=0x%x)" HERE, i * 4096); } } @@ -831,7 +831,7 @@ namespace vm if (context.gpr[1] < context.stack_addr) { - throw EXCEPTION("Stack overflow (size=0x%x, align=0x%x, SP=0x%llx, stack=*0x%x)", size, align_v, old_pos, context.stack_addr); + fmt::throw_exception("Stack overflow (size=0x%x, align=0x%x, SP=0x%llx, stack=*0x%x)" HERE, size, align_v, old_pos, context.stack_addr); } else { @@ -852,7 +852,7 @@ namespace vm if (context.gpr[1]._u32[3] >= 0x40000) // extremely rough { - throw EXCEPTION("Stack overflow (size=0x%x, align=0x%x, SP=LS:0x%05x)", size, align_v, old_pos); + fmt::throw_exception("Stack overflow (size=0x%x, align=0x%x, SP=LS:0x%05x)" HERE, size, align_v, old_pos); } else { @@ -872,7 +872,7 @@ namespace vm if (context.SP < context.stack_addr) { - throw EXCEPTION("Stack overflow (size=0x%x, align=0x%x, SP=0x%x, stack=*0x%x)", size, align_v, context.SP, context.stack_addr); + fmt::throw_exception("Stack overflow (size=0x%x, align=0x%x, SP=0x%x, stack=*0x%x)" HERE, size, align_v, context.SP, context.stack_addr); } else { @@ -883,11 +883,11 @@ namespace vm default: { - throw EXCEPTION("Invalid thread type (%u)", cpu->type); + fmt::throw_exception("Invalid thread type (%u)" HERE, cpu->type); } } - throw EXCEPTION("Invalid thread"); + fmt::throw_exception("Invalid thread" HERE); } void stack_pop_verbose(u32 addr, u32 size) noexcept diff --git a/rpcs3/Emu/Memory/vm.h b/rpcs3/Emu/Memory/vm.h index 3cc5b009e4..77ed6e4155 100644 --- a/rpcs3/Emu/Memory/vm.h +++ b/rpcs3/Emu/Memory/vm.h @@ -148,7 +148,7 @@ namespace vm return static_cast(res); } - throw fmt::exception("Not a virtual memory pointer (%p)", real_ptr); + fmt::throw_exception("Not a virtual memory pointer (%p)", real_ptr); } // Convert pointer-to-member to a vm address compatible offset diff --git a/rpcs3/Emu/PSP2/ARMv7Interpreter.cpp b/rpcs3/Emu/PSP2/ARMv7Interpreter.cpp index 4e8082fc83..d644f58eb0 100644 --- a/rpcs3/Emu/PSP2/ARMv7Interpreter.cpp +++ b/rpcs3/Emu/PSP2/ARMv7Interpreter.cpp @@ -19,16 +19,16 @@ void arm_interpreter::UNK(ARMv7Thread& cpu, const u32 op, const u32 cond) { if (op > 0xffff) { - throw fmt::exception("Unknown/Illegal opcode: 0x%04X 0x%04X (cond=0x%x)", op >> 16, op & 0xffff, cond); + fmt::throw_exception("Unknown/Illegal opcode: 0x%04X 0x%04X (cond=0x%x)", op >> 16, op & 0xffff, cond); } else { - throw fmt::exception("Unknown/Illegal opcode: 0x%04X (cond=0x%x)", op, cond); + fmt::throw_exception("Unknown/Illegal opcode: 0x%04X (cond=0x%x)", op, cond); } } else { - throw fmt::exception("Unknown/Illegal opcode: 0x%08X", op); + fmt::throw_exception("Unknown/Illegal opcode: 0x%08X", op); } } @@ -66,14 +66,14 @@ void arm_interpreter::MRC_(ARMv7Thread& cpu, const u32 op, const u32 cond) if (!cpu.TLS) { - throw fmt::exception("TLS not initialized" HERE); + fmt::throw_exception("TLS not initialized" HERE); } cpu.GPR[t] = cpu.TLS; return; } - throw fmt::exception("mrc?? p%d,%d,r%d,c%d,c%d,%d" HERE, cp, opc1, t, cn, cm, opc2); + fmt::throw_exception("mrc?? p%d,%d,r%d,c%d,c%d,%d" HERE, cp, opc1, t, cn, cm, opc2); } } @@ -133,7 +133,7 @@ void arm_interpreter::ADC_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::ADC_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -193,7 +193,7 @@ void arm_interpreter::ADD_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::ADD_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template @@ -315,20 +315,20 @@ void arm_interpreter::AND_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::AND_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::ASR_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::ASR_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -348,13 +348,13 @@ void arm_interpreter::B(ARMv7Thread& cpu, const u32 op, const u32 _cond) template void arm_interpreter::BFC(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::BFI(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -411,14 +411,14 @@ void arm_interpreter::BIC_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::BIC_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::BKPT(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -507,19 +507,19 @@ void arm_interpreter::CLZ(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::CMN_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::CMN_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::CMN_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -572,26 +572,26 @@ void arm_interpreter::CMP_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::CMP_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::DBG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::DMB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::DSB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -648,7 +648,7 @@ void arm_interpreter::EOR_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::EOR_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -690,19 +690,19 @@ void arm_interpreter::LDM(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::LDMDA(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::LDMDB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::LDMIB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -803,7 +803,7 @@ void arm_interpreter::LDRB_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::LDRB_LIT(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template @@ -884,7 +884,7 @@ void arm_interpreter::LDRD_LIT(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::LDRD_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -915,13 +915,13 @@ void arm_interpreter::LDRH_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::LDRH_LIT(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::LDRH_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -953,32 +953,32 @@ void arm_interpreter::LDRSB_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::LDRSB_LIT(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::LDRSB_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::LDRSH_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::LDRSH_LIT(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::LDRSH_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -1004,19 +1004,19 @@ void arm_interpreter::LDREX(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::LDREXB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::LDREXD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::LDREXH(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -1096,20 +1096,20 @@ void arm_interpreter::LSR_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::LSR_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::MLA(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::MLS(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -1174,19 +1174,19 @@ void arm_interpreter::MOVT(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::MRS(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::MSR_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::MSR_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -1266,7 +1266,7 @@ void arm_interpreter::MVN_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::MVN_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -1282,13 +1282,13 @@ void arm_interpreter::NOP(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::ORN_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::ORN_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -1345,14 +1345,14 @@ void arm_interpreter::ORR_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::ORR_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::PKH(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -1402,68 +1402,68 @@ void arm_interpreter::PUSH(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::QADD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::QADD16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::QADD8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::QASX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::QDADD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::QDSUB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::QSAX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::QSUB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::QSUB16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::QSUB8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::RBIT(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template @@ -1482,13 +1482,13 @@ void arm_interpreter::REV(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::REV16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::REVSH(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -1545,7 +1545,7 @@ void arm_interpreter::ROR_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::RRX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -1577,256 +1577,256 @@ void arm_interpreter::RSB_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::RSB_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::RSB_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::RSC_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::RSC_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::RSC_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SADD16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SADD8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SASX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SBC_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SBC_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SBC_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SBFX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SDIV(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SEL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SHADD16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SHADD8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SHASX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SHSAX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SHSUB16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SHSUB8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMLA__(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMLAD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMLAL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMLAL__(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMLALD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMLAW_(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMLSD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMLSLD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMMLA(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMMLS(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMMUL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMUAD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMUL__(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMULL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMULW_(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SMUSD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SSAT(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SSAT16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SSAX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SSUB16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SSUB8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -1860,19 +1860,19 @@ void arm_interpreter::STM(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::STMDA(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::STMDB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::STMIB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -2009,7 +2009,7 @@ void arm_interpreter::STRD_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::STRD_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -2085,19 +2085,19 @@ void arm_interpreter::STREX(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::STREXB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::STREXD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::STREXH(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -2157,7 +2157,7 @@ void arm_interpreter::SUB_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::SUB_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template @@ -2187,77 +2187,77 @@ void arm_interpreter::SUB_SPI(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::SUB_SPR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SVC(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SXTAB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SXTAB16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SXTAH(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SXTB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SXTB16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::SXTH(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::TB_(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::TEQ_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::TEQ_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::TEQ_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } @@ -2280,92 +2280,92 @@ void arm_interpreter::TST_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::TST_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::TST_RSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UADD16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UADD8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UASX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UBFX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UDIV(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UHADD16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UHADD8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UHASX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UHSAX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UHSUB16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UHSUB8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UMAAL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UMLAL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template @@ -2395,97 +2395,97 @@ void arm_interpreter::UMULL(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::UQADD16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UQADD8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UQASX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UQSAX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UQSUB16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UQSUB8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::USAD8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::USADA8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::USAT(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::USAT16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::USAX(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::USUB16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::USUB8(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UXTAB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UXTAB16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UXTAH(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template @@ -2505,843 +2505,843 @@ void arm_interpreter::UXTB(ARMv7Thread& cpu, const u32 op, const u32 cond) template void arm_interpreter::UXTB16(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::UXTH(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VABA_(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VABD_(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VABD_FP(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VABS(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VAC__(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VADD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VADD_FP(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VADDHN(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VADD_(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VAND(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VBIC_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VBIC_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VB__(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCEQ_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCEQ_ZERO(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCGE_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCGE_ZERO(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCGT_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCGT_ZERO(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCLE_ZERO(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCLS(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCLT_ZERO(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCLZ(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCMP_(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCNT(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCVT_FIA(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCVT_FIF(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCVT_FFA(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCVT_FFF(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCVT_DF(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCVT_HFA(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VCVT_HFF(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VDIV(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VDUP_S(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VDUP_R(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VEOR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VEXT(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VHADDSUB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VLD__MS(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VLD1_SL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VLD1_SAL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VLD2_SL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VLD2_SAL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VLD3_SL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VLD3_SAL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VLD4_SL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VLD4_SAL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VLDM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VLDR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMAXMIN(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMAXMIN_FP(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VML__(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VML__FP(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VML__S(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMOV_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMOV_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMOV_RS(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMOV_SR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMOV_RF(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMOV_2RF(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMOV_2RD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMOVL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMOVN(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMRS(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMSR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMUL_(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMUL_FP(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMUL_S(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMVN_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VMVN_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VNEG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VNM__(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VORN_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VORR_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VORR_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VPADAL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VPADD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VPADD_FP(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VPADDL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VPMAXMIN(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VPMAXMIN_FP(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VPOP(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VPUSH(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQABS(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQADD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQDML_L(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQDMULH(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQDMULL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQMOV_N(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQNEG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQRDMULH(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQRSHL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQRSHR_N(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQSHL_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQSHL_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQSHR_N(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VQSUB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VRADDHN(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VRECPE(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VRECPS(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VREV__(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VRHADD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VRSHL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VRSHR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VRSHRN(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VRSQRTE(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VRSQRTS(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VRSRA(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VRSUBHN(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSHL_IMM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSHL_REG(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSHLL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSHR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSHRN(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSLI(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSQRT(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSRA(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSRI(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VST__MS(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VST1_SL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VST2_SL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VST3_SL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VST4_SL(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSTM(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSTR(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSUB(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSUB_FP(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSUBHN(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSUB_(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VSWP(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VTB_(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VTRN(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VTST(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VUZP(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::VZIP(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::WFE(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::WFI(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::YIELD(ARMv7Thread& cpu, const u32 op, const u32 cond) { - throw EXCEPTION("TODO"); + fmt::throw_exception("TODO" HERE); } template void arm_interpreter::HACK(ARMv7Thread&, const u32, const u32); diff --git a/rpcs3/Emu/PSP2/ARMv7Interpreter.h b/rpcs3/Emu/PSP2/ARMv7Interpreter.h index fd77ae1374..fd83ef267d 100644 --- a/rpcs3/Emu/PSP2/ARMv7Interpreter.h +++ b/rpcs3/Emu/PSP2/ARMv7Interpreter.h @@ -40,7 +40,7 @@ struct arm_interpreter } break; - default: throw EXCEPTION(""); + default: fmt::throw_exception("Unimplemented" HERE); } return shift_t; @@ -122,7 +122,7 @@ struct arm_interpreter case arm_code::SRType_ASR: return ASR_C(value, amount, carry_out); case arm_code::SRType_ROR: return ROR_C(value, amount, carry_out); case arm_code::SRType_RRX: return RRX_C(value, carry_in, carry_out); - default: throw EXCEPTION(""); + default: fmt::throw_exception("Unimplemented" HERE); } } diff --git a/rpcs3/Emu/PSP2/ARMv7Module.cpp b/rpcs3/Emu/PSP2/ARMv7Module.cpp index 1f5e4c1a82..a821ec560b 100644 --- a/rpcs3/Emu/PSP2/ARMv7Module.cpp +++ b/rpcs3/Emu/PSP2/ARMv7Module.cpp @@ -102,7 +102,7 @@ extern void arm_execute_function(ARMv7Thread& cpu, u32 index) } } - throw fmt::exception("Function not registered (%u)" HERE, index); + fmt::throw_exception("Function not registered (%u)" HERE, index); } arm_static_module::arm_static_module(const char* name) @@ -377,7 +377,7 @@ void arm_load_exec(const arm_exec_object& elf) { if (!vm::falloc(prog.p_vaddr, prog.p_memsz, vm::main)) { - throw fmt::exception("vm::falloc() failed (addr=0x%x, size=0x%x)", prog.p_vaddr, prog.p_memsz); + fmt::throw_exception("vm::falloc() failed (addr=0x%x, size=0x%x)", prog.p_vaddr, prog.p_memsz); } if (prog.p_paddr) diff --git a/rpcs3/Emu/PSP2/ARMv7Thread.cpp b/rpcs3/Emu/PSP2/ARMv7Thread.cpp index fc2e147562..d461514234 100644 --- a/rpcs3/Emu/PSP2/ARMv7Thread.cpp +++ b/rpcs3/Emu/PSP2/ARMv7Thread.cpp @@ -40,14 +40,14 @@ void ARMv7Thread::cpu_init() { if (!stack_size) { - throw EXCEPTION("Invalid stack size"); + fmt::throw_exception("Invalid stack size" HERE); } stack_addr = vm::alloc(stack_size, vm::main); if (!stack_addr) { - throw EXCEPTION("Out of stack memory"); + fmt::throw_exception("Out of stack memory" HERE); } } @@ -106,7 +106,7 @@ void ARMv7Thread::cpu_task_main() } else { - throw fmt::exception("Invalid instruction set" HERE); + fmt::throw_exception("Invalid instruction set" HERE); } } } @@ -144,7 +144,7 @@ void ARMv7Thread::fast_call(u32 addr) if (SP != old_SP && !test(state, cpu_state::ret + cpu_state::exit)) // SP shouldn't change { - throw fmt::exception("Stack inconsistency (addr=0x%x, SP=0x%x, old=0x%x)", addr, SP, old_SP); + fmt::throw_exception("Stack inconsistency (addr=0x%x, SP=0x%x, old=0x%x)", addr, SP, old_SP); } } catch (cpu_state _s) diff --git a/rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp b/rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp index 9d3661a650..34711d773a 100644 --- a/rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp @@ -8,22 +8,22 @@ logs::channel sceAppMgr("sceAppMgr", logs::level::notice); s32 sceAppMgrReceiveEventNum(vm::ptr eventNum) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppMgrReceiveEvent(vm::ptr appEvent) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppMgrAcquireBgmPort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppMgrReleaseBgmPort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp b/rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp index 267bbbfba8..2d2314b1e7 100644 --- a/rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp @@ -8,67 +8,67 @@ logs::channel sceAppUtil("sceAppUtil", logs::level::notice); s32 sceAppUtilInit(vm::cptr initParam, vm::ptr bootParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppUtilShutdown() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppUtilSaveDataSlotCreate(u32 slotId, vm::cptr param, vm::cptr mountPoint) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppUtilSaveDataSlotDelete(u32 slotId, vm::cptr mountPoint) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppUtilSaveDataSlotSetParam(u32 slotId, vm::cptr param, vm::cptr mountPoint) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppUtilSaveDataSlotGetParam(u32 slotId, vm::ptr param, vm::cptr mountPoint) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppUtilSaveDataFileSave(vm::cptr slot, vm::cptr files, u32 fileNum, vm::cptr mountPoint, vm::ptr requiredSizeKB) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppUtilPhotoMount() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppUtilPhotoUmount() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppUtilSystemParamGetInt(u32 paramId, vm::ptr value) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppUtilSystemParamGetString(u32 paramId, vm::ptr buf, u32 bufSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppUtilSaveSafeMemory(vm::cptr buf, u32 bufSize, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAppUtilLoadSafeMemory(vm::ptr buf, u32 bufSize, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceAudio.cpp b/rpcs3/Emu/PSP2/Modules/sceAudio.cpp index 447c19a83b..815607bf86 100644 --- a/rpcs3/Emu/PSP2/Modules/sceAudio.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceAudio.cpp @@ -8,42 +8,42 @@ logs::channel sceAudio("sceAudio", logs::level::notice); s32 sceAudioOutOpenPort(s32 portType, s32 len, s32 freq, s32 param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioOutReleasePort(s32 port) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioOutOutput(s32 port, vm::ptr ptr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioOutSetVolume(s32 port, s32 flag, vm::ptr vol) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioOutSetConfig(s32 port, s32 len, s32 freq, s32 param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioOutGetConfig(s32 port, s32 configType) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioOutGetRestSample(s32 port) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioOutGetAdopt(s32 portType) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp b/rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp index 870adbdbc7..e8c5d05285 100644 --- a/rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp @@ -8,17 +8,17 @@ logs::channel sceAudioIn("sceAudioIn", logs::level::notice); s32 sceAudioInOpenPort(s32 portType, s32 grain, s32 freq, s32 param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioInReleasePort(s32 port) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioInInput(s32 port, vm::ptr destPtr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp b/rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp index 00fd6ac245..803d0277bc 100644 --- a/rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp @@ -8,37 +8,37 @@ logs::channel sceAudiodec("sceAudiodec", logs::level::notice); s32 sceAudiodecInitLibrary(u32 codecType, vm::ptr pInitParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudiodecTermLibrary(u32 codecType) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudiodecCreateDecoder(vm::ptr pCtrl, u32 codecType) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudiodecDeleteDecoder(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudiodecDecode(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudiodecClearContext(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudiodecGetInternalError(vm::ptr pCtrl, vm::ptr pInternalError) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp b/rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp index 0b26d376dd..202e01513d 100644 --- a/rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp @@ -8,42 +8,42 @@ logs::channel sceAudioenc("sceAudioenc", logs::level::notice); s32 sceAudioencInitLibrary(u32 codecType, vm::ptr pInitParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioencTermLibrary(u32 codecType) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioencCreateEncoder(vm::ptr pCtrl, u32 codecType) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioencDeleteEncoder(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioencEncode(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioencClearContext(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioencGetOptInfo(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAudioencGetInternalError(vm::ptr pCtrl, vm::ptr pInternalError) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceCamera.cpp b/rpcs3/Emu/PSP2/Modules/sceCamera.cpp index 4bfe8de61d..4b1b068b2d 100644 --- a/rpcs3/Emu/PSP2/Modules/sceCamera.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceCamera.cpp @@ -8,207 +8,207 @@ logs::channel sceCamera("sceCamera", logs::level::notice); s32 sceCameraOpen(s32 devnum, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraClose(s32 devnum) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraStart(s32 devnum) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraStop(s32 devnum) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraRead(s32 devnum, vm::ptr pRead) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraIsActive(s32 devnum) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetSaturation(s32 devnum, vm::ptr pLevel) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetSaturation(s32 devnum, s32 level) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetBrightness(s32 devnum, vm::ptr pLevel) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetBrightness(s32 devnum, s32 level) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetContrast(s32 devnum, vm::ptr pLevel) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetContrast(s32 devnum, s32 level) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetSharpness(s32 devnum, vm::ptr pLevel) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetSharpness(s32 devnum, s32 level) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetReverse(s32 devnum, vm::ptr pMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetReverse(s32 devnum, s32 mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetEffect(s32 devnum, vm::ptr pMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetEffect(s32 devnum, s32 mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetEV(s32 devnum, vm::ptr pLevel) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetEV(s32 devnum, s32 level) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetZoom(s32 devnum, vm::ptr pLevel) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetZoom(s32 devnum, s32 level) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetAntiFlicker(s32 devnum, vm::ptr pMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetAntiFlicker(s32 devnum, s32 mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetISO(s32 devnum, vm::ptr pMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetISO(s32 devnum, s32 mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetGain(s32 devnum, vm::ptr pMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetGain(s32 devnum, s32 mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetWhiteBalance(s32 devnum, vm::ptr pMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetWhiteBalance(s32 devnum, s32 mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetBacklight(s32 devnum, vm::ptr pMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetBacklight(s32 devnum, s32 mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetNightmode(s32 devnum, vm::ptr pMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetNightmode(s32 devnum, s32 mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraLedSwitch(s32 devnum, s32 iSwitch) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraLedBlink(s32 devnum, s32 iOnCount, s32 iOffCount, s32 iBlinkCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetNoiseReductionForDebug(s32 devnum, vm::ptr pLevel) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetNoiseReductionForDebug(s32 devnum, s32 level) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraGetSharpnessOffForDebug(s32 devnum, vm::ptr pLevel) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCameraSetSharpnessOffForDebug(s32 devnum, s32 level) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceCameraUseCacheMemoryForTrial(s32 isCache) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp b/rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp index ecb2dc7021..f104719357 100644 --- a/rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp @@ -8,22 +8,22 @@ logs::channel sceCodecEngine("sceCodecEngine", logs::level::notice); s32 sceCodecEnginePmonStart() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCodecEnginePmonStop() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCodecEnginePmonGetProcessorLoad(vm::ptr pProcessorLoad) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCodecEnginePmonReset() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp b/rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp index 254972d198..2b978eeaa1 100644 --- a/rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp @@ -8,202 +8,202 @@ logs::channel sceCommonDialog("sceCommonDialog", logs::level::notice); s32 sceCommonDialogUpdate(vm::cptr updateParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMsgDialogInit(vm::cptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceCommonDialogStatus sceMsgDialogGetStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMsgDialogAbort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMsgDialogGetResult(vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMsgDialogTerm() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMsgDialogClose() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMsgDialogProgressBarInc(s32 target, u32 delta) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMsgDialogProgressBarSetValue(s32 target, u32 rate) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCheckDialogInit(vm::ptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceCommonDialogStatus sceNetCheckDialogGetStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCheckDialogAbort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCheckDialogGetResult(vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCheckDialogTerm() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSaveDataDialogInit(vm::cptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceCommonDialogStatus sceSaveDataDialogGetStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSaveDataDialogAbort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSaveDataDialogGetResult(vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSaveDataDialogTerm() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceCommonDialogStatus sceSaveDataDialogGetSubStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSaveDataDialogSubClose() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSaveDataDialogContinue(vm::cptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSaveDataDialogFinish(vm::cptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSaveDataDialogProgressBarInc(s32 target, u32 delta) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSaveDataDialogProgressBarSetValue(s32 target, u32 rate) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceImeDialogInit(vm::cptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceCommonDialogStatus sceImeDialogGetStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceImeDialogAbort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceImeDialogGetResult(vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceImeDialogTerm() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 scePhotoImportDialogInit(vm::cptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceCommonDialogStatus scePhotoImportDialogGetStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 scePhotoImportDialogGetResult(vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 scePhotoImportDialogTerm() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 scePhotoImportDialogAbort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 scePhotoReviewDialogInit(vm::cptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceCommonDialogStatus scePhotoReviewDialogGetStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 scePhotoReviewDialogGetResult(vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 scePhotoReviewDialogTerm() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 scePhotoReviewDialogAbort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceCtrl.cpp b/rpcs3/Emu/PSP2/Modules/sceCtrl.cpp index ca5f36e827..94a7f01477 100644 --- a/rpcs3/Emu/PSP2/Modules/sceCtrl.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceCtrl.cpp @@ -8,42 +8,42 @@ logs::channel sceCtrl("sceCtrl", logs::level::notice); s32 sceCtrlSetSamplingMode(u32 uiMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCtrlGetSamplingMode(vm::ptr puiMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCtrlPeekBufferPositive(s32 port, vm::ptr pData, s32 nBufs) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCtrlPeekBufferNegative(s32 port, vm::ptr pData, s32 nBufs) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCtrlReadBufferPositive(s32 port, vm::ptr pData, s32 nBufs) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCtrlReadBufferNegative(s32 port, vm::ptr pData, s32 nBufs) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCtrlSetRapidFire(s32 port, s32 idx, vm::cptr pRule) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceCtrlClearRapidFire(s32 port, s32 idx) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceDbg.cpp b/rpcs3/Emu/PSP2/Modules/sceDbg.cpp index dacfd1066c..0e3ebf4e7e 100644 --- a/rpcs3/Emu/PSP2/Modules/sceDbg.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceDbg.cpp @@ -8,22 +8,22 @@ logs::channel sceDbg("sceDbg", logs::level::notice); s32 sceDbgSetMinimumLogLevel(s32 minimumLogLevel) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDbgSetBreakOnErrorState(SceDbgBreakOnErrorState state) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDbgAssertionHandler(vm::cptr pFile, s32 line, b8 stop, vm::cptr pComponent, vm::cptr pMessage, arm_va_args_t va_args) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDbgLoggingHandler(vm::cptr pFile, s32 line, s32 severity, vm::cptr pComponent, vm::cptr pMessage, arm_va_args_t va_args) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp b/rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp index 3b79bb78ee..7d0b7e94b4 100644 --- a/rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp @@ -8,27 +8,27 @@ logs::channel sceDeci4p("sceDeci4p", logs::level::notice); s32 sceKernelDeci4pOpen(vm::cptr protoname, u32 protonum, u32 bufsize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelDeci4pClose(s32 socketid) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelDeci4pRead(s32 socketid, vm::ptr buffer, u32 size, u32 reserved) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelDeci4pWrite(s32 socketid, vm::cptr buffer, u32 size, u32 reserved) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelDeci4pRegisterCallback(s32 socketid, s32 cbid) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceDeflt.cpp b/rpcs3/Emu/PSP2/Modules/sceDeflt.cpp index 32e34b9060..6aeae3c6f2 100644 --- a/rpcs3/Emu/PSP2/Modules/sceDeflt.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceDeflt.cpp @@ -8,67 +8,67 @@ logs::channel sceDeflt("sceDeflt", logs::level::notice); s32 sceGzipIsValid(vm::cptr pSrcGzip) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGzipGetInfo(vm::cptr pSrcGzip, vm::cpptr ppvExtra, vm::cpptr ppszName, vm::cpptr ppszComment, vm::ptr pusCrc, vm::cpptr ppvData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceGzipGetName(vm::cptr pSrcGzip) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceGzipGetComment(vm::cptr pSrcGzip) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceGzipGetCompressedData(vm::cptr pSrcGzip) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGzipDecompress(vm::ptr pDst, u32 uiBufSize, vm::cptr pSrcGzip, vm::ptr puiCrc32) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceZlibIsValid(vm::cptr pSrcZlib) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceZlibGetInfo(vm::cptr pSrcZlib, vm::ptr pbCmf, vm::ptr pbFlg, vm::ptr puiDictId, vm::cpptr ppvData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceZlibGetCompressedData(vm::cptr pSrcZlib) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceZlibDecompress(vm::ptr pDst, u32 uiBufSize, vm::cptr pSrcZlib, vm::ptr puiAdler32) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceZlibAdler32(u32 uiAdler, vm::cptr pSrc, u32 uiSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDeflateDecompress(vm::ptr pDst, u32 uiBufSize, vm::cptr pSrcDeflate, vm::cpptr ppNext) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceZipGetInfo(vm::cptr pSrc, vm::cpptr ppvExtra, vm::ptr puiCrc, vm::cpptr ppvData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceDisplay.cpp b/rpcs3/Emu/PSP2/Modules/sceDisplay.cpp index a069620b79..555aa3681b 100644 --- a/rpcs3/Emu/PSP2/Modules/sceDisplay.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceDisplay.cpp @@ -8,72 +8,72 @@ logs::channel sceDisplay("sceDisplay", logs::level::notice); s32 sceDisplayGetRefreshRate(vm::ptr pFps) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplaySetFrameBuf(vm::cptr pFrameBuf, s32 iUpdateTimingMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplayGetFrameBuf(vm::ptr pFrameBuf, s32 iUpdateTimingMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplayGetVcount() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplayWaitVblankStart() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplayWaitVblankStartCB() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplayWaitVblankStartMulti(u32 vcount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplayWaitVblankStartMultiCB(u32 vcount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplayWaitSetFrameBuf() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplayWaitSetFrameBufCB() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplayWaitSetFrameBufMulti(u32 vcount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplayWaitSetFrameBufMultiCB(u32 vcount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplayRegisterVblankStartCallback(s32 uid) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceDisplayUnregisterVblankStartCallback(s32 uid) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceFiber.cpp b/rpcs3/Emu/PSP2/Modules/sceFiber.cpp index 14cb3ea270..4beaaeddce 100644 --- a/rpcs3/Emu/PSP2/Modules/sceFiber.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceFiber.cpp @@ -8,42 +8,42 @@ logs::channel sceFiber("sceFiber", logs::level::notice); s32 _sceFiberInitializeImpl(vm::ptr fiber, vm::cptr name, vm::ptr entry, u32 argOnInitialize, vm::ptr addrContext, u32 sizeContext, vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiberOptParamInitialize(vm::ptr optParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiberFinalize(vm::ptr fiber) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiberRun(vm::ptr fiber, u32 argOnRunTo, vm::ptr argOnReturn) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiberSwitch(vm::ptr fiber, u32 argOnRunTo, vm::ptr argOnRun) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiberGetSelf(vm::pptr fiber) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiberReturnToThread(u32 argOnReturn, vm::ptr argOnRun) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiberGetInfo(vm::ptr fiber, vm::ptr fiberInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceFios.cpp b/rpcs3/Emu/PSP2/Modules/sceFios.cpp index 08f24eb6dd..eb68c8c459 100644 --- a/rpcs3/Emu/PSP2/Modules/sceFios.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceFios.cpp @@ -8,682 +8,682 @@ logs::channel sceFios("sceFios", logs::level::notice); s32 sceFiosInitialize(vm::cptr pParameters) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosTerminate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceFiosIsInitialized(vm::ptr pOutParameters) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosUpdateParameters(vm::cptr pParameters) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosSetGlobalDefaultOpAttr(vm::cptr pAttr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceFiosGetGlobalDefaultOpAttr(vm::ptr pOutAttr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosSetThreadDefaultOpAttr(vm::cptr pAttr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceFiosGetThreadDefaultOpAttr(vm::ptr pOutAttr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosGetDefaultOpAttr(vm::ptr pOutAttr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosSuspend() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceFiosGetSuspendCount() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceFiosIsSuspended() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosResume() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosShutdownAndCancelOps() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosCancelAllOps() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosCloseAllFiles() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceFiosIsIdle() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceFiosGetAllFHs(vm::ptr pOutArray, u32 arraySize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceFiosGetAllDHs(vm::ptr pOutArray, u32 arraySize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceFiosGetAllOps(vm::ptr pOutArray, u32 arraySize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceFiosIsValidHandle(s32 h) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosPathcmp(vm::cptr pA, vm::cptr pB) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosPathncmp(vm::cptr pA, vm::cptr pB, u32 n) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosPrintf(vm::cptr pFormat, arm_va_args_t va_args) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosVprintf(vm::cptr pFormat) // va_list { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFileExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceFiosFileExistsSync(vm::cptr pAttr, vm::cptr pPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFileGetSize(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFileGetSizeSync(vm::cptr pAttr, vm::cptr pPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFileDelete(vm::cptr pAttr, vm::cptr pPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFileDeleteSync(vm::cptr pAttr, vm::cptr pPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDirectoryExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceFiosDirectoryExistsSync(vm::cptr pAttr, vm::cptr pPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDirectoryCreate(vm::cptr pAttr, vm::cptr pPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDirectoryCreateSync(vm::cptr pAttr, vm::cptr pPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDirectoryDelete(vm::cptr pAttr, vm::cptr pPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDirectoryDeleteSync(vm::cptr pAttr, vm::cptr pPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceFiosExistsSync(vm::cptr pAttr, vm::cptr pPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosStat(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutStatus) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosStatSync(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutStatus) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDelete(vm::cptr pAttr, vm::cptr pPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDeleteSync(vm::cptr pAttr, vm::cptr pPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosResolve(vm::cptr pAttr, vm::cptr pInTuple, vm::ptr pOutTuple) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosResolveSync(vm::cptr pAttr, vm::cptr pInTuple, vm::ptr pOutTuple) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosRename(vm::cptr pAttr, vm::cptr pOldPath, vm::cptr pNewPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosRenameSync(vm::cptr pAttr, vm::cptr pOldPath, vm::cptr pNewPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFileRead(vm::cptr pAttr, vm::cptr pPath, vm::ptr pBuf, s64 length, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFileReadSync(vm::cptr pAttr, vm::cptr pPath, vm::ptr pBuf, s64 length, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFileWrite(vm::cptr pAttr, vm::cptr pPath, vm::cptr pBuf, s64 length, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFileWriteSync(vm::cptr pAttr, vm::cptr pPath, vm::cptr pBuf, s64 length, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFileTruncate(vm::cptr pAttr, vm::cptr pPath, s64 length) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFileTruncateSync(vm::cptr pAttr, vm::cptr pPath, s64 length) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHOpen(vm::cptr pAttr, vm::ptr pOutFH, vm::cptr pPath, vm::cptr pOpenParams) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHOpenSync(vm::cptr pAttr, vm::ptr pOutFH, vm::cptr pPath, vm::cptr pOpenParams) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHStat(vm::cptr pAttr, s32 fh, vm::ptr pOutStatus) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHStatSync(vm::cptr pAttr, s32 fh, vm::ptr pOutStatus) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHTruncate(vm::cptr pAttr, s32 fh, s64 length) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHTruncateSync(vm::cptr pAttr, s32 fh, s64 length) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHSync(vm::cptr pAttr, s32 fh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHSyncSync(vm::cptr pAttr, s32 fh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHRead(vm::cptr pAttr, s32 fh, vm::ptr pBuf, s64 length) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFHReadSync(vm::cptr pAttr, s32 fh, vm::ptr pBuf, s64 length) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHWrite(vm::cptr pAttr, s32 fh, vm::cptr pBuf, s64 length) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFHWriteSync(vm::cptr pAttr, s32 fh, vm::cptr pBuf, s64 length) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHReadv(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFHReadvSync(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHWritev(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFHWritevSync(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHPread(vm::cptr pAttr, s32 fh, vm::ptr pBuf, s64 length, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFHPreadSync(vm::cptr pAttr, s32 fh, vm::ptr pBuf, s64 length, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHPwrite(vm::cptr pAttr, s32 fh, vm::cptr pBuf, s64 length, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFHPwriteSync(vm::cptr pAttr, s32 fh, vm::cptr pBuf, s64 length, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHPreadv(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFHPreadvSync(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHPwritev(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFHPwritevSync(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHClose(vm::cptr pAttr, s32 fh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosFHCloseSync(vm::cptr pAttr, s32 fh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFHSeek(s32 fh, s64 offset, SceFiosWhence whence) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFHTell(s32 fh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceFiosFHGetPath(s32 fh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosFHGetSize(s32 fh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceFiosFHGetOpenParams(s32 fh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDHOpen(vm::cptr pAttr, vm::ptr pOutDH, vm::cptr pPath, SceFiosBuffer buf) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDHOpenSync(vm::cptr pAttr, vm::ptr pOutDH, vm::cptr pPath, SceFiosBuffer buf) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDHRead(vm::cptr pAttr, s32 dh, vm::ptr pOutEntry) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDHReadSync(vm::cptr pAttr, s32 dh, vm::ptr pOutEntry) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDHClose(vm::cptr pAttr, s32 dh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosDHCloseSync(vm::cptr pAttr, s32 dh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceFiosDHGetPath(s32 dh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceFiosOpIsDone(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosOpWait(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosOpWaitUntil(s32 op, s64 deadline) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosOpDelete(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosOpSyncWait(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosOpSyncWaitForIO(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosOpGetError(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosOpCancel(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceFiosOpIsCancelled(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceFiosOpGetAttr(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceFiosOpGetPath(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceFiosOpGetBuffer(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosOpGetOffset(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosOpGetRequestCount(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosOpGetActualCount(s32 op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosOpReschedule(s32 op, s64 newDeadline) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosTimeGetCurrent() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosTimeIntervalToNanoseconds(s64 interval) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosTimeIntervalFromNanoseconds(s64 ns) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u64 sceFiosDateGetCurrent() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u64 sceFiosDateFromComponents(vm::cptr pComponents) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceFiosDateToComponents(u64 date, vm::ptr pOutComponents) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u64 sceFiosDateFromSceDateTime(vm::cptr pSceDateTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceFiosDateToSceDateTime(u64 date, vm::ptr pSceDateTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosOverlayAdd(vm::cptr pOverlay, vm::ptr pOutID) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosOverlayRemove(s32 id) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosOverlayGetInfo(s32 id, vm::ptr pOutOverlay) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosOverlayModify(s32 id, vm::cptr pNewValue) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosOverlayGetList(vm::ptr pOutIDs, u32 maxIDs, vm::ptr pActualIDs) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosOverlayResolveSync(s32 resolveFlag, vm::cptr pInPath, vm::ptr pOutPath, u32 maxPath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosArchiveGetMountBufferSize(vm::cptr pAttr, vm::cptr pArchivePath, vm::cptr pOpenParams) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceFiosArchiveGetMountBufferSizeSync(vm::cptr pAttr, vm::cptr pArchivePath, vm::cptr pOpenParams) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosArchiveMount(vm::cptr pAttr, vm::ptr pOutFH, vm::cptr pArchivePath, vm::cptr pMountPoint, SceFiosBuffer mountBuffer, vm::cptr pOpenParams) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosArchiveMountSync(vm::cptr pAttr, vm::ptr pOutFH, vm::cptr pArchivePath, vm::cptr pMountPoint, SceFiosBuffer mountBuffer, vm::cptr pOpenParams) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosArchiveUnmount(vm::cptr pAttr, s32 fh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosArchiveUnmountSync(vm::cptr pAttr, s32 fh) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceFiosDebugDumpError(s32 err, vm::ptr pBuffer, u32 bufferSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceFiosDebugDumpOp(s32 op, vm::ptr pBuffer, u32 bufferSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceFiosDebugDumpFH(s32 fh, vm::ptr pBuffer, u32 bufferSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceFiosDebugDumpDH(s32 dh, vm::ptr pBuffer, u32 bufferSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceFiosDebugDumpDate(u64 date, vm::ptr pBuffer, u32 bufferSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosIOFilterAdd(s32 index, vm::ptr pFilterCallback, vm::ptr pFilterContext) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosIOFilterGetInfo(s32 index, vm::pptr pOutFilterCallback, vm::pptr pOutFilterContext) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceFiosIOFilterRemove(s32 index) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceFiosIOFilterPsarcDearchiver() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceFios2, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceFpu.cpp b/rpcs3/Emu/PSP2/Modules/sceFpu.cpp index e6480e5528..edf5e19ac7 100644 --- a/rpcs3/Emu/PSP2/Modules/sceFpu.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceFpu.cpp @@ -8,73 +8,73 @@ logs::channel sceFpu("sceFpu", logs::level::notice); float sceFpuSinf(float x) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuCosf(float x) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuTanf(float x) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuAtanf(float x) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuAtan2f(float y, float x) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuAsinf(float x) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuAcosf(float x) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuLogf(float x) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuLog2f(float fs) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuLog10f(float fs) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuExpf(float x) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuExp2f(float x) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuExp10f(float x) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceFpuPowf(float x, float y) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceGxm.cpp b/rpcs3/Emu/PSP2/Modules/sceGxm.cpp index 3f433da956..60a04ced03 100644 --- a/rpcs3/Emu/PSP2/Modules/sceGxm.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceGxm.cpp @@ -8,1064 +8,1064 @@ logs::channel sceGxm("sceGxm", logs::level::notice); s32 sceGxmInitialize(vm::cptr params) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTerminate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceGxmGetNotificationRegion() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmNotificationWait(vm::cptr notification) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmMapMemory(vm::ptr base, u32 size, SceGxmMemoryAttribFlags attr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmUnmapMemory(vm::ptr base) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmMapVertexUsseMemory(vm::ptr base, u32 size, vm::ptr offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmUnmapVertexUsseMemory(vm::ptr base) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmMapFragmentUsseMemory(vm::ptr base, u32 size, vm::ptr offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmUnmapFragmentUsseMemory(vm::ptr base) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmDisplayQueueAddEntry(vm::ptr oldBuffer, vm::ptr newBuffer, vm::cptr callbackData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmDisplayQueueFinish() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmSyncObjectCreate(vm::pptr syncObject) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmSyncObjectDestroy(vm::ptr syncObject) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmCreateContext(vm::cptr params, vm::pptr context) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmDestroyContext(vm::ptr context) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetValidationEnable(vm::ptr context, b8 enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetVertexProgram(vm::ptr context, vm::cptr vertexProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFragmentProgram(vm::ptr context, vm::cptr fragmentProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmReserveVertexDefaultUniformBuffer(vm::ptr context, vm::pptr uniformBuffer) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmReserveFragmentDefaultUniformBuffer(vm::ptr context, vm::pptr uniformBuffer) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmSetVertexStream(vm::ptr context, u32 streamIndex, vm::cptr streamData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmSetVertexTexture(vm::ptr context, u32 textureIndex, vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmSetFragmentTexture(vm::ptr context, u32 textureIndex, vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmSetVertexUniformBuffer(vm::ptr context, u32 bufferIndex, vm::cptr bufferData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmSetFragmentUniformBuffer(vm::ptr context, u32 bufferIndex, vm::cptr bufferData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmSetAuxiliarySurface(vm::ptr context, u32 surfaceIndex, vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetPrecomputedFragmentState(vm::ptr context, vm::cptr precomputedState) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetPrecomputedVertexState(vm::ptr context, vm::cptr precomputedState) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmDrawPrecomputed(vm::ptr context, vm::cptr precomputedDraw) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmDraw(vm::ptr context, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::cptr indexData, u32 indexCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmDrawInstanced(vm::ptr context, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::cptr indexData, u32 indexCount, u32 indexWrap) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmSetVisibilityBuffer(vm::ptr context, vm::ptr bufferBase, u32 stridePerCore) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } 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 EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmMidSceneFlush(vm::ptr context, u32 flags, vm::ptr vertexSyncObject, vm::cptr vertexNotification) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmEndScene(vm::ptr context, vm::cptr vertexNotification, vm::cptr fragmentNotification) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFrontDepthFunc(vm::ptr context, SceGxmDepthFunc depthFunc) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetBackDepthFunc(vm::ptr context, SceGxmDepthFunc depthFunc) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFrontFragmentProgramEnable(vm::ptr context, SceGxmFragmentProgramMode enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetBackFragmentProgramEnable(vm::ptr context, SceGxmFragmentProgramMode enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFrontDepthWriteEnable(vm::ptr context, SceGxmDepthWriteMode enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetBackDepthWriteEnable(vm::ptr context, SceGxmDepthWriteMode enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFrontLineFillLastPixelEnable(vm::ptr context, SceGxmLineFillLastPixelMode enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetBackLineFillLastPixelEnable(vm::ptr context, SceGxmLineFillLastPixelMode enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFrontStencilRef(vm::ptr context, u32 sref) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetBackStencilRef(vm::ptr context, u32 sref) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFrontPointLineWidth(vm::ptr context, u32 width) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetBackPointLineWidth(vm::ptr context, u32 width) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFrontPolygonMode(vm::ptr context, SceGxmPolygonMode mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetBackPolygonMode(vm::ptr context, SceGxmPolygonMode mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFrontStencilFunc(vm::ptr context, SceGxmStencilFunc func, SceGxmStencilOp stencilFail, SceGxmStencilOp depthFail, SceGxmStencilOp depthPass, u8 compareMask, u8 writeMask) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetBackStencilFunc(vm::ptr context, SceGxmStencilFunc func, SceGxmStencilOp stencilFail, SceGxmStencilOp depthFail, SceGxmStencilOp depthPass, u8 compareMask, u8 writeMask) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFrontDepthBias(vm::ptr context, s32 factor, s32 units) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetBackDepthBias(vm::ptr context, s32 factor, s32 units) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetTwoSidedEnable(vm::ptr context, SceGxmTwoSidedMode enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetViewport(vm::ptr context, float xOffset, float xScale, float yOffset, float yScale, float zOffset, float zScale) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetWClampValue(vm::ptr context, float clampValue) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetWClampEnable(vm::ptr context, SceGxmWClampMode enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetRegionClip(vm::ptr context, SceGxmRegionClipMode mode, u32 xMin, u32 yMin, u32 xMax, u32 yMax) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetCullMode(vm::ptr context, SceGxmCullMode mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetViewportEnable(vm::ptr context, SceGxmViewportMode enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetWBufferEnable(vm::ptr context, SceGxmWBufferMode enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFrontVisibilityTestIndex(vm::ptr context, u32 index) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetBackVisibilityTestIndex(vm::ptr context, u32 index) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFrontVisibilityTestOp(vm::ptr context, SceGxmVisibilityTestOp op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetBackVisibilityTestOp(vm::ptr context, SceGxmVisibilityTestOp op) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetFrontVisibilityTestEnable(vm::ptr context, SceGxmVisibilityTestMode enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmSetBackVisibilityTestEnable(vm::ptr context, SceGxmVisibilityTestMode enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmFinish(vm::ptr context) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPushUserMarker(vm::ptr context, vm::cptr tag) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPopUserMarker(vm::ptr context) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmSetUserMarker(vm::ptr context, vm::cptr tag) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPadHeartbeat(vm::cptr displaySurface, vm::ptr displaySyncObject) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPadTriggerGpuPaTrace() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmColorSurfaceInit(vm::ptr surface, SceGxmColorFormat colorFormat, SceGxmColorSurfaceType surfaceType, SceGxmColorSurfaceScaleMode scaleMode, SceGxmOutputRegisterSize outputRegisterSize, u32 width, u32 height, u32 strideInPixels, vm::ptr data) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmColorSurfaceInitDisabled(vm::ptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceGxmColorSurfaceIsEnabled(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmColorSurfaceGetClip(vm::cptr surface, vm::ptr xMin, vm::ptr yMin, vm::ptr xMax, vm::ptr yMax) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmColorSurfaceSetClip(vm::ptr surface, u32 xMin, u32 yMin, u32 xMax, u32 yMax) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmColorSurfaceScaleMode sceGxmColorSurfaceGetScaleMode(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmColorSurfaceSetScaleMode(vm::ptr surface, SceGxmColorSurfaceScaleMode scaleMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceGxmColorSurfaceGetData(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmColorSurfaceSetData(vm::ptr surface, vm::ptr data) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmColorFormat sceGxmColorSurfaceGetFormat(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmColorSurfaceSetFormat(vm::ptr surface, SceGxmColorFormat format) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmColorSurfaceType sceGxmColorSurfaceGetType(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmColorSurfaceGetStrideInPixels(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmDepthStencilSurfaceInit(vm::ptr surface, SceGxmDepthStencilFormat depthStencilFormat, SceGxmDepthStencilSurfaceType surfaceType, u32 strideInSamples, vm::ptr depthData, vm::ptr stencilData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmDepthStencilSurfaceInitDisabled(vm::ptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceGxmDepthStencilSurfaceGetBackgroundDepth(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmDepthStencilSurfaceSetBackgroundDepth(vm::ptr surface, float backgroundDepth) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u8 sceGxmDepthStencilSurfaceGetBackgroundStencil(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmDepthStencilSurfaceSetBackgroundStencil(vm::ptr surface, u8 backgroundStencil) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceGxmDepthStencilSurfaceIsEnabled(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmDepthStencilSurfaceSetForceLoadMode(vm::ptr surface, SceGxmDepthStencilForceLoadMode forceLoad) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmDepthStencilForceLoadMode sceGxmDepthStencilSurfaceGetForceLoadMode(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmDepthStencilSurfaceSetForceStoreMode(vm::ptr surface, SceGxmDepthStencilForceStoreMode forceStore) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmDepthStencilForceStoreMode sceGxmDepthStencilSurfaceGetForceStoreMode(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmColorSurfaceGammaMode sceGxmColorSurfaceGetGammaMode(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmColorSurfaceSetGammaMode(vm::ptr surface, SceGxmColorSurfaceGammaMode gammaMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmColorSurfaceDitherMode sceGxmColorSurfaceGetDitherMode(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmColorSurfaceSetDitherMode(vm::ptr surface, SceGxmColorSurfaceDitherMode ditherMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmDepthStencilFormat sceGxmDepthStencilSurfaceGetFormat(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmDepthStencilSurfaceGetStrideInSamples(vm::cptr surface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmProgramCheck(vm::cptr program) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmProgramGetSize(vm::cptr program) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmProgramType sceGxmProgramGetType(vm::cptr program) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceGxmProgramIsDiscardUsed(vm::cptr program) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceGxmProgramIsDepthReplaceUsed(vm::cptr program) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceGxmProgramIsSpriteCoordUsed(vm::cptr program) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmProgramGetDefaultUniformBufferSize(vm::cptr program) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmProgramGetParameterCount(vm::cptr program) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceGxmProgramGetParameter(vm::cptr program, u32 index) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceGxmProgramFindParameterByName(vm::cptr program, vm::cptr name) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceGxmProgramFindParameterBySemantic(vm::cptr program, SceGxmParameterSemantic semantic, u32 index) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmProgramParameterGetIndex(vm::cptr program, vm::cptr parameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmParameterCategory sceGxmProgramParameterGetCategory(vm::cptr parameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceGxmProgramParameterGetName(vm::cptr parameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmParameterSemantic sceGxmProgramParameterGetSemantic(vm::cptr parameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmProgramParameterGetSemanticIndex(vm::cptr parameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmParameterType sceGxmProgramParameterGetType(vm::cptr parameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmProgramParameterGetComponentCount(vm::cptr parameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmProgramParameterGetArraySize(vm::cptr parameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmProgramParameterGetResourceIndex(vm::cptr parameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmProgramParameterGetContainerIndex(vm::cptr parameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceGxmProgramParameterIsSamplerCube(vm::cptr parameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceGxmFragmentProgramGetProgram(vm::cptr fragmentProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceGxmVertexProgramGetProgram(vm::cptr vertexProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmShaderPatcherCreate(vm::cptr params, vm::pptr shaderPatcher) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmShaderPatcherSetUserData(vm::ptr shaderPatcher, vm::ptr userData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceGxmShaderPatcherGetUserData(vm::ptr shaderPatcher) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmShaderPatcherDestroy(vm::ptr shaderPatcher) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmShaderPatcherRegisterProgram(vm::ptr shaderPatcher, vm::cptr programHeader, vm::pptr programId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmShaderPatcherUnregisterProgram(vm::ptr shaderPatcher, vm::ptr programId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceGxmShaderPatcherGetProgramFromId(vm::ptr programId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmShaderPatcherSetAuxiliarySurface(vm::ptr shaderPatcher, u32 auxSurfaceIndex, vm::cptr auxSurface) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmShaderPatcherCreateVertexProgram(vm::ptr shaderPatcher, vm::ptr programId, vm::cptr attributes, u32 attributeCount, vm::cptr streams, u32 streamCount, vm::pptr vertexProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmShaderPatcherCreateFragmentProgram(vm::ptr shaderPatcher, vm::ptr programId, SceGxmOutputRegisterFormat outputFormat, SceGxmMultisampleMode multisampleMode, vm::cptr blendInfo, vm::cptr vertexProgram, vm::pptr fragmentProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmShaderPatcherAddRefVertexProgram(vm::ptr shaderPatcher, vm::ptr vertexProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmShaderPatcherAddRefFragmentProgram(vm::ptr shaderPatcher, vm::ptr fragmentProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmShaderPatcherReleaseVertexProgram(vm::ptr shaderPatcher, vm::ptr vertexProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmShaderPatcherReleaseFragmentProgram(vm::ptr shaderPatcher, vm::ptr fragmentProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmShaderPatcherGetHostMemAllocated(vm::cptr shaderPatcher) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmShaderPatcherGetBufferMemAllocated(vm::cptr shaderPatcher) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmShaderPatcherGetVertexUsseMemAllocated(vm::cptr shaderPatcher) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmShaderPatcherGetFragmentUsseMemAllocated(vm::cptr shaderPatcher) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureInitSwizzled(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureInitLinear(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureInitLinearStrided(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 byteStride) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureInitTiled(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureInitCube(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmTextureType sceGxmTextureGetType(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetMinFilter(vm::ptr texture, SceGxmTextureFilter minFilter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmTextureFilter sceGxmTextureGetMinFilter(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetMagFilter(vm::ptr texture, SceGxmTextureFilter magFilter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmTextureFilter sceGxmTextureGetMagFilter(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetMipFilter(vm::ptr texture, SceGxmTextureMipFilter mipFilter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmTextureMipFilter sceGxmTextureGetMipFilter(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetAnisoMode(vm::ptr texture, SceGxmTextureAnisoMode anisoMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmTextureAnisoMode sceGxmTextureGetAnisoMode(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetUAddrMode(vm::ptr texture, SceGxmTextureAddrMode addrMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmTextureAddrMode sceGxmTextureGetUAddrMode(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetVAddrMode(vm::ptr texture, SceGxmTextureAddrMode addrMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmTextureAddrMode sceGxmTextureGetVAddrMode(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetFormat(vm::ptr texture, SceGxmTextureFormat texFormat) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmTextureFormat sceGxmTextureGetFormat(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetLodBias(vm::ptr texture, u32 bias) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmTextureGetLodBias(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetStride(vm::ptr texture, u32 byteStride) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmTextureGetStride(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetWidth(vm::ptr texture, u32 width) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmTextureGetWidth(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetHeight(vm::ptr texture, u32 height) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmTextureGetHeight(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetData(vm::ptr texture, vm::cptr data) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceGxmTextureGetData(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetMipmapCount(vm::ptr texture, u32 mipCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmTextureGetMipmapCount(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetPalette(vm::ptr texture, vm::cptr paletteData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceGxmTextureGetPalette(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } SceGxmTextureGammaMode sceGxmTextureGetGammaMode(vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmTextureSetGammaMode(vm::ptr texture, SceGxmTextureGammaMode gammaMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmGetPrecomputedVertexStateSize(vm::cptr vertexProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedVertexStateInit(vm::ptr precomputedState, vm::cptr vertexProgram, vm::ptr memBlock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmPrecomputedVertexStateSetDefaultUniformBuffer(vm::ptr precomputedState, vm::ptr defaultBuffer) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceGxmPrecomputedVertexStateGetDefaultUniformBuffer(vm::cptr precomputedState) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedVertexStateSetAllTextures(vm::ptr precomputedState, vm::cptr textures) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedVertexStateSetTexture(vm::ptr precomputedState, u32 textureIndex, vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedVertexStateSetAllUniformBuffers(vm::ptr precomputedState, vm::cptr> bufferDataArray) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedVertexStateSetUniformBuffer(vm::ptr precomputedState, u32 bufferIndex, vm::cptr bufferData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmGetPrecomputedFragmentStateSize(vm::cptr fragmentProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedFragmentStateInit(vm::ptr precomputedState, vm::cptr fragmentProgram, vm::ptr memBlock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmPrecomputedFragmentStateSetDefaultUniformBuffer(vm::ptr precomputedState, vm::ptr defaultBuffer) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceGxmPrecomputedFragmentStateGetDefaultUniformBuffer(vm::cptr precomputedState) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedFragmentStateSetAllTextures(vm::ptr precomputedState, vm::cptr textureArray) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedFragmentStateSetTexture(vm::ptr precomputedState, u32 textureIndex, vm::cptr texture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedFragmentStateSetAllUniformBuffers(vm::ptr precomputedState, vm::cptr> bufferDataArray) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedFragmentStateSetUniformBuffer(vm::ptr precomputedState, u32 bufferIndex, vm::cptr bufferData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedFragmentStateSetAllAuxiliarySurfaces(vm::ptr precomputedState, vm::cptr auxSurfaceArray) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceGxmGetPrecomputedDrawSize(vm::cptr vertexProgram) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedDrawInit(vm::ptr precomputedDraw, vm::cptr vertexProgram, vm::ptr memBlock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedDrawSetAllVertexStreams(vm::ptr precomputedDraw, vm::cptr> streamDataArray) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmPrecomputedDrawSetVertexStream(vm::ptr precomputedDraw, u32 streamIndex, vm::cptr streamData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmPrecomputedDrawSetParams(vm::ptr precomputedDraw, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::cptr indexData, u32 indexCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceGxmPrecomputedDrawSetParamsInstanced(vm::ptr precomputedDraw, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::cptr indexData, u32 indexCount, u32 indexWrap) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmGetRenderTargetMemSizes(vm::cptr params, vm::ptr hostMemSize, vm::ptr driverMemSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmCreateRenderTarget(vm::cptr params, vm::pptr renderTarget) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmRenderTargetGetHostMem(vm::cptr renderTarget, vm::pptr hostMem) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmRenderTargetGetDriverMemBlock(vm::cptr renderTarget, vm::ptr driverMemBlock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmDestroyRenderTarget(vm::ptr renderTarget) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceGxmSetUniformDataF(vm::ptr uniformBuffer, vm::cptr parameter, u32 componentOffset, u32 componentCount, vm::cptr sourceData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceHttp.cpp b/rpcs3/Emu/PSP2/Modules/sceHttp.cpp index c52183762e..402605e3a8 100644 --- a/rpcs3/Emu/PSP2/Modules/sceHttp.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceHttp.cpp @@ -8,277 +8,277 @@ logs::channel sceHttp("sceHttp", logs::level::notice); s32 sceHttpInit(u32 poolSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpTerm() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpGetMemoryPoolStats(vm::ptr currentStat) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpCreateTemplate(vm::cptr userAgent, s32 httpVer, s32 autoProxyConf) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpDeleteTemplate(s32 tmplId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpCreateConnection(s32 tmplId, vm::cptr serverName, vm::cptr scheme, u16 port, s32 enableKeepalive) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpCreateConnectionWithURL(s32 tmplId, vm::cptr url, s32 enableKeepalive) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpDeleteConnection(s32 connId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpCreateRequest(s32 connId, s32 method, vm::cptr path, u64 contentLength) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpCreateRequestWithURL(s32 connId, s32 method, vm::cptr url, u64 contentLength) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpDeleteRequest(s32 reqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetResponseHeaderMaxSize(s32 id, u32 headerSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetRecvBlockSize(s32 id, u32 blockSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetRequestContentLength(s32 id, u64 contentLength) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSendRequest(s32 reqId, vm::cptr postData, u32 size) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpAbortRequest(s32 reqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpGetResponseContentLength(s32 reqId, vm::ptr contentLength) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpGetStatusCode(s32 reqId, vm::ptr statusCode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpGetAllResponseHeaders(s32 reqId, vm::pptr header, vm::ptr headerSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpReadData(s32 reqId, vm::ptr data, u32 size) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpAddRequestHeader(s32 id, vm::cptr name, vm::cptr value, u32 mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpRemoveRequestHeader(s32 id, vm::cptr name) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpParseResponseHeader(vm::cptr header, u32 headerLen, vm::cptr fieldStr, vm::cpptr fieldValue, vm::ptr valueLen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpParseStatusLine(vm::cptr statusLine, u32 lineLen, vm::ptr httpMajorVer, vm::ptr httpMinorVer, vm::ptr responseCode, vm::cpptr reasonPhrase, vm::ptr phraseLen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetAuthInfoCallback(s32 id, vm::ptr cbfunc, vm::ptr userArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetAuthEnabled(s32 id, s32 enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpGetAuthEnabled(s32 id, vm::ptr enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetRedirectCallback(s32 id, vm::ptr cbfunc, vm::ptr userArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetAutoRedirect(s32 id, s32 enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpGetAutoRedirect(s32 id, vm::ptr enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetResolveTimeOut(s32 id, u32 usec) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetResolveRetry(s32 id, s32 retry) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetConnectTimeOut(s32 id, u32 usec) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetSendTimeOut(s32 id, u32 usec) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetRecvTimeOut(s32 id, u32 usec) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpUriEscape(vm::ptr out, vm::ptr require, u32 prepare, vm::cptr in) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpUriUnescape(vm::ptr out, vm::ptr require, u32 prepare, vm::cptr in) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpUriParse(vm::ptr out, vm::cptr srcUrl, vm::ptr pool, vm::ptr require, u32 prepare) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpUriBuild(vm::ptr out, vm::ptr require, u32 prepare, vm::cptr srcElement, u32 option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpUriMerge(vm::ptr mergedUrl, vm::cptr url, vm::cptr relativeUrl, vm::ptr require, u32 prepare, u32 option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpUriSweepPath(vm::ptr dst, vm::cptr src, u32 srcSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetCookieEnabled(s32 id, s32 enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpGetCookieEnabled(s32 id, vm::ptr enable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpGetCookie(vm::cptr url, vm::ptr cookie, vm::ptr cookieLength, u32 prepare, s32 secure) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpAddCookie(vm::cptr url, vm::cptr cookie, u32 cookieLength) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetCookieRecvCallback(s32 id, vm::ptr cbfunc, vm::ptr userArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpSetCookieSendCallback(s32 id, vm::ptr cbfunc, vm::ptr userArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpsLoadCert(s32 caCertNum, vm::cpptr caList, vm::cptr cert, vm::cptr privKey) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpsUnloadCert() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpsEnableOption(u32 sslFlags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpsDisableOption(u32 sslFlags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpsGetSslError(s32 id, vm::ptr errNum, vm::ptr detail) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpsSetSslCallback(s32 id, vm::ptr cbfunc, vm::ptr userArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpsGetCaList(vm::ptr caList) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceHttpsFreeCaList(vm::ptr caList) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceIme.cpp b/rpcs3/Emu/PSP2/Modules/sceIme.cpp index c8499c0b5c..fb9552f3b9 100644 --- a/rpcs3/Emu/PSP2/Modules/sceIme.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceIme.cpp @@ -8,27 +8,27 @@ logs::channel sceIme("sceIme", logs::level::notice); s32 sceImeOpen(vm::ptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceImeUpdate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceImeSetCaret(vm::cptr caret) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceImeSetPreeditGeometry(vm::cptr preedit) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceImeClose() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceJpeg.cpp b/rpcs3/Emu/PSP2/Modules/sceJpeg.cpp index 1bc2fcf01b..481220dbcd 100644 --- a/rpcs3/Emu/PSP2/Modules/sceJpeg.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceJpeg.cpp @@ -8,12 +8,12 @@ logs::channel sceJpeg("sceJpeg", logs::level::notice); s32 sceJpegInitMJpeg(s32 maxSplitDecoder) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegFinishMJpeg() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegDecodeMJpeg( @@ -27,7 +27,7 @@ s32 sceJpegDecodeMJpeg( vm::ptr pCoefBuffer, u32 coefBufferSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegDecodeMJpegYCbCr( @@ -39,7 +39,7 @@ s32 sceJpegDecodeMJpegYCbCr( vm::ptr pCoefBuffer, u32 coefBufferSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegMJpegCsc( @@ -50,7 +50,7 @@ s32 sceJpegMJpegCsc( s32 colorOption, s32 sampling) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegGetOutputInfo( @@ -60,22 +60,22 @@ s32 sceJpegGetOutputInfo( s32 decodeMode, vm::ptr pOutputInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegCreateSplitDecoder(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegDeleteSplitDecoder(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegSplitDecodeMJpeg(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp b/rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp index afec5b64b1..59c188b807 100644 --- a/rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp @@ -8,7 +8,7 @@ logs::channel sceJpegEnc("sceJpegEnc", logs::level::notice); s32 sceJpegEncoderGetContextSize() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegEncoderInit( @@ -19,19 +19,19 @@ s32 sceJpegEncoderInit( vm::ptr pJpeg, u32 oJpegbufSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegEncoderEncode( SceJpegEncoderContext context, vm::cptr pYCbCr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegEncoderEnd(SceJpegEncoderContext context) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegEncoderSetValidRegion( @@ -39,21 +39,21 @@ s32 sceJpegEncoderSetValidRegion( s32 iFrameWidth, s32 iFrameHeight) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegEncoderSetCompressionRatio( SceJpegEncoderContext context, s32 compratio) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegEncoderSetHeaderMode( SceJpegEncoderContext context, s32 headerMode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegEncoderSetOutputAddr( @@ -61,7 +61,7 @@ s32 sceJpegEncoderSetOutputAddr( vm::ptr pJpeg, u32 oJpegbufSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceJpegEncoderCsc( @@ -71,7 +71,7 @@ s32 sceJpegEncoderCsc( s32 iFrameWidth, s32 inputPixelFormat) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp b/rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp index 882a195e49..05061e7e83 100644 --- a/rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp @@ -70,22 +70,22 @@ void arm_tls_manager::free(u32 addr) s32 sceKernelAllocMemBlock(vm::cptr name, s32 type, u32 vsize, vm::ptr pOpt) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelFreeMemBlock(s32 uid) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetMemBlockBase(s32 uid, vm::pptr ppBase) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetMemBlockInfoByAddr(vm::ptr vbase, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } arm_error_code sceKernelCreateThread(vm::cptr pName, vm::ptr entry, s32 initPriority, u32 stackSize, u32 attr, s32 cpuAffinityMask, vm::cptr pOptParam) @@ -183,28 +183,28 @@ s32 sceKernelChangeThreadCpuAffinityMask(s32 threadId, s32 cpuAffinityMask) { sceLibKernel.todo("sceKernelChangeThreadCpuAffinityMask(threadId=0x%x, cpuAffinityMask=0x%x)", threadId, cpuAffinityMask); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetThreadCpuAffinityMask(s32 threadId) { sceLibKernel.todo("sceKernelGetThreadCpuAffinityMask(threadId=0x%x)", threadId); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelChangeThreadPriority(s32 threadId, s32 priority) { sceLibKernel.todo("sceKernelChangeThreadPriority(threadId=0x%x, priority=%d)", threadId, priority); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetThreadCurrentPriority() { sceLibKernel.todo("sceKernelGetThreadCurrentPriority()"); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceKernelGetThreadId(ARMv7Thread& cpu) @@ -218,77 +218,77 @@ s32 sceKernelChangeCurrentThreadAttr(u32 clearAttr, u32 setAttr) { sceLibKernel.todo("sceKernelChangeCurrentThreadAttr()"); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetThreadExitStatus(s32 threadId, vm::ptr pExitStatus) { sceLibKernel.todo("sceKernelGetThreadExitStatus(threadId=0x%x, pExitStatus=*0x%x)", threadId, pExitStatus); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetProcessId() { sceLibKernel.todo("sceKernelGetProcessId()"); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCheckWaitableStatus() { sceLibKernel.todo("sceKernelCheckWaitableStatus()"); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetThreadInfo(s32 threadId, vm::ptr pInfo) { sceLibKernel.todo("sceKernelGetThreadInfo(threadId=0x%x, pInfo=*0x%x)", threadId, pInfo); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetThreadRunStatus(vm::ptr pStatus) { sceLibKernel.todo("sceKernelGetThreadRunStatus(pStatus=*0x%x)", pStatus); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetSystemInfo(vm::ptr pInfo) { sceLibKernel.todo("sceKernelGetSystemInfo(pInfo=*0x%x)", pInfo); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelChangeThreadVfpException(s32 clearMask, s32 setMask) { sceLibKernel.todo("sceKernelChangeThreadVfpException(clearMask=0x%x, setMask=0x%x)", clearMask, setMask); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetCurrentThreadVfpException() { sceLibKernel.todo("sceKernelGetCurrentThreadVfpException()"); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelDelayThread(u32 usec) { sceLibKernel.todo("sceKernelDelayThread()"); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelDelayThreadCB(u32 usec) { sceLibKernel.todo("sceKernelDelayThreadCB()"); - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } arm_error_code sceKernelWaitThreadEnd(s32 threadId, vm::ptr pExitStatus, vm::ptr pTimeout) @@ -320,96 +320,96 @@ s32 sceKernelWaitThreadEndCB(s32 threadId, vm::ptr pExitStatus, vm::ptr pName, u32 attr, vm::ptr callbackFunc, vm::ptr pCommon) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelDeleteCallback(s32 callbackId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelNotifyCallback(s32 callbackId, s32 notifyArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCancelCallback(s32 callbackId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetCallbackCount(s32 callbackId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCheckCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetCallbackInfo(s32 callbackId, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelRegisterCallbackToEvent(s32 eventId, s32 callbackId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelUnregisterCallbackFromEvent(s32 eventId, s32 callbackId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelUnregisterCallbackFromEventAll(s32 eventId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } // Event functions s32 sceKernelWaitEvent(s32 eventId, u32 waitPattern, vm::ptr pResultPattern, vm::ptr pUserData, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelWaitEventCB(s32 eventId, u32 waitPattern, vm::ptr pResultPattern, vm::ptr pUserData, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelPollEvent(s32 eventId, u32 bitPattern, vm::ptr pResultPattern, vm::ptr pUserData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCancelEvent(s32 eventId, vm::ptr pNumWaitThreads) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetEventInfo(s32 eventId, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelWaitMultipleEvents(vm::ptr pWaitEventList, s32 numEvents, u32 waitMode, vm::ptr pResultEventList, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelWaitMultipleEventsCB(vm::ptr pWaitEventList, s32 numEvents, u32 waitMode, vm::ptr pResultEventList, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } struct psp2_event_flag final @@ -1042,12 +1042,12 @@ arm_error_code sceKernelDeleteSema(s32 semaId) s32 sceKernelOpenSema(vm::cptr pName) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCloseSema(s32 semaId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } arm_error_code sceKernelWaitSema(s32 semaId, s32 needCount, vm::ptr pTimeout) @@ -1068,27 +1068,27 @@ arm_error_code sceKernelWaitSema(s32 semaId, s32 needCount, vm::ptr pTimeou s32 sceKernelWaitSemaCB(s32 semaId, s32 needCount, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelPollSema(s32 semaId, s32 needCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelSignalSema(s32 semaId, s32 signalCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCancelSema(s32 semaId, s32 setCount, vm::ptr pNumWaitThreads) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetSemaInfo(s32 semaId, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } // Mutex functions @@ -1118,84 +1118,84 @@ arm_error_code sceKernelDeleteMutex(s32 mutexId) s32 sceKernelOpenMutex(vm::cptr pName) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCloseMutex(s32 mutexId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelLockMutex(s32 mutexId, s32 lockCount, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelLockMutexCB(s32 mutexId, s32 lockCount, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelTryLockMutex(s32 mutexId, s32 lockCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelUnlockMutex(s32 mutexId, s32 unlockCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCancelMutex(s32 mutexId, s32 newCount, vm::ptr pNumWaitThreads) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetMutexInfo(s32 mutexId, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } // Lightweight mutex functions s32 sceKernelCreateLwMutex(vm::ptr pWork, vm::cptr pName, u32 attr, s32 initCount, vm::cptr pOptParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelDeleteLwMutex(vm::ptr pWork) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelLockLwMutex(vm::ptr pWork, s32 lockCount, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelLockLwMutexCB(vm::ptr pWork, s32 lockCount, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelTryLockLwMutex(vm::ptr pWork, s32 lockCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelUnlockLwMutex(vm::ptr pWork, s32 unlockCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetLwMutexInfo(vm::ptr pWork, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetLwMutexInfoById(s32 lwMutexId, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } // Condition variable functions @@ -1232,255 +1232,255 @@ arm_error_code sceKernelDeleteCond(s32 condId) s32 sceKernelOpenCond(vm::cptr pName) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCloseCond(s32 condId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelWaitCond(s32 condId, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelWaitCondCB(s32 condId, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelSignalCond(s32 condId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelSignalCondAll(s32 condId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelSignalCondTo(s32 condId, s32 threadId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetCondInfo(s32 condId, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } // Lightweight condition variable functions s32 sceKernelCreateLwCond(vm::ptr pWork, vm::cptr pName, u32 attr, vm::ptr pLwMutex, vm::cptr pOptParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelDeleteLwCond(vm::ptr pWork) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelWaitLwCond(vm::ptr pWork, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelWaitLwCondCB(vm::ptr pWork, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelSignalLwCond(vm::ptr pWork) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelSignalLwCondAll(vm::ptr pWork) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelSignalLwCondTo(vm::ptr pWork, s32 threadId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetLwCondInfo(vm::ptr pWork, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetLwCondInfoById(s32 lwCondId, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } // Time functions s32 sceKernelGetSystemTime(vm::ptr pClock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u64 sceKernelGetSystemTimeWide() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceKernelGetSystemTimeLow() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } // Timer functions s32 sceKernelCreateTimer(vm::cptr pName, u32 attr, vm::cptr pOptParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelDeleteTimer(s32 timerId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelOpenTimer(vm::cptr pName) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCloseTimer(s32 timerId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelStartTimer(s32 timerId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelStopTimer(s32 timerId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetTimerBase(s32 timerId, vm::ptr pBase) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u64 sceKernelGetTimerBaseWide(s32 timerId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetTimerTime(s32 timerId, vm::ptr pClock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u64 sceKernelGetTimerTimeWide(s32 timerId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelSetTimerTime(s32 timerId, vm::ptr pClock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u64 sceKernelSetTimerTimeWide(s32 timerId, u64 clock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelSetTimerEvent(s32 timerId, s32 type, vm::ptr pInterval, s32 fRepeat) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCancelTimer(s32 timerId, vm::ptr pNumWaitThreads) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetTimerInfo(s32 timerId, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } // Reader/writer lock functions s32 sceKernelCreateRWLock(vm::cptr pName, u32 attr, vm::cptr pOptParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelDeleteRWLock(s32 rwLockId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelOpenRWLock(vm::cptr pName) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCloseRWLock(s32 rwLockId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelLockReadRWLock(s32 rwLockId, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelLockReadRWLockCB(s32 rwLockId, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelTryLockReadRWLock(s32 rwLockId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelUnlockReadRWLock(s32 rwLockId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelLockWriteRWLock(s32 rwLockId, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelLockWriteRWLockCB(s32 rwLockId, vm::ptr pTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelTryLockWriteRWLock(s32 rwLockId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelUnlockWriteRWLock(s32 rwLockId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelCancelRWLock(s32 rwLockId, vm::ptr pNumReadWaitThreads, vm::ptr pNumWriteWaitThreads, s32 flag) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceKernelGetRWLockInfo(s32 rwLockId, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } arm_error_code sceKernelGetThreadmgrUIDClass(s32 uid) @@ -1500,102 +1500,102 @@ arm_error_code sceKernelGetThreadmgrUIDClass(s32 uid) s32 sceIoRemove(vm::cptr filename) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoMkdir(vm::cptr dirname, s32 mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoRmdir(vm::cptr dirname) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoRename(vm::cptr oldname, vm::cptr newname) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoDevctl(vm::cptr devname, s32 cmd, vm::cptr arg, u32 arglen, vm::ptr bufp, u32 buflen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoSync(vm::cptr devname, s32 flag) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoOpen(vm::cptr filename, s32 flag, s32 mode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoClose(s32 fd) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoIoctl(s32 fd, s32 cmd, vm::cptr argp, u32 arglen, vm::ptr bufp, u32 buflen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s64 sceIoLseek(s32 fd, s64 offset, s32 whence) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoLseek32(s32 fd, s32 offset, s32 whence) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoRead(s32 fd, vm::ptr buf, u32 nbyte) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoWrite(s32 fd, vm::cptr buf, u32 nbyte) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoPread(s32 fd, vm::ptr buf, u32 nbyte, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoPwrite(s32 fd, vm::cptr buf, u32 nbyte, s64 offset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoDopen(vm::cptr dirname) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoDclose(s32 fd) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoDread(s32 fd, vm::ptr buf) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoChstat(vm::cptr name, vm::cptr buf, u32 cbit) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceIoGetstat(vm::cptr name, vm::ptr buf) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceLibc.cpp b/rpcs3/Emu/PSP2/Modules/sceLibc.cpp index e00b4ca46c..2984cc798c 100644 --- a/rpcs3/Emu/PSP2/Modules/sceLibc.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceLibc.cpp @@ -141,7 +141,7 @@ std::string arm_fmt(ARMv7Thread& cpu, vm::cptr fmt, u32 g_count) } } - throw EXCEPTION("Unknown formatting '%s'", start.get_ptr()); + fmt::throw_exception("Unknown formatting '%s'" HERE, start.get_ptr()); } } diff --git a/rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp b/rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp index 986ba30972..fdafb8cfb8 100644 --- a/rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp @@ -10,17 +10,17 @@ namespace sce_libstdcxx_func { void __aeabi_unwind_cpp_pr0() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void __aeabi_unwind_cpp_pr1() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void __aeabi_unwind_cpp_pr2() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } } diff --git a/rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp b/rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp index 9165edaf95..5b12bc8b5c 100644 --- a/rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp @@ -8,12 +8,12 @@ logs::channel sceLiveArea("sceLiveArea", logs::level::notice); s32 sceLiveAreaResourceReplaceAll(vm::cptr dirpath) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLiveAreaResourceGetStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceLiveArea, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceLocation.cpp b/rpcs3/Emu/PSP2/Modules/sceLocation.cpp index 5d8988cdc2..63a95360b8 100644 --- a/rpcs3/Emu/PSP2/Modules/sceLocation.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceLocation.cpp @@ -8,87 +8,87 @@ logs::channel sceLocation("sceLocation", logs::level::notice); s32 sceLocationOpen(vm::ptr handle, SceLocationLocationMethod lmethod, SceLocationHeadingMethod hmethod) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationClose(u8 handle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationReopen(u8 handle, SceLocationLocationMethod lmethod, SceLocationHeadingMethod hmethod) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationGetMethod(u8 handle, vm::ptr lmethod, vm::ptr hmethod) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationGetLocation(u8 handle, vm::ptr linfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationCancelGetLocation(u8 handle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationStartLocationCallback(u8 handle, u32 distance, vm::ptr callback, vm::ptr userdata) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationStopLocationCallback(u8 handle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationGetHeading(u8 handle, vm::ptr hinfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationStartHeadingCallback(u8 handle, u32 difference, vm::ptr callback, vm::ptr userdata) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationStopHeadingCallback(u8 handle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationConfirm(u8 handle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationConfirmGetStatus(u8 handle, vm::ptr status) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationConfirmGetResult(u8 handle, vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationConfirmAbort(u8 handle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationGetPermission(u8 handle, vm::ptr info) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceLocationSetGpsEmulationFile(vm::ptr filename) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceMd5.cpp b/rpcs3/Emu/PSP2/Modules/sceMd5.cpp index 21906de842..f4d013ef91 100644 --- a/rpcs3/Emu/PSP2/Modules/sceMd5.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceMd5.cpp @@ -8,22 +8,22 @@ logs::channel sceMd5("sceMd5", logs::level::notice); s32 sceMd5Digest(vm::cptr plain, u32 len, vm::ptr digest) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMd5BlockInit(vm::ptr pContext) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMd5BlockUpdate(vm::ptr pContext, vm::cptr plain, u32 len) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMd5BlockResult(vm::ptr pContext, vm::ptr digest) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceMd5, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceMotion.cpp b/rpcs3/Emu/PSP2/Modules/sceMotion.cpp index fc5f858d33..c2edf5e1d7 100644 --- a/rpcs3/Emu/PSP2/Modules/sceMotion.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceMotion.cpp @@ -8,82 +8,82 @@ logs::channel sceMotion("sceMotion", logs::level::notice); s32 sceMotionGetState(vm::ptr motionState) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionGetSensorState(vm::ptr sensorState, s32 numRecords) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionGetBasicOrientation(vm::ptr basicOrientation) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionRotateYaw(const float radians) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionGetTiltCorrection() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionSetTiltCorrection(s32 setValue) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionGetDeadband() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionSetDeadband(s32 setValue) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionSetAngleThreshold(const float angle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } float sceMotionGetAngleThreshold() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionReset() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionMagnetometerOn() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionMagnetometerOff() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionGetMagnetometerState() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionStartSampling() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceMotionStopSampling() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceMotion, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceMt19937.cpp b/rpcs3/Emu/PSP2/Modules/sceMt19937.cpp index 42c4e1d20d..4c66c3f27e 100644 --- a/rpcs3/Emu/PSP2/Modules/sceMt19937.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceMt19937.cpp @@ -8,12 +8,12 @@ logs::channel sceMt19937("sceMt19937", logs::level::notice); s32 sceMt19937Init(vm::ptr pCtx, u32 seed) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceMt19937UInt(vm::ptr pCtx) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceNet.cpp b/rpcs3/Emu/PSP2/Modules/sceNet.cpp index 4945c9ab86..a687e895aa 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNet.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNet.cpp @@ -8,292 +8,292 @@ logs::channel sceNet("sceNet", logs::level::notice); s32 sceNetSetDnsInfo(vm::ptr info, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetClearDnsCache(s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetDumpCreate(vm::cptr name, s32 len, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetDumpRead(s32 id, vm::ptr buf, s32 len, vm::ptr pflags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetDumpDestroy(s32 id) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetDumpAbort(s32 id, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetEpollCreate(vm::cptr name, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetEpollControl(s32 eid, s32 op, s32 id, vm::ptr event) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetEpollWait(s32 eid, vm::ptr events, s32 maxevents, s32 timeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetEpollWaitCB(s32 eid, vm::ptr events, s32 maxevents, s32 timeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetEpollDestroy(s32 eid) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetEpollAbort(s32 eid, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceNetErrnoLoc() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetEtherStrton(vm::cptr str, vm::ptr n) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetEtherNtostr(vm::cptr n, vm::ptr str, u32 len) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetGetMacAddress(vm::ptr addr, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNetInetNtop(s32 af, vm::cptr src, vm::ptr dst, SceNetSocklen_t size) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetInetPton(s32 af, vm::cptr src, vm::ptr dst) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u64 sceNetHtonll(u64 host64) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceNetHtonl(u32 host32) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u16 sceNetHtons(u16 host16) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u64 sceNetNtohll(u64 net64) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceNetNtohl(u32 net32) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u16 sceNetNtohs(u16 net16) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetInit(vm::ptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetTerm() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetShowIfconfig() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetShowRoute() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetShowNetstat() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetEmulationSet(vm::ptr param, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetEmulationGet(vm::ptr param, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetResolverCreate(vm::cptr name, vm::ptr param, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetResolverStartNtoa(s32 rid, vm::cptr hostname, vm::ptr addr, s32 timeout, s32 retry, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetResolverStartAton(s32 rid, vm::cptr addr, vm::ptr hostname, s32 len, s32 timeout, s32 retry, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetResolverGetError(s32 rid, vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetResolverDestroy(s32 rid) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetResolverAbort(s32 rid, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetSocket(vm::cptr name, s32 domain, s32 type, s32 protocol) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetAccept(s32 s, vm::ptr addr, vm::ptr addrlen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetBind(s32 s, vm::cptr addr, SceNetSocklen_t addrlen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetConnect(s32 s, vm::cptr name, SceNetSocklen_t namelen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetGetpeername(s32 s, vm::ptr name, vm::ptr namelen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetGetsockname(s32 s, vm::ptr name, vm::ptr namelen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetGetsockopt(s32 s, s32 level, s32 optname, vm::ptr optval, vm::ptr optlen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetListen(s32 s, s32 backlog) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetRecv(s32 s, vm::ptr buf, u32 len, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetRecvfrom(s32 s, vm::ptr buf, u32 len, s32 flags, vm::ptr from, vm::ptr fromlen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetRecvmsg(s32 s, vm::ptr msg, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetSend(s32 s, vm::cptr msg, u32 len, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetSendto(s32 s, vm::cptr msg, u32 len, s32 flags, vm::cptr to, SceNetSocklen_t tolen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetSendmsg(s32 s, vm::cptr msg, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetSetsockopt(s32 s, s32 level, s32 optname, vm::cptr optval, SceNetSocklen_t optlen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetShutdown(s32 s, s32 how) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetSocketClose(s32 s) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetSocketAbort(s32 s, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetGetSockInfo(s32 s, vm::ptr info, s32 n, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetGetSockIdInfo(vm::ptr fds, s32 sockinfoflags, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetGetStatisticsInfo(vm::ptr info, s32 flags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp b/rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp index 9390c957ab..70f9ba9e94 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp @@ -8,82 +8,82 @@ logs::channel sceNetCtl("sceNetCtl", logs::level::notice); s32 sceNetCtlInit() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceNetCtlTerm() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlCheckCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlInetGetResult(s32 eventType, vm::ptr errorCode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlAdhocGetResult(s32 eventType, vm::ptr errorCode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlInetGetInfo(s32 code, vm::ptr info) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlInetGetState(vm::ptr state) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlGetNatInfo(vm::ptr natinfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlInetRegisterCallback(vm::ptr func, vm::ptr arg, vm::ptr cid) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlInetUnregisterCallback(s32 cid) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlAdhocRegisterCallback(vm::ptr func, vm::ptr arg, vm::ptr cid) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlAdhocUnregisterCallback(s32 cid) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlAdhocGetState(vm::ptr state) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlAdhocDisconnect() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlAdhocGetPeerList(vm::ptr buflen, vm::ptr buf) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNetCtlAdhocGetInAddr(vm::ptr inaddr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceNetCtl, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceNgs.cpp b/rpcs3/Emu/PSP2/Modules/sceNgs.cpp index c987b844d4..b9d65cd487 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNgs.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNgs.cpp @@ -8,317 +8,317 @@ logs::channel sceNgs("sceNgs", logs::level::notice); s32 sceNgsSystemGetRequiredMemorySize(vm::cptr pSynthParams, vm::ptr pnSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsSystemInit(vm::ptr pSynthSysMemory, const u32 uMemSize, vm::cptr pSynthParams, vm::ptr pSystemHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsSystemUpdate(SceNgsHSynSystem hSystemHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsSystemRelease(SceNgsHSynSystem hSystemHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsSystemLock(SceNgsHSynSystem hSystemHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsSystemUnlock(SceNgsHSynSystem hSystemHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsSystemSetParamErrorCallback(SceNgsHSynSystem hSystemHandle, vm::ptr callbackFuncPtr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsSystemSetFlags(SceNgsHSynSystem hSystemHandle, const u32 uSystemFlags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsRackGetRequiredMemorySize(SceNgsHSynSystem hSystemHandle, vm::cptr pRackDesc, vm::ptr pnSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsRackInit(SceNgsHSynSystem hSystemHandle, vm::ptr pRackBuffer, vm::cptr pRackDesc, vm::ptr pRackHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsRackGetVoiceHandle(SceNgsHRack hRackHandle, const u32 uIndex, vm::ptr pVoiceHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsRackRelease(SceNgsHRack hRackHandle, vm::ptr callbackFuncPtr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsRackSetParamErrorCallback(SceNgsHRack hRackHandle, vm::ptr callbackFuncPtr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceInit(SceNgsHVoice hVoiceHandle, vm::cptr pPreset, const u32 uInitFlags) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoicePlay(SceNgsHVoice hVoiceHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceKeyOff(SceNgsHVoice hVoiceHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceKill(SceNgsHVoice hVoiceHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoicePause(SceNgsHVoice hVoiceHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceResume(SceNgsHVoice hVoiceHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceSetPreset(SceNgsHVoice hVoiceHandle, vm::cptr pVoicePreset) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceLockParams(SceNgsHVoice hVoiceHandle, const u32 uModule, const u32 uParamsInterfaceId, vm::ptr pParamsBuffer) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceUnlockParams(SceNgsHVoice hVoiceHandle, const u32 uModule) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceSetParamsBlock(SceNgsHVoice hVoiceHandle, vm::cptr pParamData, const u32 uSize, vm::ptr pnErrorCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceBypassModule(SceNgsHVoice hVoiceHandle, const u32 uModule, const u32 uBypassFlag) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceSetModuleCallback(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::ptr callbackFuncPtr, vm::ptr pUserData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceSetFinishedCallback(SceNgsHVoice hVoiceHandle, vm::ptr callbackFuncPtr, vm::ptr pUserData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceGetStateData(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::ptr pMem, const u32 uMemSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceGetInfo(SceNgsHVoice hVoiceHandle, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceGetModuleType(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::ptr pModuleType) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceGetModuleBypass(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::ptr puBypassFlag) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceGetParamsOutOfRange(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::ptr pszMessageBuffer) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsPatchCreateRouting(vm::cptr pPatchInfo, vm::ptr pPatchHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsPatchGetInfo(SceNgsHPatch hPatchHandle, vm::ptr pRouteInfo, vm::ptr pSetup) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoiceGetOutputPatch(SceNgsHVoice hVoiceHandle, const s32 nOutputIndex, const s32 nSubIndex, vm::ptr pPatchHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsPatchRemoveRouting(SceNgsHPatch hPatchHandle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoicePatchSetVolume(SceNgsHPatch hPatchHandle, const s32 nOutputChannel, const s32 nInputChannel, const float fVol) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoicePatchSetVolumes(SceNgsHPatch hPatchHandle, const s32 nOutputChannel, vm::cptr pVolumes, const s32 nVols) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsVoicePatchSetVolumesMatrix(SceNgsHPatch hPatchHandle, vm::cptr pMatrix) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsModuleGetNumPresets(SceNgsHSynSystem hSystemHandle, const u32 uModuleID, vm::ptr puNumPresets) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNgsModuleGetPreset(SceNgsHSynSystem hSystemHandle, const u32 uModuleID, const u32 uPresetIndex, vm::ptr pParamsBuffer) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetCompressorBuss() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetCompressorSideChainBuss() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetDelayBuss() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetDistortionBuss() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetEnvelopeBuss() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetEqBuss() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetMasterBuss() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetMixerBuss() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetPauserBuss() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetReverbBuss() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetSasEmuVoice() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetSimpleVoice() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetTemplate1() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::cptr sceNgsVoiceDefGetAtrac9Voice() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaNgsGetDefaultConfig(vm::ptr config) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaNgsGetNeededMemory(vm::cptr config, vm::ptr sizeInBytes) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaNgsInit(vm::cptr config, vm::ptr buffer, u32 sizeInBytes) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaNgsShutdown() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaNgsSetSynthName(SceNgsHSynSystem synthHandle, vm::cptr name) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaNgsSetRackName(SceNgsHRack rackHandle, vm::cptr name) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaNgsSetVoiceName(SceNgsHVoice voiceHandle, vm::cptr name) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaNgsSetSampleName(vm::cptr location, u32 length, vm::cptr name) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaNgsTrace(vm::cptr message) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp b/rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp index 7800496720..5503ea8528 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp @@ -8,92 +8,92 @@ logs::channel sceNpBasic("sceNpBasic", logs::level::notice); s32 sceNpBasicInit(vm::ptr opt) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicTerm(ARMv7Thread&) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicRegisterHandler(vm::cptr handlers, vm::cptr context, vm::ptr userdata) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicUnregisterHandler(ARMv7Thread&) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicCheckCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicGetFriendOnlineStatus(vm::cptr friendId, vm::ptr status) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicGetGamePresenceOfFriend(vm::cptr friendId, vm::ptr presence) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicGetFriendListEntryCount(vm::ptr count) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicGetFriendListEntries(u32 startIndex, vm::ptr entries, u32 numEntries, vm::ptr retrieved) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicGetBlockListEntryCount(vm::ptr count) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicGetBlockListEntries(u32 startIndex, vm::ptr entries, u32 numEntries, vm::ptr retrieved) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicCheckIfPlayerIsBlocked(vm::cptr player, vm::ptr playerIsBlocked) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicSetInGamePresence(vm::cptr presence) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicUnsetInGamePresence() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicSendInGameDataMessage(vm::cptr to, vm::cptr message) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicRecordPlaySessionLog(vm::cptr withWhom, vm::cptr description) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicGetPlaySessionLogSize(SceNpBasicPlaySessionLogType type, vm::ptr size) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBasicGetPlaySessionLog(SceNpBasicPlaySessionLogType type, u32 index, vm::ptr log) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceNpBasic, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp b/rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp index bfe145d62a..d88d225302 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp @@ -8,57 +8,57 @@ logs::channel sceNpCommon("sceNpCommon", logs::level::notice); s32 sceNpAuthInit() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpAuthTerm() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpAuthCreateStartRequest(vm::cptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpAuthDestroyRequest(s32 id) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpAuthAbortRequest(s32 id) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpAuthGetTicket(s32 id, vm::ptr buf, u32 len) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpAuthGetTicketParam(vm::cptr ticket, u32 ticketSize, s32 paramId, vm::ptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpAuthGetEntitlementIdList(vm::cptr ticket, u32 ticketSize, vm::ptr entIdList, u32 entIdListNum) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpAuthGetEntitlementById(vm::cptr ticket, u32 ticketSize, vm::cptr entId, vm::ptr ent) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpCmpNpId(vm::cptr npid1, vm::cptr npid2) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpCmpNpIdInOrder(vm::cptr npid1, vm::cptr npid2, vm::ptr order) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceNpCommon, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceNpManager.cpp b/rpcs3/Emu/PSP2/Modules/sceNpManager.cpp index d0eab10b94..17b54348ab 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNpManager.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNpManager.cpp @@ -8,52 +8,52 @@ logs::channel sceNpManager("sceNpManager", logs::level::notice); s32 sceNpInit(vm::cptr commConf, vm::ptr opt) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpTerm(ARMv7Thread&) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpCheckCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpGetServiceState(vm::ptr state) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpRegisterServiceStateCallback(vm::ptr callback, vm::ptr userdata) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpUnregisterServiceStateCallback() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpManagerGetNpId(vm::ptr npId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpManagerGetAccountRegion(vm::ptr countryCode, vm::ptr languageCode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpManagerGetContentRatingFlag(vm::ptr isRestricted, vm::ptr age) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpManagerGetChatRestrictionFlag(vm::ptr isRestricted) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceNpManager, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp b/rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp index 83c4b03750..bc92ecf1f4 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp @@ -10,12 +10,12 @@ logs::channel sceNpMatching("sceNpMatching", logs::level::notice); s32 sceNpMatching2Init(u32 poolSize, s32 threadPriority, s32 cpuAffinityMask, u32 threadStackSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2Term() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2CreateContext( @@ -24,67 +24,67 @@ s32 sceNpMatching2CreateContext( vm::cptr passPhrase, vm::ptr ctxId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2DestroyContext(u16 ctxId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2ContextStart(u16 ctxId, u64 timeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2AbortContextStart(u16 ctxId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2ContextStop(u16 ctxId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SetDefaultRequestOptParam(u16 ctxId, vm::cptr optParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2RegisterRoomEventCallback(u16 ctxId, vm::ptr cbFunc, vm::ptr cbFuncArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2RegisterRoomMessageCallback(u16 ctxId, vm::ptr cbFunc, vm::ptr cbFuncArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2RegisterSignalingCallback(u16 ctxId, vm::ptr cbFunc, vm::ptr cbFuncArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2RegisterContextCallback(vm::ptr cbFunc, vm::ptr cbFuncArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2AbortRequest(u16 ctxId, u32 reqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetMemoryInfo(vm::ptr memInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetServerLocal(u16 ctxId, vm::ptr server) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetWorldInfoList( @@ -93,7 +93,7 @@ s32 sceNpMatching2GetWorldInfoList( vm::cptr optParam, vm::ptr assignedReqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2CreateJoinRoom( @@ -102,7 +102,7 @@ s32 sceNpMatching2CreateJoinRoom( vm::cptr optParam, vm::ptr assignedReqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SearchRoom( @@ -111,7 +111,7 @@ s32 sceNpMatching2SearchRoom( vm::cptr optParam, vm::ptr assignedReqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2JoinRoom( @@ -120,7 +120,7 @@ s32 sceNpMatching2JoinRoom( vm::cptr optParam, vm::ptr assignedReqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2LeaveRoom( @@ -129,7 +129,7 @@ s32 sceNpMatching2LeaveRoom( vm::cptr optParam, vm::ptr assignedReqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2GetSignalingOptParamLocal( @@ -137,7 +137,7 @@ s32 sceNpMatching2GetSignalingOptParamLocal( u64 roomId, vm::ptr signalingOptParam) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SetRoomDataExternal( @@ -146,7 +146,7 @@ s32 sceNpMatching2SetRoomDataExternal( vm::cptr optParam, vm::ptr assignedReqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2KickoutRoomMember( @@ -155,7 +155,7 @@ s32 sceNpMatching2KickoutRoomMember( vm::cptr optParam, vm::ptr assignedReqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SendRoomChatMessage( @@ -164,7 +164,7 @@ s32 sceNpMatching2SendRoomChatMessage( vm::cptr optParam, vm::ptr assignedReqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SendRoomMessage( @@ -173,7 +173,7 @@ s32 sceNpMatching2SendRoomMessage( vm::cptr optParam, vm::ptr assignedReqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SignalingGetConnectionStatus( @@ -184,7 +184,7 @@ s32 sceNpMatching2SignalingGetConnectionStatus( vm::ptr peerAddr, vm::ptr peerPort) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SignalingGetConnectionInfo( @@ -194,12 +194,12 @@ s32 sceNpMatching2SignalingGetConnectionInfo( s32 code, vm::ptr info) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SignalingGetLocalNetInfo(vm::ptr netinfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SignalingGetPeerNetInfo( @@ -208,14 +208,14 @@ s32 sceNpMatching2SignalingGetPeerNetInfo( u16 memberId, vm::ptr reqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SignalingCancelPeerNetInfo( u16 ctxId, u32 reqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpMatching2SignalingGetPeerNetInfoResult( @@ -223,7 +223,7 @@ s32 sceNpMatching2SignalingGetPeerNetInfoResult( u32 reqId, vm::ptr netinfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceNpMatching2, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceNpScore.cpp b/rpcs3/Emu/PSP2/Modules/sceNpScore.cpp index 88c47ea935..1f8df62522 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNpScore.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNpScore.cpp @@ -8,52 +8,52 @@ logs::channel sceNpScore("sceNpScore", logs::level::notice); s32 sceNpScoreInit(s32 threadPriority, s32 cpuAffinityMask, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreTerm(ARMv7Thread&) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreCreateTitleCtx(vm::cptr titleId, vm::cptr passphrase, vm::cptr selfNpId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreDeleteTitleCtx(s32 titleCtxId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreCreateRequest(s32 titleCtxId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreDeleteRequest(s32 reqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreAbortRequest(s32 reqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreSetTimeout(s32 id, s32 resolveRetry, s32 resolveTimeout, s32 connTimeout, s32 sendTimeout, s32 recvTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreSetPlayerCharacterId(s32 id, s32 pcId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreGetBoardInfo(s32 reqId, u32 boardId, vm::ptr boardInfo, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreRecordScore( @@ -66,7 +66,7 @@ s32 sceNpScoreRecordScore( vm::cptr compareDate, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreRecordGameData( @@ -78,7 +78,7 @@ s32 sceNpScoreRecordGameData( vm::cptr data, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreGetGameData( @@ -90,7 +90,7 @@ s32 sceNpScoreGetGameData( vm::ptr data, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreGetRankingByNpId( @@ -109,7 +109,7 @@ s32 sceNpScoreGetRankingByNpId( vm::ptr totalRecord, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreGetRankingByRange( @@ -127,7 +127,7 @@ s32 sceNpScoreGetRankingByRange( vm::ptr totalRecord, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } @@ -147,32 +147,32 @@ s32 sceNpScoreGetRankingByNpIdPcId( vm::ptr totalRecord, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreCensorComment(s32 reqId, vm::cptr comment, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreSanitizeComment(s32 reqId, vm::cptr comment, vm::ptr sanitizedComment, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreWaitAsync(s32 id, vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScorePollAsync(s32 reqId, vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreGetBoardInfoAsync(s32 reqId, u32 boardId, vm::ptr boardInfo, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreRecordScoreAsync( @@ -185,7 +185,7 @@ s32 sceNpScoreRecordScoreAsync( vm::cptr compareDate, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreRecordGameDataAsync( @@ -197,7 +197,7 @@ s32 sceNpScoreRecordGameDataAsync( vm::cptr data, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreGetGameDataAsync( @@ -209,7 +209,7 @@ s32 sceNpScoreGetGameDataAsync( vm::ptr data, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreGetRankingByNpIdAsync( @@ -228,7 +228,7 @@ s32 sceNpScoreGetRankingByNpIdAsync( vm::ptr totalRecord, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreGetRankingByRangeAsync( @@ -246,7 +246,7 @@ s32 sceNpScoreGetRankingByRangeAsync( vm::ptr totalRecord, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreGetRankingByNpIdPcIdAsync( @@ -265,17 +265,17 @@ s32 sceNpScoreGetRankingByNpIdPcIdAsync( vm::ptr totalRecord, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreCensorCommentAsync(s32 reqId, vm::cptr comment, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpScoreSanitizeCommentAsync(s32 reqId, vm::cptr comment, vm::ptr sanitizedComment, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceNpScore, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp b/rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp index a5a46791e0..3d70517ba7 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp @@ -8,62 +8,62 @@ logs::channel sceNpUtility("sceNpUtility", logs::level::notice); s32 sceNpLookupInit(s32 usesAsync, s32 threadPriority, s32 cpuAffinityMask, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupTerm(ARMv7Thread&) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupCreateTitleCtx(vm::cptr titleId, vm::cptr selfNpId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupDeleteTitleCtx(s32 titleCtxId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupCreateRequest(s32 titleCtxId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupDeleteRequest(s32 reqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupAbortRequest(s32 reqId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupSetTimeout(s32 id, s32 resolveRetry, u32 resolveTimeout, u32 connTimeout, u32 sendTimeout, u32 recvTimeout) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupWaitAsync(s32 reqId, vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupPollAsync(s32 reqId, vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupNpId(s32 reqId, vm::cptr onlineId, vm::ptr npId, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupNpIdAsync(s32 reqId, vm::cptr onlineId, vm::ptr npId, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupUserProfile( @@ -79,7 +79,7 @@ s32 sceNpLookupUserProfile( vm::ptr avatarImageDataSize, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupUserProfileAsync( @@ -95,37 +95,37 @@ s32 sceNpLookupUserProfileAsync( vm::ptr avatarImageDataSize, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupAvatarImage(s32 reqId, vm::cptr avatarUrl, vm::ptr avatarImage, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpLookupAvatarImageAsync(s32 reqId, vm::cptr avatarUrl, vm::ptr avatarImage, vm::ptr option) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBandwidthTestInitStart(s32 initPriority, s32 cpuAffinityMask) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBandwidthTestGetStatus() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBandwidthTestShutdown(vm::ptr result) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceNpBandwidthTestAbort() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceNpUtility, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/scePerf.cpp b/rpcs3/Emu/PSP2/Modules/scePerf.cpp index c771da3d2f..4684cee64d 100644 --- a/rpcs3/Emu/PSP2/Modules/scePerf.cpp +++ b/rpcs3/Emu/PSP2/Modules/scePerf.cpp @@ -58,7 +58,7 @@ arm_error_code scePerfArmPmonSelectEvent(ARMv7Thread& cpu, s32 threadId, u32 cou default: { - throw EXCEPTION("Unknown event requested"); + fmt::throw_exception("Unknown event requested" HERE); } } @@ -103,7 +103,7 @@ arm_error_code scePerfArmPmonGetCounterValue(ARMv7Thread& cpu, s32 threadId, u32 } else { - throw EXCEPTION("Cycle counter requested"); + fmt::throw_exception("Cycle counter requested" HERE); } return SCE_OK; @@ -145,22 +145,22 @@ u32 scePerfGetTimebaseFrequency() s32 _sceRazorCpuInit(vm::cptr pBufferBase, u32 bufferSize, u32 numPerfCounters, vm::pptr psceRazorVars) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRazorCpuPushMarker(vm::cptr szLabel) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRazorCpuPopMarker() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRazorCpuSync() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(ScePerf, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp b/rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp index ad120525ec..791efd9710 100644 --- a/rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp +++ b/rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp @@ -16,7 +16,7 @@ s32 scePhotoExportFromData( vm::ptr exportedPath, s32 exportedPathLength) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 scePhotoExportFromFile( @@ -28,7 +28,7 @@ s32 scePhotoExportFromFile( vm::ptr exportedPath, s32 exportedPathLength) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(libScePhotoExport, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp b/rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp index 8e5f828e32..c71abdd4fb 100644 --- a/rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp @@ -8,17 +8,17 @@ logs::channel sceRazorCapture("sceRazorCapture", logs::level::notice); void sceRazorCaptureSetTrigger(u32 frameIndex, vm::cptr captureFilename) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } void sceRazorCaptureSetTriggerNextFrame(vm::cptr captureFilename) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } b8 sceRazorCaptureIsInProgress() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceRazorCapture, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceRtc.cpp b/rpcs3/Emu/PSP2/Modules/sceRtc.cpp index ea44db8ee7..fdaae8526e 100644 --- a/rpcs3/Emu/PSP2/Modules/sceRtc.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceRtc.cpp @@ -8,187 +8,187 @@ logs::channel sceRtc("sceRtc", logs::level::notice); u32 sceRtcGetTickResolution() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcGetCurrentTick(vm::ptr pTick) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcGetCurrentClock(vm::ptr pTime, s32 iTimeZone) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcGetCurrentClockLocalTime(vm::ptr pTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcGetCurrentNetworkTick(vm::ptr pTick) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcConvertUtcToLocalTime(vm::cptr pUtc, vm::ptr pLocalTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcConvertLocalTimeToUtc(vm::cptr pLocalTime, vm::ptr pUtc) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcIsLeapYear(s32 year) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcGetDaysInMonth(s32 year, s32 month) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcGetDayOfWeek(s32 year, s32 month, s32 day) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcCheckValid(vm::cptr pTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcSetTime_t(vm::ptr pTime, u32 iTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcSetTime64_t(vm::ptr pTime, u64 ullTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcGetTime_t(vm::cptr pTime, vm::ptr piTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcGetTime64_t(vm::cptr pTime, vm::ptr pullTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcSetDosTime(vm::ptr pTime, u32 uiDosTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcGetDosTime(vm::cptr pTime, vm::ptr puiDosTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcSetWin32FileTime(vm::ptr pTime, u64 ulWin32Time) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcGetWin32FileTime(vm::cptr pTime, vm::ptr ulWin32Time) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcSetTick(vm::ptr pTime, vm::cptr pTick) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcGetTick(vm::cptr pTime, vm::ptr pTick) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcCompareTick(vm::cptr pTick1, vm::cptr pTick2) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcTickAddTicks(vm::ptr pTick0, vm::cptr pTick1, u64 lAdd) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcTickAddMicroseconds(vm::ptr pTick0, vm::cptr pTick1, u64 lAdd) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcTickAddSeconds(vm::ptr pTick0, vm::cptr pTick1, u64 lAdd) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcTickAddMinutes(vm::ptr pTick0, vm::cptr pTick1, u64 lAdd) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcTickAddHours(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcTickAddDays(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcTickAddWeeks(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcTickAddMonths(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcTickAddYears(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcFormatRFC2822(vm::ptr pszDateTime, vm::cptr pUtc, s32 iTimeZoneMinutes) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcFormatRFC2822LocalTime(vm::ptr pszDateTime, vm::cptr pUtc) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcFormatRFC3339(vm::ptr pszDateTime, vm::cptr pUtc, s32 iTimeZoneMinutes) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcFormatRFC3339LocalTime(vm::ptr pszDateTime, vm::cptr pUtc) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcParseDateTime(vm::ptr pUtc, vm::cptr pszDateTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceRtcParseRFC3339(vm::ptr pUtc, vm::cptr pszDateTime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceSas.cpp b/rpcs3/Emu/PSP2/Modules/sceSas.cpp index 921fadfb9a..0fc7196e17 100644 --- a/rpcs3/Emu/PSP2/Modules/sceSas.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceSas.cpp @@ -8,147 +8,147 @@ logs::channel sceSas("sceSas", logs::level::notice); s32 sceSasGetNeededMemorySize(vm::cptr config, vm::ptr outSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasInit(vm::cptr config, vm::ptr buffer, u32 bufferSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasInitWithGrain(vm::cptr config, u32 grain, vm::ptr buffer, u32 bufferSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasExit(vm::pptr outBuffer, vm::ptr outBufferSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetGrain(u32 grain) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasGetGrain() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetOutputmode(u32 outputmode) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasGetOutputmode() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasCore(vm::ptr out) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasCoreWithMix(vm::ptr inOut, s32 lvol, s32 rvol) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetVoice(s32 iVoiceNum, vm::cptr vagBuf, u32 size, u32 loopflag) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetVoicePCM(s32 iVoiceNum, vm::cptr pcmBuf, u32 size, s32 loopsize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetNoise(s32 iVoiceNum, u32 uClk) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetVolume(s32 iVoiceNum, s32 l, s32 r, s32 wl, s32 wr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetPitch(s32 iVoiceNum, s32 pitch) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetADSR(s32 iVoiceNum, u32 flag, u32 ar, u32 dr, u32 sr, u32 rr) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetADSRmode(s32 iVoiceNum, u32 flag, u32 am, u32 dm, u32 sm, u32 rm) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetSL(s32 iVoiceNum, u32 sl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetSimpleADSR(s32 iVoiceNum, u16 adsr1, u16 adsr2) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetKeyOn(s32 iVoiceNum) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetKeyOff(s32 iVoiceNum) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetPause(s32 iVoiceNum, u32 pauseFlag) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasGetPauseState(s32 iVoiceNum) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasGetEndState(s32 iVoiceNum) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasGetEnvelope(s32 iVoiceNum) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetEffect(s32 drySwitch, s32 wetSwitch) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetEffectType(s32 type) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetEffectVolume(s32 valL, s32 valR) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSasSetEffectParam(u32 delayTime, u32 feedback) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp b/rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp index b9acb49793..2cd944e56d 100644 --- a/rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp @@ -8,22 +8,22 @@ logs::channel sceScreenShot("sceScreenShot", logs::level::notice); s32 sceScreenShotSetParam(vm::cptr param) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceScreenShotSetOverlayImage(vm::cptr filePath, s32 offsetX, s32 offsetY) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceScreenShotDisable() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceScreenShotEnable() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceSsl.cpp b/rpcs3/Emu/PSP2/Modules/sceSsl.cpp index e1d117dba6..cd48fdbab2 100644 --- a/rpcs3/Emu/PSP2/Modules/sceSsl.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceSsl.cpp @@ -8,57 +8,57 @@ logs::channel sceSsl("sceSsl", logs::level::notice); s32 sceSslInit(u32 poolSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSslTerm() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSslGetMemoryPoolStats(vm::ptr currentStat) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSslGetSerialNumber(vm::ptr sslCert, vm::cpptr sboData, vm::ptr sboLen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceSslGetSubjectName(vm::ptr sslCert) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } vm::ptr sceSslGetIssuerName(vm::ptr sslCert) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSslGetNotBefore(vm::ptr sslCert, vm::ptr begin) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSslGetNotAfter(vm::ptr sslCert, vm::ptr limit) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSslGetNameEntryCount(vm::ptr certName) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSslGetNameEntryInfo(vm::ptr certName, s32 entryNum, vm::ptr oidname, u32 maxOidnameLen, vm::ptr value, u32 maxValueLen, vm::ptr valueLen) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSslFreeSslCertName(vm::ptr certName) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceSulpha.cpp b/rpcs3/Emu/PSP2/Modules/sceSulpha.cpp index a602794ade..88d7981462 100644 --- a/rpcs3/Emu/PSP2/Modules/sceSulpha.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceSulpha.cpp @@ -8,67 +8,67 @@ logs::channel sceSulpha("sceSulpha", logs::level::notice); s32 sceSulphaNetworkInit() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaNetworkShutdown() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaGetDefaultConfig(vm::ptr config) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaGetNeededMemory(vm::cptr config, vm::ptr sizeInBytes) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaInit(vm::cptr config, vm::ptr buffer, u32 sizeInBytes) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaShutdown() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaUpdate() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaFileConnect(vm::cptr filename) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaFileDisconnect() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaSetBookmark(vm::cptr name, s32 id) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaAgentsGetNeededMemory(vm::cptr config, vm::ptr sizeInBytes) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaAgentsRegister(vm::cptr config, vm::ptr buffer, u32 sizeInBytes, vm::ptr handles) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSulphaAgentsUnregister(vm::cptr handles, u32 agentCount) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp b/rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp index c410a0c62f..6e373b0bf0 100644 --- a/rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp @@ -8,87 +8,87 @@ logs::channel sceSystemGesture("sceSystemGesture", logs::level::notice); s32 sceSystemGestureInitializePrimitiveTouchRecognizer(vm::ptr parameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureFinalizePrimitiveTouchRecognizer() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureResetPrimitiveTouchRecognizer() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureUpdatePrimitiveTouchRecognizer(vm::cptr pFrontData, vm::cptr pBackData) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureGetPrimitiveTouchEvents(vm::ptr primitiveEventBuffer, const u32 capacityOfBuffer, vm::ptr numberOfEvent) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureGetPrimitiveTouchEventsCount() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureGetPrimitiveTouchEventByIndex(const u32 index, vm::ptr primitiveTouchEvent) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureGetPrimitiveTouchEventByPrimitiveID(const u16 primitiveID, vm::ptr primitiveTouchEvent) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureCreateTouchRecognizer(vm::ptr touchRecognizer, const SceSystemGestureType gestureType, const u8 touchPanelPortID, vm::cptr rectangle, vm::cptr touchRecognizerParameter) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureGetTouchRecognizerInformation(vm::cptr touchRecognizer, vm::ptr information) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureResetTouchRecognizer(vm::ptr touchRecognizer) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureUpdateTouchRecognizer(vm::ptr touchRecognizer) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureUpdateTouchRecognizerRectangle(vm::ptr touchRecognizer, vm::cptr rectangle) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureGetTouchEvents(vm::cptr touchRecognizer, vm::ptr eventBuffer, const u32 capacityOfBuffer, vm::ptr numberOfEvent) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureGetTouchEventsCount(vm::cptr touchRecognizer) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureGetTouchEventByIndex(vm::cptr touchRecognizer, const u32 index, vm::ptr touchEvent) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceSystemGestureGetTouchEventByEventID(vm::cptr touchRecognizer, const u32 eventID, vm::ptr touchEvent) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceTouch.cpp b/rpcs3/Emu/PSP2/Modules/sceTouch.cpp index e59a7ef936..3f8925c2f5 100644 --- a/rpcs3/Emu/PSP2/Modules/sceTouch.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceTouch.cpp @@ -8,27 +8,27 @@ logs::channel sceTouch("sceTouch", logs::level::notice); s32 sceTouchGetPanelInfo(u32 port, vm::ptr pPanelInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceTouchRead(u32 port, vm::ptr pData, u32 nBufs) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceTouchPeek(u32 port, vm::ptr pData, u32 nBufs) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceTouchSetSamplingState(u32 port, u32 state) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceTouchGetSamplingState(u32 port, vm::ptr pState) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceUlt.cpp b/rpcs3/Emu/PSP2/Modules/sceUlt.cpp index af1ecd53dc..625825ae9f 100644 --- a/rpcs3/Emu/PSP2/Modules/sceUlt.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceUlt.cpp @@ -10,12 +10,12 @@ logs::channel sceUlt("sceUlt", logs::level::notice); s32 _sceUltWaitingQueueResourcePoolOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceUltWaitingQueueResourcePoolGetWorkAreaSize(u32 numThreads, u32 numSyncObjects) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltWaitingQueueResourcePoolCreate( @@ -27,22 +27,22 @@ s32 _sceUltWaitingQueueResourcePoolCreate( vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltWaitingQueueResourcePoolDestroy(vm::ptr pool) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltQueueDataResourcePoolOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceUltQueueDataResourcePoolGetWorkAreaSize(u32 numData, u32 dataSize, u32 numQueueObject) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltQueueDataResourcePoolCreate( @@ -56,22 +56,22 @@ s32 _sceUltQueueDataResourcePoolCreate( vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltQueueDataResourcePoolDestroy(vm::ptr pool) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceUltMutexGetStandaloneWorkAreaSize(u32 waitingQueueDepth, u32 numConditionVariable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltMutexOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltMutexCreate( @@ -81,7 +81,7 @@ s32 _sceUltMutexCreate( vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltMutexCreateStandalone( @@ -93,32 +93,32 @@ s32 _sceUltMutexCreateStandalone( vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltMutexLock(vm::ptr mutex) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltMutexTryLock(vm::ptr mutex) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltMutexUnlock(vm::ptr mutex) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltMutexDestroy(vm::ptr mutex) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltConditionVariableOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltConditionVariableCreate( @@ -128,39 +128,39 @@ s32 _sceUltConditionVariableCreate( vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltConditionVariableSignal(vm::ptr conditionVariable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltConditionVariableSignalAll(vm::ptr conditionVariable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltConditionVariableWait(vm::ptr conditionVariable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltConditionVariableDestroy(vm::ptr conditionVariable) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltQueueOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceUltQueueGetStandaloneWorkAreaSize(u32 queueDepth, u32 dataSize, u32 waitingQueueLength) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltQueueCreate( @@ -172,7 +172,7 @@ s32 _sceUltQueueCreate( vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltQueueCreateStandalone( @@ -185,37 +185,37 @@ s32 _sceUltQueueCreateStandalone( vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltQueuePush(vm::ptr queue, vm::cptr data) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltQueueTryPush(vm::ptr queue, vm::cptr data) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltQueuePop(vm::ptr queue, vm::ptr data) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltQueueTryPop(vm::ptr queue, vm::ptr data) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltQueueDestroy(vm::ptr queue) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltReaderWriterLockOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltReaderWriterLockCreate( @@ -225,7 +225,7 @@ s32 _sceUltReaderWriterLockCreate( vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltReaderWriterLockCreateStandalone( @@ -236,52 +236,52 @@ s32 _sceUltReaderWriterLockCreateStandalone( vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceUltReaderWriterLockGetStandaloneWorkAreaSize(u32 waitingQueueDepth) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltReaderWriterLockLockRead(vm::ptr rwlock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltReaderWriterLockTryLockRead(vm::ptr rwlock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltReaderWriterLockUnlockRead(vm::ptr rwlock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltReaderWriterLockLockWrite(vm::ptr rwlock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltReaderWriterLockTryLockWrite(vm::ptr rwlock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltReaderWriterLockUnlockWrite(vm::ptr rwlock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltReaderWriterLockDestroy(vm::ptr rwlock) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltSemaphoreOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltSemaphoreCreate( @@ -292,37 +292,37 @@ s32 _sceUltSemaphoreCreate( vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltSemaphoreAcquire(vm::ptr semaphore, s32 numResource) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltSemaphoreTryAcquire(vm::ptr semaphore, s32 numResource) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltSemaphoreRelease(vm::ptr semaphore, s32 numResource) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltSemaphoreDestroy(vm::ptr semaphore) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltUlthreadRuntimeOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } u32 sceUltUlthreadRuntimeGetWorkAreaSize(u32 numMaxUlthread, u32 numWorkerThread) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltUlthreadRuntimeCreate( @@ -334,17 +334,17 @@ s32 _sceUltUlthreadRuntimeCreate( vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltUlthreadRuntimeDestroy(vm::ptr runtime) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltUlthreadOptParamInitialize(vm::ptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 _sceUltUlthreadCreate( @@ -358,32 +358,32 @@ s32 _sceUltUlthreadCreate( vm::cptr optParam, u32 buildVersion) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltUlthreadYield() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltUlthreadExit(s32 status) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltUlthreadJoin(vm::ptr ulthread, vm::ptr status) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltUlthreadTryJoin(vm::ptr ulthread, vm::ptr status) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceUltUlthreadGetSelf(vm::pptr ulthread) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } #define REG_FUNC(nid, name) REG_FNID(SceUlt, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceVideodec.cpp b/rpcs3/Emu/PSP2/Modules/sceVideodec.cpp index 0ebef4aa25..d75ba323b9 100644 --- a/rpcs3/Emu/PSP2/Modules/sceVideodec.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceVideodec.cpp @@ -8,47 +8,47 @@ logs::channel sceVideodec("sceVideodec", logs::level::notice); s32 sceVideodecInitLibrary(u32 codecType, vm::cptr pInitInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVideodecTermLibrary(u32 codecType) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAvcdecQueryDecoderMemSize(u32 codecType, vm::cptr pDecoderInfo, vm::ptr pMemInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAvcdecCreateDecoder(u32 codecType, vm::ptr pCtrl, vm::cptr pDecoderInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAvcdecDeleteDecoder(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAvcdecDecodeAvailableSize(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAvcdecDecode(vm::ptr pCtrl, vm::cptr pAu, vm::ptr pArrayPicture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAvcdecDecodeStop(vm::ptr pCtrl, vm::ptr pArrayPicture) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceAvcdecDecodeFlush(vm::ptr pCtrl) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceVoice.cpp b/rpcs3/Emu/PSP2/Modules/sceVoice.cpp index 88967abaac..578b896f46 100644 --- a/rpcs3/Emu/PSP2/Modules/sceVoice.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceVoice.cpp @@ -8,127 +8,127 @@ logs::channel sceVoice("sceVoice", logs::level::notice); s32 sceVoiceInit(vm::ptr pArg, SceVoiceVersion version) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceEnd() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceStart(vm::ptr pArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceStop() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceResetPort(u32 portId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceCreatePort(vm::ptr portId, vm::cptr pArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceUpdatePort(u32 portId, vm::cptr pArg) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceConnectIPortToOPort(u32 ips, u32 ops) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceDisconnectIPortFromOPort(u32 ips, u32 ops) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceDeletePort(u32 portId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceWriteToIPort(u32 ips, vm::cptr data, vm::ptr size, s16 frameGaps) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceReadFromOPort(u32 ops, vm::ptr data, vm::ptr size) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceSetMuteFlagAll(u16 bMuted) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceSetMuteFlag(u32 portId, u16 bMuted) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceGetMuteFlag(u32 portId, vm::ptr bMuted) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceSetVolume(u32 portId, float volume) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceGetVolume(u32 portId, vm::ptr volume) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceSetBitRate(u32 portId, SceVoiceBitRate bitrate) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceGetBitRate(u32 portId, vm::ptr bitrate) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceGetPortInfo(u32 portId, vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoicePausePort(u32 portId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceResumePort(u32 portId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoicePausePortAll() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceResumePortAll() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceGetResourceInfo(vm::ptr pInfo) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp b/rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp index f5ae9af81e..751b5569e4 100644 --- a/rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp @@ -8,87 +8,87 @@ logs::channel sceVoiceQoS("sceVoiceQoS", logs::level::notice); s32 sceVoiceQoSInit() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSEnd() { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSCreateLocalEndpoint(vm::ptr pLocalId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSDeleteLocalEndpoint(s32 localId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSCreateRemoteEndpoint(vm::ptr pRemoteId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSDeleteRemoteEndpoint(s32 remoteId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSConnect(vm::ptr pConnectionId, s32 localId, s32 remoteId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSDisconnect(s32 connectionId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSGetLocalEndpoint(s32 connectionId, vm::ptr pLocalId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSGetRemoteEndpoint(s32 connectionId, vm::ptr pRemoteId) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSSetLocalEndpointAttribute(s32 localId, SceVoiceQoSAttributeId attributeId, vm::cptr pAttributeValue, s32 attributeSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSGetLocalEndpointAttribute(s32 localId, SceVoiceQoSAttributeId attributeId, vm::ptr pAttributeValue, s32 attributeSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSSetConnectionAttribute(s32 connectionId, SceVoiceQoSAttributeId attributeId, vm::cptr pAttributeValue, s32 attributeSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSGetConnectionAttribute(s32 connectionId, SceVoiceQoSAttributeId attributeId, vm::ptr pAttributeValue, s32 attributeSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSGetStatus(s32 connectionId, SceVoiceQoSStatusId statusId, vm::ptr pStatusValue, s32 statusSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSWritePacket(s32 connectionId, vm::cptr pData, vm::ptr pSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } s32 sceVoiceQoSReadPacket(s32 connectionId, vm::ptr pData, vm::ptr pSize) { - throw EXCEPTION(""); + fmt::throw_exception("Unimplemented" HERE); } diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.cpp b/rpcs3/Emu/RSX/Common/BufferUtils.cpp index 8780d3b14b..fcfc976178 100644 --- a/rpcs3/Emu/RSX/Common/BufferUtils.cpp +++ b/rpcs3/Emu/RSX/Common/BufferUtils.cpp @@ -9,7 +9,7 @@ namespace template gsl::span as_span_workaround(gsl::span unformated_span) { - return{ (T*)unformated_span.data(), gsl::narrow(unformated_span.size_bytes() / sizeof(T)) }; + return{ (T*)unformated_span.data(), ::narrow(unformated_span.size_bytes() / sizeof(T)) }; } } @@ -254,7 +254,7 @@ bool is_primitive_native(rsx::primitive_type draw_mode) case rsx::primitive_type::quad_strip: return false; } - throw EXCEPTION("Wrong primitive type"); + fmt::throw_exception("Wrong primitive type" HERE); } /** We assume that polygon is convex in polygon mode (constraints in OpenGL) @@ -291,7 +291,7 @@ u32 get_index_type_size(rsx::index_array_type type) case rsx::index_array_type::u16: return sizeof(u16); case rsx::index_array_type::u32: return sizeof(u32); } - throw EXCEPTION("Wrong index type"); + fmt::throw_exception("Wrong index type" HERE); } void write_index_array_for_non_indexed_non_native_primitive_to_buffer(char* dst, rsx::primitive_type draw_mode, unsigned first, unsigned count) @@ -344,7 +344,7 @@ void write_index_array_for_non_indexed_non_native_primitive_to_buffer(char* dst, case rsx::primitive_type::line_strip: case rsx::primitive_type::triangles: case rsx::primitive_type::triangle_strip: - throw EXCEPTION("Native primitive type doesn't require expansion"); + fmt::throw_exception("Native primitive type doesn't require expansion" HERE); } } @@ -389,7 +389,7 @@ namespace case rsx::primitive_type::quads: return expand_indexed_quads(src.subspan(first), dst, restart_index_enabled, restart_index); } - throw EXCEPTION("Don't know how to expand draw mode"); + fmt::throw_exception("Don't know how to expand draw mode" HERE); } } @@ -407,7 +407,7 @@ std::tuple write_index_array_data_to_buffer(gsl::span dst, return write_index_array_data_to_buffer_impl(as_span_workaround(dst), gsl::as_span>(src), draw_mode, restart_index_enabled, restart_index, first_count_arguments, expands); } - throw EXCEPTION("Unknown index type"); + fmt::throw_exception("Unknown index type" HERE); } void stream_vector(void *dst, u32 x, u32 y, u32 z, u32 w) diff --git a/rpcs3/Emu/RSX/Common/ProgramStateCache.h b/rpcs3/Emu/RSX/Common/ProgramStateCache.h index e76983b481..bdc70f33b9 100644 --- a/rpcs3/Emu/RSX/Common/ProgramStateCache.h +++ b/rpcs3/Emu/RSX/Common/ProgramStateCache.h @@ -164,7 +164,7 @@ public: auto I = m_vertex_shader_cache.find(rsx_vp); if (I != m_vertex_shader_cache.end()) return I->second; - throw EXCEPTION("Trying to get unknown transform program"); + fmt::throw_exception("Trying to get unknown transform program" HERE); } const fragment_program_type& get_shader_program(const RSXFragmentProgram& rsx_fp) const @@ -172,7 +172,7 @@ public: auto I = m_fragment_shader_cache.find(rsx_fp); if (I != m_fragment_shader_cache.end()) return I->second; - throw EXCEPTION("Trying to get unknown shader program"); + fmt::throw_exception("Trying to get unknown shader program" HERE); } template @@ -227,7 +227,7 @@ public: 0x6, 0x7, 0x4, 0x5, 0x2, 0x3, 0x0, 0x1); - EXPECTS(dst_buffer.size_bytes() >= gsl::narrow(I->second.FragmentConstantOffsetCache.size()) * 16); + EXPECTS(dst_buffer.size_bytes() >= ::narrow(I->second.FragmentConstantOffsetCache.size()) * 16); size_t offset = 0; for (size_t offset_in_fragment_program : I->second.FragmentConstantOffsetCache) diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.cpp b/rpcs3/Emu/RSX/Common/TextureUtils.cpp index 9d1627716c..738968864b 100644 --- a/rpcs3/Emu/RSX/Common/TextureUtils.cpp +++ b/rpcs3/Emu/RSX/Common/TextureUtils.cpp @@ -12,7 +12,7 @@ namespace template gsl::span as_span_workaround(gsl::span unformated_span) { - return{ (T*)unformated_span.data(), gsl::narrow(unformated_span.size_bytes() / sizeof(T)) }; + return{ (T*)unformated_span.data(), ::narrow(unformated_span.size_bytes() / sizeof(T)) }; } // TODO: Make this function part of GSL @@ -46,7 +46,7 @@ struct copy_unmodified_block_swizzled for (int d = 0; d < depth; ++d) { rsx::convert_linear_swizzle((void*)src.subspan(d * width_in_block * row_count).data(), temp_swizzled.get(), width_in_block, row_count, true); - gsl::span swizzled_src{ temp_swizzled.get(), gsl::narrow(width_in_block * row_count) }; + gsl::span swizzled_src{ temp_swizzled.get(), ::narrow(width_in_block * row_count) }; for (int row = 0; row < row_count; ++row) copy(dst.subspan((row + d * row_count) * dst_pitch_in_block, width_in_block), swizzled_src.subspan(row * width_in_block, width_in_block)); } @@ -130,7 +130,7 @@ std::tuple get_height_depth_layer(const RsxTextureType &tex) case rsx::texture_dimension_extended::texture_dimension_cubemap: return std::make_tuple(tex.height(), 1, 6); case rsx::texture_dimension_extended::texture_dimension_3d: return std::make_tuple(tex.height(), tex.depth(), 1); } - throw EXCEPTION("Unsupported texture dimension"); + fmt::throw_exception("Unsupported texture dimension" HERE); } } @@ -183,7 +183,7 @@ std::vector get_subresources_layout_impl(const RsxTextur case CELL_GCM_TEXTURE_COMPRESSED_DXT45: return get_subresources_layout_impl<4, u128>(pixels, w, h, depth, layer, texture.get_exact_mipmap_count(), texture.pitch(), !is_swizzled); } - throw EXCEPTION("Wrong format 0x%x", format); + fmt::throw_exception("Wrong format 0x%x" HERE, format); } std::vector get_subresources_layout(const rsx::texture &texture) @@ -271,7 +271,7 @@ void upload_texture_subresource(gsl::span dst_buffer, const rsx_subre break; default: - throw EXCEPTION("Wrong format 0x%x", format); + fmt::throw_exception("Wrong format 0x%x" HERE, format); } } diff --git a/rpcs3/Emu/RSX/Common/ring_buffer_helper.h b/rpcs3/Emu/RSX/Common/ring_buffer_helper.h index 68c8333973..f5d0bc9314 100644 --- a/rpcs3/Emu/RSX/Common/ring_buffer_helper.h +++ b/rpcs3/Emu/RSX/Common/ring_buffer_helper.h @@ -61,7 +61,7 @@ public: template size_t alloc(size_t size) { - if (!can_alloc(size)) throw EXCEPTION("Working buffer not big enough"); + if (!can_alloc(size)) fmt::throw_exception("Working buffer not big enough" HERE); size_t alloc_size = align(size, Alignement); size_t aligned_put_pos = align(m_put_pos, Alignement); if (aligned_put_pos + alloc_size < m_size) diff --git a/rpcs3/Emu/RSX/Common/surface_store.cpp b/rpcs3/Emu/RSX/Common/surface_store.cpp index e5b11bcb68..fee947a220 100644 --- a/rpcs3/Emu/RSX/Common/surface_store.cpp +++ b/rpcs3/Emu/RSX/Common/surface_store.cpp @@ -16,7 +16,7 @@ namespace rsx case surface_target::surfaces_a_b_c: return{ 0, 1, 2 }; case surface_target::surfaces_a_b_c_d: return{ 0, 1, 2, 3 }; } - throw EXCEPTION("Wrong color_target"); + fmt::throw_exception("Wrong color_target" HERE); } size_t get_aligned_pitch(surface_color_format format, u32 width) @@ -38,7 +38,7 @@ namespace rsx case surface_color_format::w16z16y16x16: return align(width * 8, 256); case surface_color_format::w32z32y32x32: return align(width * 16, 256); } - throw EXCEPTION("Unknown color surface format"); + fmt::throw_exception("Unknown color surface format" HERE); } size_t get_packed_pitch(surface_color_format format, u32 width) @@ -60,7 +60,7 @@ namespace rsx case surface_color_format::w16z16y16x16: return width * 8; case surface_color_format::w32z32y32x32: return width * 16; } - throw EXCEPTION("Unknown color surface format"); + fmt::throw_exception("Unknown color surface format" HERE); } } } \ No newline at end of file diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h index 3c14764aa8..1740276138 100644 --- a/rpcs3/Emu/RSX/Common/surface_store.h +++ b/rpcs3/Emu/RSX/Common/surface_store.h @@ -242,8 +242,8 @@ namespace rsx gsl::span raw_src = Traits::map_downloaded_buffer(download_data[i], std::forward(args)...); - size_t src_pitch = utility::get_aligned_pitch(color_format, gsl::narrow(width)); - size_t dst_pitch = utility::get_packed_pitch(color_format, gsl::narrow(width)); + size_t src_pitch = utility::get_aligned_pitch(color_format, ::narrow(width)); + size_t dst_pitch = utility::get_packed_pitch(color_format, ::narrow(width)); result[i].resize(dst_pitch * height); @@ -259,13 +259,13 @@ namespace rsx case surface_color_format::x8r8g8b8_z8r8g8b8: case surface_color_format::x32: { - gsl::span> dst_span{ (be_t*)result[i].data(), gsl::narrow(dst_pitch * height / sizeof(be_t)) }; + gsl::span> dst_span{ (be_t*)result[i].data(), ::narrow(dst_pitch * height / sizeof(be_t)) }; copy_pitched_src_to_dst(dst_span, gsl::as_span(raw_src), src_pitch, width, height); break; } case surface_color_format::b8: { - gsl::span dst_span{ (u8*)result[i].data(), gsl::narrow(dst_pitch * height / sizeof(u8)) }; + gsl::span dst_span{ (u8*)result[i].data(), ::narrow(dst_pitch * height / sizeof(u8)) }; copy_pitched_src_to_dst(dst_span, gsl::as_span(raw_src), src_pitch, width, height); break; } @@ -274,20 +274,20 @@ namespace rsx case surface_color_format::x1r5g5b5_o1r5g5b5: case surface_color_format::x1r5g5b5_z1r5g5b5: { - gsl::span> dst_span{ (be_t*)result[i].data(), gsl::narrow(dst_pitch * height / sizeof(be_t)) }; + gsl::span> dst_span{ (be_t*)result[i].data(), ::narrow(dst_pitch * height / sizeof(be_t)) }; copy_pitched_src_to_dst(dst_span, gsl::as_span(raw_src), src_pitch, width, height); break; } // Note : may require some big endian swap case surface_color_format::w32z32y32x32: { - gsl::span dst_span{ (u128*)result[i].data(), gsl::narrow(dst_pitch * height / sizeof(u128)) }; + gsl::span dst_span{ (u128*)result[i].data(), ::narrow(dst_pitch * height / sizeof(u128)) }; copy_pitched_src_to_dst(dst_span, gsl::as_span(raw_src), src_pitch, width, height); break; } case surface_color_format::w16z16y16x16: { - gsl::span dst_span{ (u64*)result[i].data(), gsl::narrow(dst_pitch * height / sizeof(u64)) }; + gsl::span dst_span{ (u64*)result[i].data(), ::narrow(dst_pitch * height / sizeof(u64)) }; copy_pitched_src_to_dst(dst_span, gsl::as_span(raw_src), src_pitch, width, height); break; } @@ -321,13 +321,13 @@ namespace rsx if (depth_format == surface_depth_format::z16) { result[0].resize(width * height * 2); - gsl::span dest{ (u16*)result[0].data(), gsl::narrow(width * height) }; + gsl::span dest{ (u16*)result[0].data(), ::narrow(width * height) }; copy_pitched_src_to_dst(dest, gsl::as_span(depth_buffer_raw_src), row_pitch, width, height); } if (depth_format == surface_depth_format::z24s8) { result[0].resize(width * height * 4); - gsl::span dest{ (u32*)result[0].data(), gsl::narrow(width * height) }; + gsl::span dest{ (u32*)result[0].data(), ::narrow(width * height) }; copy_pitched_src_to_dst(dest, gsl::as_span(depth_buffer_raw_src), row_pitch, width, height); } Traits::unmap_downloaded_buffer(depth_data, std::forward(args)...); @@ -337,7 +337,7 @@ namespace rsx gsl::span stencil_buffer_raw_src = Traits::map_downloaded_buffer(stencil_data, std::forward(args)...); result[1].resize(width * height); - gsl::span dest{ (u8*)result[1].data(), gsl::narrow(width * height) }; + gsl::span dest{ (u8*)result[1].data(), ::narrow(width * height) }; copy_pitched_src_to_dst(dest, gsl::as_span(stencil_buffer_raw_src), align(width, 256), width, height); Traits::unmap_downloaded_buffer(stencil_data, std::forward(args)...); return result; diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp index 49fef0db29..ed685c11eb 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp @@ -35,7 +35,7 @@ namespace case 4: return D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; } - throw EXCEPTION("Wrong vector size %d", size); + fmt::throw_exception("Wrong vector size %d" HERE, size); } u32 get_vertex_count(const std::vector > first_count_commands) @@ -178,7 +178,7 @@ std::tuple, size_t> upload_inlined_ stride += rsx::get_vertex_type_size_on_host(info.type, info.size); } - u32 element_count = gsl::narrow(inlined_array_raw_data.size_bytes()) / stride; + u32 element_count = ::narrow(inlined_array_raw_data.size_bytes()) / stride; std::vector result; UINT64 vertex_buffer_offset = 0; @@ -287,7 +287,7 @@ D3D12_CONSTANT_BUFFER_VIEW_DESC D3D12GSRender::upload_fragment_shader_constants( size_t offset = 0; float *mapped_buffer = m_buffer_data.map(CD3DX12_RANGE(heap_offset, heap_offset + buffer_size)); - m_pso_cache.fill_fragment_constans_buffer({ mapped_buffer, gsl::narrow(buffer_size) }, m_fragment_program); + m_pso_cache.fill_fragment_constans_buffer({ mapped_buffer, ::narrow(buffer_size) }, m_fragment_program); m_buffer_data.unmap(CD3DX12_RANGE(heap_offset, heap_offset + buffer_size)); return { @@ -336,7 +336,7 @@ std::tuple> D3D12GSRe std::vector vertex_buffer_view; std::tie(vertex_buffer_view, vertex_count) = upload_inlined_vertex_array( rsx::method_registers.vertex_arrays_info, - { (const gsl::byte*) inline_vertex_array.data(), gsl::narrow(inline_vertex_array.size() * sizeof(uint)) }, + { (const gsl::byte*) inline_vertex_array.data(), ::narrow(inline_vertex_array.size() * sizeof(uint)) }, m_buffer_data, m_vertex_buffer_data.Get(), command_list); if (is_primitive_native(rsx::method_registers.current_draw_clause.primitive)) @@ -367,7 +367,7 @@ std::tuple> D3D12GSRe EXPECTS(rsx::method_registers.current_draw_clause.command == rsx::draw_command::indexed); // Index count - size_t index_count = get_index_count(rsx::method_registers.current_draw_clause.primitive, gsl::narrow(get_vertex_count(rsx::method_registers.current_draw_clause.first_count_commands))); + size_t index_count = get_index_count(rsx::method_registers.current_draw_clause.primitive, ::narrow(get_vertex_count(rsx::method_registers.current_draw_clause.first_count_commands))); rsx::index_array_type indexed_type = rsx::method_registers.index_type(); size_t index_size = get_index_type_size(indexed_type); @@ -378,7 +378,7 @@ std::tuple> D3D12GSRe void *mapped_buffer = m_buffer_data.map(CD3DX12_RANGE(heap_offset, heap_offset + buffer_size)); u32 min_index, max_index; - gsl::span dst{ reinterpret_cast(mapped_buffer), gsl::narrow(buffer_size) }; + gsl::span dst{ reinterpret_cast(mapped_buffer), ::narrow(buffer_size) }; std::tie(min_index, max_index) = write_index_array_data_to_buffer(dst, get_raw_index_array(rsx::method_registers.current_draw_clause.first_count_commands), indexed_type, rsx::method_registers.current_draw_clause.primitive, rsx::method_registers.restart_index_enabled(), rsx::method_registers.restart_index(), rsx::method_registers.current_draw_clause.first_count_commands, diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp index 1432ed2917..fb891260f6 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp @@ -20,7 +20,7 @@ D3D12_BLEND_OP get_blend_op(rsx::blend_equation op) case rsx::blend_equation::reverse_substract_signed: break; } - throw EXCEPTION("Invalid or unsupported blend op (0x%x)", (u32)op); + fmt::throw_exception("Invalid or unsupported blend op (0x%x)" HERE, (u32)op); } D3D12_BLEND get_blend_factor(rsx::blend_factor factor) @@ -45,7 +45,7 @@ D3D12_BLEND get_blend_factor(rsx::blend_factor factor) case rsx::blend_factor::one_minus_constant_alpha: return D3D12_BLEND_INV_BLEND_FACTOR; } - throw EXCEPTION("Invalid blend factor (0x%x)", (u32)factor); + fmt::throw_exception("Invalid blend factor (0x%x)" HERE, (u32)factor); } D3D12_BLEND get_blend_factor_alpha(rsx::blend_factor factor) @@ -70,7 +70,7 @@ D3D12_BLEND get_blend_factor_alpha(rsx::blend_factor factor) case rsx::blend_factor::one_minus_constant_alpha: return D3D12_BLEND_INV_BLEND_FACTOR; } - throw EXCEPTION("Invalid blend alpha factor (0x%x)", (u32)factor); + fmt::throw_exception("Invalid blend alpha factor (0x%x)" HERE, (u32)factor); } /** @@ -96,7 +96,7 @@ D3D12_LOGIC_OP get_logic_op(rsx::logic_op op) case rsx::logic_op::logic_or_inverted: return D3D12_LOGIC_OP_OR_INVERTED; case rsx::logic_op::logic_nand: return D3D12_LOGIC_OP_NAND; } - throw EXCEPTION("Invalid logic op (0x%x)", (u32)op); + fmt::throw_exception("Invalid logic op (0x%x)" HERE, (u32)op); } /** @@ -115,7 +115,7 @@ D3D12_STENCIL_OP get_stencil_op(rsx::stencil_op op) case rsx::stencil_op::incr_wrap: return D3D12_STENCIL_OP_INCR; case rsx::stencil_op::decr_wrap: return D3D12_STENCIL_OP_DECR; } - throw EXCEPTION("Invalid stencil op (0x%x)", (u32)op); + fmt::throw_exception("Invalid stencil op (0x%x)" HERE, (u32)op); } D3D12_COMPARISON_FUNC get_compare_func(rsx::comparison_function op) @@ -131,7 +131,7 @@ D3D12_COMPARISON_FUNC get_compare_func(rsx::comparison_function op) case rsx::comparison_function::greater_or_equal: return D3D12_COMPARISON_FUNC_GREATER_EQUAL; case rsx::comparison_function::always: return D3D12_COMPARISON_FUNC_ALWAYS; } - throw EXCEPTION("Invalid or unsupported compare func (0x%x)", (u32)op); + fmt::throw_exception("Invalid or unsupported compare func (0x%x)" HERE, (u32)op); } DXGI_FORMAT get_texture_format(u8 format) @@ -169,7 +169,7 @@ DXGI_FORMAT get_texture_format(u8 format) case ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN) & CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8: return DXGI_FORMAT_R8G8_B8G8_UNORM; break; } - throw EXCEPTION("Invalid or unsupported texture format (0x%x)", (u32)format); + fmt::throw_exception("Invalid or unsupported texture format (0x%x)" HERE, (u32)format); } UINT get_texture_max_aniso(rsx::texture_max_anisotropy aniso) @@ -185,7 +185,7 @@ UINT get_texture_max_aniso(rsx::texture_max_anisotropy aniso) case rsx::texture_max_anisotropy::x12: return 12; case rsx::texture_max_anisotropy::x16: return 16; } - throw EXCEPTION("Invalid texture max aniso (0x%x)", (u32)aniso); + fmt::throw_exception("Invalid texture max aniso (0x%x)" HERE, (u32)aniso); } D3D12_TEXTURE_ADDRESS_MODE get_texture_wrap_mode(rsx::texture_wrap_mode wrap) @@ -201,7 +201,7 @@ D3D12_TEXTURE_ADDRESS_MODE get_texture_wrap_mode(rsx::texture_wrap_mode wrap) case rsx::texture_wrap_mode::mirror_once_border: return D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE; case rsx::texture_wrap_mode::mirror_once_clamp: return D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE; } - throw EXCEPTION("Invalid texture wrap mode (0x%x)", (u32)wrap); + fmt::throw_exception("Invalid texture wrap mode (0x%x)" HERE, (u32)wrap); } namespace @@ -239,7 +239,7 @@ namespace mip = D3D12_FILTER_TYPE_POINT; return; } - throw EXCEPTION("Invalid max filter"); + fmt::throw_exception("Invalid max filter" HERE); } D3D12_FILTER_TYPE get_mag_filter(rsx::texture_magnify_filter mag_filter) @@ -250,7 +250,7 @@ namespace case rsx::texture_magnify_filter::linear: return D3D12_FILTER_TYPE_LINEAR; case rsx::texture_magnify_filter::convolution_mag: return D3D12_FILTER_TYPE_LINEAR; } - throw EXCEPTION("Invalid mag filter"); + fmt::throw_exception("Invalid mag filter" HERE); } } @@ -277,7 +277,7 @@ D3D12_PRIMITIVE_TOPOLOGY get_primitive_topology(rsx::primitive_type draw_mode) case rsx::primitive_type::quad_strip: return D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST; case rsx::primitive_type::polygon: return D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST; } - throw EXCEPTION("Invalid draw mode (0x%x)", (u32)draw_mode); + fmt::throw_exception("Invalid draw mode (0x%x)" HERE, (u32)draw_mode); } D3D12_PRIMITIVE_TOPOLOGY_TYPE get_primitive_topology_type(rsx::primitive_type draw_mode) @@ -295,7 +295,7 @@ D3D12_PRIMITIVE_TOPOLOGY_TYPE get_primitive_topology_type(rsx::primitive_type dr case rsx::primitive_type::polygon: return D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE; case rsx::primitive_type::line_loop: return D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE; } - throw EXCEPTION("Invalid or unsupported draw mode (0x%x)", (u32)draw_mode); + fmt::throw_exception("Invalid or unsupported draw mode (0x%x)" HERE, (u32)draw_mode); } DXGI_FORMAT get_color_surface_format(rsx::surface_color_format format) @@ -316,7 +316,7 @@ DXGI_FORMAT get_color_surface_format(rsx::surface_color_format format) case rsx::surface_color_format::w32z32y32x32: return DXGI_FORMAT_R32G32B32A32_FLOAT; case rsx::surface_color_format::x32: return DXGI_FORMAT_R32_FLOAT; } - throw EXCEPTION("Invalid format (0x%x)", (u32)format); + fmt::throw_exception("Invalid format (0x%x)" HERE, (u32)format); } DXGI_FORMAT get_depth_stencil_surface_format(rsx::surface_depth_format format) @@ -326,7 +326,7 @@ DXGI_FORMAT get_depth_stencil_surface_format(rsx::surface_depth_format format) case rsx::surface_depth_format::z16: return DXGI_FORMAT_D16_UNORM; case rsx::surface_depth_format::z24s8: return DXGI_FORMAT_D24_UNORM_S8_UINT; } - throw EXCEPTION("Invalid format (0x%x)", (u32)format); + fmt::throw_exception("Invalid format (0x%x)" HERE, (u32)format); } DXGI_FORMAT get_depth_stencil_surface_clear_format(rsx::surface_depth_format format) @@ -336,7 +336,7 @@ DXGI_FORMAT get_depth_stencil_surface_clear_format(rsx::surface_depth_format for case rsx::surface_depth_format::z16: return DXGI_FORMAT_D16_UNORM; case rsx::surface_depth_format::z24s8: return DXGI_FORMAT_D24_UNORM_S8_UINT; } - throw EXCEPTION("Invalid format (0x%x)", (u32)format); + fmt::throw_exception("Invalid format (0x%x)" HERE, (u32)format); } DXGI_FORMAT get_depth_stencil_typeless_surface_format(rsx::surface_depth_format format) @@ -346,7 +346,7 @@ DXGI_FORMAT get_depth_stencil_typeless_surface_format(rsx::surface_depth_format case rsx::surface_depth_format::z16: return DXGI_FORMAT_R16_TYPELESS; case rsx::surface_depth_format::z24s8: return DXGI_FORMAT_R24G8_TYPELESS; } - throw EXCEPTION("Invalid format (0x%x)", (u32)format); + fmt::throw_exception("Invalid format (0x%x)" HERE, (u32)format); } DXGI_FORMAT get_depth_samplable_surface_format(rsx::surface_depth_format format) @@ -356,7 +356,7 @@ DXGI_FORMAT get_depth_samplable_surface_format(rsx::surface_depth_format format) case rsx::surface_depth_format::z16: return DXGI_FORMAT_R16_UNORM; case rsx::surface_depth_format::z24s8: return DXGI_FORMAT_R24_UNORM_X8_TYPELESS; } - throw EXCEPTION("Invalid format (0x%x)", (u32)format); + fmt::throw_exception("Invalid format (0x%x)" HERE, (u32)format); } BOOL get_front_face_ccw(rsx::front_face ffv) @@ -366,7 +366,7 @@ BOOL get_front_face_ccw(rsx::front_face ffv) case rsx::front_face::cw: return FALSE; case rsx::front_face::ccw: return TRUE; } - throw EXCEPTION("Invalid front face value (0x%x)", (u32)ffv); + fmt::throw_exception("Invalid front face value (0x%x)" HERE, (u32)ffv); } D3D12_CULL_MODE get_cull_face(rsx::cull_face cfv) @@ -377,7 +377,7 @@ D3D12_CULL_MODE get_cull_face(rsx::cull_face cfv) case rsx::cull_face::back: return D3D12_CULL_MODE_BACK; case rsx::cull_face::front_and_back: return D3D12_CULL_MODE_NONE; } - throw EXCEPTION("Invalid cull face value (0x%x)", (u32)cfv); + fmt::throw_exception("Invalid cull face value (0x%x)" HERE, (u32)cfv); } DXGI_FORMAT get_index_type(rsx::index_array_type index_type) @@ -387,7 +387,7 @@ DXGI_FORMAT get_index_type(rsx::index_array_type index_type) case rsx::index_array_type::u16: return DXGI_FORMAT_R16_UINT; case rsx::index_array_type::u32: return DXGI_FORMAT_R32_UINT; } - throw EXCEPTION("Invalid index_type (0x%x)", (u32)index_type); + fmt::throw_exception("Invalid index_type (0x%x)" HERE, (u32)index_type); } DXGI_FORMAT get_vertex_attribute_format(rsx::vertex_base_type type, u8 size) @@ -456,7 +456,7 @@ DXGI_FORMAT get_vertex_attribute_format(rsx::vertex_base_type type, u8 size) case 1: return DXGI_FORMAT_R16G16B16A16_SNORM; case 2: case 3: - case 4: throw EXCEPTION("Unsupported CMP vertex format with size > 1"); + case 4: fmt::throw_exception("Unsupported CMP vertex format with size > 1" HERE); } break; } @@ -473,7 +473,7 @@ DXGI_FORMAT get_vertex_attribute_format(rsx::vertex_base_type type, u8 size) } } - throw EXCEPTION("Invalid or unsupported type or size (type=0x%x, size=0x%x)", (u32)type, size); + fmt::throw_exception("Invalid or unsupported type or size (type=0x%x, size=0x%x)" HERE, (u32)type, size); } D3D12_RECT get_scissor(u16 clip_origin_x, u16 clip_origin_y, u16 clip_w, u16 clip_h) diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp index ba6b24c398..2ebf9269ed 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp @@ -477,7 +477,7 @@ bool is_flip_surface_in_global_memory(rsx::surface_target color_target) case rsx::surface_target::none: return false; } - throw EXCEPTION("Wrong color_target"); + fmt::throw_exception("Wrong color_target" HERE); } } diff --git a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h index 0ece930e2a..0c7f84c04c 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h @@ -154,12 +154,12 @@ struct D3D12Traits D3D12_GRAPHICS_PIPELINE_STATE_DESC graphicPipelineStateDesc = {}; if (vertexProgramData.bytecode == nullptr) - throw EXCEPTION("Vertex program compilation failure"); + fmt::throw_exception("Vertex program compilation failure" HERE); graphicPipelineStateDesc.VS.BytecodeLength = vertexProgramData.bytecode->GetBufferSize(); graphicPipelineStateDesc.VS.pShaderBytecode = vertexProgramData.bytecode->GetBufferPointer(); if (fragmentProgramData.bytecode == nullptr) - throw EXCEPTION("fragment program compilation failure"); + fmt::throw_exception("fragment program compilation failure" HERE); graphicPipelineStateDesc.PS.BytecodeLength = fragmentProgramData.bytecode->GetBufferSize(); graphicPipelineStateDesc.PS.pShaderBytecode = fragmentProgramData.bytecode->GetBufferPointer(); diff --git a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp index 6587743112..0c3f1b0b40 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp @@ -25,7 +25,7 @@ namespace case rsx::surface_depth_format::z16: return 0xFFFF; case rsx::surface_depth_format::z24s8: return 0xFFFFFF; } - throw EXCEPTION("Unknown depth format"); + fmt::throw_exception("Unknown depth format" HERE); } UINT get_num_rtt(rsx::surface_target color_target) @@ -39,7 +39,7 @@ namespace case rsx::surface_target::surfaces_a_b_c: return 3; case rsx::surface_target::surfaces_a_b_c_d: return 4; } - throw EXCEPTION("Unknown color target"); + fmt::throw_exception("Unknown color target" HERE); } std::vector get_rtt_indexes(rsx::surface_target color_target) @@ -53,7 +53,7 @@ namespace case rsx::surface_target::surfaces_a_b_c: return{ 0, 1, 2 }; case rsx::surface_target::surfaces_a_b_c_d: return{ 0, 1, 2, 3 }; } - throw EXCEPTION("Unknown color target"); + fmt::throw_exception("Unknown color target" HERE); } u8 get_clear_stencil(u32 register_value) @@ -80,7 +80,7 @@ namespace case rsx::surface_color_format::w16z16y16x16: return align(width * 8, 256); case rsx::surface_color_format::w32z32y32x32: return align(width * 16, 256); } - throw EXCEPTION("Unknown color surface format"); + fmt::throw_exception("Unknown color surface format" HERE); } size_t get_packed_pitch(rsx::surface_color_format format, u32 width) @@ -102,7 +102,7 @@ namespace case rsx::surface_color_format::w16z16y16x16: return width * 8; case rsx::surface_color_format::w32z32y32x32: return width * 16; } - throw EXCEPTION("Unknown color surface format"); + fmt::throw_exception("Unknown color surface format" HERE); } } diff --git a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.h b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.h index ca21547541..fd036b34a8 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.h @@ -135,7 +135,7 @@ struct render_target_traits { ID3D12GraphicsCommandList* command_list = res_store.command_list.Get(); DXGI_FORMAT dxgi_format = get_color_surface_format(color_format); - size_t row_pitch = rsx::utility::get_aligned_pitch(color_format, gsl::narrow(width)); + size_t row_pitch = rsx::utility::get_aligned_pitch(color_format, ::narrow(width)); size_t buffer_size = row_pitch * height; size_t heap_offset = readback_heap.alloc(buffer_size); @@ -238,7 +238,7 @@ struct render_target_traits readback_heap.m_get_pos = current_put_pos_minus_one; const gsl::byte *mapped_buffer = readback_heap.map(CD3DX12_RANGE(offset, offset + buffer_size)); - return { mapped_buffer , gsl::narrow(buffer_size) }; + return { mapped_buffer , ::narrow(buffer_size) }; } static diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp index b3b547ebf3..adbf6e1a5c 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp @@ -59,7 +59,7 @@ namespace case rsx::texture_dimension_extended::texture_dimension_3d: return CD3DX12_RESOURCE_DESC::Tex3D(dxgi_format, texture.width(), texture.height(), texture.depth(), texture.get_exact_mipmap_count()); } - throw EXCEPTION("Unknown texture dimension"); + fmt::throw_exception("Unknown texture dimension" HERE); } } @@ -83,7 +83,7 @@ namespace { size_t mip_level = 0; void *mapped_buffer_ptr = texture_buffer_heap.map(CD3DX12_RANGE(heap_offset, heap_offset + buffer_size)); - gsl::span mapped_buffer{ (gsl::byte*)mapped_buffer_ptr, gsl::narrow(buffer_size) }; + gsl::span mapped_buffer{ (gsl::byte*)mapped_buffer_ptr, ::narrow(buffer_size) }; std::vector input_layouts = get_subresources_layout(texture); u8 block_size_in_bytes = get_format_block_size_in_bytes(format); u8 block_size_in_texel = get_format_block_size_in_texel(format); @@ -163,7 +163,7 @@ D3D12_SHADER_RESOURCE_VIEW_DESC get_srv_descriptor_with_dimensions(const rsx::te shared_resource_view_desc.Texture3D.MipLevels = tex.get_exact_mipmap_count(); return shared_resource_view_desc; } - throw EXCEPTION("Wrong texture dimension"); + fmt::throw_exception("Wrong texture dimension" HERE); } } diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Utils.h b/rpcs3/Emu/RSX/D3D12/D3D12Utils.h index 70f4fd110a..f9c0c18f2f 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Utils.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12Utils.h @@ -22,7 +22,7 @@ inline std::string get_hresult_message(HRESULT hr) #endif } -#define CHECK_HRESULT(expr) { HRESULT hr = (expr); if (FAILED(hr)) throw EXCEPTION("HRESULT = %s", get_hresult_message(hr)); } +#define CHECK_HRESULT(expr) { HRESULT hr = (expr); if (FAILED(hr)) fmt::throw_exception("HRESULT = %s" HERE, get_hresult_message(hr)); } /** * Send data to dst pointer without polluting cache. diff --git a/rpcs3/Emu/RSX/GL/GLCommonDecompiler.cpp b/rpcs3/Emu/RSX/GL/GLCommonDecompiler.cpp index ac455eac90..bd5ebb7fef 100644 --- a/rpcs3/Emu/RSX/GL/GLCommonDecompiler.cpp +++ b/rpcs3/Emu/RSX/GL/GLCommonDecompiler.cpp @@ -98,7 +98,7 @@ std::string compareFunctionImpl(COMPARE f, const std::string &Op0, const std::st case COMPARE::FUNCTION_SNE: return "notEqual(" + Op0 + ", " + Op1 + ")"; } - throw EXCEPTION("Unknown compare function"); + fmt::throw_exception("Unknown compare function" HERE); } void insert_glsl_legacy_function(std::ostream& OS) diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index eec0540b8e..5046318aee 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -21,7 +21,7 @@ namespace case rsx::surface_depth_format::z16: return 0xFFFF; case rsx::surface_depth_format::z24s8: return 0xFFFFFF; } - throw EXCEPTION("Unknown depth format"); + fmt::throw_exception("Unknown depth format" HERE); } } @@ -323,7 +323,7 @@ namespace case rsx::texture_dimension_extended::texture_dimension_cubemap: return GL_TEXTURE_CUBE_MAP; case rsx::texture_dimension_extended::texture_dimension_3d: return GL_TEXTURE_3D; } - throw EXCEPTION("Unknown texture target"); + fmt::throw_exception("Unknown texture target" HERE); } GLenum get_gl_target_for_texture(const rsx::vertex_texture& tex) @@ -335,7 +335,7 @@ namespace case rsx::texture_dimension_extended::texture_dimension_cubemap: return GL_TEXTURE_CUBE_MAP; case rsx::texture_dimension_extended::texture_dimension_3d: return GL_TEXTURE_3D; } - throw EXCEPTION("Unknown texture target"); + fmt::throw_exception("Unknown texture target" HERE); } } diff --git a/rpcs3/Emu/RSX/GL/gl_helpers.cpp b/rpcs3/Emu/RSX/GL/gl_helpers.cpp index a359b59b49..b93e53813c 100644 --- a/rpcs3/Emu/RSX/GL/gl_helpers.cpp +++ b/rpcs3/Emu/RSX/GL/gl_helpers.cpp @@ -20,7 +20,7 @@ namespace gl case rsx::primitive_type::quad_strip: return GL_TRIANGLES; case rsx::primitive_type::polygon: return GL_TRIANGLES; } - throw EXCEPTION("unknow primitive type"); + fmt::throw_exception("unknow primitive type" HERE); } #ifdef WIN32 @@ -91,7 +91,7 @@ namespace gl if (status != GL_FRAMEBUFFER_COMPLETE) { - throw std::logic_error(fmt::format("0x%04x", status)); + fmt::throw_exception("0x%04x", status); } } @@ -536,6 +536,6 @@ namespace gl case rsx::primitive_type::polygon: return false; } - throw EXCEPTION("unknown primitive type"); + fmt::throw_exception("unknown primitive type" HERE); } } diff --git a/rpcs3/Emu/RSX/GL/gl_helpers.h b/rpcs3/Emu/RSX/GL/gl_helpers.h index 74fdf1fb01..5fa8810a3b 100644 --- a/rpcs3/Emu/RSX/GL/gl_helpers.h +++ b/rpcs3/Emu/RSX/GL/gl_helpers.h @@ -19,9 +19,9 @@ namespace gl { const char* file; const char* function; - long line; + int line; - constexpr __glcheck_impl_t(const char* file, const char* function, long line) + constexpr __glcheck_impl_t(const char* file, const char* function, int line) : file(file) , function(function) , line(line) @@ -43,7 +43,7 @@ namespace gl default: error = "unknown error"; break; } - throw std::runtime_error(fmt::format("OpenGL error: %s. file '%s' function '%s' line %ld", error.c_str(), file, function, line)); + fmt::throw_exception("OpenGL error: %s\n(in file %s:%d, function %s)", error, file, line, function); } } }; @@ -1239,7 +1239,7 @@ namespace gl void copy_from(buffer &buf, u32 gl_format_type, u32 offset, u32 length) { if (get_target() != target::textureBuffer) - throw EXCEPTION("OpenGL error: texture cannot copy from buffer"); + fmt::throw_exception("OpenGL error: texture cannot copy from buffer" HERE); /* if (!offset) { @@ -1248,7 +1248,7 @@ namespace gl }*/ if (glTextureBufferRangeEXT == nullptr) - throw EXCEPTION("OpenGL error: partial buffer access for textures is unsupported on your system"); + fmt::throw_exception("OpenGL error: partial buffer access for textures is unsupported on your system" HERE); __glcheck glTextureBufferRangeEXT(id(), (GLenum)target::textureBuffer, gl_format_type, buf.id(), offset, length); } diff --git a/rpcs3/Emu/RSX/GL/gl_render_targets.cpp b/rpcs3/Emu/RSX/GL/gl_render_targets.cpp index 563b07dda2..d3a145f208 100644 --- a/rpcs3/Emu/RSX/GL/gl_render_targets.cpp +++ b/rpcs3/Emu/RSX/GL/gl_render_targets.cpp @@ -72,7 +72,7 @@ u8 rsx::internals::get_pixel_size(rsx::surface_depth_format format) case rsx::surface_depth_format::z16: return 2; case rsx::surface_depth_format::z24s8: return 4; } - throw EXCEPTION("Unknown depth format"); + fmt::throw_exception("Unknown depth format" HERE); } diff --git a/rpcs3/Emu/RSX/GL/gl_render_targets.h b/rpcs3/Emu/RSX/GL/gl_render_targets.h index 193b169ce7..6f93978b52 100644 --- a/rpcs3/Emu/RSX/GL/gl_render_targets.h +++ b/rpcs3/Emu/RSX/GL/gl_render_targets.h @@ -179,7 +179,7 @@ struct gl_render_target_traits static gsl::span map_downloaded_buffer(const std::vector &buffer) { - return{ reinterpret_cast(buffer.data()), gsl::narrow(buffer.size()) }; + return{ reinterpret_cast(buffer.data()), ::narrow(buffer.size()) }; } static diff --git a/rpcs3/Emu/RSX/GL/gl_texture_cache.h b/rpcs3/Emu/RSX/GL/gl_texture_cache.h index 9a0fb0f44d..9e27e7247d 100644 --- a/rpcs3/Emu/RSX/GL/gl_texture_cache.h +++ b/rpcs3/Emu/RSX/GL/gl_texture_cache.h @@ -300,7 +300,7 @@ namespace gl case GL_DEPTH_COMPONENT16: break; default: - throw EXCEPTION("Unsupported depth format!"); + fmt::throw_exception("Unsupported depth format!" HERE); } __glcheck glTexImage2D(GL_TEXTURE_2D, 0, gl_pixel_format_internal, width, height, 0, in_format, ex_format, nullptr); @@ -334,7 +334,7 @@ namespace gl } } - if (!region) throw EXCEPTION("No region created!!"); + if (!region) fmt::throw_exception("No region created!!" HERE); } if (width != region->current_width || @@ -369,7 +369,7 @@ namespace gl void write_rtt(u32 base, u32 size, u32 texaddr) { //Actually download the data, since it seems that cell is writing to it manually - throw; + fmt::throw_exception("write_rtt" HERE); } void destroy_rtt_cache() @@ -407,7 +407,7 @@ namespace gl void initialize_rtt_cache() { - if (rtt_cache.size()) throw EXCEPTION("Initialize RTT cache while cache already exists! Leaking objects??"); + if (rtt_cache.size()) fmt::throw_exception("Initialize RTT cache while cache already exists! Leaking objects??" HERE); for (int i = 0; i < 64; ++i) { diff --git a/rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp b/rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp index 0bee4c08bb..657322d932 100644 --- a/rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp +++ b/rpcs3/Emu/RSX/GL/rsx_gl_texture.cpp @@ -37,7 +37,7 @@ namespace case CELL_GCM_TEXTURE_COMPRESSED_DXT23: return GL_COMPRESSED_RGBA_S3TC_DXT3_EXT; case CELL_GCM_TEXTURE_COMPRESSED_DXT45: return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; } - throw EXCEPTION("Compressed or unknown texture format 0x%x", texture_format); + fmt::throw_exception("Compressed or unknown texture format 0x%x" HERE, texture_format); } @@ -66,7 +66,7 @@ namespace case CELL_GCM_TEXTURE_D8R8G8B8: return std::make_tuple(GL_BGRA, GL_UNSIGNED_INT_8_8_8_8); case CELL_GCM_TEXTURE_Y16_X16_FLOAT: return std::make_tuple(GL_RG, GL_HALF_FLOAT); } - throw EXCEPTION("Compressed or unknown texture format 0x%x", texture_format); + fmt::throw_exception("Compressed or unknown texture format 0x%x" HERE, texture_format); } bool is_compressed_format(u32 texture_format) @@ -99,7 +99,7 @@ namespace case CELL_GCM_TEXTURE_COMPRESSED_DXT45: return true; } - throw EXCEPTION("Unknown format 0x%x", texture_format); + fmt::throw_exception("Unknown format 0x%x" HERE, texture_format); } bool requires_unpack_byte(u32 texture_format) @@ -178,7 +178,7 @@ namespace return { GL_ZERO, GL_GREEN, GL_BLUE, GL_RED }; } - throw EXCEPTION("Unknown format 0x%x", texture_format); + fmt::throw_exception("Unknown format 0x%x" HERE, texture_format); } } @@ -198,7 +198,7 @@ namespace rsx case rsx::texture_minify_filter::linear_linear: return GL_LINEAR_MIPMAP_LINEAR; case rsx::texture_minify_filter::convolution_min: return GL_LINEAR_MIPMAP_LINEAR; } - throw EXCEPTION("Unknow min filter"); + fmt::throw_exception("Unknow min filter" HERE); } int gl_tex_mag_filter(rsx::texture_magnify_filter mag_filter) @@ -209,7 +209,7 @@ namespace rsx case rsx::texture_magnify_filter::linear: return GL_LINEAR; case rsx::texture_magnify_filter::convolution_mag: return GL_LINEAR; } - throw EXCEPTION("Unknow mag filter"); + fmt::throw_exception("Unknow mag filter" HERE); } static const int gl_tex_zfunc[] = diff --git a/rpcs3/Emu/RSX/GL/vertex_buffer.cpp b/rpcs3/Emu/RSX/GL/vertex_buffer.cpp index deb1fe45ab..38f29097f6 100644 --- a/rpcs3/Emu/RSX/GL/vertex_buffer.cpp +++ b/rpcs3/Emu/RSX/GL/vertex_buffer.cpp @@ -20,7 +20,7 @@ namespace const u32* vec_selectors[] = { 0, vec1_types, vec2_types, vec3_types, vec4_types }; if (type > rsx::vertex_base_type::ub256) - throw EXCEPTION("OpenGL error: unknown vertex base type 0x%x", (u32)type); + fmt::throw_exception("OpenGL error: unknown vertex base type 0x%x" HERE, (u32)type); return vec_selectors[size][(int)type]; } @@ -107,7 +107,7 @@ namespace case rsx::vertex_base_type::cmp: return gl::buffer_pointer::type::s16; // Needs conversion case rsx::vertex_base_type::ub256: gl::buffer_pointer::type::u8; } - throw EXCEPTION("unknown vertex type"); + fmt::throw_exception("unknown vertex type" HERE); } bool gl_normalized(rsx::vertex_base_type type) @@ -124,7 +124,7 @@ namespace case rsx::vertex_base_type::s32k: return false; } - throw EXCEPTION("unknown vertex type"); + fmt::throw_exception("unknown vertex type" HERE); } // return vertex count if primitive type is not native (empty array otherwise) @@ -158,12 +158,12 @@ namespace { u32 min_index, max_index, vertex_draw_count = initial_vertex_count; - vertex_draw_count = (u32)get_index_count(draw_mode, gsl::narrow(vertex_draw_count)); + vertex_draw_count = (u32)get_index_count(draw_mode, ::narrow(vertex_draw_count)); - u32 type_size = gsl::narrow(get_index_type_size(type)); + u32 type_size = ::narrow(get_index_type_size(type)); u32 block_sz = vertex_draw_count * type_size; - gsl::span dst{ reinterpret_cast(ptr), gsl::narrow(block_sz) }; + gsl::span dst{ reinterpret_cast(ptr), ::narrow(block_sz) }; std::tie(min_index, max_index) = write_index_array_data_to_buffer(dst, raw_index_buffer, type, draw_mode, rsx::method_registers.restart_index_enabled(), rsx::method_registers.restart_index(), first_count_commands, [](auto prim) { return !is_primitive_native(prim); }); @@ -202,7 +202,7 @@ u32 GLGSRender::set_vertex_buffer() if (rsx::method_registers.current_draw_clause.command == rsx::draw_command::indexed) { rsx::index_array_type type = rsx::method_registers.index_type(); - u32 type_size = gsl::narrow(get_index_type_size(type)); + u32 type_size = ::narrow(get_index_type_size(type)); vertex_draw_count += rsx::method_registers.current_draw_clause.get_elements_count(); diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 3978011d72..31a4746547 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -119,7 +119,7 @@ namespace rsx res = (u32)RSXIOMem.RealAddr(offset); // TODO: Error Check? if (res == 0) { - throw EXCEPTION("GetAddress(offset=0x%x, location=0x%x): RSXIO memory not mapped", offset, location); + fmt::throw_exception("GetAddress(offset=0x%x, location=0x%x): RSXIO memory not mapped" HERE, offset, location); } //if (fxm::get()->strict_ordering[offset >> 20]) @@ -131,7 +131,7 @@ namespace rsx } default: { - throw EXCEPTION("Invalid location (offset=0x%x, location=0x%x)", offset, location); + fmt::throw_exception("Invalid location (offset=0x%x, location=0x%x)" HERE, offset, location); } } @@ -153,7 +153,7 @@ namespace rsx case 3: return sizeof(u16) * 4; } - throw EXCEPTION("Wrong vector size"); + fmt::throw_exception("Wrong vector size" HERE); case vertex_base_type::f: return sizeof(f32) * size; case vertex_base_type::sf: switch (size) @@ -165,7 +165,7 @@ namespace rsx case 3: return sizeof(f16) * 4; } - throw EXCEPTION("Wrong vector size"); + fmt::throw_exception("Wrong vector size" HERE); case vertex_base_type::ub: switch (size) { @@ -176,11 +176,11 @@ namespace rsx case 3: return sizeof(u8) * 4; } - throw EXCEPTION("Wrong vector size"); + fmt::throw_exception("Wrong vector size" HERE); case vertex_base_type::cmp: return sizeof(u16) * 4; case vertex_base_type::ub256: EXPECTS(size == 4); return sizeof(u8) * 4; } - throw EXCEPTION("RSXVertexData::GetTypeSize: Bad vertex data type (%d)!", (u8)type); + fmt::throw_exception("RSXVertexData::GetTypeSize: Bad vertex data type (%d)!" HERE, (u8)type); } void tiled_region::write(const void *src, u32 width, u32 height, u32 pitch) @@ -232,7 +232,7 @@ namespace rsx } break; default: - throw; + ::narrow(tile->comp, "tile->comp" HERE); } } @@ -281,7 +281,7 @@ namespace rsx } break; default: - throw; + ::narrow(tile->comp, "tile->comp" HERE); } } @@ -566,7 +566,7 @@ namespace rsx u32 address = rsx::get_address(rsx::method_registers.index_array_address(), rsx::method_registers.index_array_location()); rsx::index_array_type type = rsx::method_registers.index_type(); - u32 type_size = gsl::narrow(get_index_type_size(type)); + u32 type_size = ::narrow(get_index_type_size(type)); bool is_primitive_restart_enabled = rsx::method_registers.restart_index_enabled(); u32 primitive_restart_index = rsx::method_registers.restart_index(); @@ -929,7 +929,7 @@ namespace rsx if (!RSXIOMem.Read32(addr, &value)) { - throw EXCEPTION("%s(addr=0x%x): RSXIO memory not mapped", __FUNCTION__, addr); + fmt::throw_exception("%s(addr=0x%x): RSXIO memory not mapped" HERE, __FUNCTION__, addr); } return value; @@ -939,7 +939,7 @@ namespace rsx { if (!RSXIOMem.Write32(addr, value)) { - throw EXCEPTION("%s(addr=0x%x): RSXIO memory not mapped", __FUNCTION__, addr); + fmt::throw_exception("%s(addr=0x%x): RSXIO memory not mapped" HERE, __FUNCTION__, addr); } } } diff --git a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp index a113d7f14d..22d75bfc93 100644 --- a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp +++ b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp @@ -93,7 +93,7 @@ namespace vk case COMPARE::FUNCTION_SNE: return "notEqual(" + Op0 + ", " + Op1 + ")"; } - throw EXCEPTION("Unknown compare function"); + fmt::throw_exception("Unknown compare function" HERE); } void insert_glsl_legacy_function(std::ostream& OS) @@ -259,7 +259,7 @@ namespace vk return t; } - throw EXCEPTION("Unknown register name: %s", name); + fmt::throw_exception("Unknown register name: %s" HERE, name); } bool compile_glsl_to_spv(std::string& shader, glsl::program_domain domain, std::vector& spv) diff --git a/rpcs3/Emu/RSX/VK/VKFormats.cpp b/rpcs3/Emu/RSX/VK/VKFormats.cpp index 71471d3b6e..f2a2fd2247 100644 --- a/rpcs3/Emu/RSX/VK/VKFormats.cpp +++ b/rpcs3/Emu/RSX/VK/VKFormats.cpp @@ -33,10 +33,10 @@ VkFormat get_compatible_depth_surface_format(const gpu_formats_support &support, { if (support.d24_unorm_s8) return VK_FORMAT_D24_UNORM_S8_UINT; if (support.d32_sfloat_s8) return VK_FORMAT_D32_SFLOAT_S8_UINT; - throw EXCEPTION("No hardware support for z24s8"); + fmt::throw_exception("No hardware support for z24s8" HERE); } } - throw EXCEPTION("Invalid format (0x%x)", (u32)format); + fmt::throw_exception("Invalid format (0x%x)" HERE, (u32)format); } std::tuple get_min_filter_and_mip(rsx::texture_minify_filter min_filter) @@ -51,7 +51,7 @@ std::tuple get_min_filter_and_mip(rsx::texture_mi case rsx::texture_minify_filter::linear_linear: return std::make_tuple(VK_FILTER_LINEAR, VK_SAMPLER_MIPMAP_MODE_LINEAR); case rsx::texture_minify_filter::convolution_min: return std::make_tuple(VK_FILTER_LINEAR, VK_SAMPLER_MIPMAP_MODE_LINEAR); } - throw EXCEPTION("Invalid max filter"); + fmt::throw_exception("Invalid max filter" HERE); } VkFilter get_mag_filter(rsx::texture_magnify_filter mag_filter) @@ -62,7 +62,7 @@ VkFilter get_mag_filter(rsx::texture_magnify_filter mag_filter) case rsx::texture_magnify_filter::linear: return VK_FILTER_LINEAR; case rsx::texture_magnify_filter::convolution_mag: return VK_FILTER_LINEAR; } - throw EXCEPTION("Invalid mag filter (0x%x)", (u32)mag_filter); + fmt::throw_exception("Invalid mag filter (0x%x)" HERE, (u32)mag_filter); } VkBorderColor get_border_color(u8 color) @@ -88,7 +88,7 @@ VkSamplerAddressMode vk_wrap_mode(rsx::texture_wrap_mode gcm_wrap) case rsx::texture_wrap_mode::mirror_once_border: return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; case rsx::texture_wrap_mode::mirror_once_clamp: return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; } - throw EXCEPTION("unhandled texture clamp mode"); + fmt::throw_exception("unhandled texture clamp mode" HERE); } float max_aniso(rsx::texture_max_anisotropy gcm_aniso) @@ -105,7 +105,7 @@ float max_aniso(rsx::texture_max_anisotropy gcm_aniso) case rsx::texture_max_anisotropy::x16: return 16.0f; } - throw EXCEPTION("Texture anisotropy error: bad max aniso (%d)", (u32)gcm_aniso); + fmt::throw_exception("Texture anisotropy error: bad max aniso (%d)" HERE, (u32)gcm_aniso); } @@ -183,7 +183,7 @@ VkComponentMapping get_component_mapping(u32 format, u8 swizzle_mask) return { map_table[remap_r], map_table[remap_g], map_table[remap_b], map_table[remap_a] }; } } - throw EXCEPTION("Invalid or unsupported component mapping for texture format (0x%x)", format); + fmt::throw_exception("Invalid or unsupported component mapping for texture format (0x%x)" HERE, format); } } diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp index 7f6df3626e..a0f8a68ff1 100644 --- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp @@ -376,7 +376,7 @@ void VKFragmentProgram::Compile() std::vector spir_v; if (!vk::compile_glsl_to_spv(shader, vk::glsl::glsl_fragment_program, spir_v)) - throw EXCEPTION("Failed to compile fragment shader"); + fmt::throw_exception("Failed to compile fragment shader" HERE); //Create the object and compile VkShaderModuleCreateInfo fs_info; diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index f0ff23c387..0443337e35 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -15,7 +15,7 @@ namespace case rsx::surface_depth_format::z16: return 0xFFFF; case rsx::surface_depth_format::z24s8: return 0xFFFFFF; } - throw EXCEPTION("Unknown depth format"); + fmt::throw_exception("Unknown depth format" HERE); } u8 get_pixel_size(rsx::surface_depth_format format) @@ -25,7 +25,7 @@ namespace case rsx::surface_depth_format::z16: return 2; case rsx::surface_depth_format::z24s8: return 4; } - throw EXCEPTION("Unknown depth format"); + fmt::throw_exception("Unknown depth format" HERE); } } @@ -44,7 +44,7 @@ namespace vk case rsx::comparison_function::not_equal: return VK_COMPARE_OP_NOT_EQUAL; case rsx::comparison_function::always: return VK_COMPARE_OP_ALWAYS; default: - throw EXCEPTION("Unknown compare op: 0x%x", (u32)op); + fmt::throw_exception("Unknown compare op: 0x%x" HERE, (u32)op); } } @@ -195,7 +195,7 @@ namespace vk case rsx::logic_op::logic_or_inverted: return VK_LOGIC_OP_OR_INVERTED; case rsx::logic_op::logic_nand: return VK_LOGIC_OP_NAND; default: - throw EXCEPTION("Unknown logic op 0x%x", (u32)op); + fmt::throw_exception("Unknown logic op 0x%x" HERE, (u32)op); } } @@ -218,7 +218,7 @@ namespace vk case rsx::blend_factor::one_minus_constant_alpha: return VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA; case rsx::blend_factor::one_minus_constant_color: return VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR; default: - throw EXCEPTION("Unknown blend factor 0x%x", (u32)factor); + fmt::throw_exception("Unknown blend factor 0x%x" HERE, (u32)factor); } }; @@ -232,7 +232,7 @@ namespace vk case rsx::blend_equation::min: return VK_BLEND_OP_MIN; case rsx::blend_equation::max: return VK_BLEND_OP_MAX; default: - throw EXCEPTION("Unknown blend op: 0x%x", (u32)op); + fmt::throw_exception("Unknown blend op: 0x%x" HERE, (u32)op); } } @@ -250,7 +250,7 @@ namespace vk case rsx::stencil_op::incr_wrap: return VK_STENCIL_OP_INCREMENT_AND_WRAP; case rsx::stencil_op::decr_wrap: return VK_STENCIL_OP_DECREMENT_AND_WRAP; default: - throw EXCEPTION("Unknown stencil op: 0x%x", (u32)op); + fmt::throw_exception("Unknown stencil op: 0x%x" HERE, (u32)op); } } @@ -261,7 +261,7 @@ namespace vk case rsx::front_face::cw: return VK_FRONT_FACE_CLOCKWISE; case rsx::front_face::ccw: return VK_FRONT_FACE_COUNTER_CLOCKWISE; default: - throw EXCEPTION("Unknown front face value: 0x%x", (u32)ffv); + fmt::throw_exception("Unknown front face value: 0x%x" HERE, (u32)ffv); } } @@ -274,7 +274,7 @@ namespace vk case CELL_GCM_FRONT_AND_BACK: return VK_CULL_MODE_FRONT_AND_BACK; default: return VK_CULL_MODE_NONE; } - throw EXCEPTION("Unknown cull face value: 0x%x", (u32)cfv); + fmt::throw_exception("Unknown cull face value: 0x%x" HERE, (u32)cfv); } } @@ -1071,7 +1071,7 @@ bool VKGSRender::load_program() if (fragment_constants_sz) { buf = (u8*)m_uniform_buffer_ring_info.map(fragment_constants_offset, fragment_constants_sz); - m_prog_buffer.fill_fragment_constans_buffer({ reinterpret_cast(buf), gsl::narrow(fragment_constants_sz) }, fragment_program); + m_prog_buffer.fill_fragment_constans_buffer({ reinterpret_cast(buf), ::narrow(fragment_constants_sz) }, fragment_program); m_uniform_buffer_ring_info.unmap(); } diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.cpp b/rpcs3/Emu/RSX/VK/VKHelpers.cpp index 7faebe85f8..68f1cca34f 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.cpp +++ b/rpcs3/Emu/RSX/VK/VKHelpers.cpp @@ -77,8 +77,8 @@ namespace vk } } - if (result.device_local == VK_MAX_MEMORY_TYPES) throw EXCEPTION("GPU doesn't support device local memory"); - if (result.host_visible_coherent == VK_MAX_MEMORY_TYPES) throw EXCEPTION("GPU doesn't support host coherent device local memory"); + if (result.device_local == VK_MAX_MEMORY_TYPES) fmt::throw_exception("GPU doesn't support device local memory" HERE); + if (result.host_visible_coherent == VK_MAX_MEMORY_TYPES) fmt::throw_exception("GPU doesn't support host coherent device local memory" HERE); return result; } @@ -116,7 +116,7 @@ namespace vk case ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN) & CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8: return VK_FORMAT_R8G8_UNORM; // Not right case ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN) & CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8: return VK_FORMAT_R8G8_UNORM; // Not right } - throw EXCEPTION("Invalid or unsupported sampler format for texture format (0x%x)", format); + fmt::throw_exception("Invalid or unsupported sampler format for texture format (0x%x)" HERE, format); } VkAllocationCallbacks default_callbacks() diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index 2ad7df1e96..6a19bbef77 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -24,7 +24,7 @@ namespace rsx namespace vk { -#define CHECK_RESULT(expr) do { VkResult _res = (expr); if (_res != VK_SUCCESS) throw fmt::exception("Assertion failed! Result is %Xh", (s32)_res); } while (0) +#define CHECK_RESULT(expr) do { VkResult _res = (expr); if (_res != VK_SUCCESS) fmt::throw_exception("Assertion failed! Result is %Xh", (s32)_res); } while (0) VKAPI_ATTR void *VKAPI_CALL mem_realloc(void *pUserData, void *pOriginal, size_t size, size_t alignment, VkSystemAllocationScope allocationScope); VKAPI_ATTR void *VKAPI_CALL mem_alloc(void *pUserData, size_t size, size_t alignment, VkSystemAllocationScope allocationScope); @@ -124,7 +124,7 @@ namespace vk vkGetPhysicalDeviceQueueFamilyProperties(dev, &count, queue_props.data()); } - if (queue >= queue_props.size()) throw EXCEPTION("Bad queue index passed to get_queue_properties (%u)", queue); + if (queue >= queue_props.size()) fmt::throw_exception("Bad queue index passed to get_queue_properties (%u)" HERE, queue); return queue_props[queue]; } @@ -287,7 +287,7 @@ namespace vk access_mask |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!owner->get_compatible_memory_type(typeBits, access_mask, &typeIndex)) - throw EXCEPTION("Could not find suitable memory type!"); + fmt::throw_exception("Could not find suitable memory type!" HERE); VkMemoryAllocateInfo infos; infos.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; @@ -375,7 +375,7 @@ namespace vk //Suggested memory type is incompatible with this memory type. //Go through the bitset and test for requested props. if (!dev.get_compatible_memory_type(memory_req.memoryTypeBits, access_flags, &memory_type_index)) - throw EXCEPTION("No compatible memory type was found!"); + fmt::throw_exception("No compatible memory type was found!" HERE); } memory = std::make_shared(m_device, memory_req.size, memory_type_index); @@ -502,7 +502,7 @@ namespace vk //Suggested memory type is incompatible with this memory type. //Go through the bitset and test for requested props. if (!dev.get_compatible_memory_type(memory_reqs.memoryTypeBits, access_flags, &memory_type_index)) - throw EXCEPTION("No compatible memory type was found!"); + fmt::throw_exception("No compatible memory type was found!" HERE); } memory.reset(new memory_block(m_device, memory_reqs.size, memory_type_index)); @@ -876,7 +876,7 @@ namespace vk nb_swap_images = 0; getSwapchainImagesKHR(dev, m_vk_swapchain, &nb_swap_images, nullptr); - if (!nb_swap_images) throw EXCEPTION("Driver returned 0 images for swapchain"); + if (!nb_swap_images) fmt::throw_exception("Driver returned 0 images for swapchain" HERE); std::vector swap_images; swap_images.resize(nb_swap_images); @@ -1093,7 +1093,7 @@ namespace vk void makeCurrentInstance(uint32_t instance_id) { if (!instance_id || instance_id > m_vk_instances.size()) - throw EXCEPTION("Invalid instance passed to makeCurrentInstance (%u)", instance_id); + fmt::throw_exception("Invalid instance passed to makeCurrentInstance (%u)" HERE, instance_id); if (m_debugger) { @@ -1113,7 +1113,7 @@ namespace vk VkInstance getInstanceById(uint32_t instance_id) { if (!instance_id || instance_id > m_vk_instances.size()) - throw EXCEPTION("Invalid instance passed to getInstanceById (%u)", instance_id); + fmt::throw_exception("Invalid instance passed to getInstanceById (%u)" HERE, instance_id); instance_id--; return m_vk_instances[instance_id]; @@ -1195,10 +1195,10 @@ namespace vk // Generate error if could not find both a graphics and a present queue if (graphicsQueueNodeIndex == UINT32_MAX || presentQueueNodeIndex == UINT32_MAX) - throw EXCEPTION("Failed to find a suitable graphics/compute queue"); + fmt::throw_exception("Failed to find a suitable graphics/compute queue" HERE); if (graphicsQueueNodeIndex != presentQueueNodeIndex) - throw EXCEPTION("Separate graphics and present queues not supported"); + fmt::throw_exception("Separate graphics and present queues not supported" HERE); // Get the list of VkFormat's that are supported: uint32_t formatCount; @@ -1216,7 +1216,7 @@ namespace vk } else { - if (!formatCount) throw EXCEPTION("Format count is zero!"); + if (!formatCount) fmt::throw_exception("Format count is zero!" HERE); format = surfFormats[0].format; } diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp index 9dddfe4b76..8b2dfc5d0b 100644 --- a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp +++ b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp @@ -65,7 +65,7 @@ namespace vk } } - throw EXCEPTION("texture not found"); + fmt::throw_exception("texture not found" HERE); } void program::bind_uniform(VkDescriptorBufferInfo buffer_descriptor, uint32_t binding_point, VkDescriptorSet &descriptor_set) @@ -101,7 +101,7 @@ namespace vk return; } } - throw EXCEPTION("vertex buffer not found"); + fmt::throw_exception("vertex buffer not found" HERE); } } } diff --git a/rpcs3/Emu/RSX/VK/VKTexture.cpp b/rpcs3/Emu/RSX/VK/VKTexture.cpp index d45e957cae..a5dd069bf2 100644 --- a/rpcs3/Emu/RSX/VK/VKTexture.cpp +++ b/rpcs3/Emu/RSX/VK/VKTexture.cpp @@ -149,7 +149,7 @@ namespace vk size_t offset_in_buffer = upload_heap.alloc<512>(image_linear_size); void *mapped_buffer = upload_buffer->map(offset_in_buffer, image_linear_size); - gsl::span mapped{ (gsl::byte*)mapped_buffer, gsl::narrow(image_linear_size) }; + gsl::span mapped{ (gsl::byte*)mapped_buffer, ::narrow(image_linear_size) }; upload_texture_subresource(mapped, layout, format, is_swizzled, 256); upload_buffer->unmap(); @@ -360,7 +360,7 @@ namespace vk buffer_size = get_placed_texture_storage_size(tex, layout_alignment[0].first, layout_alignment[0].first); if (buffer_size != layout_alignment[0].second.size) - throw EXCEPTION("Bad texture alignment computation!"); + fmt::throw_exception("Bad texture alignment computation!" HERE); } else { @@ -370,7 +370,7 @@ namespace vk } CHECK_RESULT(vkMapMemory((*owner), vram_allocation, 0, m_memory_layout.size, 0, (void**)&data)); - gsl::span mapped{ (gsl::byte*)(data + layout_alignment[0].second.offset), gsl::narrow(layout_alignment[0].second.size) }; + gsl::span mapped{ (gsl::byte*)(data + layout_alignment[0].second.offset), ::narrow(layout_alignment[0].second.size) }; const std::vector &subresources_layout = get_subresources_layout(tex); for (const rsx_subresource_layout &layout : subresources_layout) @@ -386,7 +386,7 @@ namespace vk if (m_memory_layout.size < max_size) { - throw EXCEPTION("Failed to upload texture. Invalid memory block size."); + fmt::throw_exception("Failed to upload texture. Invalid memory block size." HERE); } int index= 0; @@ -401,7 +401,7 @@ namespace vk } CHECK_RESULT(vkMapMemory((*owner), vram_allocation, 0, m_memory_layout.size, 0, (void**)&data)); - gsl::span mapped{ (gsl::byte*)(data), gsl::narrow(m_memory_layout.size) }; + gsl::span mapped{ (gsl::byte*)(data), ::narrow(m_memory_layout.size) }; const std::vector &subresources_layout = get_subresources_layout(tex); size_t idx = 0; diff --git a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp index ca7e8850bf..3b3634efda 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp +++ b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp @@ -49,7 +49,7 @@ namespace vk const VkFormat* vec_selectors[] = { 0, vec1_types, vec2_types, vec3_types, vec4_types }; if (type > rsx::vertex_base_type::ub256) - throw EXCEPTION("VKGS error: unknown vertex base type 0x%x", (u32)type); + fmt::throw_exception("VKGS error: unknown vertex base type 0x%x" HERE, (u32)type); return vec_selectors[size][(int)type]; } @@ -81,7 +81,7 @@ namespace vk requires_modification = true; return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; default: - throw ("Unsupported primitive topology 0x%X", (u8)mode); + fmt::throw_exception("Unsupported primitive topology 0x%x", (u8)mode); } } @@ -261,7 +261,7 @@ VKGSRender::upload_vertex_data() if (rsx::method_registers.current_draw_clause.command == rsx::draw_command::indexed || primitives_emulated) { rsx::index_array_type type = rsx::method_registers.index_type(); - u32 type_size = gsl::narrow(get_index_type_size(type)); + u32 type_size = ::narrow(get_index_type_size(type)); if (is_indexed_draw) //Could be emulated or not, emulated array vertex count already computed above { @@ -358,7 +358,7 @@ VKGSRender::upload_vertex_data() vk::copy_inlined_data_to_buffer(src, dst, vertex_draw_count, vertex_info.type, vertex_info.size, opt_size, element_size, stride); break; default: - throw EXCEPTION("Unknown base type %d", (u32)vertex_info.type); + fmt::throw_exception("Unknown base type %d" HERE, (u32)vertex_info.type); } m_attrib_ring_info.unmap(); diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp index 8c203fc519..145ce7536b 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp +++ b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp @@ -315,7 +315,7 @@ void VKVertexProgram::Compile() std::vector spir_v; if (!vk::compile_glsl_to_spv(shader, vk::glsl::glsl_vertex_program, spir_v)) - throw EXCEPTION("Failed to compile vertex shader"); + fmt::throw_exception("Failed to compile vertex shader" HERE); VkShaderModuleCreateInfo vs_info; vs_info.codeSize = spir_v.size() * sizeof(u32); diff --git a/rpcs3/Emu/RSX/gcm_enums.cpp b/rpcs3/Emu/RSX/gcm_enums.cpp index e1fe86e992..20814538d5 100644 --- a/rpcs3/Emu/RSX/gcm_enums.cpp +++ b/rpcs3/Emu/RSX/gcm_enums.cpp @@ -1,8 +1,6 @@ #include "gcm_enums.h" #include "Utilities/StrFmt.h" - -#undef EXCEPTION -#define EXCEPTION(format_str, ...) fmt::exception(format_str, ##__VA_ARGS__) +#include "Utilities/Macro.h" rsx::vertex_base_type rsx::to_vertex_base_type(u8 in) { @@ -16,7 +14,7 @@ rsx::vertex_base_type rsx::to_vertex_base_type(u8 in) case 6: return rsx::vertex_base_type::cmp; case 7: return rsx::vertex_base_type::ub256; } - throw EXCEPTION("Unknown vertex base type %d", in); + fmt::throw_exception("Unknown vertex base type %d" HERE, in); } rsx::index_array_type rsx::to_index_array_type(u8 in) @@ -26,7 +24,7 @@ rsx::index_array_type rsx::to_index_array_type(u8 in) case 0: return rsx::index_array_type::u32; case 1: return rsx::index_array_type::u16; } - throw EXCEPTION("Unknown index array type %d", in); + fmt::throw_exception("Unknown index array type %d" HERE, in); } rsx::primitive_type rsx::to_primitive_type(u8 in) @@ -45,7 +43,7 @@ rsx::primitive_type rsx::to_primitive_type(u8 in) case 9: return rsx::primitive_type::quad_strip; case 10: return rsx::primitive_type::polygon; } - throw EXCEPTION("Unknown primitive type %d", in); + fmt::throw_exception("Unknown primitive type %d" HERE, in); } enum @@ -63,7 +61,7 @@ rsx::window_origin rsx::to_window_origin(u8 in) case CELL_GCM_WINDOW_ORIGIN_TOP: return rsx::window_origin::top; case CELL_GCM_WINDOW_ORIGIN_BOTTOM: return rsx::window_origin::bottom; } - throw EXCEPTION("Unknown window origin modifier 0x%x", in); + fmt::throw_exception("Unknown window origin modifier 0x%x" HERE, in); } rsx::window_pixel_center rsx::to_window_pixel_center(u8 in) @@ -73,7 +71,7 @@ rsx::window_pixel_center rsx::to_window_pixel_center(u8 in) case CELL_GCM_WINDOW_PIXEL_CENTER_HALF: return rsx::window_pixel_center::half; case CELL_GCM_WINDOW_PIXEL_CENTER_INTEGER: return rsx::window_pixel_center::integer; } - throw EXCEPTION("Unknown window pixel center 0x%x", in); + fmt::throw_exception("Unknown window pixel center 0x%x" HERE, in); } enum @@ -104,7 +102,7 @@ rsx::comparison_function rsx::to_comparison_function(u16 in) case CELL_GCM_GEQUAL: return rsx::comparison_function::greater_or_equal; case CELL_GCM_ALWAYS: return rsx::comparison_function::always; } - throw EXCEPTION("Unknown comparison function 0x%x", in); + fmt::throw_exception("Unknown comparison function 0x%x" HERE, in); } enum @@ -128,7 +126,7 @@ rsx::fog_mode rsx::to_fog_mode(u32 in) case CELL_GCM_FOG_MODE_EXP2_ABS: return rsx::fog_mode::exponential2_abs; case CELL_GCM_FOG_MODE_LINEAR_ABS: return rsx::fog_mode::linear_abs; } - throw EXCEPTION("Unknown fog mode 0x%x", in); + fmt::throw_exception("Unknown fog mode 0x%x" HERE, in); } rsx::texture_dimension rsx::to_texture_dimension(u8 in) @@ -139,7 +137,7 @@ rsx::texture_dimension rsx::to_texture_dimension(u8 in) case 2: return rsx::texture_dimension::dimension2d; case 3: return rsx::texture_dimension::dimension3d; } - throw EXCEPTION("Unknown texture dimension %d", in); + fmt::throw_exception("Unknown texture dimension %d" HERE, in); } namespace rsx @@ -589,7 +587,7 @@ rsx::texture_wrap_mode rsx::to_texture_wrap_mode(u8 in) case CELL_GCM_TEXTURE_MIRROR_ONCE_BORDER: return rsx::texture_wrap_mode::mirror_once_border; case CELL_GCM_TEXTURE_MIRROR_ONCE_CLAMP: return rsx::texture_wrap_mode::mirror_once_clamp; } - throw EXCEPTION("Unknown wrap mode 0x%x", in); + fmt::throw_exception("Unknown wrap mode 0x%x" HERE, in); } rsx::texture_max_anisotropy rsx::to_texture_max_anisotropy(u8 in) @@ -605,7 +603,7 @@ rsx::texture_max_anisotropy rsx::to_texture_max_anisotropy(u8 in) case CELL_GCM_TEXTURE_MAX_ANISO_12: return rsx::texture_max_anisotropy::x12; case CELL_GCM_TEXTURE_MAX_ANISO_16: return rsx::texture_max_anisotropy::x16; } - throw EXCEPTION("Unknown anisotropy max mode 0x%x", in); + fmt::throw_exception("Unknown anisotropy max mode 0x%x" HERE, in); } rsx::texture_minify_filter rsx::to_texture_minify_filter(u8 in) @@ -620,7 +618,7 @@ rsx::texture_minify_filter rsx::to_texture_minify_filter(u8 in) case CELL_GCM_TEXTURE_LINEAR_LINEAR: return rsx::texture_minify_filter::linear_linear; case CELL_GCM_TEXTURE_CONVOLUTION_MIN: return rsx::texture_minify_filter::linear_linear; } - throw EXCEPTION("Unknown minify filter 0x%x", in); + fmt::throw_exception("Unknown minify filter 0x%x" HERE, in); } @@ -632,7 +630,7 @@ rsx::texture_magnify_filter rsx::to_texture_magnify_filter(u8 in) case CELL_GCM_TEXTURE_LINEAR: return rsx::texture_magnify_filter::linear; case CELL_GCM_TEXTURE_CONVOLUTION_MAG: return rsx::texture_magnify_filter::convolution_mag; } - throw EXCEPTION("Unknown magnify filter 0x%x", in); + fmt::throw_exception("Unknown magnify filter 0x%x" HERE, in); } rsx::surface_target rsx::to_surface_target(u8 in) @@ -646,7 +644,7 @@ rsx::surface_target rsx::to_surface_target(u8 in) case CELL_GCM_SURFACE_TARGET_MRT2: return rsx::surface_target::surfaces_a_b_c; case CELL_GCM_SURFACE_TARGET_MRT3: return rsx::surface_target::surfaces_a_b_c_d; } - throw EXCEPTION("Unknown surface target 0x%x", in); + fmt::throw_exception("Unknown surface target 0x%x" HERE, in); } rsx::surface_depth_format rsx::to_surface_depth_format(u8 in) @@ -656,7 +654,7 @@ rsx::surface_depth_format rsx::to_surface_depth_format(u8 in) case CELL_GCM_SURFACE_Z16: return rsx::surface_depth_format::z16; case CELL_GCM_SURFACE_Z24S8: return rsx::surface_depth_format::z24s8; } - throw EXCEPTION("Unknown surface depth format 0x%x", in); + fmt::throw_exception("Unknown surface depth format 0x%x" HERE, in); } @@ -670,7 +668,7 @@ rsx::surface_antialiasing rsx::to_surface_antialiasing(u8 in) case CELL_GCM_SURFACE_SQUARE_CENTERED_4: return rsx::surface_antialiasing::square_centered_4_samples; case CELL_GCM_SURFACE_SQUARE_ROTATED_4: return rsx::surface_antialiasing::square_rotated_4_samples; } - throw EXCEPTION("Unknown surface antialiasing format 0x%x", in); + fmt::throw_exception("Unknown surface antialiasing format 0x%x" HERE, in); } rsx::surface_color_format rsx::to_surface_color_format(u8 in) @@ -692,7 +690,7 @@ rsx::surface_color_format rsx::to_surface_color_format(u8 in) case CELL_GCM_SURFACE_X8B8G8R8_O8B8G8R8: return rsx::surface_color_format::x8b8g8r8_o8b8g8r8; case CELL_GCM_SURFACE_A8B8G8R8: return rsx::surface_color_format::a8b8g8r8; } - throw EXCEPTION("Unknown surface color format 0x%x", in); + fmt::throw_exception("Unknown surface color format 0x%x" HERE, in); } enum @@ -717,7 +715,7 @@ rsx::stencil_op rsx::to_stencil_op(u16 in) case CELL_GCM_DECR_WRAP: return rsx::stencil_op::decr_wrap; case CELL_GCM_ZERO: return rsx::stencil_op::zero; } - throw EXCEPTION("Unknown stencil op 0x%x", in); + fmt::throw_exception("Unknown stencil op 0x%x" HERE, in); } enum @@ -745,7 +743,7 @@ rsx::blend_equation rsx::to_blend_equation(u16 in) case CELL_GCM_FUNC_ADD_SIGNED: return rsx::blend_equation::add_signed; case CELL_GCM_FUNC_REVERSE_ADD_SIGNED: return rsx::blend_equation::reverse_add_signed; } - throw EXCEPTION("Unknown blend eq 0x%x", in); + fmt::throw_exception("Unknown blend eq 0x%x" HERE, in); } enum @@ -785,7 +783,7 @@ rsx::blend_factor rsx::to_blend_factor(u16 in) case CELL_GCM_CONSTANT_ALPHA: return rsx::blend_factor::constant_alpha; case CELL_GCM_ONE_MINUS_CONSTANT_ALPHA: return rsx::blend_factor::one_minus_constant_alpha; } - throw EXCEPTION("Unknown blend factor 0x%x", in); + fmt::throw_exception("Unknown blend factor 0x%x" HERE, in); } enum @@ -829,7 +827,7 @@ rsx::logic_op rsx::to_logic_op(u16 in) case CELL_GCM_NAND: return rsx::logic_op::logic_nand; case CELL_GCM_SET: return rsx::logic_op::logic_set; } - throw EXCEPTION("Unknown logic op 0x%x", in); + fmt::throw_exception("Unknown logic op 0x%x" HERE, in); } enum @@ -846,7 +844,7 @@ rsx::front_face rsx::to_front_face(u16 in) case CELL_GCM_CW: return rsx::front_face::cw; case CELL_GCM_CCW: return rsx::front_face::ccw; } - throw EXCEPTION("Unknown front face 0x%x", in); + fmt::throw_exception("Unknown front face 0x%x" HERE, in); } enum @@ -864,7 +862,7 @@ rsx::cull_face rsx::to_cull_face(u16 in) case CELL_GCM_FRONT: return rsx::cull_face::front; case CELL_GCM_BACK: return rsx::cull_face::back; } - throw EXCEPTION("Unknown cull face 0x%x", in); + fmt::throw_exception("Unknown cull face 0x%x" HERE, in); } enum @@ -883,7 +881,7 @@ rsx::blit_engine::transfer_origin rsx::blit_engine::to_transfer_origin(u8 in) case CELL_GCM_TRANSFER_ORIGIN_CENTER: return rsx::blit_engine::transfer_origin::center; case CELL_GCM_TRANSFER_ORIGIN_CORNER: return rsx::blit_engine::transfer_origin::corner; } - throw EXCEPTION("Unknown tranfer origin 0x%x", in); + fmt::throw_exception("Unknown tranfer origin 0x%x" HERE, in); } rsx::blit_engine::transfer_interpolator rsx::blit_engine::to_transfer_interpolator(u8 in) @@ -893,7 +891,7 @@ rsx::blit_engine::transfer_interpolator rsx::blit_engine::to_transfer_interpolat case CELL_GCM_TRANSFER_INTERPOLATOR_ZOH: return rsx::blit_engine::transfer_interpolator::zoh; case CELL_GCM_TRANSFER_INTERPOLATOR_FOH: return rsx::blit_engine::transfer_interpolator::foh; } - throw EXCEPTION("Unknown tranfer interpolator 0x%x", in); + fmt::throw_exception("Unknown tranfer interpolator 0x%x" HERE, in); } enum @@ -917,7 +915,7 @@ rsx::blit_engine::transfer_operation rsx::blit_engine::to_transfer_operation(u8 case CELL_GCM_TRANSFER_OPERATION_SRCCOPY_PREMULT: return rsx::blit_engine::transfer_operation::srccopy_premult; case CELL_GCM_TRANSFER_OPERATION_BLEND_PREMULT: return rsx::blit_engine::transfer_operation::blend_premult; } - throw EXCEPTION("Unknown tranfer operation 0x%x", in); + fmt::throw_exception("Unknown tranfer operation 0x%x" HERE, in); } enum @@ -955,7 +953,7 @@ rsx::blit_engine::transfer_source_format rsx::blit_engine::to_transfer_source_fo case CELL_GCM_TRANSFER_SCALE_FORMAT_A8B8G8R8: return rsx::blit_engine::transfer_source_format::a8b8g8r8; case CELL_GCM_TRANSFER_SCALE_FORMAT_X8B8G8R8: return rsx::blit_engine::transfer_source_format::x8b8g8r8; } - throw EXCEPTION("Unknown transfer source format 0x%x", in); + fmt::throw_exception("Unknown transfer source format 0x%x" HERE, in); } enum @@ -974,7 +972,7 @@ rsx::blit_engine::transfer_destination_format rsx::blit_engine::to_transfer_dest case CELL_GCM_TRANSFER_SURFACE_FORMAT_A8R8G8B8: return rsx::blit_engine::transfer_destination_format::a8r8g8b8; case CELL_GCM_TRANSFER_SURFACE_FORMAT_Y32: return rsx::blit_engine::transfer_destination_format::y32; } - throw EXCEPTION("Unknown transfer destination format 0x%x", in); + fmt::throw_exception("Unknown transfer destination format 0x%x" HERE, in); } enum @@ -990,7 +988,7 @@ rsx::blit_engine::context_surface rsx::blit_engine::to_context_surface(u32 in) case CELL_GCM_CONTEXT_SURFACE2D: return rsx::blit_engine::context_surface::surface2d; case CELL_GCM_CONTEXT_SWIZZLE2D: return rsx::blit_engine::context_surface::swizzle2d; } - throw EXCEPTION("Unknown context surface 0x%x", in); + fmt::throw_exception("Unknown context surface 0x%x" HERE, in); } enum @@ -1006,7 +1004,7 @@ rsx::blit_engine::context_dma rsx::blit_engine::to_context_dma(u32 in) case CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_REPORT: return rsx::blit_engine::context_dma::to_memory_get_report; case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN: return rsx::blit_engine::context_dma::report_location_main; } - throw EXCEPTION("Unknown context dma 0x%x", in); + fmt::throw_exception("Unknown context dma 0x%x" HERE, in); } enum @@ -1024,7 +1022,7 @@ rsx::user_clip_plane_op rsx::to_user_clip_plane_op(u8 in) case CELL_GCM_USER_CLIP_PLANE_ENABLE_LT: return rsx::user_clip_plane_op::less_than; case CELL_GCM_USER_CLIP_PLANE_ENABLE_GE: return rsx::user_clip_plane_op::greather_or_equal; } - throw EXCEPTION("Unknown user clip plane 0x%x", in); + fmt::throw_exception("Unknown user clip plane 0x%x" HERE, in); } enum @@ -1040,7 +1038,7 @@ rsx::shading_mode rsx::to_shading_mode(u32 in) case CELL_GCM_FLAT: return rsx::shading_mode::flat; case CELL_GCM_SMOOTH: return rsx::shading_mode::smooth; } - throw EXCEPTION("Unknown shading mode 0x%x", in); + fmt::throw_exception("Unknown shading mode 0x%x" HERE, in); } enum @@ -1058,6 +1056,6 @@ rsx::polygon_mode rsx::to_polygon_mode(u32 in) case CELL_GCM_POLYGON_MODE_LINE: return rsx::polygon_mode::line; case CELL_GCM_POLYGON_MODE_FILL: return rsx::polygon_mode::fill; } - throw EXCEPTION("Unknown polygon mode 0x%x", in); + fmt::throw_exception("Unknown polygon mode 0x%x" HERE, in); } diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/Emu/RSX/rsx_methods.cpp index e22a9ebdc2..ed5f449684 100644 --- a/rpcs3/Emu/RSX/rsx_methods.cpp +++ b/rpcs3/Emu/RSX/rsx_methods.cpp @@ -31,7 +31,7 @@ namespace rsx [[noreturn]] void invalid_method(thread*, u32 _reg, u32 arg) { - throw fmt::exception("Invalid RSX method 0x%x (arg=0x%x)" HERE, _reg << 2, arg); + fmt::throw_exception("Invalid RSX method 0x%x (arg=0x%x)" HERE, _reg << 2, arg); } template struct vertex_data_type_from_element_type; diff --git a/rpcs3/Gui/RSXDebugger.cpp b/rpcs3/Gui/RSXDebugger.cpp index 88e96cec46..b32c722ec2 100644 --- a/rpcs3/Gui/RSXDebugger.cpp +++ b/rpcs3/Gui/RSXDebugger.cpp @@ -435,7 +435,7 @@ namespace case rsx::surface_color_format::x1r5g5b5_o1r5g5b5: case rsx::surface_color_format::x1r5g5b5_z1r5g5b5: case rsx::surface_color_format::w32z32y32x32: - throw EXCEPTION("Unsupported format for display"); + fmt::throw_exception("Unsupported format for display" HERE); } } diff --git a/rpcs3/Loader/PSF.cpp b/rpcs3/Loader/PSF.cpp index 7dd269b756..275fc18b11 100644 --- a/rpcs3/Loader/PSF.cpp +++ b/rpcs3/Loader/PSF.cpp @@ -98,7 +98,7 @@ namespace psf return SIZE_32(u32); } - throw fmt::exception("Invalid format (0x%x)" HERE, m_type); + fmt::throw_exception("Invalid format (0x%x)" HERE, m_type); } registry load_object(const fs::file& stream) @@ -261,7 +261,7 @@ namespace psf } else { - throw EXCEPTION("Invalid entry format (key='%s', fmt=0x%x)", entry.first, fmt); + fmt::throw_exception("Invalid entry format (key='%s', fmt=0x%x)" HERE, entry.first, fmt); } } } diff --git a/rpcs3/rpcs3.cpp b/rpcs3/rpcs3.cpp index ffa9a4f6d6..65505521f0 100644 --- a/rpcs3/rpcs3.cpp +++ b/rpcs3/rpcs3.cpp @@ -175,7 +175,7 @@ bool Rpcs3App::OnInit() case frame_type::Vulkan: return std::make_unique("Vulkan", w, h); } - throw fmt::exception("Invalid frame type (0x%x)" HERE, (int)type); + fmt::throw_exception("Invalid frame type (0x%x)" HERE, (int)type); }; callbacks.get_gs_render = PURE_EXPR(g_cfg_gs_render.get()()); diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index dabc2eeed5..ae1b7277f5 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -38,9 +38,6 @@ namespace std { inline namespace literals { inline namespace chrono_literals {}} using namespace std::literals; -// Obsolete, throw fmt::exception directly. Use 'HERE' macro, if necessary. -#define EXCEPTION(format_str, ...) fmt::exception("%s(): " format_str HERE, __FUNCTION__, ##__VA_ARGS__) - #include "Utilities/types.h" #include "Utilities/Macro.h" #include "Utilities/Platform.h"