diff --git a/Utilities/Log.cpp b/Utilities/Log.cpp index 162c8cfbfd..d86e235c62 100644 --- a/Utilities/Log.cpp +++ b/Utilities/Log.cpp @@ -1,6 +1,4 @@ -#include "stdafx.h" -#include -#include +#include "stdafx.h" #include "Thread.h" #include "File.h" #include "Log.h" @@ -9,257 +7,144 @@ #include #endif -using namespace Log; - -std::unique_ptr g_log_manager; - -u32 LogMessage::size() const +namespace _log { - //1 byte for NULL terminator - return (u32)(sizeof(LogMessage::size_type) + sizeof(LogType) + sizeof(Severity) + sizeof(std::string::value_type) * mText.size() + 1); -} - -void LogMessage::serialize(char *output) const -{ - LogMessage::size_type size = this->size(); - memcpy(output, &size, sizeof(LogMessage::size_type)); - output += sizeof(LogMessage::size_type); - memcpy(output, &mType, sizeof(LogType)); - output += sizeof(LogType); - memcpy(output, &mServerity, sizeof(Severity)); - output += sizeof(Severity); - memcpy(output, mText.c_str(), mText.size() ); - output += sizeof(std::string::value_type)*mText.size(); - *output = '\0'; - -} -LogMessage LogMessage::deserialize(char *input, u32* size_out) -{ - LogMessage msg; - LogMessage::size_type msgSize = *(reinterpret_cast(input)); - input += sizeof(LogMessage::size_type); - msg.mType = *(reinterpret_cast(input)); - input += sizeof(LogType); - msg.mServerity = *(reinterpret_cast(input)); - input += sizeof(Severity); - if (msgSize > 9000) + logger& get_logger() { - int wtf = 6; + // Use magic static for global logger instance + static logger instance; + return instance; } - msg.mText.append(input, msgSize - 1 - sizeof(Severity) - sizeof(LogType)); - if (size_out){(*size_out) = msgSize;} - return msg; + + file_listener g_log_file(_PRGNAME_ ".log"); + + file_writer g_tty_file("TTY.log"); + + channel GENERAL("", level::notice); + channel LOADER("LDR", level::notice); + channel MEMORY("MEM", level::notice); + channel RSX("RSX", level::notice); + channel HLE("HLE", level::notice); + channel PPU("PPU", level::notice); + channel SPU("SPU", level::notice); + channel ARMv7("ARMv7"); } - - -LogChannel::LogChannel() : LogChannel("unknown") -{} - -LogChannel::LogChannel(const std::string& name) : - name(name) - , mEnabled(true) - , mLogLevel(Severity::Warning) -{} - -void LogChannel::log(const LogMessage &msg) +_log::listener::listener() { - std::lock_guard lock(mListenerLock); - for (auto &listener : mListeners) + // Register self + get_logger().add_listener(this); +} + +_log::listener::~listener() +{ + // Unregister self + get_logger().remove_listener(this); +} + +_log::channel::channel(const std::string& name, _log::level init_level) + : name{ name } + , enabled{ init_level } +{ + // TODO: register config property "name" associated with "enabled" member +} + +void _log::logger::add_listener(_log::listener* listener) +{ + std::lock_guard lock(m_mutex); + + m_listeners.emplace(listener); +} + +void _log::logger::remove_listener(_log::listener* listener) +{ + std::lock_guard lock(m_mutex); + + m_listeners.erase(listener); +} + +void _log::logger::broadcast(const _log::channel& ch, _log::level sev, const std::string& text) const +{ + reader_lock lock(m_mutex); + + for (auto listener : m_listeners) { - listener->log(msg); + listener->log(ch, sev, text); } } -void LogChannel::addListener(std::shared_ptr listener) +void _log::broadcast(const _log::channel& ch, _log::level sev, const std::string& text) { - std::lock_guard lock(mListenerLock); - mListeners.insert(listener); -} -void LogChannel::removeListener(std::shared_ptr listener) -{ - std::lock_guard lock(mListenerLock); - mListeners.erase(listener); + get_logger().broadcast(ch, sev, text); } -struct CoutListener : LogListener +_log::file_writer::file_writer(const std::string& name) { - void log(const LogMessage &msg) override + try { - std::cerr << msg.mText << std::endl; - } -}; - -struct FileListener : LogListener -{ - fs::file mFile; - bool mPrependChannelName; - - FileListener(const std::string& name = _PRGNAME_ ".log", bool prependChannel = true) - : mFile(fs::get_config_dir() + name, fom::rewrite) - , mPrependChannelName(prependChannel) - { - if (!mFile) + if (!m_file.open(fs::get_config_dir() + name, fom::rewrite | fom::append)) { + throw EXCEPTION("Can't create log file %s (error %d)", name, errno); + } + } + catch (const fmt::exception& e) + { #ifdef _WIN32 - MessageBoxA(0, ("Can't create log file: " + name).c_str(), "Error", MB_ICONERROR); + MessageBoxA(0, e.what(), "_log::file_writer() failed", MB_ICONERROR); #else - std::printf("Can't create log file: %s\n", name.c_str()); + std::printf("_log::file_writer() failed: %s\n", e.what()); #endif - } } +} - void log(const LogMessage &msg) override +void _log::file_writer::log(const std::string& text) +{ + m_file.write(text); +} + +std::size_t _log::file_writer::size() const +{ + return m_file.seek(0, fs::seek_cur); +} + +void _log::file_listener::log(const _log::channel& ch, _log::level sev, const std::string& text) +{ + std::string msg; msg.reserve(text.size() + 200); + + // Used character: U+00B7 (Middle Dot) + switch (sev) { - std::string text = msg.mText; - if (mPrependChannelName) - { - text.insert(0, gTypeNameTable[static_cast(msg.mType)].mName); - - if (msg.mType == Log::TTY) - { - text = fmt::escape(text); - if (text[text.length() - 1] != '\n') - { - text += '\n'; - } - } - } - - mFile.write(text); + case level::always: msg = u8"·A "; break; + case level::fatal: msg = u8"·F "; break; + case level::error: msg = u8"·E "; break; + case level::todo: msg = u8"·U "; break; + case level::success: msg = u8"·S "; break; + case level::warning: msg = u8"·W "; break; + case level::notice: msg = u8"·! "; break; + case level::trace: msg = u8"·T "; break; } -}; -LogManager::LogManager() -#ifdef BUFFERED_LOGGING - : mExiting(false), mLogConsumer() -#endif -{ - auto it = mChannels.begin(); - std::shared_ptr listener(new FileListener()); - for (const LogTypeName& name : gTypeNameTable) + // TODO: print time? + + if (auto t = thread_ctrl::get_current()) { - it->name = name.mName; - it->addListener(listener); - it++; + msg += '{'; + msg += t->get_name(); + msg += "} "; } - std::shared_ptr TTYListener(new FileListener("TTY.log", false)); - getChannel(TTY).addListener(TTYListener); -#ifdef BUFFERED_LOGGING - mLogConsumer = std::thread(&LogManager::consumeLog, this); -#endif -} -LogManager::~LogManager() -{ -#ifdef BUFFERED_LOGGING - mExiting = true; - mBufferReady.notify_all(); - mLogConsumer.join(); -} - -void LogManager::consumeLog() -{ - std::unique_lock lock(mStatusMut); - while (!mExiting) + if (ch.name.size()) { - mBufferReady.wait(lock); - mBuffer.lockGet(); - size_t size = mBuffer.size(); - std::vector local_messages(size); - mBuffer.popN(&local_messages.front(), size); - mBuffer.unlockGet(); - - u32 cursor = 0; - u32 removed = 0; - while (cursor < size) - { - Log::LogMessage msg = Log::LogMessage::deserialize(local_messages.data() + cursor, &removed); - cursor += removed; - getChannel(msg.mType).log(msg); - } + msg += ch.name; + msg += sev == level::todo ? " TODO: " : ": "; } -#endif -} - -void LogManager::log(LogMessage msg) -{ - //don't do any formatting changes or filtering to the TTY output since we - //use the raw output to do diffs with the output of a real PS3 and some - //programs write text in single bytes to the console - if (msg.mType != TTY) + else if (sev == level::todo) { - std::string prefix; - switch (msg.mServerity) - { - case Severity::Success: - prefix = "S "; - break; - case Severity::Notice: - prefix = "! "; - break; - case Severity::Warning: - prefix = "W "; - break; - case Severity::Error: - prefix = "E "; - break; - } - if (auto thr = thread_ctrl::get_current()) - { - prefix += "{" + thr->get_name() + "} "; - } - msg.mText.insert(0, prefix); - msg.mText.append(1,'\n'); + msg += "TODO: "; } -#ifdef BUFFERED_LOGGING - size_t size = msg.size(); - std::vector temp_buffer(size); - msg.serialize(temp_buffer.data()); - mBuffer.pushRange(temp_buffer.begin(), temp_buffer.end()); - mBufferReady.notify_one(); -#else - mChannels[static_cast(msg.mType)].log(msg); -#endif -} + + msg += text; + msg += '\n'; -void LogManager::addListener(std::shared_ptr listener) -{ - for (auto& channel : mChannels) - { - channel.addListener(listener); - } -} - -void LogManager::removeListener(std::shared_ptr listener) -{ - for (auto& channel : mChannels) - { - channel.removeListener(listener); - } -} - -LogManager& LogManager::getInstance() -{ - if (!g_log_manager) - { - g_log_manager.reset(new LogManager()); - } - - return *g_log_manager; -} - -LogChannel &LogManager::getChannel(LogType type) -{ - return mChannels[static_cast(type)]; -} - -void log_message(Log::LogType type, Log::Severity sev, const char* text) -{ - log_message(type, sev, std::string(text)); -} - -void log_message(Log::LogType type, Log::Severity sev, std::string text) -{ - g_log_manager->log({ type, sev, std::move(text) }); + file_writer::log(msg); } diff --git a/Utilities/Log.h b/Utilities/Log.h index a0e3b268b9..11ef6c6c21 100644 --- a/Utilities/Log.h +++ b/Utilities/Log.h @@ -1,134 +1,155 @@ #pragma once -#include "Utilities/MTRingbuffer.h" -//#define BUFFERED_LOGGING 1 +#include "SharedMutex.h" -//first parameter is of type Log::LogType and text is of type std::string - -#define LOG_SUCCESS(logType, text, ...) log_message(logType, Log::Severity::Success, text, ##__VA_ARGS__) -#define LOG_NOTICE(logType, text, ...) log_message(logType, Log::Severity::Notice, text, ##__VA_ARGS__) -#define LOG_WARNING(logType, text, ...) log_message(logType, Log::Severity::Warning, text, ##__VA_ARGS__) -#define LOG_ERROR(logType, text, ...) log_message(logType, Log::Severity::Error, text, ##__VA_ARGS__) - -namespace Log +namespace _log { - const unsigned int MAX_LOG_BUFFER_LENGTH = 1024*1024; - const unsigned int gBuffSize = 1000; - - enum LogType : u32 + enum class level : uint { - GENERAL = 0, - LOADER, - MEMORY, - RSX, - HLE, - PPU, - SPU, - ARMv7, - TTY, + always, // highest level (unused, cannot be disabled) + fatal, + error, + todo, + success, + warning, + notice, + trace, // lowest level (usually disabled) }; + struct channel; + struct listener; - struct LogTypeName + // Log manager + class logger final { - LogType mType; - std::string mName; + mutable shared_mutex m_mutex; + + std::set m_listeners; + + public: + // Register listener + void add_listener(listener* listener); + + // Unregister listener + void remove_listener(listener* listener); + + // Send log message to all listeners + void broadcast(const channel& ch, level sev, const std::string& text) const; }; - //well I'd love make_array() but alas manually counting is not the end of the world - static const std::array gTypeNameTable = { { - { GENERAL, "G: " }, - { LOADER, "LDR: " }, - { MEMORY, "MEM: " }, - { RSX, "RSX: " }, - { HLE, "HLE: " }, - { PPU, "PPU: " }, - { SPU, "SPU: " }, - { ARMv7, "ARM: " }, - { TTY, "TTY: " } - } }; + // Send log message to global logger instance + void broadcast(const channel& ch, level sev, const std::string& text); - enum class Severity : u32 + // Log channel (source) + struct channel { - Notice = 0, - Warning, - Success, - Error, + // Channel prefix (also used for identification) + const std::string name; + + // The lowest logging level enabled for this channel (used for early filtering) + std::atomic enabled; + + // Initialization (max level enabled by default) + channel(const std::string& name, level = level::trace); + + virtual ~channel() = default; + + // Log without formatting + force_inline void log(level sev, const std::string& text) const + { + if (sev <= enabled) + broadcast(*this, sev, text); + } + + // Log with formatting + template + force_inline safe_buffers void format(level sev, const char* fmt, const Args&... args) const + { + if (sev <= enabled) + broadcast(*this, sev, fmt::format(fmt, fmt::do_unveil(args)...)); + } + +#define GEN_LOG_METHOD(_sev)\ + template\ + force_inline void _sev(const char* fmt, const Args&... args)\ + {\ + return format(level::_sev, fmt, args...);\ + } + + GEN_LOG_METHOD(fatal) + GEN_LOG_METHOD(error) + GEN_LOG_METHOD(todo) + GEN_LOG_METHOD(success) + GEN_LOG_METHOD(warning) + GEN_LOG_METHOD(notice) + GEN_LOG_METHOD(trace) + +#undef GEN_LOG_METHOD }; - struct LogMessage + // Log listener (destination) + struct listener { - using size_type = u32; - LogType mType; - Severity mServerity; - std::string mText; + listener(); + + virtual ~listener(); - u32 size() const; - void serialize(char *output) const; - static LogMessage deserialize(char *input, u32* size_out=nullptr); + virtual void log(const channel& ch, level sev, const std::string& text) = 0; }; - struct LogListener + class file_writer { - virtual ~LogListener() {}; - virtual void log(const LogMessage &msg) = 0; + // Could be memory-mapped file + fs::file m_file; + + public: + file_writer(const std::string& name); + + virtual ~file_writer() = default; + + // Append raw data + void log(const std::string& text); + + // Get current file size (may be used by secondary readers) + std::size_t size() const; }; - struct LogChannel + struct file_listener : public file_writer, public listener { - LogChannel(); - LogChannel(const std::string& name); - LogChannel(LogChannel& other) = delete; - void log(const LogMessage &msg); - void addListener(std::shared_ptr listener); - void removeListener(std::shared_ptr listener); - std::string name; - private: - bool mEnabled; - Severity mLogLevel; - std::mutex mListenerLock; - std::set> mListeners; + file_listener(const std::string& name) + : file_writer(name) + , listener() + { + } + + // Encode level, current thread name, channel name and write log message + virtual void log(const channel& ch, level sev, const std::string& text) override; }; - struct LogManager - { - LogManager(); - ~LogManager(); - static LogManager& getInstance(); - LogChannel& getChannel(LogType type); - void log(LogMessage msg); - void addListener(std::shared_ptr listener); - void removeListener(std::shared_ptr listener); -#ifdef BUFFERED_LOGGING - void consumeLog(); -#endif - private: -#ifdef BUFFERED_LOGGING - MTRingbuffer mBuffer; - std::condition_variable mBufferReady; - std::mutex mStatusMut; - std::atomic mExiting; - std::thread mLogConsumer; -#endif - std::array::value> mChannels; - //std::array mChannels; //TODO: use this once Microsoft sorts their shit out - }; + // Global variable for RPCS3.log + extern file_listener g_log_file; + + // Global variable for TTY.log + extern file_writer g_tty_file; + + // Small set of predefined channels: + + extern channel GENERAL; + extern channel LOADER; + extern channel MEMORY; + extern channel RSX; + extern channel HLE; + extern channel PPU; + extern channel SPU; + extern channel ARMv7; } -static struct { inline operator Log::LogType() { return Log::LogType::GENERAL; } } GENERAL; -static struct { inline operator Log::LogType() { return Log::LogType::LOADER; } } LOADER; -static struct { inline operator Log::LogType() { return Log::LogType::MEMORY; } } MEMORY; -static struct { inline operator Log::LogType() { return Log::LogType::RSX; } } RSX; -static struct { inline operator Log::LogType() { return Log::LogType::HLE; } } HLE; -static struct { inline operator Log::LogType() { return Log::LogType::PPU; } } PPU; -static struct { inline operator Log::LogType() { return Log::LogType::SPU; } } SPU; -static struct { inline operator Log::LogType() { return Log::LogType::ARMv7; } } ARMv7; -static struct { inline operator Log::LogType() { return Log::LogType::TTY; } } TTY; +// Legacy: -void log_message(Log::LogType type, Log::Severity sev, const char* text); -void log_message(Log::LogType type, Log::Severity sev, std::string text); - -template never_inline void log_message(Log::LogType type, Log::Severity sev, const char* fmt, Args... args) -{ - log_message(type, sev, fmt::format(fmt, fmt::do_unveil(args)...)); -} +#define LOG_SUCCESS(ch, fmt, ...) _log::ch.success(fmt, ##__VA_ARGS__) +#define LOG_NOTICE(ch, fmt, ...) _log::ch.notice (fmt, ##__VA_ARGS__) +#define LOG_WARNING(ch, fmt, ...) _log::ch.warning(fmt, ##__VA_ARGS__) +#define LOG_ERROR(ch, fmt, ...) _log::ch.error (fmt, ##__VA_ARGS__) +#define LOG_TODO(ch, fmt, ...) _log::ch.todo (fmt, ##__VA_ARGS__) +#define LOG_TRACE(ch, fmt, ...) _log::ch.trace (fmt, ##__VA_ARGS__) +#define LOG_FATAL(ch, fmt, ...) _log::ch.fatal (fmt, ##__VA_ARGS__) diff --git a/Utilities/MTRingbuffer.h b/Utilities/MTRingbuffer.h deleted file mode 100644 index 91b44d5a5b..0000000000 --- a/Utilities/MTRingbuffer.h +++ /dev/null @@ -1,155 +0,0 @@ -#pragma once - -//Simple non-resizable FIFO Ringbuffer that can be simultaneously be read from and written to -//if we ever get to use boost please replace this with boost::circular_buffer, there's no reason -//why we would have to keep this amateur attempt at such a fundamental data-structure around -template< typename T, unsigned int MAX_MTRINGBUFFER_BUFFER_SIZE> -class MTRingbuffer{ - std::array mBuffer; - //this is a recursive mutex because the get methods lock it but the only - //way to be sure that they do not block is to check the size and the only - //way to check the size and use get atomically is to lock this mutex, - //so it goes: - //lock get mutex-->check size-->call get-->lock get mutex-->unlock get mutex-->return from get-->unlock get mutex - std::recursive_mutex mMutGet; - std::mutex mMutPut; - - size_t mGet; - size_t mPut; - size_t moveGet(size_t by = 1){ return (mGet + by) % MAX_MTRINGBUFFER_BUFFER_SIZE; } - size_t movePut(size_t by = 1){ return (mPut + by) % MAX_MTRINGBUFFER_BUFFER_SIZE; } -public: - MTRingbuffer() : mGet(0), mPut(0){} - - //blocks until there's something to get, so check "spaceLeft()" if you want to avoid blocking - //also lock the get mutex around the spaceLeft() check and the pop if you want to avoid racing - T pop() - { - std::lock_guard lock(mMutGet); - while (mGet == mPut) - { - //wait until there's actually something to get - //throwing an exception might be better, blocking here is a little awkward - std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack - } - size_t ret = mGet; - mGet = moveGet(); - return mBuffer[ret]; - } - - //blocks if the buffer is full until there's enough room - void push(T &putEle) - { - std::lock_guard lock(mMutPut); - while (movePut() == mGet) - { - //if this is reached a lot it's time to increase the buffer size - //or implement dynamic re-sizing - std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack - } - mBuffer[mPut] = std::forward(putEle); - mPut = movePut(); - } - - bool empty() - { - return mGet == mPut; - } - - //returns the amount of free places, this is the amount of actual free spaces-1 - //since mGet==mPut signals an empty buffer we can't actually use the last free - //space, so we shouldn't report it as free. - size_t spaceLeft() //apparently free() is a macro definition in msvc in some conditions - { - if (mGet < mPut) - { - return mBuffer.size() - (mPut - mGet) - 1; - } - else if (mGet > mPut) - { - return mGet - mPut - 1; - } - else - { - return mBuffer.size() - 1; - } - } - - size_t size() - { - //the magic -1 is the same magic 1 that is explained in the spaceLeft() function - return mBuffer.size() - spaceLeft() - 1; - } - - //takes random access iterator to T - template - void pushRange(IteratorType from, IteratorType until) - { - std::lock_guard lock(mMutPut); - size_t length = until - from; - - //if whatever we're trying to store is greater than the entire buffer the following loop will be infinite - assert(mBuffer.size() > length); - while (spaceLeft() < length) - { - //if this is reached a lot it's time to increase the buffer size - //or implement dynamic re-sizing - std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack - } - if (mPut + length <= mBuffer.size()) - { - std::copy(from, until, mBuffer.begin() + mPut); - } - else - { - size_t tillEnd = mBuffer.size() - mPut; - std::copy(from, from + tillEnd, mBuffer.begin() + mPut); - std::copy(from + tillEnd, until, mBuffer.begin()); - } - mPut = movePut(length); - - } - - //takes output iterator to T - template - void popN(IteratorType output, size_t n) - { - std::lock_guard lock(mMutGet); - //make sure we're not trying to retrieve more than is in - assert(n <= size()); - peekN(output, n); - mGet = moveGet(n); - } - - //takes output iterator to T - template - void peekN(IteratorType output, size_t n) - { - size_t lGet = mGet; - if (lGet + n <= mBuffer.size()) - { - std::copy_n(mBuffer.begin() + lGet, n, output); - } - else - { - auto next = std::copy(mBuffer.begin() + lGet, mBuffer.end(), output); - std::copy_n(mBuffer.begin(), n - (mBuffer.size() - lGet), next); - } - } - - //well this is just asking for trouble - //but the comment above the declaration of mMutGet explains why it's there - //if there's a better way please remove this - void lockGet() - { - mMutGet.lock(); - } - - //well this is just asking for trouble - //but the comment above the declaration of mMutGet explains why it's there - //if there's a better way please remove this - void unlockGet() - { - mMutGet.unlock(); - } -}; diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h index f694e4d79f..02f544a58b 100644 --- a/Utilities/StrFmt.h +++ b/Utilities/StrFmt.h @@ -155,19 +155,19 @@ namespace fmt } }; - template<> struct unveil + template<> struct unveil { - using result_type = const char*; + using result_type = const char* const; - force_inline static result_type get_value(const char* arg) + force_inline static result_type get_value(const char* const& arg) { return arg; } }; - template struct unveil + template struct unveil { - using result_type = const char*; + using result_type = const char* const; force_inline static result_type get_value(const char(&arg)[N]) { @@ -220,7 +220,8 @@ namespace fmt // vm::ptr, vm::bptr, ... (fmt::do_unveil) (vm_ptr.h) (with appropriate address type, using .addr() can be avoided) // vm::ref, vm::bref, ... (fmt::do_unveil) (vm_ref.h) // - template safe_buffers std::string format(const char* fmt, Args... args) + template + safe_buffers std::string format(const char* fmt, const Args&... args) { // fixed stack buffer for the first attempt std::array fixed_buf; diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp index d72b20a757..86a6701b3a 100644 --- a/Utilities/Thread.cpp +++ b/Utilities/Thread.cpp @@ -1351,21 +1351,15 @@ void named_thread_t::start() { try { - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(GENERAL, "Thread started"); - } + LOG_TRACE(GENERAL, "Thread started"); thread->on_task(); - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(GENERAL, "Thread ended"); - } + LOG_TRACE(GENERAL, "Thread ended"); } catch (const std::exception& e) { - LOG_ERROR(GENERAL, "Exception: %s\nPlease report this to the developers.", e.what()); + LOG_FATAL(GENERAL, "Exception: %s\nPlease report this to the developers.", e.what()); Emu.Pause(); } catch (EmulationStopped) diff --git a/rpcs3/Crypto/unself.cpp b/rpcs3/Crypto/unself.cpp index d2f0edf254..a45f289f82 100644 --- a/rpcs3/Crypto/unself.cpp +++ b/rpcs3/Crypto/unself.cpp @@ -1330,7 +1330,7 @@ bool CheckDebugSelf(const std::string& self, const std::string& elf) bool DecryptSelf(const std::string& elf, const std::string& self) { - LOG_NOTICE(GENERAL, "Decrypting %s", self); + LOG_NOTICE(LOADER, "Decrypting %s", self); // Check for a debug SELF first. if (!CheckDebugSelf(self, elf)) diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp index 7fd3606b4d..005c7a2e38 100644 --- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp +++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp @@ -1125,7 +1125,7 @@ struct ARMv7_op2_table_t { if (opcode.code & ~opcode.mask) { - LOG_ERROR(GENERAL, "%s: wrong opcode mask (mask=0x%04x, code=0x%04x)", opcode.name, opcode.mask >> 16, opcode.code >> 16); + LOG_ERROR(ARMv7, "%s: wrong opcode mask (mask=0x%04x, code=0x%04x)", opcode.name, opcode.mask >> 16, opcode.code >> 16); } t2.push_back(&opcode); @@ -1164,7 +1164,7 @@ struct ARMv7_op4t_table_t { if (opcode.code & ~opcode.mask) { - LOG_ERROR(GENERAL, "%s: wrong opcode mask (mask=0x%04x 0x%04x, code=0x%04x 0x%04x)", opcode.name, opcode.mask >> 16, (u16)opcode.mask, opcode.code >> 16, (u16)opcode.code); + LOG_ERROR(ARMv7, "%s: wrong opcode mask (mask=0x%04x 0x%04x, code=0x%04x 0x%04x)", opcode.name, opcode.mask >> 16, (u16)opcode.mask, opcode.code >> 16, (u16)opcode.code); } table.push_back(&opcode); @@ -1199,7 +1199,7 @@ struct ARMv7_op4arm_table_t { if (opcode.code & ~opcode.mask) { - LOG_ERROR(GENERAL, "%s: wrong opcode mask (mask=0x%08x, code=0x%08x)", opcode.name, opcode.mask, opcode.code); + LOG_ERROR(ARMv7, "%s: wrong opcode mask (mask=0x%08x, code=0x%08x)", opcode.name, opcode.mask, opcode.code); } table.push_back(&opcode); @@ -1365,7 +1365,7 @@ u32 ARMv7Decoder::DecodeMemory(const u32 address) // "group" decoding algorithm (temporarily disabled) //execute_main_group(&m_thr); - //// LOG_NOTICE(GENERAL, "%s, %d \n\n", m_thr.m_last_instr_name, m_thr.m_last_instr_size); + //// LOG_NOTICE(ARMv7, "%s, %d \n\n", m_thr.m_last_instr_name, m_thr.m_last_instr_size); //m_thr.m_last_instr_name = "Unknown"; //return m_thr.m_last_instr_size; } diff --git a/rpcs3/Emu/ARMv7/ARMv7Opcodes.h b/rpcs3/Emu/ARMv7/ARMv7Opcodes.h index ed415bf2a2..7afe804363 100644 --- a/rpcs3/Emu/ARMv7/ARMv7Opcodes.h +++ b/rpcs3/Emu/ARMv7/ARMv7Opcodes.h @@ -2005,7 +2005,7 @@ static void execute_main_group(ARMv7Thread* thr) case 0xe: (*g_table_0xe).func(thr, (*g_table_0xe).type); break; case 0xf: (*g_table_0xf).func(thr, (*g_table_0xf).type); break; - default: LOG_ERROR(GENERAL, "ARMv7Decoder: unknown group 0x%x", (thr->code.code0 & 0xf000) >> 12); Emu.Pause(); break; + default: LOG_ERROR(ARMv7, "ARMv7Decoder: unknown group 0x%x", (thr->code.code0 & 0xf000) >> 12); Emu.Pause(); break; } } diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp index 3354d3c779..93e918482c 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp @@ -33,7 +33,7 @@ s32 sceKernelGetMemBlockInfoByAddr(vm::ptr vbase, vm::ptr pName, vm::ptr entry, s32 initPriority, u32 stackSize, u32 attr, s32 cpuAffinityMask, vm::cptr pOptParam) { - sceLibKernel.Warning("sceKernelCreateThread(pName=*0x%x, entry=*0x%x, initPriority=%d, stackSize=0x%x, attr=0x%x, cpuAffinityMask=0x%x, pOptParam=*0x%x)", + sceLibKernel.warning("sceKernelCreateThread(pName=*0x%x, entry=*0x%x, initPriority=%d, stackSize=0x%x, attr=0x%x, cpuAffinityMask=0x%x, pOptParam=*0x%x)", pName, entry, initPriority, stackSize, attr, cpuAffinityMask, pOptParam); auto armv7 = idm::make_ptr(pName.get_ptr()); @@ -48,7 +48,7 @@ s32 sceKernelCreateThread(vm::cptr pName, vm::ptr en s32 sceKernelStartThread(s32 threadId, u32 argSize, vm::cptr pArgBlock) { - sceLibKernel.Warning("sceKernelStartThread(threadId=0x%x, argSize=0x%x, pArgBlock=*0x%x)", threadId, argSize, pArgBlock); + sceLibKernel.warning("sceKernelStartThread(threadId=0x%x, argSize=0x%x, pArgBlock=*0x%x)", threadId, argSize, pArgBlock); const auto thread = idm::get(threadId); @@ -78,7 +78,7 @@ s32 sceKernelStartThread(s32 threadId, u32 argSize, vm::cptr pArgBlock) s32 sceKernelExitThread(ARMv7Thread& context, s32 exitStatus) { - sceLibKernel.Warning("sceKernelExitThread(exitStatus=0x%x)", exitStatus); + sceLibKernel.warning("sceKernelExitThread(exitStatus=0x%x)", exitStatus); // exit status is stored in r0 context.exit(); @@ -88,7 +88,7 @@ s32 sceKernelExitThread(ARMv7Thread& context, s32 exitStatus) s32 sceKernelDeleteThread(s32 threadId) { - sceLibKernel.Warning("sceKernelDeleteThread(threadId=0x%x)", threadId); + sceLibKernel.warning("sceKernelDeleteThread(threadId=0x%x)", threadId); const auto thread = idm::get(threadId); @@ -110,7 +110,7 @@ s32 sceKernelDeleteThread(s32 threadId) s32 sceKernelExitDeleteThread(ARMv7Thread& context, s32 exitStatus) { - sceLibKernel.Warning("sceKernelExitDeleteThread(exitStatus=0x%x)", exitStatus); + sceLibKernel.warning("sceKernelExitDeleteThread(exitStatus=0x%x)", exitStatus); // exit status is stored in r0 context.stop(); @@ -123,91 +123,91 @@ s32 sceKernelExitDeleteThread(ARMv7Thread& context, s32 exitStatus) s32 sceKernelChangeThreadCpuAffinityMask(s32 threadId, s32 cpuAffinityMask) { - sceLibKernel.Todo("sceKernelChangeThreadCpuAffinityMask(threadId=0x%x, cpuAffinityMask=0x%x)", threadId, cpuAffinityMask); + sceLibKernel.todo("sceKernelChangeThreadCpuAffinityMask(threadId=0x%x, cpuAffinityMask=0x%x)", threadId, cpuAffinityMask); throw EXCEPTION(""); } s32 sceKernelGetThreadCpuAffinityMask(s32 threadId) { - sceLibKernel.Todo("sceKernelGetThreadCpuAffinityMask(threadId=0x%x)", threadId); + sceLibKernel.todo("sceKernelGetThreadCpuAffinityMask(threadId=0x%x)", threadId); throw EXCEPTION(""); } s32 sceKernelChangeThreadPriority(s32 threadId, s32 priority) { - sceLibKernel.Todo("sceKernelChangeThreadPriority(threadId=0x%x, priority=%d)", threadId, priority); + sceLibKernel.todo("sceKernelChangeThreadPriority(threadId=0x%x, priority=%d)", threadId, priority); throw EXCEPTION(""); } s32 sceKernelGetThreadCurrentPriority() { - sceLibKernel.Todo("sceKernelGetThreadCurrentPriority()"); + sceLibKernel.todo("sceKernelGetThreadCurrentPriority()"); throw EXCEPTION(""); } u32 sceKernelGetThreadId(ARMv7Thread& context) { - sceLibKernel.Log("sceKernelGetThreadId()"); + sceLibKernel.trace("sceKernelGetThreadId()"); return context.get_id(); } s32 sceKernelChangeCurrentThreadAttr(u32 clearAttr, u32 setAttr) { - sceLibKernel.Todo("sceKernelChangeCurrentThreadAttr()"); + sceLibKernel.todo("sceKernelChangeCurrentThreadAttr()"); throw EXCEPTION(""); } s32 sceKernelGetThreadExitStatus(s32 threadId, vm::ptr pExitStatus) { - sceLibKernel.Todo("sceKernelGetThreadExitStatus(threadId=0x%x, pExitStatus=*0x%x)", threadId, pExitStatus); + sceLibKernel.todo("sceKernelGetThreadExitStatus(threadId=0x%x, pExitStatus=*0x%x)", threadId, pExitStatus); throw EXCEPTION(""); } s32 sceKernelGetProcessId() { - sceLibKernel.Todo("sceKernelGetProcessId()"); + sceLibKernel.todo("sceKernelGetProcessId()"); throw EXCEPTION(""); } s32 sceKernelCheckWaitableStatus() { - sceLibKernel.Todo("sceKernelCheckWaitableStatus()"); + sceLibKernel.todo("sceKernelCheckWaitableStatus()"); throw EXCEPTION(""); } s32 sceKernelGetThreadInfo(s32 threadId, vm::ptr pInfo) { - sceLibKernel.Todo("sceKernelGetThreadInfo(threadId=0x%x, pInfo=*0x%x)", threadId, pInfo); + sceLibKernel.todo("sceKernelGetThreadInfo(threadId=0x%x, pInfo=*0x%x)", threadId, pInfo); throw EXCEPTION(""); } s32 sceKernelGetThreadRunStatus(vm::ptr pStatus) { - sceLibKernel.Todo("sceKernelGetThreadRunStatus(pStatus=*0x%x)", pStatus); + sceLibKernel.todo("sceKernelGetThreadRunStatus(pStatus=*0x%x)", pStatus); throw EXCEPTION(""); } s32 sceKernelGetSystemInfo(vm::ptr pInfo) { - sceLibKernel.Todo("sceKernelGetSystemInfo(pInfo=*0x%x)", pInfo); + sceLibKernel.todo("sceKernelGetSystemInfo(pInfo=*0x%x)", pInfo); throw EXCEPTION(""); } s32 sceKernelGetThreadmgrUIDClass(s32 uid) { - sceLibKernel.Error("sceKernelGetThreadmgrUIDClass(uid=0x%x)", uid); + sceLibKernel.error("sceKernelGetThreadmgrUIDClass(uid=0x%x)", uid); const auto type = idm::get_type(uid); @@ -227,35 +227,35 @@ s32 sceKernelGetThreadmgrUIDClass(s32 uid) s32 sceKernelChangeThreadVfpException(s32 clearMask, s32 setMask) { - sceLibKernel.Todo("sceKernelChangeThreadVfpException(clearMask=0x%x, setMask=0x%x)", clearMask, setMask); + sceLibKernel.todo("sceKernelChangeThreadVfpException(clearMask=0x%x, setMask=0x%x)", clearMask, setMask); throw EXCEPTION(""); } s32 sceKernelGetCurrentThreadVfpException() { - sceLibKernel.Todo("sceKernelGetCurrentThreadVfpException()"); + sceLibKernel.todo("sceKernelGetCurrentThreadVfpException()"); throw EXCEPTION(""); } s32 sceKernelDelayThread(u32 usec) { - sceLibKernel.Todo("sceKernelDelayThread()"); + sceLibKernel.todo("sceKernelDelayThread()"); throw EXCEPTION(""); } s32 sceKernelDelayThreadCB(u32 usec) { - sceLibKernel.Todo("sceKernelDelayThreadCB()"); + sceLibKernel.todo("sceKernelDelayThreadCB()"); throw EXCEPTION(""); } s32 sceKernelWaitThreadEnd(s32 threadId, vm::ptr pExitStatus, vm::ptr pTimeout) { - sceLibKernel.Warning("sceKernelWaitThreadEnd(threadId=0x%x, pExitStatus=*0x%x, pTimeout=*0x%x)", threadId, pExitStatus, pTimeout); + sceLibKernel.warning("sceKernelWaitThreadEnd(threadId=0x%x, pExitStatus=*0x%x, pTimeout=*0x%x)", threadId, pExitStatus, pTimeout); const auto thread = idm::get(threadId); @@ -285,7 +285,7 @@ s32 sceKernelWaitThreadEnd(s32 threadId, vm::ptr pExitStatus, vm::ptr s32 sceKernelWaitThreadEndCB(s32 threadId, vm::ptr pExitStatus, vm::ptr pTimeout) { - sceLibKernel.Todo("sceKernelWaitThreadEndCB(threadId=0x%x, pExitStatus=*0x%x, pTimeout=*0x%x)", threadId, pExitStatus, pTimeout); + sceLibKernel.todo("sceKernelWaitThreadEndCB(threadId=0x%x, pExitStatus=*0x%x, pTimeout=*0x%x)", threadId, pExitStatus, pTimeout); throw EXCEPTION(""); } @@ -383,14 +383,14 @@ s32 sceKernelWaitMultipleEventsCB(vm::ptr pWaitEventList, s3 s32 sceKernelCreateEventFlag(vm::cptr pName, u32 attr, u32 initPattern, vm::cptr pOptParam) { - sceLibKernel.Error("sceKernelCreateEventFlag(pName=*0x%x, attr=0x%x, initPattern=0x%x, pOptParam=*0x%x)", pName, attr, initPattern, pOptParam); + sceLibKernel.error("sceKernelCreateEventFlag(pName=*0x%x, attr=0x%x, initPattern=0x%x, pOptParam=*0x%x)", pName, attr, initPattern, pOptParam); return idm::make(pName.get_ptr(), attr, initPattern); } s32 sceKernelDeleteEventFlag(s32 evfId) { - sceLibKernel.Error("sceKernelDeleteEventFlag(evfId=0x%x)", evfId); + sceLibKernel.error("sceKernelDeleteEventFlag(evfId=0x%x)", evfId); const auto evf = idm::withdraw(evfId); @@ -410,7 +410,7 @@ s32 sceKernelDeleteEventFlag(s32 evfId) s32 sceKernelOpenEventFlag(vm::cptr pName) { - sceLibKernel.Error("sceKernelOpenEventFlag(pName=*0x%x)", pName); + sceLibKernel.error("sceKernelOpenEventFlag(pName=*0x%x)", pName); // For now, go through all objects to find the name for (const auto& data : idm::get_map()) @@ -428,7 +428,7 @@ s32 sceKernelOpenEventFlag(vm::cptr pName) s32 sceKernelCloseEventFlag(s32 evfId) { - sceLibKernel.Error("sceKernelCloseEventFlag(evfId=0x%x)", evfId); + sceLibKernel.error("sceKernelCloseEventFlag(evfId=0x%x)", evfId); const auto evf = idm::withdraw(evfId); @@ -448,7 +448,7 @@ s32 sceKernelCloseEventFlag(s32 evfId) s32 sceKernelWaitEventFlag(ARMv7Thread& context, s32 evfId, u32 bitPattern, u32 waitMode, vm::ptr pResultPat, vm::ptr pTimeout) { - sceLibKernel.Error("sceKernelWaitEventFlag(evfId=0x%x, bitPattern=0x%x, waitMode=0x%x, pResultPat=*0x%x, pTimeout=*0x%x)", evfId, bitPattern, waitMode, pResultPat, pTimeout); + sceLibKernel.error("sceKernelWaitEventFlag(evfId=0x%x, bitPattern=0x%x, waitMode=0x%x, pResultPat=*0x%x, pTimeout=*0x%x)", evfId, bitPattern, waitMode, pResultPat, pTimeout); const u64 start_time = pTimeout ? get_system_time() : 0; const u32 timeout = pTimeout ? pTimeout->value() : 0; @@ -509,14 +509,14 @@ s32 sceKernelWaitEventFlag(ARMv7Thread& context, s32 evfId, u32 bitPattern, u32 s32 sceKernelWaitEventFlagCB(ARMv7Thread& context, s32 evfId, u32 bitPattern, u32 waitMode, vm::ptr pResultPat, vm::ptr pTimeout) { - sceLibKernel.Todo("sceKernelWaitEventFlagCB(evfId=0x%x, bitPattern=0x%x, waitMode=0x%x, pResultPat=*0x%x, pTimeout=*0x%x)", evfId, bitPattern, waitMode, pResultPat, pTimeout); + sceLibKernel.todo("sceKernelWaitEventFlagCB(evfId=0x%x, bitPattern=0x%x, waitMode=0x%x, pResultPat=*0x%x, pTimeout=*0x%x)", evfId, bitPattern, waitMode, pResultPat, pTimeout); return sceKernelWaitEventFlag(context, evfId, bitPattern, waitMode, pResultPat, pTimeout); } s32 sceKernelPollEventFlag(s32 evfId, u32 bitPattern, u32 waitMode, vm::ptr pResultPat) { - sceLibKernel.Error("sceKernelPollEventFlag(evfId=0x%x, bitPattern=0x%x, waitMode=0x%x, pResultPat=*0x%x)", evfId, bitPattern, waitMode, pResultPat); + sceLibKernel.error("sceKernelPollEventFlag(evfId=0x%x, bitPattern=0x%x, waitMode=0x%x, pResultPat=*0x%x)", evfId, bitPattern, waitMode, pResultPat); const auto evf = idm::get(evfId); @@ -541,7 +541,7 @@ s32 sceKernelPollEventFlag(s32 evfId, u32 bitPattern, u32 waitMode, vm::ptr s32 sceKernelSetEventFlag(s32 evfId, u32 bitPattern) { - sceLibKernel.Error("sceKernelSetEventFlag(evfId=0x%x, bitPattern=0x%x)", evfId, bitPattern); + sceLibKernel.error("sceKernelSetEventFlag(evfId=0x%x, bitPattern=0x%x)", evfId, bitPattern); const auto evf = idm::get(evfId); @@ -586,7 +586,7 @@ s32 sceKernelSetEventFlag(s32 evfId, u32 bitPattern) s32 sceKernelClearEventFlag(s32 evfId, u32 bitPattern) { - sceLibKernel.Error("sceKernelClearEventFlag(evfId=0x%x, bitPattern=0x%x)", evfId, bitPattern); + sceLibKernel.error("sceKernelClearEventFlag(evfId=0x%x, bitPattern=0x%x)", evfId, bitPattern); const auto evf = idm::get(evfId); @@ -604,7 +604,7 @@ s32 sceKernelClearEventFlag(s32 evfId, u32 bitPattern) s32 sceKernelCancelEventFlag(s32 evfId, u32 setPattern, vm::ptr pNumWaitThreads) { - sceLibKernel.Error("sceKernelCancelEventFlag(evfId=0x%x, setPattern=0x%x, pNumWaitThreads=*0x%x)", evfId, setPattern, pNumWaitThreads); + sceLibKernel.error("sceKernelCancelEventFlag(evfId=0x%x, setPattern=0x%x, pNumWaitThreads=*0x%x)", evfId, setPattern, pNumWaitThreads); const auto evf = idm::get(evfId); @@ -632,7 +632,7 @@ s32 sceKernelCancelEventFlag(s32 evfId, u32 setPattern, vm::ptr pNumWaitThr s32 sceKernelGetEventFlagInfo(s32 evfId, vm::ptr pInfo) { - sceLibKernel.Error("sceKernelGetEventFlagInfo(evfId=0x%x, pInfo=*0x%x)", evfId, pInfo); + sceLibKernel.error("sceKernelGetEventFlagInfo(evfId=0x%x, pInfo=*0x%x)", evfId, pInfo); const auto evf = idm::get(evfId); @@ -660,14 +660,14 @@ s32 sceKernelGetEventFlagInfo(s32 evfId, vm::ptr pInfo) s32 sceKernelCreateSema(vm::cptr pName, u32 attr, s32 initCount, s32 maxCount, vm::cptr pOptParam) { - sceLibKernel.Error("sceKernelCreateSema(pName=*0x%x, attr=0x%x, initCount=%d, maxCount=%d, pOptParam=*0x%x)", pName, attr, initCount, maxCount, pOptParam); + sceLibKernel.error("sceKernelCreateSema(pName=*0x%x, attr=0x%x, initCount=%d, maxCount=%d, pOptParam=*0x%x)", pName, attr, initCount, maxCount, pOptParam); return idm::make(pName.get_ptr(), attr, initCount, maxCount); } s32 sceKernelDeleteSema(s32 semaId) { - sceLibKernel.Error("sceKernelDeleteSema(semaId=0x%x)", semaId); + sceLibKernel.error("sceKernelDeleteSema(semaId=0x%x)", semaId); const auto sema = idm::withdraw(semaId); @@ -693,7 +693,7 @@ s32 sceKernelCloseSema(s32 semaId) s32 sceKernelWaitSema(s32 semaId, s32 needCount, vm::ptr pTimeout) { - sceLibKernel.Error("sceKernelWaitSema(semaId=0x%x, needCount=%d, pTimeout=*0x%x)", semaId, needCount, pTimeout); + sceLibKernel.error("sceKernelWaitSema(semaId=0x%x, needCount=%d, pTimeout=*0x%x)", semaId, needCount, pTimeout); const auto sema = idm::get(semaId); @@ -702,7 +702,7 @@ s32 sceKernelWaitSema(s32 semaId, s32 needCount, vm::ptr pTimeout) return SCE_KERNEL_ERROR_INVALID_UID; } - sceLibKernel.Error("*** name = %s", sema->name); + sceLibKernel.error("*** name = %s", sema->name); Emu.Pause(); return SCE_OK; } @@ -736,14 +736,14 @@ s32 sceKernelGetSemaInfo(s32 semaId, vm::ptr pInfo) s32 sceKernelCreateMutex(vm::cptr pName, u32 attr, s32 initCount, vm::cptr pOptParam) { - sceLibKernel.Error("sceKernelCreateMutex(pName=*0x%x, attr=0x%x, initCount=%d, pOptParam=*0x%x)", pName, attr, initCount, pOptParam); + sceLibKernel.error("sceKernelCreateMutex(pName=*0x%x, attr=0x%x, initCount=%d, pOptParam=*0x%x)", pName, attr, initCount, pOptParam); return idm::make(pName.get_ptr(), attr, initCount); } s32 sceKernelDeleteMutex(s32 mutexId) { - sceLibKernel.Error("sceKernelDeleteMutex(mutexId=0x%x)", mutexId); + sceLibKernel.error("sceKernelDeleteMutex(mutexId=0x%x)", mutexId); const auto mutex = idm::withdraw(mutexId); @@ -843,7 +843,7 @@ s32 sceKernelGetLwMutexInfoById(s32 lwMutexId, vm::ptr pIn s32 sceKernelCreateCond(vm::cptr pName, u32 attr, s32 mutexId, vm::cptr pOptParam) { - sceLibKernel.Error("sceKernelCreateCond(pName=*0x%x, attr=0x%x, mutexId=0x%x, pOptParam=*0x%x)", pName, attr, mutexId, pOptParam); + sceLibKernel.error("sceKernelCreateCond(pName=*0x%x, attr=0x%x, mutexId=0x%x, pOptParam=*0x%x)", pName, attr, mutexId, pOptParam); const auto mutex = idm::get(mutexId); @@ -857,7 +857,7 @@ s32 sceKernelCreateCond(vm::cptr pName, u32 attr, s32 mutexId, vm::cptr(condId); diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp index 5bd6c83f5c..d3a3f08c47 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp @@ -150,7 +150,7 @@ namespace sce_libc_func { void __cxa_atexit(vm::ptr func, vm::ptr arg, vm::ptr dso) { - sceLibc.Warning("__cxa_atexit(func=*0x%x, arg=*0x%x, dso=*0x%x)", func, arg, dso); + sceLibc.warning("__cxa_atexit(func=*0x%x, arg=*0x%x, dso=*0x%x)", func, arg, dso); std::lock_guard lock(g_atexit_mutex); @@ -162,7 +162,7 @@ namespace sce_libc_func void __aeabi_atexit(vm::ptr arg, vm::ptr func, vm::ptr dso) { - sceLibc.Warning("__aeabi_atexit(arg=*0x%x, func=*0x%x, dso=*0x%x)", arg, func, dso); + sceLibc.warning("__aeabi_atexit(arg=*0x%x, func=*0x%x, dso=*0x%x)", arg, func, dso); std::lock_guard lock(g_atexit_mutex); @@ -174,7 +174,7 @@ namespace sce_libc_func void exit(ARMv7Thread& context) { - sceLibc.Warning("exit()"); + sceLibc.warning("exit()"); std::lock_guard lock(g_atexit_mutex); @@ -185,7 +185,7 @@ namespace sce_libc_func func(context); } - sceLibc.Success("Process finished"); + sceLibc.success("Process finished"); Emu.CallAfter([]() { @@ -202,52 +202,52 @@ namespace sce_libc_func void printf(ARMv7Thread& context, vm::cptr fmt, armv7_va_args_t va_args) { - sceLibc.Warning("printf(fmt=*0x%x)", fmt); - sceLibc.Log("*** *fmt = '%s'", fmt.get_ptr()); + sceLibc.warning("printf(fmt=*0x%x)", fmt); + sceLibc.trace("*** *fmt = '%s'", fmt.get_ptr()); const std::string& result = armv7_fmt(context, fmt, va_args.g_count, va_args.f_count, va_args.v_count); - sceLibc.Log("*** -> '%s'", result); + sceLibc.trace("*** -> '%s'", result); - LOG_NOTICE(TTY, result); + _log::g_tty_file.log(result); } void sprintf(ARMv7Thread& context, vm::ptr str, vm::cptr fmt, armv7_va_args_t va_args) { - sceLibc.Warning("sprintf(str=*0x%x, fmt=*0x%x)", str, fmt); - sceLibc.Log("*** *fmt = '%s'", fmt.get_ptr()); + sceLibc.warning("sprintf(str=*0x%x, fmt=*0x%x)", str, fmt); + sceLibc.trace("*** *fmt = '%s'", fmt.get_ptr()); const std::string& result = armv7_fmt(context, fmt, va_args.g_count, va_args.f_count, va_args.v_count); - sceLibc.Log("*** -> '%s'", result); + sceLibc.trace("*** -> '%s'", result); ::memcpy(str.get_ptr(), result.c_str(), result.size() + 1); } void __cxa_set_dso_handle_main(vm::ptr dso) { - sceLibc.Warning("__cxa_set_dso_handle_main(dso=*0x%x)", dso); + sceLibc.warning("__cxa_set_dso_handle_main(dso=*0x%x)", dso); g_dso = dso; } void memcpy(vm::ptr dst, vm::cptr src, u32 size) { - sceLibc.Warning("memcpy(dst=*0x%x, src=*0x%x, size=0x%x)", dst, src, size); + sceLibc.warning("memcpy(dst=*0x%x, src=*0x%x, size=0x%x)", dst, src, size); ::memcpy(dst.get_ptr(), src.get_ptr(), size); } void memset(vm::ptr dst, s32 value, u32 size) { - sceLibc.Warning("memset(dst=*0x%x, value=%d, size=0x%x)", dst, value, size); + sceLibc.warning("memset(dst=*0x%x, value=%d, size=0x%x)", dst, value, size); ::memset(dst.get_ptr(), value, size); } void _Assert(vm::cptr text, vm::cptr func) { - sceLibc.Error("_Assert(text=*0x%x, func=*0x%x)", text, func); + sceLibc.error("_Assert(text=*0x%x, func=*0x%x)", text, func); - LOG_ERROR(TTY, "%s : %s\n", func.get_ptr(), text.get_ptr()); + LOG_FATAL(HLE, "%s : %s\n", func.get_ptr(), text.get_ptr()); Emu.Pause(); } } diff --git a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp b/rpcs3/Emu/ARMv7/Modules/scePerf.cpp index 1ef2fcd3e8..844c1e79bf 100644 --- a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp +++ b/rpcs3/Emu/ARMv7/Modules/scePerf.cpp @@ -8,7 +8,7 @@ extern u64 get_system_time(); s32 scePerfArmPmonReset(ARMv7Thread& context, s32 threadId) { - scePerf.Warning("scePerfArmPmonReset(threadId=0x%x)", threadId); + scePerf.warning("scePerfArmPmonReset(threadId=0x%x)", threadId); if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF) { @@ -22,7 +22,7 @@ s32 scePerfArmPmonReset(ARMv7Thread& context, s32 threadId) s32 scePerfArmPmonSelectEvent(ARMv7Thread& context, s32 threadId, u32 counter, u8 eventCode) { - scePerf.Warning("scePerfArmPmonSelectEvent(threadId=0x%x, counter=0x%x, eventCode=0x%x)", threadId, counter, eventCode); + scePerf.warning("scePerfArmPmonSelectEvent(threadId=0x%x, counter=0x%x, eventCode=0x%x)", threadId, counter, eventCode); if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF) { @@ -74,7 +74,7 @@ s32 scePerfArmPmonSelectEvent(ARMv7Thread& context, s32 threadId, u32 counter, u s32 scePerfArmPmonStart(ARMv7Thread& context, s32 threadId) { - scePerf.Warning("scePerfArmPmonStart(threadId=0x%x)", threadId); + scePerf.warning("scePerfArmPmonStart(threadId=0x%x)", threadId); if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF) { @@ -86,7 +86,7 @@ s32 scePerfArmPmonStart(ARMv7Thread& context, s32 threadId) s32 scePerfArmPmonStop(ARMv7Thread& context, s32 threadId) { - scePerf.Warning("scePerfArmPmonStop(threadId=0x%x)"); + scePerf.warning("scePerfArmPmonStop(threadId=0x%x)"); if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF) { @@ -98,7 +98,7 @@ s32 scePerfArmPmonStop(ARMv7Thread& context, s32 threadId) s32 scePerfArmPmonGetCounterValue(ARMv7Thread& context, s32 threadId, u32 counter, vm::ptr pValue) { - scePerf.Warning("scePerfArmPmonGetCounterValue(threadId=0x%x, counter=%d, pValue=*0x%x)", threadId, counter, pValue); + scePerf.warning("scePerfArmPmonGetCounterValue(threadId=0x%x, counter=%d, pValue=*0x%x)", threadId, counter, pValue); if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF) { @@ -124,7 +124,7 @@ s32 scePerfArmPmonGetCounterValue(ARMv7Thread& context, s32 threadId, u32 counte s32 scePerfArmPmonSoftwareIncrement(ARMv7Thread& context, u32 mask) { - scePerf.Warning("scePerfArmPmonSoftwareIncrement(mask=0x%x)", mask); + scePerf.warning("scePerfArmPmonSoftwareIncrement(mask=0x%x)", mask); if (mask > SCE_PERF_ARM_PMON_COUNTER_MASK_ALL) { @@ -144,14 +144,14 @@ s32 scePerfArmPmonSoftwareIncrement(ARMv7Thread& context, u32 mask) u64 scePerfGetTimebaseValue() { - scePerf.Warning("scePerfGetTimebaseValue()"); + scePerf.warning("scePerfGetTimebaseValue()"); return get_system_time(); } u32 scePerfGetTimebaseFrequency() { - scePerf.Warning("scePerfGetTimebaseFrequency()"); + scePerf.warning("scePerfGetTimebaseFrequency()"); return 1; } @@ -198,4 +198,4 @@ psv_log_base scePerf("ScePerf", []() REG_FUNC(0xC3DE4C0A, sceRazorCpuPushMarker); REG_FUNC(0xDC3224C3, sceRazorCpuPopMarker); REG_FUNC(0x4F1385E3, sceRazorCpuSync); -}); \ No newline at end of file +}); diff --git a/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp b/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp index 194128abe7..7637ba5aa8 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp @@ -6,21 +6,21 @@ s32 sceSysmoduleLoadModule(u16 id) { - sceSysmodule.Warning("sceSysmoduleLoadModule(id=0x%04x) -> SCE_OK", id); + sceSysmodule.warning("sceSysmoduleLoadModule(id=0x%04x) -> SCE_OK", id); return SCE_OK; // loading succeeded } s32 sceSysmoduleUnloadModule(u16 id) { - sceSysmodule.Warning("sceSysmoduleUnloadModule(id=0x%04x) -> SCE_OK", id); + sceSysmodule.warning("sceSysmoduleUnloadModule(id=0x%04x) -> SCE_OK", id); return SCE_OK; // unloading succeeded } s32 sceSysmoduleIsLoaded(u16 id) { - sceSysmodule.Warning("sceSysmoduleIsLoaded(id=0x%04x) -> SCE_OK", id); + sceSysmodule.warning("sceSysmoduleIsLoaded(id=0x%04x) -> SCE_OK", id); return SCE_OK; // module is loaded } diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.cpp b/rpcs3/Emu/ARMv7/PSVFuncList.cpp index 3b09b0a8b5..d293d066b1 100644 --- a/rpcs3/Emu/ARMv7/PSVFuncList.cpp +++ b/rpcs3/Emu/ARMv7/PSVFuncList.cpp @@ -4,14 +4,14 @@ #include "PSVFuncList.h" psv_log_base::psv_log_base(const std::string& name, init_func_t init) - : m_name(name) + : _log::channel(name) , m_init(init) { on_error = [this](s32 code, psv_func* func) { if (code < 0) { - Error("%s() failed: 0x%08X", func->name, code); + error("%s() failed: 0x%08X", func->name, code); Emu.Pause(); } }; diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.h b/rpcs3/Emu/ARMv7/PSVFuncList.h index e6a02cad24..5233115fa3 100644 --- a/rpcs3/Emu/ARMv7/PSVFuncList.h +++ b/rpcs3/Emu/ARMv7/PSVFuncList.h @@ -2,16 +2,14 @@ #include "Emu/Memory/Memory.h" #include "ARMv7Thread.h" -#include "Emu/SysCalls/LogBase.h" namespace vm { using namespace psv; } // PSV module class -class psv_log_base : public LogBase +class psv_log_base : public _log::channel { using init_func_t = void(*)(); - std::string m_name; init_func_t m_init; public: @@ -32,12 +30,6 @@ public: m_init(); } - - virtual const std::string& GetName() const override - { - return m_name; - } - }; using armv7_func_caller = void(*)(ARMv7Thread&); diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp index 6bf842f73d..23959d5070 100644 --- a/rpcs3/Emu/CPU/CPUThread.cpp +++ b/rpcs3/Emu/CPU/CPUThread.cpp @@ -89,7 +89,7 @@ void CPUThread::dump_info() const { if (!Emu.IsStopped()) { - LOG_NOTICE(GENERAL, RegsToString()); + LOG_NOTICE(GENERAL, "%s", RegsToString()); } } diff --git a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp index c83cc5e2b7..561e498f2d 100644 --- a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp +++ b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp @@ -188,7 +188,7 @@ void ppu_recompiler_llvm::Compiler::translate_to_llvm_ir(llvm::Module *module, c std::string verify; raw_string_ostream verify_ostream(verify); if (verifyFunction(*m_state.function, &verify_ostream)) { -// m_recompilation_engine.Log() << "Verification failed: " << verify_ostream.str() << "\n"; +// m_recompilation_engine.trace() << "Verification failed: " << verify_ostream.str() << "\n"; } m_module = nullptr; @@ -421,13 +421,13 @@ std::pair RecompilationEngine::compile(cons Function *llvm_function = module_ptr->getFunction(name); void *function = execution_engine->getPointerToFunction(llvm_function); - /* m_recompilation_engine.Log() << "\nDisassembly:\n"; + /* m_recompilation_engine.trace() << "\nDisassembly:\n"; auto disassembler = LLVMCreateDisasm(sys::getProcessTriple().c_str(), nullptr, 0, nullptr, nullptr); for (size_t pc = 0; pc < mci.size();) { char str[1024]; auto size = LLVMDisasmInstruction(disassembler, ((u8 *)mci.address()) + pc, mci.size() - pc, (uint64_t)(((u8 *)mci.address()) + pc), str, sizeof(str)); - m_recompilation_engine.Log() << fmt::format("0x%08X: ", (u64)(((u8 *)mci.address()) + pc)) << str << '\n'; + m_recompilation_engine.trace() << fmt::format("0x%08X: ", (u64)(((u8 *)mci.address()) + pc)) << str << '\n'; pc += size; } diff --git a/rpcs3/Emu/Cell/RawSPUThread.cpp b/rpcs3/Emu/Cell/RawSPUThread.cpp index 8089a0b73a..f0c9c06f6a 100644 --- a/rpcs3/Emu/Cell/RawSPUThread.cpp +++ b/rpcs3/Emu/Cell/RawSPUThread.cpp @@ -60,7 +60,7 @@ bool RawSPUThread::read_reg(const u32 addr, u32& value) } } - LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(0x%x): unknown/illegal offset (0x%x)", index, addr, offset); + LOG_ERROR(SPU, "RawSPUThread[%d]: Read32(0x%x): unknown/illegal offset (0x%x)", index, addr, offset); return false; } diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 8377ded004..5c92fae5f5 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -376,10 +376,7 @@ void SPUThread::do_dma_list_cmd(u32 cmd, spu_mfc_arg_t args) void SPUThread::process_mfc_cmd(u32 cmd) { - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(SPU, "DMA %s: cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x", get_mfc_cmd_name(cmd), cmd, ch_mfc_args.lsa, ch_mfc_args.ea, ch_mfc_args.tag, ch_mfc_args.size); - } + LOG_TRACE(SPU, "DMA %s: cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x", get_mfc_cmd_name(cmd), cmd, ch_mfc_args.lsa, ch_mfc_args.ea, ch_mfc_args.tag, ch_mfc_args.size); switch (cmd) { @@ -576,10 +573,7 @@ void SPUThread::set_interrupt_status(bool enable) u32 SPUThread::get_ch_count(u32 ch) { - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(SPU, "get_ch_count(ch=%d [%s])", ch, ch < 128 ? spu_ch_name[ch] : "???"); - } + LOG_TRACE(SPU, "get_ch_count(ch=%d [%s])", ch, ch < 128 ? spu_ch_name[ch] : "???"); switch (ch) { @@ -603,10 +597,7 @@ u32 SPUThread::get_ch_count(u32 ch) u32 SPUThread::get_ch_value(u32 ch) { - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(SPU, "get_ch_value(ch=%d [%s])", ch, ch < 128 ? spu_ch_name[ch] : "???"); - } + LOG_TRACE(SPU, "get_ch_value(ch=%d [%s])", ch, ch < 128 ? spu_ch_name[ch] : "???"); auto read_channel = [this](spu_channel_t& channel) -> u32 { @@ -767,10 +758,7 @@ u32 SPUThread::get_ch_value(u32 ch) void SPUThread::set_ch_value(u32 ch, u32 value) { - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(SPU, "set_ch_value(ch=%d [%s], value=0x%x)", ch, ch < 128 ? spu_ch_name[ch] : "???", value); - } + LOG_TRACE(SPU, "set_ch_value(ch=%d [%s], value=0x%x)", ch, ch < 128 ? spu_ch_name[ch] : "???", value); switch (ch) { @@ -826,10 +814,7 @@ void SPUThread::set_ch_value(u32 ch, u32 value) ch_out_mbox.set_value(data, 0); - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(SPU, "sys_spu_thread_send_event(spup=%d, data0=0x%x, data1=0x%x)", spup, value & 0x00ffffff, data); - } + LOG_TRACE(SPU, "sys_spu_thread_send_event(spup=%d, data0=0x%x, data1=0x%x)", spup, value & 0x00ffffff, data); const auto queue = this->spup[spup].lock(); @@ -865,10 +850,7 @@ void SPUThread::set_ch_value(u32 ch, u32 value) ch_out_mbox.set_value(data, 0); - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_WARNING(SPU, "sys_spu_thread_throw_event(spup=%d, data0=0x%x, data1=0x%x)", spup, value & 0x00ffffff, data); - } + LOG_TRACE(SPU, "sys_spu_thread_throw_event(spup=%d, data0=0x%x, data1=0x%x)", spup, value & 0x00ffffff, data); const auto queue = this->spup[spup].lock(); @@ -915,10 +897,7 @@ void SPUThread::set_ch_value(u32 ch, u32 value) throw EXCEPTION("sys_event_flag_set_bit(id=%d, value=0x%x (flag=%d)): Invalid flag", data, value, flag); } - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_WARNING(SPU, "sys_event_flag_set_bit(id=%d, value=0x%x (flag=%d))", data, value, flag); - } + LOG_TRACE(SPU, "sys_event_flag_set_bit(id=%d, value=0x%x (flag=%d))", data, value, flag); const auto eflag = idm::get(data); @@ -959,10 +938,7 @@ void SPUThread::set_ch_value(u32 ch, u32 value) throw EXCEPTION("sys_event_flag_set_bit_impatient(id=%d, value=0x%x (flag=%d)): Invalid flag", data, value, flag); } - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_WARNING(SPU, "sys_event_flag_set_bit_impatient(id=%d, value=0x%x (flag=%d))", data, value, flag); - } + LOG_TRACE(SPU, "sys_event_flag_set_bit_impatient(id=%d, value=0x%x (flag=%d))", data, value, flag); const auto eflag = idm::get(data); @@ -1158,10 +1134,7 @@ void SPUThread::set_ch_value(u32 ch, u32 value) void SPUThread::stop_and_signal(u32 code) { - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(SPU, "stop_and_signal(code=0x%x)", code); - } + LOG_TRACE(SPU, "stop_and_signal(code=0x%x)", code); if (m_type == CPU_THREAD_RAW_SPU) { @@ -1229,10 +1202,7 @@ void SPUThread::stop_and_signal(u32 code) ch_out_mbox.set_value(spuq, 0); - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(SPU, "sys_spu_thread_receive_event(spuq=0x%x)", spuq); - } + LOG_TRACE(SPU, "sys_spu_thread_receive_event(spuq=0x%x)", spuq); const auto group = tg.lock(); @@ -1355,10 +1325,7 @@ void SPUThread::stop_and_signal(u32 code) ch_out_mbox.set_value(value, 0); - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(SPU, "sys_spu_thread_group_exit(status=0x%x)", value); - } + LOG_TRACE(SPU, "sys_spu_thread_group_exit(status=0x%x)", value); const auto group = tg.lock(); @@ -1394,10 +1361,7 @@ void SPUThread::stop_and_signal(u32 code) throw EXCEPTION("sys_spu_thread_exit(): Out_MBox is empty"); } - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(SPU, "sys_spu_thread_exit(status=0x%x)", ch_out_mbox.get_value()); - } + LOG_TRACE(SPU, "sys_spu_thread_exit(status=0x%x)", ch_out_mbox.get_value()); const auto group = tg.lock(); @@ -1425,10 +1389,7 @@ void SPUThread::stop_and_signal(u32 code) void SPUThread::halt() { - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(SPU, "halt()"); - } + LOG_TRACE(SPU, "halt()"); if (m_type == CPU_THREAD_RAW_SPU) { diff --git a/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp b/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp index ca493c51df..4ebe12a0b0 100644 --- a/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp +++ b/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp @@ -60,7 +60,7 @@ std::string CgBinaryDisasm::GetDSTDisasm(bool isSca) default: if (d3.dst > 15) - LOG_ERROR(RSX, fmt::format("dst index out of range: %u", d3.dst)); + LOG_ERROR(RSX, "dst index out of range: %u", d3.dst); ret += fmt::format("o[%d]", d3.dst) + GetVecMaskDisasm(); break; @@ -94,7 +94,7 @@ std::string CgBinaryDisasm::GetSRCDisasm(const u32 n) break; default: - LOG_ERROR(RSX, fmt::format("Bad src%u reg type: %d", n, u32{ src[n].reg_type })); + LOG_ERROR(RSX, "Bad src%u reg type: %d", n, u32{ src[n].reg_type }); Emu.Pause(); break; } diff --git a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp index d48240513a..0ca3cfd5d8 100644 --- a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp @@ -47,7 +47,7 @@ std::string VertexProgramDecompiler::GetDST(bool isSca) default: if (d3.dst > 15) - LOG_ERROR(RSX, fmt::format("dst index out of range: %u", d3.dst)); + LOG_ERROR(RSX, "dst index out of range: %u", d3.dst); ret += m_parr.AddParam(PF_PARAM_NONE, getFloatTypeName(4), std::string("dst_reg") + std::to_string(d3.dst), d3.dst == 0 ? getFloatTypeName(4) + "(0.0f, 0.0f, 0.0f, 1.0f)" : getFloatTypeName(4) + "(0.0, 0.0, 0.0, 0.0)"); break; } @@ -91,7 +91,7 @@ std::string VertexProgramDecompiler::GetSRC(const u32 n) break; default: - LOG_ERROR(RSX, fmt::format("Bad src%u reg type: %d", n, u32{ src[n].reg_type })); + LOG_ERROR(RSX, "Bad src%u reg type: %d", n, u32{ src[n].reg_type }); Emu.Pause(); break; } diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index e51b5a58e6..98b52debaf 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -566,9 +566,9 @@ void GLGSRender::on_init_thread() GSRender::on_init_thread(); gl::init(); - LOG_NOTICE(Log::RSX, (const char*)glGetString(GL_VERSION)); - LOG_NOTICE(Log::RSX, (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION)); - LOG_NOTICE(Log::RSX, (const char*)glGetString(GL_VENDOR)); + LOG_NOTICE(RSX, "%s", (const char*)glGetString(GL_VERSION)); + LOG_NOTICE(RSX, "%s", (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION)); + LOG_NOTICE(RSX, "%s", (const char*)glGetString(GL_VENDOR)); glEnable(GL_VERTEX_PROGRAM_POINT_SIZE); m_vao.create(); diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 8984611e73..2ae9725017 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -424,7 +424,7 @@ namespace rsx if (cmd & 0x3) { - LOG_WARNING(Log::RSX, "unaligned command: %s (0x%x from 0x%x)", get_method_name(first_cmd).c_str(), first_cmd, cmd & 0xffff); + LOG_WARNING(RSX, "unaligned command: %s (0x%x from 0x%x)", get_method_name(first_cmd).c_str(), first_cmd, cmd & 0xffff); } for (u32 i = 0; i < count; i++) @@ -434,7 +434,7 @@ namespace rsx if (rpcs3::config.misc.log.rsx_logging.value()) { - LOG_NOTICE(Log::RSX, "%s(0x%x) = 0x%x", get_method_name(reg).c_str(), reg, value); + LOG_NOTICE(RSX, "%s(0x%x) = 0x%x", get_method_name(reg).c_str(), reg, value); } method_registers[reg] = value; diff --git a/rpcs3/Emu/SysCalls/LogBase.cpp b/rpcs3/Emu/SysCalls/LogBase.cpp deleted file mode 100644 index 23a2ccb44d..0000000000 --- a/rpcs3/Emu/SysCalls/LogBase.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "stdafx.h" -#include "Emu/System.h" -#include "Emu/state.h" -#include "LogBase.h" - -bool LogBase::CheckLogging() const -{ - return rpcs3::config.misc.log.hle_logging.value() || m_logging; -} - -void LogBase::LogOutput(LogType type, std::string text) const -{ - switch (type) - { - case LogNotice: LOG_NOTICE(HLE, GetName() + ": " + text); break; - case LogSuccess: LOG_SUCCESS(HLE, GetName() + ": " + text); break; - case LogWarning: LOG_WARNING(HLE, GetName() + ": " + text); break; - case LogError: LOG_ERROR(HLE, GetName() + ": " + text); break; - case LogTodo: LOG_ERROR(HLE, GetName() + " TODO: " + text); break; - } -} diff --git a/rpcs3/Emu/SysCalls/LogBase.h b/rpcs3/Emu/SysCalls/LogBase.h deleted file mode 100644 index 56dd55e9c8..0000000000 --- a/rpcs3/Emu/SysCalls/LogBase.h +++ /dev/null @@ -1,74 +0,0 @@ -#pragma once - -class LogBase -{ - bool m_logging; - bool CheckLogging() const; - - enum LogType - { - LogNotice, - LogSuccess, - LogWarning, - LogError, - LogTodo, - }; - - void LogOutput(LogType type, std::string text) const; - - template never_inline safe_buffers void LogPrepare(LogType type, const char* fmt, Args... args) const - { - LogOutput(type, fmt::format(fmt, args...)); - } - - never_inline safe_buffers void LogPrepare(LogType type, const char* fmt) const - { - LogOutput(type, fmt); - } - -public: - void SetLogging(bool value) - { - m_logging = value; - } - - LogBase() - { - SetLogging(false); - } - - virtual const std::string& GetName() const = 0; - - template force_inline void Notice(const char* fmt, Args... args) const - { - LogPrepare(LogNotice, fmt, fmt::do_unveil(args)...); - } - - template force_inline void Log(const char* fmt, Args... args) const - { - if (CheckLogging()) - { - Notice(fmt, args...); - } - } - - template force_inline void Success(const char* fmt, Args... args) const - { - LogPrepare(LogSuccess, fmt, fmt::do_unveil(args)...); - } - - template force_inline void Warning(const char* fmt, Args... args) const - { - LogPrepare(LogWarning, fmt, fmt::do_unveil(args)...); - } - - template force_inline void Error(const char* fmt, Args... args) const - { - LogPrepare(LogError, fmt, fmt::do_unveil(args)...); - } - - template force_inline void Todo(const char* fmt, Args... args) const - { - LogPrepare(LogTodo, fmt, fmt::do_unveil(args)...); - } -}; diff --git a/rpcs3/Emu/SysCalls/Modules.cpp b/rpcs3/Emu/SysCalls/Modules.cpp index d7643ee27c..744dfc95bb 100644 --- a/rpcs3/Emu/SysCalls/Modules.cpp +++ b/rpcs3/Emu/SysCalls/Modules.cpp @@ -144,10 +144,7 @@ void execute_ppu_func_by_index(PPUThread& ppu, u32 index) throw EXCEPTION("Forced HLE enabled: %s (0x%llx)", get_ps3_function_name(func->id), func->id); } - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(HLE, "Branch to LLE function: %s (0x%llx)", get_ps3_function_name(func->id), func->id); - } + LOG_TRACE(HLE, "Branch to LLE function: %s (0x%llx)", get_ps3_function_name(func->id), func->id); if (index & EIF_PERFORM_BLR) { @@ -173,35 +170,23 @@ void execute_ppu_func_by_index(PPUThread& ppu, u32 index) const u32 pc = data[0]; const u32 rtoc = data[1]; - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(HLE, "LLE function called: %s", get_ps3_function_name(func->id)); - } + LOG_TRACE(HLE, "LLE function called: %s", get_ps3_function_name(func->id)); ppu.fast_call(pc, rtoc); - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(HLE, "LLE function finished: %s -> 0x%llx", get_ps3_function_name(func->id), ppu.GPR[3]); - } + LOG_TRACE(HLE, "LLE function finished: %s -> 0x%llx", get_ps3_function_name(func->id), ppu.GPR[3]); } else if (func->func) { - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(HLE, "HLE function called: %s", get_ps3_function_name(func->id)); - } + LOG_TRACE(HLE, "HLE function called: %s", get_ps3_function_name(func->id)); func->func(ppu); - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(HLE, "HLE function finished: %s -> 0x%llx", get_ps3_function_name(func->id), ppu.GPR[3]); - } + LOG_TRACE(HLE, "HLE function finished: %s -> 0x%llx", get_ps3_function_name(func->id), ppu.GPR[3]); } else { - LOG_ERROR(HLE, "Unimplemented function: %s -> CELL_OK", get_ps3_function_name(func->id)); + LOG_TODO(HLE, "Unimplemented function: %s -> CELL_OK", get_ps3_function_name(func->id)); ppu.GPR[3] = 0; } @@ -529,9 +514,9 @@ bool patch_ppu_import(u32 addr, u32 index) return false; } -Module<>::Module(const char* name, void(*init)()) - : m_is_loaded(false) - , m_name(name) +Module<>::Module(const std::string& name, void(*init)()) + : _log::channel(name, _log::level::notice) + , m_is_loaded(false) , m_init(init) { } @@ -589,13 +574,3 @@ bool Module<>::IsLoaded() const { return m_is_loaded; } - -const std::string& Module<>::GetName() const -{ - return m_name; -} - -void Module<>::SetName(const std::string& name) -{ - m_name = name; -} diff --git a/rpcs3/Emu/SysCalls/Modules.h b/rpcs3/Emu/SysCalls/Modules.h index 37904b8252..656ea1a0f3 100644 --- a/rpcs3/Emu/SysCalls/Modules.h +++ b/rpcs3/Emu/SysCalls/Modules.h @@ -3,7 +3,6 @@ #include "Emu/SysCalls/SC_FUNC.h" #include "Emu/SysCalls/CB_FUNC.h" #include "ErrorCodes.h" -#include "LogBase.h" namespace vm { using namespace ps3; } @@ -67,11 +66,10 @@ struct StaticFunc std::unordered_map labels; }; -template<> class Module : public LogBase +template<> class Module : public _log::channel { friend class ModuleManager; - std::string m_name; bool m_is_loaded; void(*m_init)(); @@ -79,7 +77,7 @@ protected: std::function on_alloc; public: - Module(const char* name, void(*init)()); + Module(const std::string& name, void(*init)()); Module(const Module&) = delete; // Delete copy/move constructors and copy/move operators @@ -96,9 +94,6 @@ public: void SetLoaded(bool loaded = true); bool IsLoaded() const; - - virtual const std::string& GetName() const override; - void SetName(const std::string& name); }; // Module<> with an instance of specified type in PS3 memory @@ -187,4 +182,4 @@ template type, vm::ptr attr) { - cellAdec.Warning("cellAdecQueryAttr(type=*0x%x, attr=*0x%x)", type, attr); + cellAdec.warning("cellAdecQueryAttr(type=*0x%x, attr=*0x%x)", type, attr); if (!adecCheckType(type->audioCodecType)) { @@ -518,7 +518,7 @@ s32 cellAdecQueryAttr(vm::ptr type, vm::ptr attr) s32 cellAdecOpen(vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr handle) { - cellAdec.Warning("cellAdecOpen(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); + cellAdec.warning("cellAdecOpen(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); if (!adecCheckType(type->audioCodecType)) { @@ -532,7 +532,7 @@ s32 cellAdecOpen(vm::ptr type, vm::ptr res, vm:: s32 cellAdecOpenEx(vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr handle) { - cellAdec.Warning("cellAdecOpenEx(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); + cellAdec.warning("cellAdecOpenEx(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); if (!adecCheckType(type->audioCodecType)) { @@ -546,14 +546,14 @@ s32 cellAdecOpenEx(vm::ptr type, vm::ptr res, s32 cellAdecOpenExt(vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr handle) { - cellAdec.Warning("cellAdecOpenExt(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); + cellAdec.warning("cellAdecOpenExt(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); return cellAdecOpenEx(type, res, cb, handle); } s32 cellAdecClose(u32 handle) { - cellAdec.Warning("cellAdecClose(handle=0x%x)", handle); + cellAdec.warning("cellAdecClose(handle=0x%x)", handle); const auto adec = idm::get(handle); @@ -579,7 +579,7 @@ s32 cellAdecClose(u32 handle) s32 cellAdecStartSeq(u32 handle, u32 param) { - cellAdec.Warning("cellAdecStartSeq(handle=0x%x, param=*0x%x)", handle, param); + cellAdec.warning("cellAdecStartSeq(handle=0x%x, param=*0x%x)", handle, param); const auto adec = idm::get(handle); @@ -607,7 +607,7 @@ s32 cellAdecStartSeq(u32 handle, u32 param) task.at3p.output = atx->bw_pcm; task.at3p.downmix = atx->downmix_flag; task.at3p.ats_header = atx->au_includes_ats_hdr_flg; - cellAdec.Todo("*** CellAdecParamAtracX: sr=%d, ch_cfg=%d(%d), frame_size=0x%x, extra=0x%x, output=%d, downmix=%d, ats_header=%d", + cellAdec.todo("*** CellAdecParamAtracX: sr=%d, ch_cfg=%d(%d), frame_size=0x%x, extra=0x%x, output=%d, downmix=%d, ats_header=%d", task.at3p.sample_rate, task.at3p.channel_config, task.at3p.channels, task.at3p.frame_size, (u32&)task.at3p.extra_config, task.at3p.output, task.at3p.downmix, task.at3p.ats_header); break; } @@ -615,12 +615,12 @@ s32 cellAdecStartSeq(u32 handle, u32 param) { const auto mp3 = vm::cptr::make(param); - cellAdec.Todo("*** CellAdecParamMP3: bw_pcm=%d", mp3->bw_pcm); + cellAdec.todo("*** CellAdecParamMP3: bw_pcm=%d", mp3->bw_pcm); break; } default: { - cellAdec.Todo("cellAdecStartSeq(): Unimplemented audio codec type(%d)", adec->type); + cellAdec.todo("cellAdecStartSeq(): Unimplemented audio codec type(%d)", adec->type); Emu.Pause(); return CELL_OK; } @@ -632,7 +632,7 @@ s32 cellAdecStartSeq(u32 handle, u32 param) s32 cellAdecEndSeq(u32 handle) { - cellAdec.Warning("cellAdecEndSeq(handle=0x%x)", handle); + cellAdec.warning("cellAdecEndSeq(handle=0x%x)", handle); const auto adec = idm::get(handle); @@ -647,7 +647,7 @@ s32 cellAdecEndSeq(u32 handle) s32 cellAdecDecodeAu(u32 handle, vm::ptr auInfo) { - cellAdec.Log("cellAdecDecodeAu(handle=0x%x, auInfo=*0x%x)", handle, auInfo); + cellAdec.trace("cellAdecDecodeAu(handle=0x%x, auInfo=*0x%x)", handle, auInfo); const auto adec = idm::get(handle); @@ -663,14 +663,14 @@ s32 cellAdecDecodeAu(u32 handle, vm::ptr auInfo) task.au.pts = ((u64)auInfo->pts.upper << 32) | (u64)auInfo->pts.lower; task.au.userdata = auInfo->userData; - //cellAdec.Notice("cellAdecDecodeAu(): addr=0x%x, size=0x%x, pts=0x%llx", task.au.addr, task.au.size, task.au.pts); + //cellAdec.notice("cellAdecDecodeAu(): addr=0x%x, size=0x%x, pts=0x%llx", task.au.addr, task.au.size, task.au.pts); adec->job.push(task, &adec->is_closed); return CELL_OK; } s32 cellAdecGetPcm(u32 handle, vm::ptr outBuffer) { - cellAdec.Log("cellAdecGetPcm(handle=0x%x, outBuffer=*0x%x)", handle, outBuffer); + cellAdec.trace("cellAdecGetPcm(handle=0x%x, outBuffer=*0x%x)", handle, outBuffer); const auto adec = idm::get(handle); @@ -786,7 +786,7 @@ s32 cellAdecGetPcm(u32 handle, vm::ptr outBuffer) s32 cellAdecGetPcmItem(u32 handle, vm::pptr pcmItem) { - cellAdec.Log("cellAdecGetPcmItem(handle=0x%x, pcmItem=**0x%x)", handle, pcmItem); + cellAdec.trace("cellAdecGetPcmItem(handle=0x%x, pcmItem=**0x%x)", handle, pcmItem); const auto adec = idm::get(handle); @@ -847,7 +847,7 @@ s32 cellAdecGetPcmItem(u32 handle, vm::pptr pcmItem) } else { - cellAdec.Error("cellAdecGetPcmItem(): unsupported channel count (%d)", frame->channels); + cellAdec.error("cellAdecGetPcmItem(): unsupported channel count (%d)", frame->channels); Emu.Pause(); } } diff --git a/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp b/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp index 9230874c66..977aa05480 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp @@ -7,7 +7,7 @@ s32 cellAtracSetDataAndGetMemSize(vm::ptr pHandle, vm::ptr pucBufferAddr, u32 uiReadByte, u32 uiBufferByte, vm::ptr puiWorkMemByte) { - cellAtrac.Warning("cellAtracSetDataAndGetMemSize(pHandle=*0x%x, pucBufferAddr=*0x%x, uiReadByte=0x%x, uiBufferByte=0x%x, puiWorkMemByte=*0x%x)", pHandle, pucBufferAddr, uiReadByte, uiBufferByte, puiWorkMemByte); + cellAtrac.warning("cellAtracSetDataAndGetMemSize(pHandle=*0x%x, pucBufferAddr=*0x%x, uiReadByte=0x%x, uiBufferByte=0x%x, puiWorkMemByte=*0x%x)", pHandle, pucBufferAddr, uiReadByte, uiBufferByte, puiWorkMemByte); *puiWorkMemByte = 0x1000; return CELL_OK; @@ -15,7 +15,7 @@ s32 cellAtracSetDataAndGetMemSize(vm::ptr pHandle, vm::ptr s32 cellAtracCreateDecoder(vm::ptr pHandle, vm::ptr pucWorkMem, u32 uiPpuThreadPriority, u32 uiSpuThreadPriority) { - cellAtrac.Warning("cellAtracCreateDecoder(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, uiSpuThreadPriority=%d)", pHandle, pucWorkMem, uiPpuThreadPriority, uiSpuThreadPriority); + cellAtrac.warning("cellAtracCreateDecoder(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, uiSpuThreadPriority=%d)", pHandle, pucWorkMem, uiPpuThreadPriority, uiSpuThreadPriority); pHandle->pucWorkMem = pucWorkMem; return CELL_OK; @@ -23,7 +23,7 @@ s32 cellAtracCreateDecoder(vm::ptr pHandle, vm::ptr pucWork s32 cellAtracCreateDecoderExt(vm::ptr pHandle, vm::ptr pucWorkMem, u32 uiPpuThreadPriority, vm::ptr pExtRes) { - cellAtrac.Warning("cellAtracCreateDecoderExt(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, pExtRes=*0x%x)", pHandle, pucWorkMem, uiPpuThreadPriority, pExtRes); + cellAtrac.warning("cellAtracCreateDecoderExt(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, pExtRes=*0x%x)", pHandle, pucWorkMem, uiPpuThreadPriority, pExtRes); pHandle->pucWorkMem = pucWorkMem; return CELL_OK; @@ -31,14 +31,14 @@ s32 cellAtracCreateDecoderExt(vm::ptr pHandle, vm::ptr pucW s32 cellAtracDeleteDecoder(vm::ptr pHandle) { - cellAtrac.Warning("cellAtracDeleteDecoder(pHandle=*0x%x)", pHandle); + cellAtrac.warning("cellAtracDeleteDecoder(pHandle=*0x%x)", pHandle); return CELL_OK; } s32 cellAtracDecode(vm::ptr pHandle, vm::ptr pfOutAddr, vm::ptr puiSamples, vm::ptr puiFinishflag, vm::ptr piRemainFrame) { - cellAtrac.Warning("cellAtracDecode(pHandle=*0x%x, pfOutAddr=*0x%x, puiSamples=*0x%x, puiFinishFlag=*0x%x, piRemainFrame=*0x%x)", pHandle, pfOutAddr, puiSamples, puiFinishflag, piRemainFrame); + cellAtrac.warning("cellAtracDecode(pHandle=*0x%x, pfOutAddr=*0x%x, puiSamples=*0x%x, puiFinishFlag=*0x%x, piRemainFrame=*0x%x)", pHandle, pfOutAddr, puiSamples, puiFinishflag, piRemainFrame); *puiSamples = 0; *puiFinishflag = 1; @@ -48,7 +48,7 @@ s32 cellAtracDecode(vm::ptr pHandle, vm::ptr pfOutAddr, s32 cellAtracGetStreamDataInfo(vm::ptr pHandle, vm::pptr ppucWritePointer, vm::ptr puiWritableByte, vm::ptr puiReadPosition) { - cellAtrac.Warning("cellAtracGetStreamDataInfo(pHandle=*0x%x, ppucWritePointer=**0x%x, puiWritableByte=*0x%x, puiReadPosition=*0x%x)", pHandle, ppucWritePointer, puiWritableByte, puiReadPosition); + cellAtrac.warning("cellAtracGetStreamDataInfo(pHandle=*0x%x, ppucWritePointer=**0x%x, puiWritableByte=*0x%x, puiReadPosition=*0x%x)", pHandle, ppucWritePointer, puiWritableByte, puiReadPosition); *ppucWritePointer = pHandle->pucWorkMem; *puiWritableByte = 0x1000; @@ -58,14 +58,14 @@ s32 cellAtracGetStreamDataInfo(vm::ptr pHandle, vm::pptr pp s32 cellAtracAddStreamData(vm::ptr pHandle, u32 uiAddByte) { - cellAtrac.Warning("cellAtracAddStreamData(pHandle=*0x%x, uiAddByte=0x%x)", pHandle, uiAddByte); + cellAtrac.warning("cellAtracAddStreamData(pHandle=*0x%x, uiAddByte=0x%x)", pHandle, uiAddByte); return CELL_OK; } s32 cellAtracGetRemainFrame(vm::ptr pHandle, vm::ptr piRemainFrame) { - cellAtrac.Warning("cellAtracGetRemainFrame(pHandle=*0x%x, piRemainFrame=*0x%x)", pHandle, piRemainFrame); + cellAtrac.warning("cellAtracGetRemainFrame(pHandle=*0x%x, piRemainFrame=*0x%x)", pHandle, piRemainFrame); *piRemainFrame = CELL_ATRAC_ALLDATA_IS_ON_MEMORY; return CELL_OK; @@ -73,7 +73,7 @@ s32 cellAtracGetRemainFrame(vm::ptr pHandle, vm::ptr piRem s32 cellAtracGetVacantSize(vm::ptr pHandle, vm::ptr puiVacantSize) { - cellAtrac.Warning("cellAtracGetVacantSize(pHandle=*0x%x, puiVacantSize=*0x%x)", pHandle, puiVacantSize); + cellAtrac.warning("cellAtracGetVacantSize(pHandle=*0x%x, puiVacantSize=*0x%x)", pHandle, puiVacantSize); *puiVacantSize = 0x1000; return CELL_OK; @@ -81,14 +81,14 @@ s32 cellAtracGetVacantSize(vm::ptr pHandle, vm::ptr puiVac s32 cellAtracIsSecondBufferNeeded(vm::ptr pHandle) { - cellAtrac.Warning("cellAtracIsSecondBufferNeeded(pHandle=*0x%x)", pHandle); + cellAtrac.warning("cellAtracIsSecondBufferNeeded(pHandle=*0x%x)", pHandle); return 0; } s32 cellAtracGetSecondBufferInfo(vm::ptr pHandle, vm::ptr puiReadPosition, vm::ptr puiDataByte) { - cellAtrac.Warning("cellAtracGetSecondBufferInfo(pHandle=*0x%x, puiReadPosition=*0x%x, puiDataByte=*0x%x)", pHandle, puiReadPosition, puiDataByte); + cellAtrac.warning("cellAtracGetSecondBufferInfo(pHandle=*0x%x, puiReadPosition=*0x%x, puiDataByte=*0x%x)", pHandle, puiReadPosition, puiDataByte); *puiReadPosition = 0; *puiDataByte = 0; // write to null block will occur @@ -97,14 +97,14 @@ s32 cellAtracGetSecondBufferInfo(vm::ptr pHandle, vm::ptr s32 cellAtracSetSecondBuffer(vm::ptr pHandle, vm::ptr pucSecondBufferAddr, u32 uiSecondBufferByte) { - cellAtrac.Warning("cellAtracSetSecondBuffer(pHandle=*0x%x, pucSecondBufferAddr=*0x%x, uiSecondBufferByte=0x%x)", pHandle, pucSecondBufferAddr, uiSecondBufferByte); + cellAtrac.warning("cellAtracSetSecondBuffer(pHandle=*0x%x, pucSecondBufferAddr=*0x%x, uiSecondBufferByte=0x%x)", pHandle, pucSecondBufferAddr, uiSecondBufferByte); return CELL_OK; } s32 cellAtracGetChannel(vm::ptr pHandle, vm::ptr puiChannel) { - cellAtrac.Warning("cellAtracGetChannel(pHandle=*0x%x, puiChannel=*0x%x)", pHandle, puiChannel); + cellAtrac.warning("cellAtracGetChannel(pHandle=*0x%x, puiChannel=*0x%x)", pHandle, puiChannel); *puiChannel = 2; return CELL_OK; @@ -112,7 +112,7 @@ s32 cellAtracGetChannel(vm::ptr pHandle, vm::ptr puiChanne s32 cellAtracGetMaxSample(vm::ptr pHandle, vm::ptr puiMaxSample) { - cellAtrac.Warning("cellAtracGetMaxSample(pHandle=*0x%x, puiMaxSample=*0x%x)", pHandle, puiMaxSample); + cellAtrac.warning("cellAtracGetMaxSample(pHandle=*0x%x, puiMaxSample=*0x%x)", pHandle, puiMaxSample); *puiMaxSample = 512; return CELL_OK; @@ -120,7 +120,7 @@ s32 cellAtracGetMaxSample(vm::ptr pHandle, vm::ptr puiMaxS s32 cellAtracGetNextSample(vm::ptr pHandle, vm::ptr puiNextSample) { - cellAtrac.Warning("cellAtracGetNextSample(pHandle=*0x%x, puiNextSample=*0x%x)", pHandle, puiNextSample); + cellAtrac.warning("cellAtracGetNextSample(pHandle=*0x%x, puiNextSample=*0x%x)", pHandle, puiNextSample); *puiNextSample = 0; return CELL_OK; @@ -128,7 +128,7 @@ s32 cellAtracGetNextSample(vm::ptr pHandle, vm::ptr puiNex s32 cellAtracGetSoundInfo(vm::ptr pHandle, vm::ptr piEndSample, vm::ptr piLoopStartSample, vm::ptr piLoopEndSample) { - cellAtrac.Warning("cellAtracGetSoundInfo(pHandle=*0x%x, piEndSample=*0x%x, piLoopStartSample=*0x%x, piLoopEndSample=*0x%x)", pHandle, piEndSample, piLoopStartSample, piLoopEndSample); + cellAtrac.warning("cellAtracGetSoundInfo(pHandle=*0x%x, piEndSample=*0x%x, piLoopStartSample=*0x%x, piLoopEndSample=*0x%x)", pHandle, piEndSample, piLoopStartSample, piLoopEndSample); *piEndSample = 0; *piLoopStartSample = 0; @@ -138,7 +138,7 @@ s32 cellAtracGetSoundInfo(vm::ptr pHandle, vm::ptr piEndSa s32 cellAtracGetNextDecodePosition(vm::ptr pHandle, vm::ptr puiSamplePosition) { - cellAtrac.Warning("cellAtracGetNextDecodePosition(pHandle=*0x%x, puiSamplePosition=*0x%x)", pHandle, puiSamplePosition); + cellAtrac.warning("cellAtracGetNextDecodePosition(pHandle=*0x%x, puiSamplePosition=*0x%x)", pHandle, puiSamplePosition); *puiSamplePosition = 0; return CELL_ATRAC_ERROR_ALLDATA_WAS_DECODED; @@ -146,7 +146,7 @@ s32 cellAtracGetNextDecodePosition(vm::ptr pHandle, vm::ptr pHandle, vm::ptr puiBitrate) { - cellAtrac.Warning("cellAtracGetBitrate(pHandle=*0x%x, puiBitrate=*0x%x)", pHandle, puiBitrate); + cellAtrac.warning("cellAtracGetBitrate(pHandle=*0x%x, puiBitrate=*0x%x)", pHandle, puiBitrate); *puiBitrate = 128; return CELL_OK; @@ -154,7 +154,7 @@ s32 cellAtracGetBitrate(vm::ptr pHandle, vm::ptr puiBitrat s32 cellAtracGetLoopInfo(vm::ptr pHandle, vm::ptr piLoopNum, vm::ptr puiLoopStatus) { - cellAtrac.Warning("cellAtracGetLoopInfo(pHandle=*0x%x, piLoopNum=*0x%x, puiLoopStatus=*0x%x)", pHandle, piLoopNum, puiLoopStatus); + cellAtrac.warning("cellAtracGetLoopInfo(pHandle=*0x%x, piLoopNum=*0x%x, puiLoopStatus=*0x%x)", pHandle, piLoopNum, puiLoopStatus); *piLoopNum = 0; *puiLoopStatus = 0; @@ -163,14 +163,14 @@ s32 cellAtracGetLoopInfo(vm::ptr pHandle, vm::ptr piLoopNu s32 cellAtracSetLoopNum(vm::ptr pHandle, s32 iLoopNum) { - cellAtrac.Warning("cellAtracSetLoopNum(pHandle=*0x%x, iLoopNum=%d)", pHandle, iLoopNum); + cellAtrac.warning("cellAtracSetLoopNum(pHandle=*0x%x, iLoopNum=%d)", pHandle, iLoopNum); return CELL_OK; } s32 cellAtracGetBufferInfoForResetting(vm::ptr pHandle, u32 uiSample, vm::ptr pBufferInfo) { - cellAtrac.Warning("cellAtracGetBufferInfoForResetting(pHandle=*0x%x, uiSample=0x%x, pBufferInfo=*0x%x)", pHandle, uiSample, pBufferInfo); + cellAtrac.warning("cellAtracGetBufferInfoForResetting(pHandle=*0x%x, uiSample=0x%x, pBufferInfo=*0x%x)", pHandle, uiSample, pBufferInfo); pBufferInfo->pucWriteAddr = pHandle->pucWorkMem; pBufferInfo->uiWritableByte = 0x1000; @@ -181,14 +181,14 @@ s32 cellAtracGetBufferInfoForResetting(vm::ptr pHandle, u32 uiS s32 cellAtracResetPlayPosition(vm::ptr pHandle, u32 uiSample, u32 uiWriteByte) { - cellAtrac.Warning("cellAtracResetPlayPosition(pHandle=*0x%x, uiSample=0x%x, uiWriteByte=0x%x)", pHandle, uiSample, uiWriteByte); + cellAtrac.warning("cellAtracResetPlayPosition(pHandle=*0x%x, uiSample=0x%x, uiWriteByte=0x%x)", pHandle, uiSample, uiWriteByte); return CELL_OK; } s32 cellAtracGetInternalErrorInfo(vm::ptr pHandle, vm::ptr piResult) { - cellAtrac.Warning("cellAtracGetInternalErrorInfo(pHandle=*0x%x, piResult=*0x%x)", pHandle, piResult); + cellAtrac.warning("cellAtracGetInternalErrorInfo(pHandle=*0x%x, piResult=*0x%x)", pHandle, piResult); *piResult = 0; return CELL_OK; diff --git a/rpcs3/Emu/SysCalls/Modules/cellAtracMulti.cpp b/rpcs3/Emu/SysCalls/Modules/cellAtracMulti.cpp index 5eccf4839a..5e8c78596d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAtracMulti.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellAtracMulti.cpp @@ -7,7 +7,7 @@ s32 cellAtracMultiSetDataAndGetMemSize(vm::ptr pHandle, vm::ptr pucBufferAddr, u32 uiReadByte, u32 uiBufferByte, u32 uiOutputChNum, vm::ptr piTrackArray, vm::ptr puiWorkMemByte) { - cellAtracMulti.Warning("cellAtracMultiSetDataAndGetMemSize(pHandle=*0x%x, pucBufferAddr=*0x%x, uiReadByte=0x%x, uiBufferByte=0x%x, uiOutputChNum=%d, piTrackArray=*0x%x, puiWorkMemByte=*0x%x)", + cellAtracMulti.warning("cellAtracMultiSetDataAndGetMemSize(pHandle=*0x%x, pucBufferAddr=*0x%x, uiReadByte=0x%x, uiBufferByte=0x%x, uiOutputChNum=%d, piTrackArray=*0x%x, puiWorkMemByte=*0x%x)", pHandle, pucBufferAddr, uiReadByte, uiBufferByte, uiOutputChNum, piTrackArray, puiWorkMemByte); *puiWorkMemByte = 0x1000; @@ -16,7 +16,7 @@ s32 cellAtracMultiSetDataAndGetMemSize(vm::ptr pHandle, vm s32 cellAtracMultiCreateDecoder(vm::ptr pHandle, vm::ptr pucWorkMem, u32 uiPpuThreadPriority, u32 uiSpuThreadPriority) { - cellAtracMulti.Warning("cellAtracMultiCreateDecoder(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, uiSpuThreadPriority=%d)", pHandle, pucWorkMem, uiPpuThreadPriority, uiSpuThreadPriority); + cellAtracMulti.warning("cellAtracMultiCreateDecoder(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, uiSpuThreadPriority=%d)", pHandle, pucWorkMem, uiPpuThreadPriority, uiSpuThreadPriority); pHandle->pucWorkMem = pucWorkMem; return CELL_OK; @@ -24,7 +24,7 @@ s32 cellAtracMultiCreateDecoder(vm::ptr pHandle, vm::ptr pHandle, vm::ptr pucWorkMem, u32 uiPpuThreadPriority, vm::ptr pExtRes) { - cellAtracMulti.Warning("cellAtracMultiCreateDecoderExt(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, pExtRes=*0x%x)", pHandle, pucWorkMem, uiPpuThreadPriority, pExtRes); + cellAtracMulti.warning("cellAtracMultiCreateDecoderExt(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, pExtRes=*0x%x)", pHandle, pucWorkMem, uiPpuThreadPriority, pExtRes); pHandle->pucWorkMem = pucWorkMem; return CELL_OK; @@ -32,14 +32,14 @@ s32 cellAtracMultiCreateDecoderExt(vm::ptr pHandle, vm::pt s32 cellAtracMultiDeleteDecoder(vm::ptr pHandle) { - cellAtracMulti.Warning("cellAtracMultiDeleteDecoder(pHandle=*0x%x)", pHandle); + cellAtracMulti.warning("cellAtracMultiDeleteDecoder(pHandle=*0x%x)", pHandle); return CELL_OK; } s32 cellAtracMultiDecode(vm::ptr pHandle, vm::ptr pfOutAddr, vm::ptr puiSamples, vm::ptr puiFinishflag, vm::ptr piRemainFrame) { - cellAtracMulti.Warning("cellAtracMultiDecode(pHandle=*0x%x, pfOutAddr=*0x%x, puiSamples=*0x%x, puiFinishFlag=*0x%x, piRemainFrame=*0x%x)", pHandle, pfOutAddr, puiSamples, puiFinishflag, piRemainFrame); + cellAtracMulti.warning("cellAtracMultiDecode(pHandle=*0x%x, pfOutAddr=*0x%x, puiSamples=*0x%x, puiFinishFlag=*0x%x, piRemainFrame=*0x%x)", pHandle, pfOutAddr, puiSamples, puiFinishflag, piRemainFrame); *puiSamples = 0; *puiFinishflag = 1; @@ -49,7 +49,7 @@ s32 cellAtracMultiDecode(vm::ptr pHandle, vm::ptr p s32 cellAtracMultiGetStreamDataInfo(vm::ptr pHandle, vm::pptr ppucWritePointer, vm::ptr puiWritableByte, vm::ptr puiReadPosition) { - cellAtracMulti.Warning("cellAtracMultiGetStreamDataInfo(pHandle=*0x%x, ppucWritePointer=**0x%x, puiWritableByte=*0x%x, puiReadPosition=*0x%x)", pHandle, ppucWritePointer, puiWritableByte, puiReadPosition); + cellAtracMulti.warning("cellAtracMultiGetStreamDataInfo(pHandle=*0x%x, ppucWritePointer=**0x%x, puiWritableByte=*0x%x, puiReadPosition=*0x%x)", pHandle, ppucWritePointer, puiWritableByte, puiReadPosition); *ppucWritePointer = pHandle->pucWorkMem; *puiWritableByte = 0x1000; @@ -59,14 +59,14 @@ s32 cellAtracMultiGetStreamDataInfo(vm::ptr pHandle, vm::p s32 cellAtracMultiAddStreamData(vm::ptr pHandle, u32 uiAddByte) { - cellAtracMulti.Warning("cellAtracMultiAddStreamData(pHandle=*0x%x, uiAddByte=0x%x)", pHandle, uiAddByte); + cellAtracMulti.warning("cellAtracMultiAddStreamData(pHandle=*0x%x, uiAddByte=0x%x)", pHandle, uiAddByte); return CELL_OK; } s32 cellAtracMultiGetRemainFrame(vm::ptr pHandle, vm::ptr piRemainFrame) { - cellAtracMulti.Warning("cellAtracMultiGetRemainFrame(pHandle=*0x%x, piRemainFrame=*0x%x)", pHandle, piRemainFrame); + cellAtracMulti.warning("cellAtracMultiGetRemainFrame(pHandle=*0x%x, piRemainFrame=*0x%x)", pHandle, piRemainFrame); *piRemainFrame = CELL_ATRACMULTI_ALLDATA_IS_ON_MEMORY; return CELL_OK; @@ -74,7 +74,7 @@ s32 cellAtracMultiGetRemainFrame(vm::ptr pHandle, vm::ptr< s32 cellAtracMultiGetVacantSize(vm::ptr pHandle, vm::ptr puiVacantSize) { - cellAtracMulti.Warning("cellAtracMultiGetVacantSize(pHandle=*0x%x, puiVacantSize=*0x%x)", pHandle, puiVacantSize); + cellAtracMulti.warning("cellAtracMultiGetVacantSize(pHandle=*0x%x, puiVacantSize=*0x%x)", pHandle, puiVacantSize); *puiVacantSize = 0x1000; return CELL_OK; @@ -82,14 +82,14 @@ s32 cellAtracMultiGetVacantSize(vm::ptr pHandle, vm::ptr pHandle) { - cellAtracMulti.Warning("cellAtracMultiIsSecondBufferNeeded(pHandle=*0x%x)", pHandle); + cellAtracMulti.warning("cellAtracMultiIsSecondBufferNeeded(pHandle=*0x%x)", pHandle); return 0; } s32 cellAtracMultiGetSecondBufferInfo(vm::ptr pHandle, vm::ptr puiReadPosition, vm::ptr puiDataByte) { - cellAtracMulti.Warning("cellAtracMultiGetSecondBufferInfo(pHandle=*0x%x, puiReadPosition=*0x%x, puiDataByte=*0x%x)", pHandle, puiReadPosition, puiDataByte); + cellAtracMulti.warning("cellAtracMultiGetSecondBufferInfo(pHandle=*0x%x, puiReadPosition=*0x%x, puiDataByte=*0x%x)", pHandle, puiReadPosition, puiDataByte); *puiReadPosition = 0; *puiDataByte = 0; // write to null block will occur @@ -98,14 +98,14 @@ s32 cellAtracMultiGetSecondBufferInfo(vm::ptr pHandle, vm: s32 cellAtracMultiSetSecondBuffer(vm::ptr pHandle, vm::ptr pucSecondBufferAddr, u32 uiSecondBufferByte) { - cellAtracMulti.Warning("cellAtracMultiSetSecondBuffer(pHandle=*0x%x, pucSecondBufferAddr=*0x%x, uiSecondBufferByte=0x%x)", pHandle, pucSecondBufferAddr, uiSecondBufferByte); + cellAtracMulti.warning("cellAtracMultiSetSecondBuffer(pHandle=*0x%x, pucSecondBufferAddr=*0x%x, uiSecondBufferByte=0x%x)", pHandle, pucSecondBufferAddr, uiSecondBufferByte); return CELL_OK; } s32 cellAtracMultiGetChannel(vm::ptr pHandle, vm::ptr puiChannel) { - cellAtracMulti.Warning("cellAtracMultiGetChannel(pHandle=*0x%x, puiChannel=*0x%x)", pHandle, puiChannel); + cellAtracMulti.warning("cellAtracMultiGetChannel(pHandle=*0x%x, puiChannel=*0x%x)", pHandle, puiChannel); *puiChannel = 2; return CELL_OK; @@ -113,7 +113,7 @@ s32 cellAtracMultiGetChannel(vm::ptr pHandle, vm::ptr s32 cellAtracMultiGetMaxSample(vm::ptr pHandle, vm::ptr puiMaxSample) { - cellAtracMulti.Warning("cellAtracMultiGetMaxSample(pHandle=*0x%x, puiMaxSample=*0x%x)", pHandle, puiMaxSample); + cellAtracMulti.warning("cellAtracMultiGetMaxSample(pHandle=*0x%x, puiMaxSample=*0x%x)", pHandle, puiMaxSample); *puiMaxSample = 512; return CELL_OK; @@ -121,7 +121,7 @@ s32 cellAtracMultiGetMaxSample(vm::ptr pHandle, vm::ptr pHandle, vm::ptr puiNextSample) { - cellAtracMulti.Warning("cellAtracMultiGetNextSample(pHandle=*0x%x, puiNextSample=*0x%x)", pHandle, puiNextSample); + cellAtracMulti.warning("cellAtracMultiGetNextSample(pHandle=*0x%x, puiNextSample=*0x%x)", pHandle, puiNextSample); *puiNextSample = 0; return CELL_OK; @@ -129,7 +129,7 @@ s32 cellAtracMultiGetNextSample(vm::ptr pHandle, vm::ptr pHandle, vm::ptr piEndSample, vm::ptr piLoopStartSample, vm::ptr piLoopEndSample) { - cellAtracMulti.Warning("cellAtracMultiGetSoundInfo(pHandle=*0x%x, piEndSample=*0x%x, piLoopStartSample=*0x%x, piLoopEndSample=*0x%x)", pHandle, piEndSample, piLoopStartSample, piLoopEndSample); + cellAtracMulti.warning("cellAtracMultiGetSoundInfo(pHandle=*0x%x, piEndSample=*0x%x, piLoopStartSample=*0x%x, piLoopEndSample=*0x%x)", pHandle, piEndSample, piLoopStartSample, piLoopEndSample); *piEndSample = 0; *piLoopStartSample = 0; @@ -139,7 +139,7 @@ s32 cellAtracMultiGetSoundInfo(vm::ptr pHandle, vm::ptr pHandle, vm::ptr puiSamplePosition) { - cellAtracMulti.Warning("cellAtracMultiGetNextDecodePosition(pHandle=*0x%x, puiSamplePosition=*0x%x)", pHandle, puiSamplePosition); + cellAtracMulti.warning("cellAtracMultiGetNextDecodePosition(pHandle=*0x%x, puiSamplePosition=*0x%x)", pHandle, puiSamplePosition); *puiSamplePosition = 0; return CELL_ATRACMULTI_ERROR_ALLDATA_WAS_DECODED; @@ -147,7 +147,7 @@ s32 cellAtracMultiGetNextDecodePosition(vm::ptr pHandle, v s32 cellAtracMultiGetBitrate(vm::ptr pHandle, vm::ptr puiBitrate) { - cellAtracMulti.Warning("cellAtracMultiGetBitrate(pHandle=*0x%x, puiBitrate=*0x%x)", pHandle, puiBitrate); + cellAtracMulti.warning("cellAtracMultiGetBitrate(pHandle=*0x%x, puiBitrate=*0x%x)", pHandle, puiBitrate); *puiBitrate = 128; return CELL_OK; @@ -155,14 +155,14 @@ s32 cellAtracMultiGetBitrate(vm::ptr pHandle, vm::ptr s32 cellAtracMultiGetTrackArray(vm::ptr pHandle, vm::ptr piTrackArray) { - cellAtracMulti.Error("cellAtracMultiGetTrackArray(pHandle=*0x%x, piTrackArray=*0x%x)", pHandle, piTrackArray); + cellAtracMulti.error("cellAtracMultiGetTrackArray(pHandle=*0x%x, piTrackArray=*0x%x)", pHandle, piTrackArray); return CELL_OK; } s32 cellAtracMultiGetLoopInfo(vm::ptr pHandle, vm::ptr piLoopNum, vm::ptr puiLoopStatus) { - cellAtracMulti.Warning("cellAtracMultiGetLoopInfo(pHandle=*0x%x, piLoopNum=*0x%x, puiLoopStatus=*0x%x)", pHandle, piLoopNum, puiLoopStatus); + cellAtracMulti.warning("cellAtracMultiGetLoopInfo(pHandle=*0x%x, piLoopNum=*0x%x, puiLoopStatus=*0x%x)", pHandle, piLoopNum, puiLoopStatus); *piLoopNum = 0; *puiLoopStatus = 0; @@ -171,14 +171,14 @@ s32 cellAtracMultiGetLoopInfo(vm::ptr pHandle, vm::ptr pHandle, s32 iLoopNum) { - cellAtracMulti.Warning("cellAtracMultiSetLoopNum(pHandle=*0x%x, iLoopNum=%d)", pHandle, iLoopNum); + cellAtracMulti.warning("cellAtracMultiSetLoopNum(pHandle=*0x%x, iLoopNum=%d)", pHandle, iLoopNum); return CELL_OK; } s32 cellAtracMultiGetBufferInfoForResetting(vm::ptr pHandle, u32 uiSample, vm::ptr pBufferInfo) { - cellAtracMulti.Warning("cellAtracMultiGetBufferInfoForResetting(pHandle=*0x%x, uiSample=0x%x, pBufferInfo=*0x%x)", pHandle, uiSample, pBufferInfo); + cellAtracMulti.warning("cellAtracMultiGetBufferInfoForResetting(pHandle=*0x%x, uiSample=0x%x, pBufferInfo=*0x%x)", pHandle, uiSample, pBufferInfo); pBufferInfo->pucWriteAddr = pHandle->pucWorkMem; pBufferInfo->uiWritableByte = 0x1000; @@ -189,14 +189,14 @@ s32 cellAtracMultiGetBufferInfoForResetting(vm::ptr pHandl s32 cellAtracMultiResetPlayPosition(vm::ptr pHandle, u32 uiSample, u32 uiWriteByte, vm::ptr piTrackArray) { - cellAtracMulti.Warning("cellAtracMultiResetPlayPosition(pHandle=*0x%x, uiSample=0x%x, uiWriteByte=0x%x, piTrackArray=*0x%x)", pHandle, uiSample, uiWriteByte, piTrackArray); + cellAtracMulti.warning("cellAtracMultiResetPlayPosition(pHandle=*0x%x, uiSample=0x%x, uiWriteByte=0x%x, piTrackArray=*0x%x)", pHandle, uiSample, uiWriteByte, piTrackArray); return CELL_OK; } s32 cellAtracMultiGetInternalErrorInfo(vm::ptr pHandle, vm::ptr piResult) { - cellAtracMulti.Warning("cellAtracMultiGetInternalErrorInfo(pHandle=*0x%x, piResult=*0x%x)", pHandle, piResult); + cellAtracMulti.warning("cellAtracMultiGetInternalErrorInfo(pHandle=*0x%x, piResult=*0x%x)", pHandle, piResult); *piResult = 0; return CELL_OK; diff --git a/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp b/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp index 629f2e01ee..fcc1961beb 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp @@ -24,7 +24,7 @@ std::shared_ptr g_audio_thread; s32 cellAudioInit() { - cellAudio.Warning("cellAudioInit()"); + cellAudio.warning("cellAudioInit()"); if (!g_audio.state.compare_and_swap_test(AUDIO_STATE_NOT_INITIALIZED, AUDIO_STATE_INITIALIZED)) { @@ -157,7 +157,7 @@ s32 cellAudioInit() //const u64 missed_time = time_pos - expected_time; //if (missed_time > AUDIO_SAMPLES * MHZ / 48000) //{ - // cellAudio.Notice("%f ms adjusted", (float)missed_time / 1000); + // cellAudio.notice("%f ms adjusted", (float)missed_time / 1000); // g_audio.start_time += missed_time; //} @@ -408,7 +408,7 @@ s32 cellAudioInit() s32 cellAudioQuit() { - cellAudio.Warning("cellAudioQuit()"); + cellAudio.warning("cellAudioQuit()"); if (!g_audio.state.compare_and_swap_test(AUDIO_STATE_INITIALIZED, AUDIO_STATE_FINALIZED)) { @@ -424,7 +424,7 @@ s32 cellAudioQuit() s32 cellAudioPortOpen(vm::ptr audioParam, vm::ptr portNum) { - cellAudio.Warning("cellAudioPortOpen(audioParam=*0x%x, portNum=*0x%x)", audioParam, portNum); + cellAudio.warning("cellAudioPortOpen(audioParam=*0x%x, portNum=*0x%x)", audioParam, portNum); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -460,35 +460,35 @@ s32 cellAudioPortOpen(vm::ptr audioParam, vm::ptr portN // list unsupported flags if (attr & CELL_AUDIO_PORTATTR_BGM) { - cellAudio.Todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_BGM"); + cellAudio.todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_BGM"); } if (attr & CELL_AUDIO_PORTATTR_OUT_SECONDARY) { - cellAudio.Todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_OUT_SECONDARY"); + cellAudio.todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_OUT_SECONDARY"); } if (attr & CELL_AUDIO_PORTATTR_OUT_PERSONAL_0) { - cellAudio.Todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_OUT_PERSONAL_0"); + cellAudio.todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_OUT_PERSONAL_0"); } if (attr & CELL_AUDIO_PORTATTR_OUT_PERSONAL_1) { - cellAudio.Todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_OUT_PERSONAL_1"); + cellAudio.todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_OUT_PERSONAL_1"); } if (attr & CELL_AUDIO_PORTATTR_OUT_PERSONAL_2) { - cellAudio.Todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_OUT_PERSONAL_2"); + cellAudio.todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_OUT_PERSONAL_2"); } if (attr & CELL_AUDIO_PORTATTR_OUT_PERSONAL_3) { - cellAudio.Todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_OUT_PERSONAL_3"); + cellAudio.todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_OUT_PERSONAL_3"); } if (attr & CELL_AUDIO_PORTATTR_OUT_NO_ROUTE) { - cellAudio.Todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_OUT_NO_ROUTE"); + cellAudio.todo("cellAudioPortOpen(): CELL_AUDIO_PORTATTR_OUT_NO_ROUTE"); } if (attr & 0xFFFFFFFFF0EFEFEEULL) { - cellAudio.Todo("cellAudioPortOpen(): unknown attributes (0x%llx)", attr); + cellAudio.todo("cellAudioPortOpen(): unknown attributes (0x%llx)", attr); } // open audio port @@ -521,14 +521,14 @@ s32 cellAudioPortOpen(vm::ptr audioParam, vm::ptr portN port.level_set.store({ port.level, 0.0f }); *portNum = port_index; - cellAudio.Warning("*** audio port opened(nChannel=%d, nBlock=%d, attr=0x%llx, level=%f): port = %d", channel, block, attr, port.level, port_index); + cellAudio.warning("*** audio port opened(nChannel=%d, nBlock=%d, attr=0x%llx, level=%f): port = %d", channel, block, attr, port.level, port_index); return CELL_OK; } s32 cellAudioGetPortConfig(u32 portNum, vm::ptr portConfig) { - cellAudio.Warning("cellAudioGetPortConfig(portNum=%d, portConfig=*0x%x)", portNum, portConfig); + cellAudio.warning("cellAudioGetPortConfig(portNum=%d, portConfig=*0x%x)", portNum, portConfig); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -561,7 +561,7 @@ s32 cellAudioGetPortConfig(u32 portNum, vm::ptr portConfig) s32 cellAudioPortStart(u32 portNum) { - cellAudio.Warning("cellAudioPortStart(portNum=%d)", portNum); + cellAudio.warning("cellAudioPortStart(portNum=%d)", portNum); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -584,7 +584,7 @@ s32 cellAudioPortStart(u32 portNum) s32 cellAudioPortClose(u32 portNum) { - cellAudio.Warning("cellAudioPortClose(portNum=%d)", portNum); + cellAudio.warning("cellAudioPortClose(portNum=%d)", portNum); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -607,7 +607,7 @@ s32 cellAudioPortClose(u32 portNum) s32 cellAudioPortStop(u32 portNum) { - cellAudio.Warning("cellAudioPortStop(portNum=%d)", portNum); + cellAudio.warning("cellAudioPortStop(portNum=%d)", portNum); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -630,7 +630,7 @@ s32 cellAudioPortStop(u32 portNum) s32 cellAudioGetPortTimestamp(u32 portNum, u64 tag, vm::ptr stamp) { - cellAudio.Log("cellAudioGetPortTimestamp(portNum=%d, tag=0x%llx, stamp=*0x%x)", portNum, tag, stamp); + cellAudio.trace("cellAudioGetPortTimestamp(portNum=%d, tag=0x%llx, stamp=*0x%x)", portNum, tag, stamp); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -658,7 +658,7 @@ s32 cellAudioGetPortTimestamp(u32 portNum, u64 tag, vm::ptr stamp) s32 cellAudioGetPortBlockTag(u32 portNum, u64 blockNo, vm::ptr tag) { - cellAudio.Log("cellAudioGetPortBlockTag(portNum=%d, blockNo=0x%llx, tag=*0x%x)", portNum, blockNo, tag); + cellAudio.trace("cellAudioGetPortBlockTag(portNum=%d, blockNo=0x%llx, tag=*0x%x)", portNum, blockNo, tag); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -699,7 +699,7 @@ s32 cellAudioGetPortBlockTag(u32 portNum, u64 blockNo, vm::ptr tag) s32 cellAudioSetPortLevel(u32 portNum, float level) { - cellAudio.Log("cellAudioSetPortLevel(portNum=%d, level=%f)", portNum, level); + cellAudio.trace("cellAudioSetPortLevel(portNum=%d, level=%f)", portNum, level); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -724,7 +724,7 @@ s32 cellAudioSetPortLevel(u32 portNum, float level) } else { - cellAudio.Todo("cellAudioSetPortLevel(%d): negative level value (%f)", portNum, level); + cellAudio.todo("cellAudioSetPortLevel(%d): negative level value (%f)", portNum, level); } return CELL_OK; @@ -732,7 +732,7 @@ s32 cellAudioSetPortLevel(u32 portNum, float level) s32 cellAudioCreateNotifyEventQueue(vm::ptr id, vm::ptr key) { - cellAudio.Warning("cellAudioCreateNotifyEventQueue(id=*0x%x, key=*0x%x)", id, key); + cellAudio.warning("cellAudioCreateNotifyEventQueue(id=*0x%x, key=*0x%x)", id, key); for (u64 k = 0; k < 100; k++) { @@ -753,7 +753,7 @@ s32 cellAudioCreateNotifyEventQueue(vm::ptr id, vm::ptr key) s32 cellAudioCreateNotifyEventQueueEx(vm::ptr id, vm::ptr key, u32 iFlags) { - cellAudio.Todo("cellAudioCreateNotifyEventQueueEx(id=*0x%x, key=*0x%x, iFlags=0x%x)", id, key, iFlags); + cellAudio.todo("cellAudioCreateNotifyEventQueueEx(id=*0x%x, key=*0x%x, iFlags=0x%x)", id, key, iFlags); if (iFlags & ~CELL_AUDIO_CREATEEVENTFLAG_SPU) { @@ -767,7 +767,7 @@ s32 cellAudioCreateNotifyEventQueueEx(vm::ptr id, vm::ptr key, u32 iFl s32 cellAudioSetNotifyEventQueue(u64 key) { - cellAudio.Warning("cellAudioSetNotifyEventQueue(key=0x%llx)", key); + cellAudio.warning("cellAudioSetNotifyEventQueue(key=0x%llx)", key); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -791,7 +791,7 @@ s32 cellAudioSetNotifyEventQueue(u64 key) s32 cellAudioSetNotifyEventQueueEx(u64 key, u32 iFlags) { - cellAudio.Todo("cellAudioSetNotifyEventQueueEx(key=0x%llx, iFlags=0x%x)", key, iFlags); + cellAudio.todo("cellAudioSetNotifyEventQueueEx(key=0x%llx, iFlags=0x%x)", key, iFlags); // TODO @@ -800,7 +800,7 @@ s32 cellAudioSetNotifyEventQueueEx(u64 key, u32 iFlags) s32 cellAudioRemoveNotifyEventQueue(u64 key) { - cellAudio.Warning("cellAudioRemoveNotifyEventQueue(key=0x%llx)", key); + cellAudio.warning("cellAudioRemoveNotifyEventQueue(key=0x%llx)", key); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -824,7 +824,7 @@ s32 cellAudioRemoveNotifyEventQueue(u64 key) s32 cellAudioRemoveNotifyEventQueueEx(u64 key, u32 iFlags) { - cellAudio.Todo("cellAudioRemoveNotifyEventQueueEx(key=0x%llx, iFlags=0x%x)", key, iFlags); + cellAudio.todo("cellAudioRemoveNotifyEventQueueEx(key=0x%llx, iFlags=0x%x)", key, iFlags); // TODO @@ -833,7 +833,7 @@ s32 cellAudioRemoveNotifyEventQueueEx(u64 key, u32 iFlags) s32 cellAudioAddData(u32 portNum, vm::ptr src, u32 samples, float volume) { - cellAudio.Log("cellAudioAddData(portNum=%d, src=*0x%x, samples=%d, volume=%f)", portNum, src, samples, volume); + cellAudio.trace("cellAudioAddData(portNum=%d, src=*0x%x, samples=%d, volume=%f)", portNum, src, samples, volume); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -848,7 +848,7 @@ s32 cellAudioAddData(u32 portNum, vm::ptr src, u32 samples, float volume) if (samples != 256) { // despite the docs, seems that only fixed value is supported - cellAudio.Error("cellAudioAddData(): invalid samples value (%d)", samples); + cellAudio.error("cellAudioAddData(): invalid samples value (%d)", samples); return CELL_AUDIO_ERROR_PARAM; } @@ -866,7 +866,7 @@ s32 cellAudioAddData(u32 portNum, vm::ptr src, u32 samples, float volume) s32 cellAudioAdd2chData(u32 portNum, vm::ptr src, u32 samples, float volume) { - cellAudio.Log("cellAudioAdd2chData(portNum=%d, src=*0x%x, samples=%d, volume=%f)", portNum, src, samples, volume); + cellAudio.trace("cellAudioAdd2chData(portNum=%d, src=*0x%x, samples=%d, volume=%f)", portNum, src, samples, volume); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -881,7 +881,7 @@ s32 cellAudioAdd2chData(u32 portNum, vm::ptr src, u32 samples, float volu if (samples != 256) { // despite the docs, seems that only fixed value is supported - cellAudio.Error("cellAudioAdd2chData(): invalid samples value (%d)", samples); + cellAudio.error("cellAudioAdd2chData(): invalid samples value (%d)", samples); return CELL_AUDIO_ERROR_PARAM; } @@ -891,7 +891,7 @@ s32 cellAudioAdd2chData(u32 portNum, vm::ptr src, u32 samples, float volu if (port.channel == 2) { - cellAudio.Error("cellAudioAdd2chData(portNum=%d): port.channel = 2", portNum); + cellAudio.error("cellAudioAdd2chData(portNum=%d): port.channel = 2", portNum); } else if (port.channel == 6) { @@ -921,7 +921,7 @@ s32 cellAudioAdd2chData(u32 portNum, vm::ptr src, u32 samples, float volu } else { - cellAudio.Error("cellAudioAdd2chData(portNum=%d): invalid port.channel value (%d)", portNum, port.channel); + cellAudio.error("cellAudioAdd2chData(portNum=%d): invalid port.channel value (%d)", portNum, port.channel); } return CELL_OK; @@ -929,7 +929,7 @@ s32 cellAudioAdd2chData(u32 portNum, vm::ptr src, u32 samples, float volu s32 cellAudioAdd6chData(u32 portNum, vm::ptr src, float volume) { - cellAudio.Log("cellAudioAdd6chData(portNum=%d, src=*0x%x, volume=%f)", portNum, src, volume); + cellAudio.trace("cellAudioAdd6chData(portNum=%d, src=*0x%x, volume=%f)", portNum, src, volume); if (g_audio.state != AUDIO_STATE_INITIALIZED) { @@ -947,7 +947,7 @@ s32 cellAudioAdd6chData(u32 portNum, vm::ptr src, float volume) if (port.channel == 2 || port.channel == 6) { - cellAudio.Error("cellAudioAdd2chData(portNum=%d): port.channel = %d", portNum, port.channel); + cellAudio.error("cellAudioAdd2chData(portNum=%d): port.channel = %d", portNum, port.channel); } else if (port.channel == 8) { @@ -965,7 +965,7 @@ s32 cellAudioAdd6chData(u32 portNum, vm::ptr src, float volume) } else { - cellAudio.Error("cellAudioAdd6chData(portNum=%d): invalid port.channel value (%d)", portNum, port.channel); + cellAudio.error("cellAudioAdd6chData(portNum=%d): invalid port.channel value (%d)", portNum, port.channel); } return CELL_OK; @@ -973,25 +973,25 @@ s32 cellAudioAdd6chData(u32 portNum, vm::ptr src, float volume) s32 cellAudioMiscSetAccessoryVolume(u32 devNum, float volume) { - cellAudio.Todo("cellAudioMiscSetAccessoryVolume(devNum=%d, volume=%f)", devNum, volume); + cellAudio.todo("cellAudioMiscSetAccessoryVolume(devNum=%d, volume=%f)", devNum, volume); return CELL_OK; } s32 cellAudioSendAck(u64 data3) { - cellAudio.Todo("cellAudioSendAck(data3=0x%llx)", data3); + cellAudio.todo("cellAudioSendAck(data3=0x%llx)", data3); return CELL_OK; } s32 cellAudioSetPersonalDevice(s32 iPersonalStream, s32 iDevice) { - cellAudio.Todo("cellAudioSetPersonalDevice(iPersonalStream=%d, iDevice=%d)", iPersonalStream, iDevice); + cellAudio.todo("cellAudioSetPersonalDevice(iPersonalStream=%d, iDevice=%d)", iPersonalStream, iDevice); return CELL_OK; } s32 cellAudioUnsetPersonalDevice(s32 iPersonalStream) { - cellAudio.Todo("cellAudioUnsetPersonalDevice(iPersonalStream=%d)", iPersonalStream); + cellAudio.todo("cellAudioUnsetPersonalDevice(iPersonalStream=%d)", iPersonalStream); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellAudioOut.cpp b/rpcs3/Emu/SysCalls/Modules/cellAudioOut.cpp index bc58d4d983..0734bee4b8 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAudioOut.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellAudioOut.cpp @@ -8,7 +8,7 @@ extern Module<> cellSysutil; s32 cellAudioOutGetSoundAvailability(u32 audioOut, u32 type, u32 fs, u32 option) { - cellSysutil.Warning("cellAudioOutGetSoundAvailability(audioOut=%d, type=%d, fs=0x%x, option=%d)", audioOut, type, fs, option); + cellSysutil.warning("cellAudioOutGetSoundAvailability(audioOut=%d, type=%d, fs=0x%x, option=%d)", audioOut, type, fs, option); option = 0; @@ -48,7 +48,7 @@ s32 cellAudioOutGetSoundAvailability(u32 audioOut, u32 type, u32 fs, u32 option) s32 cellAudioOutGetSoundAvailability2(u32 audioOut, u32 type, u32 fs, u32 ch, u32 option) { - cellSysutil.Warning("cellAudioOutGetSoundAvailability2(audioOut=%d, type=%d, fs=0x%x, ch=%d, option=%d)", audioOut, type, fs, ch, option); + cellSysutil.warning("cellAudioOutGetSoundAvailability2(audioOut=%d, type=%d, fs=0x%x, ch=%d, option=%d)", audioOut, type, fs, ch, option); option = 0; @@ -97,7 +97,7 @@ s32 cellAudioOutGetSoundAvailability2(u32 audioOut, u32 type, u32 fs, u32 ch, u3 s32 cellAudioOutGetState(u32 audioOut, u32 deviceIndex, vm::ptr state) { - cellSysutil.Warning("cellAudioOutGetState(audioOut=0x%x, deviceIndex=0x%x, state=*0x%x)", audioOut, deviceIndex, state); + cellSysutil.warning("cellAudioOutGetState(audioOut=0x%x, deviceIndex=0x%x, state=*0x%x)", audioOut, deviceIndex, state); *state = {}; @@ -126,7 +126,7 @@ s32 cellAudioOutGetState(u32 audioOut, u32 deviceIndex, vm::ptr config, vm::ptr option, u32 waitForEvent) { - cellSysutil.Warning("cellAudioOutConfigure(audioOut=%d, config=*0x%x, option=*0x%x, waitForEvent=%d)", audioOut, config, option, waitForEvent); + cellSysutil.warning("cellAudioOutConfigure(audioOut=%d, config=*0x%x, option=*0x%x, waitForEvent=%d)", audioOut, config, option, waitForEvent); switch (audioOut) { @@ -154,7 +154,7 @@ s32 cellAudioOutConfigure(u32 audioOut, vm::ptr confi s32 cellAudioOutGetConfiguration(u32 audioOut, vm::ptr config, vm::ptr option) { - cellSysutil.Warning("cellAudioOutGetConfiguration(audioOut=%d, config=*0x%x, option=*0x%x)", audioOut, config, option); + cellSysutil.warning("cellAudioOutGetConfiguration(audioOut=%d, config=*0x%x, option=*0x%x)", audioOut, config, option); if (option) *option = {}; *config = {}; @@ -178,7 +178,7 @@ s32 cellAudioOutGetConfiguration(u32 audioOut, vm::ptr info) { - cellSysutil.Todo("cellAudioOutGetDeviceInfo(audioOut=%d, deviceIndex=%d, info=*0x%x)", audioOut, deviceIndex, info); + cellSysutil.todo("cellAudioOutGetDeviceInfo(audioOut=%d, deviceIndex=%d, info=*0x%x)", audioOut, deviceIndex, info); if (deviceIndex) return CELL_AUDIO_OUT_ERROR_DEVICE_NOT_FOUND; @@ -209,7 +209,7 @@ s32 cellAudioOutGetDeviceInfo(u32 audioOut, u32 deviceIndex, vm::ptr gamma) { - cellAvconfExt.Warning("cellVideoOutGetGamma(videoOut=%d, gamma=*0x%x)", videoOut, gamma); + cellAvconfExt.warning("cellVideoOutGetGamma(videoOut=%d, gamma=*0x%x)", videoOut, gamma); if (videoOut != CELL_VIDEO_OUT_PRIMARY) { @@ -67,7 +67,7 @@ s32 cellAudioOutGetAvailableDeviceInfo() s32 cellVideoOutSetGamma(u32 videoOut, f32 gamma) { - cellAvconfExt.Warning("cellVideoOutSetGamma(videoOut=%d, gamma=%f)", videoOut, gamma); + cellAvconfExt.warning("cellVideoOutSetGamma(videoOut=%d, gamma=%f)", videoOut, gamma); if (videoOut != CELL_VIDEO_OUT_PRIMARY) { @@ -111,7 +111,7 @@ s32 cellAudioInUnregisterDevice() s32 cellVideoOutGetScreenSize(u32 videoOut, vm::ptr screenSize) { - cellAvconfExt.Warning("cellVideoOutGetScreenSize(videoOut=%d, screenSize=*0x%x)", videoOut, screenSize); + cellAvconfExt.warning("cellVideoOutGetScreenSize(videoOut=%d, screenSize=*0x%x)", videoOut, screenSize); if (videoOut != CELL_VIDEO_OUT_PRIMARY) { diff --git a/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp b/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp index e874818cbf..e0c194ebac 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp @@ -80,7 +80,7 @@ struct camera_t s32 cellCameraInit() { - cellCamera.Warning("cellCameraInit()"); + cellCamera.warning("cellCameraInit()"); if (rpcs3::config.io.camera.value() == io_camera_state::null) { @@ -146,7 +146,7 @@ s32 cellCameraInit() s32 cellCameraEnd() { - cellCamera.Warning("cellCameraEnd()"); + cellCamera.warning("cellCameraEnd()"); if (!fxm::remove()) { @@ -182,7 +182,7 @@ s32 cellCameraGetDeviceGUID(s32 dev_num, vm::ptr guid) s32 cellCameraGetType(s32 dev_num, vm::ptr type) { - cellCamera.Warning("cellCameraGetType(dev_num=%d, type=*0x%x)", dev_num, type); + cellCamera.warning("cellCameraGetType(dev_num=%d, type=*0x%x)", dev_num, type); const auto camera = fxm::get(); @@ -204,13 +204,13 @@ s32 cellCameraGetType(s32 dev_num, vm::ptr type) s32 cellCameraIsAvailable(s32 dev_num) { - cellCamera.Todo("cellCameraIsAvailable(dev_num=%d)", dev_num); + cellCamera.todo("cellCameraIsAvailable(dev_num=%d)", dev_num); return CELL_OK; } s32 cellCameraIsAttached(s32 dev_num) { - cellCamera.Warning("cellCameraIsAttached(dev_num=%d)", dev_num); + cellCamera.warning("cellCameraIsAttached(dev_num=%d)", dev_num); if (rpcs3::config.io.camera.value() == io_camera_state::connected) { @@ -222,19 +222,19 @@ s32 cellCameraIsAttached(s32 dev_num) s32 cellCameraIsOpen(s32 dev_num) { - cellCamera.Todo("cellCameraIsOpen(dev_num=%d)", dev_num); + cellCamera.todo("cellCameraIsOpen(dev_num=%d)", dev_num); return CELL_OK; } s32 cellCameraIsStarted(s32 dev_num) { - cellCamera.Todo("cellCameraIsStarted(dev_num=%d)", dev_num); + cellCamera.todo("cellCameraIsStarted(dev_num=%d)", dev_num); return CELL_OK; } s32 cellCameraGetAttribute(s32 dev_num, s32 attrib, vm::ptr arg1, vm::ptr arg2) { - cellCamera.Warning("cellCameraGetAttribute(dev_num=%d, attrib=%d, arg1=*0x%x, arg2=*0x%x)", dev_num, attrib, arg1, arg2); + cellCamera.warning("cellCameraGetAttribute(dev_num=%d, attrib=%d, arg1=*0x%x, arg2=*0x%x)", dev_num, attrib, arg1, arg2); const auto attr_name = get_camera_attr_name(attrib); @@ -258,7 +258,7 @@ s32 cellCameraGetAttribute(s32 dev_num, s32 attrib, vm::ptr arg1, vm::ptr lock(m_mutex); if (released >= put_count) { - cellDmux.Error("es::release() error: buffer is empty"); + cellDmux.error("es::release() error: buffer is empty"); Emu.Pause(); return false; } if (released >= got_count) { - cellDmux.Error("es::release() error: buffer has not been seen yet"); + cellDmux.error("es::release() error: buffer has not been seen yet"); Emu.Pause(); return false; } @@ -221,7 +221,7 @@ bool ElementaryStream::release() u32 addr = 0; if (!entries.pop(addr, &dmux->is_closed) || !addr) { - cellDmux.Error("es::release() error: entries.Pop() failed"); + cellDmux.error("es::release() error: entries.Pop() failed"); Emu.Pause(); return false; } @@ -235,7 +235,7 @@ bool ElementaryStream::peek(u32& out_data, bool no_ex, u32& out_spec, bool updat std::lock_guard lock(m_mutex); if (got_count < released) { - cellDmux.Error("es::peek() error: got_count(%d) < released(%d) (put_count=%d)", got_count, released, put_count); + cellDmux.error("es::peek() error: got_count(%d) < released(%d) (put_count=%d)", got_count, released, put_count); Emu.Pause(); return false; } @@ -247,7 +247,7 @@ bool ElementaryStream::peek(u32& out_data, bool no_ex, u32& out_spec, bool updat u32 addr = 0; if (!entries.peek(addr, got_count - released, &dmux->is_closed) || !addr) { - cellDmux.Error("es::peek() error: entries.Peek() failed"); + cellDmux.error("es::peek() error: entries.Peek() failed"); Emu.Pause(); return false; } @@ -292,7 +292,7 @@ void dmuxQueryEsAttr(u32 info /* may be 0 */, vm::cptr esFi attr->memSize = 0x7000; // 0x73d9 from ps3 } - cellDmux.Warning("*** filter(0x%x, 0x%x, 0x%x, 0x%x)", esFilterId->filterIdMajor, esFilterId->filterIdMinor, esFilterId->supplementalInfo1, esFilterId->supplementalInfo2); + cellDmux.warning("*** filter(0x%x, 0x%x, 0x%x, 0x%x)", esFilterId->filterIdMajor, esFilterId->filterIdMinor, esFilterId->supplementalInfo1, esFilterId->supplementalInfo2); } void dmuxOpen(u32 dmux_id) // TODO: call from the constructor @@ -400,7 +400,7 @@ void dmuxOpen(u32 dmux_id) // TODO: call from the constructor stream.skip(4); stream.get(len); - cellDmux.Notice("PRIVATE_STREAM_2 (%d)", len); + cellDmux.notice("PRIVATE_STREAM_2 (%d)", len); if (!stream.check(len)) { @@ -491,7 +491,7 @@ void dmuxOpen(u32 dmux_id) // TODO: call from the constructor es.push_au(frame_size + 8, es.last_dts, es.last_pts, stream.userdata, false /* TODO: set correct value */, 0); - //cellDmux.Notice("ATX AU pushed (ats=0x%llx, frame_size=%d)", *(be_t*)data, frame_size); + //cellDmux.notice("ATX AU pushed (ats=0x%llx, frame_size=%d)", *(be_t*)data, frame_size); auto esMsg = vm::ptr::make(dmux.memAddr + (cb_add ^= 16)); esMsg->msgType = CELL_DMUX_ES_MSG_TYPE_AU_FOUND; @@ -501,7 +501,7 @@ void dmuxOpen(u32 dmux_id) // TODO: call from the constructor } else { - cellDmux.Notice("PRIVATE_STREAM_1 (len=%d, fid_minor=0x%x)", len, fid_minor); + cellDmux.notice("PRIVATE_STREAM_1 (len=%d, fid_minor=0x%x)", len, fid_minor); stream.skip(len); } break; @@ -578,7 +578,7 @@ void dmuxOpen(u32 dmux_id) // TODO: call from the constructor } else { - cellDmux.Notice("Video stream (code=0x%x, len=%d)", code, len); + cellDmux.notice("Video stream (code=0x%x, len=%d)", code, len); stream.skip(len); } break; @@ -611,7 +611,7 @@ void dmuxOpen(u32 dmux_id) // TODO: call from the constructor { if (task.stream.discontinuity) { - cellDmux.Warning("dmuxSetStream (beginning)"); + cellDmux.warning("dmuxSetStream (beginning)"); for (u32 i = 0; i < sizeof(esALL) / sizeof(esALL[0]); i++) { if (esALL[i]) @@ -730,7 +730,7 @@ void dmuxOpen(u32 dmux_id) // TODO: call from the constructor if (es.raw_data.size()) { - cellDmux.Error("dmuxFlushEs: 0x%x bytes lost (es_id=%d)", (u32)es.raw_data.size(), es.id); + cellDmux.error("dmuxFlushEs: 0x%x bytes lost (es_id=%d)", (u32)es.raw_data.size(), es.id); } // callback @@ -768,7 +768,7 @@ void dmuxOpen(u32 dmux_id) // TODO: call from the constructor s32 cellDmuxQueryAttr(vm::cptr type, vm::ptr attr) { - cellDmux.Warning("cellDmuxQueryAttr(type=*0x%x, attr=*0x%x)", type, attr); + cellDmux.warning("cellDmuxQueryAttr(type=*0x%x, attr=*0x%x)", type, attr); if (type->streamType != CELL_DMUX_STREAM_TYPE_PAMF) { @@ -781,7 +781,7 @@ s32 cellDmuxQueryAttr(vm::cptr type, vm::ptr attr) s32 cellDmuxQueryAttr2(vm::cptr type2, vm::ptr attr) { - cellDmux.Warning("cellDmuxQueryAttr2(demuxerType2=*0x%x, demuxerAttr=*0x%x)", type2, attr); + cellDmux.warning("cellDmuxQueryAttr2(demuxerType2=*0x%x, demuxerAttr=*0x%x)", type2, attr); if (type2->streamType != CELL_DMUX_STREAM_TYPE_PAMF) { @@ -794,7 +794,7 @@ s32 cellDmuxQueryAttr2(vm::cptr type2, vm::ptr attr s32 cellDmuxOpen(vm::cptr type, vm::cptr res, vm::cptr cb, vm::ptr handle) { - cellDmux.Warning("cellDmuxOpen(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); + cellDmux.warning("cellDmuxOpen(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); if (type->streamType != CELL_DMUX_STREAM_TYPE_PAMF) { @@ -810,7 +810,7 @@ s32 cellDmuxOpen(vm::cptr type, vm::cptr res, vm s32 cellDmuxOpenEx(vm::cptr type, vm::cptr resEx, vm::cptr cb, vm::ptr handle) { - cellDmux.Warning("cellDmuxOpenEx(type=*0x%x, resEx=*0x%x, cb=*0x%x, handle=*0x%x)", type, resEx, cb, handle); + cellDmux.warning("cellDmuxOpenEx(type=*0x%x, resEx=*0x%x, cb=*0x%x, handle=*0x%x)", type, resEx, cb, handle); if (type->streamType != CELL_DMUX_STREAM_TYPE_PAMF) { @@ -826,14 +826,14 @@ s32 cellDmuxOpenEx(vm::cptr type, vm::cptr res s32 cellDmuxOpenExt(vm::cptr type, vm::cptr resEx, vm::cptr cb, vm::ptr handle) { - cellDmux.Warning("cellDmuxOpenExt(type=*0x%x, resEx=*0x%x, cb=*0x%x, handle=*0x%x)", type, resEx, cb, handle); + cellDmux.warning("cellDmuxOpenExt(type=*0x%x, resEx=*0x%x, cb=*0x%x, handle=*0x%x)", type, resEx, cb, handle); return cellDmuxOpenEx(type, resEx, cb, handle); } s32 cellDmuxOpen2(vm::cptr type2, vm::cptr res2, vm::cptr cb, vm::ptr handle) { - cellDmux.Warning("cellDmuxOpen2(type2=*0x%x, res2=*0x%x, cb=*0x%x, handle=*0x%x)", type2, res2, cb, handle); + cellDmux.warning("cellDmuxOpen2(type2=*0x%x, res2=*0x%x, cb=*0x%x, handle=*0x%x)", type2, res2, cb, handle); if (type2->streamType != CELL_DMUX_STREAM_TYPE_PAMF) { @@ -849,7 +849,7 @@ s32 cellDmuxOpen2(vm::cptr type2, vm::cptr res s32 cellDmuxClose(u32 handle) { - cellDmux.Warning("cellDmuxClose(handle=0x%x)", handle); + cellDmux.warning("cellDmuxClose(handle=0x%x)", handle); const auto dmux = idm::get(handle); @@ -865,7 +865,7 @@ s32 cellDmuxClose(u32 handle) { if (Emu.IsStopped()) { - cellDmux.Warning("cellDmuxClose(%d) aborted", handle); + cellDmux.warning("cellDmuxClose(%d) aborted", handle); return CELL_OK; } @@ -879,7 +879,7 @@ s32 cellDmuxClose(u32 handle) s32 cellDmuxSetStream(u32 handle, u32 streamAddress, u32 streamSize, b8 discontinuity, u64 userData) { - cellDmux.Log("cellDmuxSetStream(handle=0x%x, streamAddress=0x%x, streamSize=%d, discontinuity=%d, userData=0x%llx)", handle, streamAddress, streamSize, discontinuity, userData); + cellDmux.trace("cellDmuxSetStream(handle=0x%x, streamAddress=0x%x, streamSize=%d, discontinuity=%d, userData=0x%llx)", handle, streamAddress, streamSize, discontinuity, userData); const auto dmux = idm::get(handle); @@ -907,7 +907,7 @@ s32 cellDmuxSetStream(u32 handle, u32 streamAddress, u32 streamSize, b8 disconti s32 cellDmuxResetStream(u32 handle) { - cellDmux.Warning("cellDmuxResetStream(handle=0x%x)", handle); + cellDmux.warning("cellDmuxResetStream(handle=0x%x)", handle); const auto dmux = idm::get(handle); @@ -922,7 +922,7 @@ s32 cellDmuxResetStream(u32 handle) s32 cellDmuxResetStreamAndWaitDone(u32 handle) { - cellDmux.Warning("cellDmuxResetStreamAndWaitDone(handle=0x%x)", handle); + cellDmux.warning("cellDmuxResetStreamAndWaitDone(handle=0x%x)", handle); const auto dmux = idm::get(handle); @@ -944,7 +944,7 @@ s32 cellDmuxResetStreamAndWaitDone(u32 handle) { if (Emu.IsStopped()) { - cellDmux.Warning("cellDmuxResetStreamAndWaitDone(%d) aborted", handle); + cellDmux.warning("cellDmuxResetStreamAndWaitDone(%d) aborted", handle); return CELL_OK; } std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack @@ -955,7 +955,7 @@ s32 cellDmuxResetStreamAndWaitDone(u32 handle) s32 cellDmuxQueryEsAttr(vm::cptr type, vm::cptr esFilterId, u32 esSpecificInfo, vm::ptr esAttr) { - cellDmux.Warning("cellDmuxQueryEsAttr(demuxerType=*0x%x, esFilterId=*0x%x, esSpecificInfo=*0x%x, esAttr=*0x%x)", type, esFilterId, esSpecificInfo, esAttr); + cellDmux.warning("cellDmuxQueryEsAttr(demuxerType=*0x%x, esFilterId=*0x%x, esSpecificInfo=*0x%x, esAttr=*0x%x)", type, esFilterId, esSpecificInfo, esAttr); if (type->streamType != CELL_DMUX_STREAM_TYPE_PAMF) { @@ -969,7 +969,7 @@ s32 cellDmuxQueryEsAttr(vm::cptr type, vm::cptr type2, vm::cptr esFilterId, u32 esSpecificInfo, vm::ptr esAttr) { - cellDmux.Warning("cellDmuxQueryEsAttr2(type2=*0x%x, esFilterId=*0x%x, esSpecificInfo=*0x%x, esAttr=*0x%x)", type2, esFilterId, esSpecificInfo, esAttr); + cellDmux.warning("cellDmuxQueryEsAttr2(type2=*0x%x, esFilterId=*0x%x, esSpecificInfo=*0x%x, esAttr=*0x%x)", type2, esFilterId, esSpecificInfo, esAttr); if (type2->streamType != CELL_DMUX_STREAM_TYPE_PAMF) { @@ -983,7 +983,7 @@ s32 cellDmuxQueryEsAttr2(vm::cptr type2, vm::cptr esFilterId, vm::cptr esResourceInfo, vm::cptr esCb, u32 esSpecificInfo, vm::ptr esHandle) { - cellDmux.Warning("cellDmuxEnableEs(handle=0x%x, esFilterId=*0x%x, esResourceInfo=*0x%x, esCb=*0x%x, esSpecificInfo=*0x%x, esHandle=*0x%x)", handle, esFilterId, esResourceInfo, esCb, esSpecificInfo, esHandle); + cellDmux.warning("cellDmuxEnableEs(handle=0x%x, esFilterId=*0x%x, esResourceInfo=*0x%x, esCb=*0x%x, esSpecificInfo=*0x%x, esHandle=*0x%x)", handle, esFilterId, esResourceInfo, esCb, esSpecificInfo, esHandle); const auto dmux = idm::get(handle); @@ -1000,7 +1000,7 @@ s32 cellDmuxEnableEs(u32 handle, vm::cptr esFilterId, vm::c *esHandle = es->id; - cellDmux.Warning("*** New ES(dmux=0x%x, addr=0x%x, size=0x%x, filter={0x%x, 0x%x, 0x%x, 0x%x}, cb=0x%x, arg=0x%x, spec=0x%x): id = 0x%x", + cellDmux.warning("*** New ES(dmux=0x%x, addr=0x%x, size=0x%x, filter={0x%x, 0x%x, 0x%x, 0x%x}, cb=0x%x, arg=0x%x, spec=0x%x): id = 0x%x", handle, es->memAddr, es->memSize, es->fidMajor, es->fidMinor, es->sup1, es->sup2, es->cbFunc, es->cbArg, es->spec, es->id); DemuxerTask task(dmuxEnableEs); @@ -1013,7 +1013,7 @@ s32 cellDmuxEnableEs(u32 handle, vm::cptr esFilterId, vm::c s32 cellDmuxDisableEs(u32 esHandle) { - cellDmux.Warning("cellDmuxDisableEs(esHandle=0x%x)", esHandle); + cellDmux.warning("cellDmuxDisableEs(esHandle=0x%x)", esHandle); const auto es = idm::get(esHandle); @@ -1032,7 +1032,7 @@ s32 cellDmuxDisableEs(u32 esHandle) s32 cellDmuxResetEs(u32 esHandle) { - cellDmux.Log("cellDmuxResetEs(esHandle=0x%x)", esHandle); + cellDmux.trace("cellDmuxResetEs(esHandle=0x%x)", esHandle); const auto es = idm::get(esHandle); @@ -1051,7 +1051,7 @@ s32 cellDmuxResetEs(u32 esHandle) s32 cellDmuxGetAu(u32 esHandle, vm::ptr auInfo, vm::ptr auSpecificInfo) { - cellDmux.Log("cellDmuxGetAu(esHandle=0x%x, auInfo=**0x%x, auSpecificInfo=**0x%x)", esHandle, auInfo, auSpecificInfo); + cellDmux.trace("cellDmuxGetAu(esHandle=0x%x, auInfo=**0x%x, auSpecificInfo=**0x%x)", esHandle, auInfo, auSpecificInfo); const auto es = idm::get(esHandle); @@ -1074,7 +1074,7 @@ s32 cellDmuxGetAu(u32 esHandle, vm::ptr auInfo, vm::ptr auSpecificInfo s32 cellDmuxPeekAu(u32 esHandle, vm::ptr auInfo, vm::ptr auSpecificInfo) { - cellDmux.Log("cellDmuxPeekAu(esHandle=0x%x, auInfo=**0x%x, auSpecificInfo=**0x%x)", esHandle, auInfo, auSpecificInfo); + cellDmux.trace("cellDmuxPeekAu(esHandle=0x%x, auInfo=**0x%x, auSpecificInfo=**0x%x)", esHandle, auInfo, auSpecificInfo); const auto es = idm::get(esHandle); @@ -1097,7 +1097,7 @@ s32 cellDmuxPeekAu(u32 esHandle, vm::ptr auInfo, vm::ptr auSpecificInf s32 cellDmuxGetAuEx(u32 esHandle, vm::ptr auInfoEx, vm::ptr auSpecificInfo) { - cellDmux.Log("cellDmuxGetAuEx(esHandle=0x%x, auInfoEx=**0x%x, auSpecificInfo=**0x%x)", esHandle, auInfoEx, auSpecificInfo); + cellDmux.trace("cellDmuxGetAuEx(esHandle=0x%x, auInfoEx=**0x%x, auSpecificInfo=**0x%x)", esHandle, auInfoEx, auSpecificInfo); const auto es = idm::get(esHandle); @@ -1120,7 +1120,7 @@ s32 cellDmuxGetAuEx(u32 esHandle, vm::ptr auInfoEx, vm::ptr auSpecific s32 cellDmuxPeekAuEx(u32 esHandle, vm::ptr auInfoEx, vm::ptr auSpecificInfo) { - cellDmux.Log("cellDmuxPeekAuEx(esHandle=0x%x, auInfoEx=**0x%x, auSpecificInfo=**0x%x)", esHandle, auInfoEx, auSpecificInfo); + cellDmux.trace("cellDmuxPeekAuEx(esHandle=0x%x, auInfoEx=**0x%x, auSpecificInfo=**0x%x)", esHandle, auInfoEx, auSpecificInfo); const auto es = idm::get(esHandle); @@ -1143,7 +1143,7 @@ s32 cellDmuxPeekAuEx(u32 esHandle, vm::ptr auInfoEx, vm::ptr auSpecifi s32 cellDmuxReleaseAu(u32 esHandle) { - cellDmux.Log("cellDmuxReleaseAu(esHandle=0x%x)", esHandle); + cellDmux.trace("cellDmuxReleaseAu(esHandle=0x%x)", esHandle); const auto es = idm::get(esHandle); @@ -1161,7 +1161,7 @@ s32 cellDmuxReleaseAu(u32 esHandle) s32 cellDmuxFlushEs(u32 esHandle) { - cellDmux.Warning("cellDmuxFlushEs(esHandle=0x%x)", esHandle); + cellDmux.warning("cellDmuxFlushEs(esHandle=0x%x)", esHandle); const auto es = idm::get(esHandle); diff --git a/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp b/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp index 345db211f3..906b8d5184 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp @@ -81,7 +81,7 @@ s32 cellFiberPpuJoinFiber() vm::ptr cellFiberPpuSelf() { - cellFiber.Log("cellFiberPpuSelf() -> nullptr"); // TODO + cellFiber.trace("cellFiberPpuSelf() -> nullptr"); // TODO // returns fiber structure (zero for simple PPU thread) return vm::null; diff --git a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp index 749956f4cb..dff5cbb589 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp @@ -11,7 +11,7 @@ extern Module<> cellFont; // Functions s32 cellFontInitializeWithRevision(u64 revisionFlags, vm::ptr config) { - cellFont.Warning("cellFontInitializeWithRevision(revisionFlags=0x%llx, config=*0x%x)", revisionFlags, config); + cellFont.warning("cellFontInitializeWithRevision(revisionFlags=0x%llx, config=*0x%x)", revisionFlags, config); if (config->fc_size < 24) { @@ -20,7 +20,7 @@ s32 cellFontInitializeWithRevision(u64 revisionFlags, vm::ptr co if (config->flags != 0) { - cellFont.Error("cellFontInitializeWithRevision: Unknown flags (0x%x)", config->flags); + cellFont.error("cellFontInitializeWithRevision: Unknown flags (0x%x)", config->flags); } return CELL_OK; @@ -34,20 +34,20 @@ s32 cellFontGetRevisionFlags(vm::ptr revisionFlags) s32 cellFontEnd() { - cellFont.Warning("cellFontEnd()"); + cellFont.warning("cellFontEnd()"); return CELL_OK; } s32 cellFontSetFontsetOpenMode(u32 openMode) { - cellFont.Todo("cellFontSetFontsetOpenMode(openMode=0x%x)", openMode); + cellFont.todo("cellFontSetFontsetOpenMode(openMode=0x%x)", openMode); return CELL_OK; } s32 cellFontOpenFontMemory(vm::ptr library, u32 fontAddr, u32 fontSize, u32 subNum, u32 uniqueId, vm::ptr font) { - cellFont.Warning("cellFontOpenFontMemory(library=*0x%x, fontAddr=0x%x, fontSize=%d, subNum=%d, uniqueId=%d, font=*0x%x)", library, fontAddr, fontSize, subNum, uniqueId, font); + cellFont.warning("cellFontOpenFontMemory(library=*0x%x, fontAddr=0x%x, fontSize=%d, subNum=%d, uniqueId=%d, font=*0x%x)", library, fontAddr, fontSize, subNum, uniqueId, font); font->stbfont = (stbtt_fontinfo*)((u8*)&(font->stbfont) + sizeof(void*)); // hack: use next bytes of the struct @@ -63,7 +63,7 @@ s32 cellFontOpenFontMemory(vm::ptr library, u32 fontAddr, u32 f s32 cellFontOpenFontFile(vm::ptr library, vm::cptr fontPath, u32 subNum, s32 uniqueId, vm::ptr font) { - cellFont.Warning("cellFontOpenFontFile(library=*0x%x, fontPath=*0x%x, subNum=%d, uniqueId=%d, font=*0x%x)", library, fontPath, subNum, uniqueId, font); + cellFont.warning("cellFontOpenFontFile(library=*0x%x, fontPath=*0x%x, subNum=%d, uniqueId=%d, font=*0x%x)", library, fontPath, subNum, uniqueId, font); vfsFile f(fontPath.get_ptr()); if (!f.IsOpened()) @@ -82,11 +82,11 @@ s32 cellFontOpenFontFile(vm::ptr library, vm::cptr fontPa s32 cellFontOpenFontset(PPUThread& ppu, vm::ptr library, vm::ptr fontType, vm::ptr font) { - cellFont.Warning("cellFontOpenFontset(library=*0x%x, fontType=*0x%x, font=*0x%x)", library, fontType, font); + cellFont.warning("cellFontOpenFontset(library=*0x%x, fontType=*0x%x, font=*0x%x)", library, fontType, font); if (fontType->map != CELL_FONT_MAP_UNICODE) { - cellFont.Warning("cellFontOpenFontset: Only Unicode is supported"); + cellFont.warning("cellFontOpenFontset: Only Unicode is supported"); } std::string file; @@ -146,12 +146,12 @@ s32 cellFontOpenFontset(PPUThread& ppu, vm::ptr library, vm::pt case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_YG_DFHEI5_RSANS2_SET: case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_YG_DFHEI5_VAGR2_SET: case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_VAGR2_SET: - cellFont.Warning("cellFontOpenFontset: fontType->type = %d not supported yet. RD-R-LATIN.TTF will be used instead.", fontType->type); + cellFont.warning("cellFontOpenFontset: fontType->type = %d not supported yet. RD-R-LATIN.TTF will be used instead.", fontType->type); file = "/dev_flash/data/font/SCE-PS3-RD-R-LATIN.TTF"; break; default: - cellFont.Warning("cellFontOpenFontset: fontType->type = %d not supported.", fontType->type); + cellFont.warning("cellFontOpenFontset: fontType->type = %d not supported.", fontType->type); return CELL_FONT_ERROR_NO_SUPPORT_FONTSET; } @@ -163,7 +163,7 @@ s32 cellFontOpenFontset(PPUThread& ppu, vm::ptr library, vm::pt s32 cellFontOpenFontInstance(vm::ptr openedFont, vm::ptr font) { - cellFont.Warning("cellFontOpenFontInstance(openedFont=*0x%x, font=*0x%x)", openedFont, font); + cellFont.warning("cellFontOpenFontInstance(openedFont=*0x%x, font=*0x%x)", openedFont, font); font->renderer_addr = openedFont->renderer_addr; font->scale_x = openedFont->scale_x; @@ -177,13 +177,13 @@ s32 cellFontOpenFontInstance(vm::ptr openedFont, vm::ptr fon s32 cellFontSetFontOpenMode(u32 openMode) { - cellFont.Todo("cellFontSetFontOpenMode(openMode=0x%x)", openMode); + cellFont.todo("cellFontSetFontOpenMode(openMode=0x%x)", openMode); return CELL_OK; } s32 cellFontCreateRenderer(vm::ptr library, vm::ptr config, vm::ptr Renderer) { - cellFont.Todo("cellFontCreateRenderer(library=*0x%x, config=*0x%x, Renderer=*0x%x)", library, config, Renderer); + cellFont.todo("cellFontCreateRenderer(library=*0x%x, config=*0x%x, Renderer=*0x%x)", library, config, Renderer); //Write data in Renderer @@ -192,7 +192,7 @@ s32 cellFontCreateRenderer(vm::ptr library, vm::ptr surface, vm::ptr buffer, s32 bufferWidthByte, s32 pixelSizeByte, s32 w, s32 h) { - cellFont.Warning("cellFontRenderSurfaceInit(surface=*0x%x, buffer=*0x%x, bufferWidthByte=%d, pixelSizeByte=%d, w=%d, h=%d)", surface, buffer, bufferWidthByte, pixelSizeByte, w, h); + cellFont.warning("cellFontRenderSurfaceInit(surface=*0x%x, buffer=*0x%x, bufferWidthByte=%d, pixelSizeByte=%d, w=%d, h=%d)", surface, buffer, bufferWidthByte, pixelSizeByte, w, h); surface->buffer = buffer; surface->widthByte = bufferWidthByte; @@ -203,7 +203,7 @@ void cellFontRenderSurfaceInit(vm::ptr surface, vm::ptr surface, s32 x0, s32 y0, s32 w, s32 h) { - cellFont.Warning("cellFontRenderSurfaceSetScissor(surface=*0x%x, x0=%d, y0=%d, w=%d, h=%d)", surface, x0, y0, w, h); + cellFont.warning("cellFontRenderSurfaceSetScissor(surface=*0x%x, x0=%d, y0=%d, w=%d, h=%d)", surface, x0, y0, w, h); surface->sc_x0 = x0; surface->sc_y0 = y0; @@ -213,7 +213,7 @@ void cellFontRenderSurfaceSetScissor(vm::ptr surface, s32 s32 cellFontSetScalePixel(vm::ptr font, float w, float h) { - cellFont.Log("cellFontSetScalePixel(font=*0x%x, w=%f, h=%f)", font, w, h); + cellFont.trace("cellFontSetScalePixel(font=*0x%x, w=%f, h=%f)", font, w, h); font->scale_x = w; font->scale_y = h; @@ -223,7 +223,7 @@ s32 cellFontSetScalePixel(vm::ptr font, float w, float h) s32 cellFontGetHorizontalLayout(vm::ptr font, vm::ptr layout) { - cellFont.Log("cellFontGetHorizontalLayout(font=*0x%x, layout=*0x%x)", font, layout); + cellFont.trace("cellFontGetHorizontalLayout(font=*0x%x, layout=*0x%x)", font, layout); s32 ascent, descent, lineGap; float scale = stbtt_ScaleForPixelHeight(font->stbfont, font->scale_y); @@ -238,7 +238,7 @@ s32 cellFontGetHorizontalLayout(vm::ptr font, vm::ptr font, vm::ptr renderer) { - cellFont.Warning("cellFontBindRenderer(font=*0x%x, renderer=*0x%x)", font, renderer); + cellFont.warning("cellFontBindRenderer(font=*0x%x, renderer=*0x%x)", font, renderer); if (font->renderer_addr) { @@ -252,7 +252,7 @@ s32 cellFontBindRenderer(vm::ptr font, vm::ptr rende s32 cellFontUnbindRenderer(vm::ptr font) { - cellFont.Warning("cellFontBindRenderer(font=*0x%x)", font); + cellFont.warning("cellFontBindRenderer(font=*0x%x)", font); if (!font->renderer_addr) { @@ -272,7 +272,7 @@ s32 cellFontDestroyRenderer() s32 cellFontSetupRenderScalePixel(vm::ptr font, float w, float h) { - cellFont.Todo("cellFontSetupRenderScalePixel(font=*0x%x, w=%f, h=%f)", font, w, h); + cellFont.todo("cellFontSetupRenderScalePixel(font=*0x%x, w=%f, h=%f)", font, w, h); if (!font->renderer_addr) { @@ -285,7 +285,7 @@ s32 cellFontSetupRenderScalePixel(vm::ptr font, float w, float h) s32 cellFontGetRenderCharGlyphMetrics(vm::ptr font, u32 code, vm::ptr metrics) { - cellFont.Todo("cellFontGetRenderCharGlyphMetrics(font=*0x%x, code=0x%x, metrics=*0x%x)", font, code, metrics); + cellFont.todo("cellFontGetRenderCharGlyphMetrics(font=*0x%x, code=0x%x, metrics=*0x%x)", font, code, metrics); if (!font->renderer_addr) { @@ -298,7 +298,7 @@ s32 cellFontGetRenderCharGlyphMetrics(vm::ptr font, u32 code, vm::ptr< s32 cellFontRenderCharGlyphImage(vm::ptr font, u32 code, vm::ptr surface, float x, float y, vm::ptr metrics, vm::ptr transInfo) { - cellFont.Notice("cellFontRenderCharGlyphImage(font=*0x%x, code=0x%x, surface=*0x%x, x=%f, y=%f, metrics=*0x%x, trans=*0x%x)", font, code, surface, x, y, metrics, transInfo); + cellFont.notice("cellFontRenderCharGlyphImage(font=*0x%x, code=0x%x, surface=*0x%x, x=%f, y=%f, metrics=*0x%x, trans=*0x%x)", font, code, surface, x, y, metrics, transInfo); if (!font->renderer_addr) { @@ -349,7 +349,7 @@ s32 cellFontEndLibrary() s32 cellFontSetEffectSlant(vm::ptr font, float slantParam) { - cellFont.Log("cellFontSetEffectSlant(font=*0x%x, slantParam=%f)", font, slantParam); + cellFont.trace("cellFontSetEffectSlant(font=*0x%x, slantParam=%f)", font, slantParam); if (slantParam < -1.0 || slantParam > 1.0) { @@ -363,7 +363,7 @@ s32 cellFontSetEffectSlant(vm::ptr font, float slantParam) s32 cellFontGetEffectSlant(vm::ptr font, vm::ptr slantParam) { - cellFont.Warning("cellFontSetEffectSlant(font=*0x%x, slantParam=*0x%x)", font, slantParam); + cellFont.warning("cellFontSetEffectSlant(font=*0x%x, slantParam=*0x%x)", font, slantParam); *slantParam = font->slant; @@ -372,7 +372,7 @@ s32 cellFontGetEffectSlant(vm::ptr font, vm::ptr slantParam) s32 cellFontGetFontIdCode(vm::ptr font, u32 code, vm::ptr fontId, vm::ptr fontCode) { - cellFont.Todo("cellFontGetFontIdCode(font=*0x%x, code=%d, fontId=*0x%x, fontCode=*0x%x)", font, code, fontId, fontCode); + cellFont.todo("cellFontGetFontIdCode(font=*0x%x, code=%d, fontId=*0x%x, fontCode=*0x%x)", font, code, fontId, fontCode); // TODO: ? return CELL_OK; @@ -380,7 +380,7 @@ s32 cellFontGetFontIdCode(vm::ptr font, u32 code, vm::ptr fontId, s32 cellFontCloseFont(vm::ptr font) { - cellFont.Warning("cellFontCloseFont(font=*0x%x)", font); + cellFont.warning("cellFontCloseFont(font=*0x%x)", font); if (font->origin == CELL_FONT_OPEN_FONTSET || font->origin == CELL_FONT_OPEN_FONT_FILE || @@ -394,7 +394,7 @@ s32 cellFontCloseFont(vm::ptr font) s32 cellFontGetCharGlyphMetrics(vm::ptr font, u32 code, vm::ptr metrics) { - cellFont.Warning("cellFontGetCharGlyphMetrics(font=*0x%x, code=0x%x, metrics=*0x%x)", font, code, metrics); + cellFont.warning("cellFontGetCharGlyphMetrics(font=*0x%x, code=0x%x, metrics=*0x%x)", font, code, metrics); s32 x0, y0, x1, y1; s32 advanceWidth, leftSideBearing; @@ -423,11 +423,11 @@ s32 cellFontGraphicsSetFontRGBA() s32 cellFontOpenFontsetOnMemory(PPUThread& ppu, vm::ptr library, vm::ptr fontType, vm::ptr font) { - cellFont.Todo("cellFontOpenFontsetOnMemory(library=*0x%x, fontType=*0x%x, font=*0x%x)", library, fontType, font); + cellFont.todo("cellFontOpenFontsetOnMemory(library=*0x%x, fontType=*0x%x, font=*0x%x)", library, fontType, font); if (fontType->map != CELL_FONT_MAP_UNICODE) { - cellFont.Warning("cellFontOpenFontsetOnMemory: Only Unicode is supported"); + cellFont.warning("cellFontOpenFontsetOnMemory: Only Unicode is supported"); } return CELL_OK; @@ -537,7 +537,7 @@ s32 cellFontDeleteGlyph() s32 cellFontExtend(u32 a1, u32 a2, u32 a3) { - cellFont.Todo("cellFontExtend(a1=0x%x, a2=0x%x, a3=0x%x)", a1, a2, a3); + cellFont.todo("cellFontExtend(a1=0x%x, a2=0x%x, a3=0x%x)", a1, a2, a3); //In a test I did: a1=0xcfe00000, a2=0x0, a3=(pointer to something) if (a1 == 0xcfe00000) { diff --git a/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp b/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp index 74b64035e9..5afe132d5e 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp @@ -8,7 +8,7 @@ extern Module<> cellFontFT; s32 cellFontInitLibraryFreeTypeWithRevision(u64 revisionFlags, vm::ptr config, vm::pptr lib) { - cellFontFT.Warning("cellFontInitLibraryFreeTypeWithRevision(revisionFlags=0x%llx, config=*0x%x, lib=**0x%x)", revisionFlags, config, lib); + cellFontFT.warning("cellFontInitLibraryFreeTypeWithRevision(revisionFlags=0x%llx, config=*0x%x, lib=**0x%x)", revisionFlags, config, lib); lib->set(vm::alloc(sizeof(CellFontLibrary), vm::main)); diff --git a/rpcs3/Emu/SysCalls/Modules/cellFs.cpp b/rpcs3/Emu/SysCalls/Modules/cellFs.cpp index 4cfbcfd5ea..37154ae03b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFs.cpp @@ -16,7 +16,7 @@ extern Module<> cellFs; s32 cellFsOpen(vm::cptr path, s32 flags, vm::ptr fd, vm::cptr arg, u64 size) { - cellFs.Warning("cellFsOpen(path=*0x%x, flags=%#o, fd=*0x%x, arg=*0x%x, size=0x%llx) -> sys_fs_open()", path, flags, fd, arg, size); + cellFs.warning("cellFsOpen(path=*0x%x, flags=%#o, fd=*0x%x, arg=*0x%x, size=0x%llx) -> sys_fs_open()", path, flags, fd, arg, size); // TODO @@ -26,7 +26,7 @@ s32 cellFsOpen(vm::cptr path, s32 flags, vm::ptr fd, vm::cptr a s32 cellFsRead(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nread) { - cellFs.Log("cellFsRead(fd=0x%x, buf=0x%x, nbytes=0x%llx, nread=0x%x)", fd, buf, nbytes, nread); + cellFs.trace("cellFsRead(fd=0x%x, buf=0x%x, nbytes=0x%llx, nread=0x%x)", fd, buf, nbytes, nread); // call the syscall return sys_fs_read(fd, buf, nbytes, nread ? nread : vm::var{}); @@ -34,7 +34,7 @@ s32 cellFsRead(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nread) s32 cellFsWrite(u32 fd, vm::cptr buf, u64 nbytes, vm::ptr nwrite) { - cellFs.Log("cellFsWrite(fd=0x%x, buf=*0x%x, nbytes=0x%llx, nwrite=*0x%x)", fd, buf, nbytes, nwrite); + cellFs.trace("cellFsWrite(fd=0x%x, buf=*0x%x, nbytes=0x%llx, nwrite=*0x%x)", fd, buf, nbytes, nwrite); // call the syscall return sys_fs_write(fd, buf, nbytes, nwrite ? nwrite : vm::var{}); @@ -42,7 +42,7 @@ s32 cellFsWrite(u32 fd, vm::cptr buf, u64 nbytes, vm::ptr nwrite) s32 cellFsClose(u32 fd) { - cellFs.Log("cellFsClose(fd=0x%x)", fd); + cellFs.trace("cellFsClose(fd=0x%x)", fd); // call the syscall return sys_fs_close(fd); @@ -50,7 +50,7 @@ s32 cellFsClose(u32 fd) s32 cellFsOpendir(vm::cptr path, vm::ptr fd) { - cellFs.Warning("cellFsOpendir(path=*0x%x, fd=*0x%x) -> sys_fs_opendir()", path, fd); + cellFs.warning("cellFsOpendir(path=*0x%x, fd=*0x%x) -> sys_fs_opendir()", path, fd); // TODO @@ -60,7 +60,7 @@ s32 cellFsOpendir(vm::cptr path, vm::ptr fd) s32 cellFsReaddir(u32 fd, vm::ptr dir, vm::ptr nread) { - cellFs.Log("cellFsReaddir(fd=0x%x, dir=*0x%x, nread=*0x%x)", fd, dir, nread); + cellFs.trace("cellFsReaddir(fd=0x%x, dir=*0x%x, nread=*0x%x)", fd, dir, nread); // call the syscall return dir && nread ? sys_fs_readdir(fd, dir, nread) : CELL_FS_EFAULT; @@ -68,7 +68,7 @@ s32 cellFsReaddir(u32 fd, vm::ptr dir, vm::ptr nread) s32 cellFsClosedir(u32 fd) { - cellFs.Log("cellFsClosedir(fd=0x%x)", fd); + cellFs.trace("cellFsClosedir(fd=0x%x)", fd); // call the syscall return sys_fs_closedir(fd); @@ -76,7 +76,7 @@ s32 cellFsClosedir(u32 fd) s32 cellFsStat(vm::cptr path, vm::ptr sb) { - cellFs.Warning("cellFsStat(path=*0x%x, sb=*0x%x) -> sys_fs_stat()", path, sb); + cellFs.warning("cellFsStat(path=*0x%x, sb=*0x%x) -> sys_fs_stat()", path, sb); // TODO @@ -86,7 +86,7 @@ s32 cellFsStat(vm::cptr path, vm::ptr sb) s32 cellFsFstat(u32 fd, vm::ptr sb) { - cellFs.Log("cellFsFstat(fd=0x%x, sb=*0x%x)", fd, sb); + cellFs.trace("cellFsFstat(fd=0x%x, sb=*0x%x)", fd, sb); // call the syscall return sys_fs_fstat(fd, sb); @@ -94,7 +94,7 @@ s32 cellFsFstat(u32 fd, vm::ptr sb) s32 cellFsMkdir(vm::cptr path, s32 mode) { - cellFs.Warning("cellFsMkdir(path=*0x%x, mode=%#o) -> sys_fs_mkdir()", path, mode); + cellFs.warning("cellFsMkdir(path=*0x%x, mode=%#o) -> sys_fs_mkdir()", path, mode); // TODO @@ -104,7 +104,7 @@ s32 cellFsMkdir(vm::cptr path, s32 mode) s32 cellFsRename(vm::cptr from, vm::cptr to) { - cellFs.Warning("cellFsRename(from=*0x%x, to=*0x%x) -> sys_fs_rename()", from, to); + cellFs.warning("cellFsRename(from=*0x%x, to=*0x%x) -> sys_fs_rename()", from, to); // TODO @@ -114,7 +114,7 @@ s32 cellFsRename(vm::cptr from, vm::cptr to) s32 cellFsRmdir(vm::cptr path) { - cellFs.Warning("cellFsRmdir(path=*0x%x) -> sys_fs_rmdir()", path); + cellFs.warning("cellFsRmdir(path=*0x%x) -> sys_fs_rmdir()", path); // TODO @@ -124,7 +124,7 @@ s32 cellFsRmdir(vm::cptr path) s32 cellFsUnlink(vm::cptr path) { - cellFs.Warning("cellFsUnlink(path=*0x%x) -> sys_fs_unlink()", path); + cellFs.warning("cellFsUnlink(path=*0x%x) -> sys_fs_unlink()", path); // TODO @@ -134,7 +134,7 @@ s32 cellFsUnlink(vm::cptr path) s32 cellFsLseek(u32 fd, s64 offset, u32 whence, vm::ptr pos) { - cellFs.Log("cellFsLseek(fd=0x%x, offset=0x%llx, whence=0x%x, pos=*0x%x)", fd, offset, whence, pos); + cellFs.trace("cellFsLseek(fd=0x%x, offset=0x%llx, whence=0x%x, pos=*0x%x)", fd, offset, whence, pos); // call the syscall return pos ? sys_fs_lseek(fd, offset, whence, pos) : CELL_FS_EFAULT; @@ -142,14 +142,14 @@ s32 cellFsLseek(u32 fd, s64 offset, u32 whence, vm::ptr pos) s32 cellFsFsync(u32 fd) { - cellFs.Todo("cellFsFsync(fd=0x%x)", fd); + cellFs.todo("cellFsFsync(fd=0x%x)", fd); return CELL_OK; } s32 cellFsFGetBlockSize(u32 fd, vm::ptr sector_size, vm::ptr block_size) { - cellFs.Log("cellFsFGetBlockSize(fd=0x%x, sector_size=*0x%x, block_size=*0x%x)", fd, sector_size, block_size); + cellFs.trace("cellFsFGetBlockSize(fd=0x%x, sector_size=*0x%x, block_size=*0x%x)", fd, sector_size, block_size); // call the syscall return sector_size && block_size ? sys_fs_fget_block_size(fd, sector_size, block_size, vm::var{}, vm::var{}) : CELL_FS_EFAULT; @@ -157,7 +157,7 @@ s32 cellFsFGetBlockSize(u32 fd, vm::ptr sector_size, vm::ptr block_siz s32 cellFsGetBlockSize(vm::cptr path, vm::ptr sector_size, vm::ptr block_size) { - cellFs.Warning("cellFsGetBlockSize(path=*0x%x, sector_size=*0x%x, block_size=*0x%x) -> sys_fs_get_block_size()", path, sector_size, block_size); + cellFs.warning("cellFsGetBlockSize(path=*0x%x, sector_size=*0x%x, block_size=*0x%x) -> sys_fs_get_block_size()", path, sector_size, block_size); // TODO @@ -167,7 +167,7 @@ s32 cellFsGetBlockSize(vm::cptr path, vm::ptr sector_size, vm::ptr path, u64 size) { - cellFs.Warning("cellFsTruncate(path=*0x%x, size=0x%llx) -> sys_fs_truncate()", path, size); + cellFs.warning("cellFsTruncate(path=*0x%x, size=0x%llx) -> sys_fs_truncate()", path, size); // TODO @@ -177,7 +177,7 @@ s32 cellFsTruncate(vm::cptr path, u64 size) s32 cellFsFtruncate(u32 fd, u64 size) { - cellFs.Log("cellFsFtruncate(fd=0x%x, size=0x%llx)", fd, size); + cellFs.trace("cellFsFtruncate(fd=0x%x, size=0x%llx)", fd, size); // call the syscall return sys_fs_ftruncate(fd, size); @@ -185,7 +185,7 @@ s32 cellFsFtruncate(u32 fd, u64 size) s32 cellFsChmod(vm::cptr path, s32 mode) { - cellFs.Warning("cellFsChmod(path=*0x%x, mode=%#o) -> sys_fs_chmod()", path, mode); + cellFs.warning("cellFsChmod(path=*0x%x, mode=%#o) -> sys_fs_chmod()", path, mode); // TODO @@ -195,8 +195,8 @@ s32 cellFsChmod(vm::cptr path, s32 mode) s32 cellFsGetFreeSize(vm::cptr path, vm::ptr block_size, vm::ptr block_count) { - cellFs.Warning("cellFsGetFreeSize(path=*0x%x, block_size=*0x%x, block_count=*0x%x)", path, block_size, block_count); - cellFs.Warning("*** path = '%s'", path.get_ptr()); + cellFs.warning("cellFsGetFreeSize(path=*0x%x, block_size=*0x%x, block_count=*0x%x)", path, block_size, block_count); + cellFs.warning("*** path = '%s'", path.get_ptr()); // TODO: Get real values. Currently, it always returns 40 GB of free space divided in 4 KB blocks *block_size = 4096; // ? @@ -207,7 +207,7 @@ s32 cellFsGetFreeSize(vm::cptr path, vm::ptr block_size, vm::ptr s32 cellFsGetDirectoryEntries(u32 fd, vm::ptr entries, u32 entries_size, vm::ptr data_count) { - cellFs.Warning("cellFsGetDirectoryEntries(fd=%d, entries=*0x%x, entries_size=0x%x, data_count=*0x%x)", fd, entries, entries_size, data_count); + cellFs.warning("cellFsGetDirectoryEntries(fd=%d, entries=*0x%x, entries_size=0x%x, data_count=*0x%x)", fd, entries, entries_size, data_count); const auto directory = idm::get(fd); @@ -250,7 +250,7 @@ s32 cellFsGetDirectoryEntries(u32 fd, vm::ptr entries, u32 s32 cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr buf, u64 buffer_size, vm::ptr nread) { - cellFs.Log("cellFsReadWithOffset(fd=%d, offset=0x%llx, buf=*0x%x, buffer_size=0x%llx, nread=*0x%x)", fd, offset, buf, buffer_size, nread); + cellFs.trace("cellFsReadWithOffset(fd=%d, offset=0x%llx, buf=*0x%x, buffer_size=0x%llx, nread=*0x%x)", fd, offset, buf, buffer_size, nread); // TODO: use single sys_fs_fcntl syscall @@ -281,7 +281,7 @@ s32 cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr buf, u64 buffer_size, s32 cellFsWriteWithOffset(u32 fd, u64 offset, vm::cptr buf, u64 data_size, vm::ptr nwrite) { - cellFs.Log("cellFsWriteWithOffset(fd=%d, offset=0x%llx, buf=*0x%x, data_size=0x%llx, nwrite=*0x%x)", fd, offset, buf, data_size, nwrite); + cellFs.trace("cellFsWriteWithOffset(fd=%d, offset=0x%llx, buf=*0x%x, data_size=0x%llx, nwrite=*0x%x)", fd, offset, buf, data_size, nwrite); // TODO: use single sys_fs_fcntl syscall @@ -312,7 +312,7 @@ s32 cellFsWriteWithOffset(u32 fd, u64 offset, vm::cptr buf, u64 data_size, s32 cellFsStReadInit(u32 fd, vm::cptr ringbuf) { - cellFs.Warning("cellFsStReadInit(fd=%d, ringbuf=*0x%x)", fd, ringbuf); + cellFs.warning("cellFsStReadInit(fd=%d, ringbuf=*0x%x)", fd, ringbuf); if (ringbuf->copy & ~CELL_FS_ST_COPYLESS) { @@ -365,7 +365,7 @@ s32 cellFsStReadInit(u32 fd, vm::cptr ringbuf) s32 cellFsStReadFinish(u32 fd) { - cellFs.Warning("cellFsStReadFinish(fd=%d)", fd); + cellFs.warning("cellFsStReadFinish(fd=%d)", fd); const auto file = idm::get(fd); @@ -388,7 +388,7 @@ s32 cellFsStReadFinish(u32 fd) s32 cellFsStReadGetRingBuf(u32 fd, vm::ptr ringbuf) { - cellFs.Warning("cellFsStReadGetRingBuf(fd=%d, ringbuf=*0x%x)", fd, ringbuf); + cellFs.warning("cellFsStReadGetRingBuf(fd=%d, ringbuf=*0x%x)", fd, ringbuf); const auto file = idm::get(fd); @@ -412,7 +412,7 @@ s32 cellFsStReadGetRingBuf(u32 fd, vm::ptr ringbuf) s32 cellFsStReadGetStatus(u32 fd, vm::ptr status) { - cellFs.Warning("cellFsStReadGetRingBuf(fd=%d, status=*0x%x)", fd, status); + cellFs.warning("cellFsStReadGetRingBuf(fd=%d, status=*0x%x)", fd, status); const auto file = idm::get(fd); @@ -446,7 +446,7 @@ s32 cellFsStReadGetStatus(u32 fd, vm::ptr status) s32 cellFsStReadGetRegid(u32 fd, vm::ptr regid) { - cellFs.Warning("cellFsStReadGetRingBuf(fd=%d, regid=*0x%x)", fd, regid); + cellFs.warning("cellFsStReadGetRingBuf(fd=%d, regid=*0x%x)", fd, regid); const auto file = idm::get(fd); @@ -467,7 +467,7 @@ s32 cellFsStReadGetRegid(u32 fd, vm::ptr regid) s32 cellFsStReadStart(u32 fd, u64 offset, u64 size) { - cellFs.Warning("cellFsStReadStart(fd=%d, offset=0x%llx, size=0x%llx)", fd, offset, size); + cellFs.warning("cellFsStReadStart(fd=%d, offset=0x%llx, size=0x%llx)", fd, offset, size); const auto file = idm::get(fd); @@ -548,7 +548,7 @@ s32 cellFsStReadStart(u32 fd, u64 offset, u64 size) s32 cellFsStReadStop(u32 fd) { - cellFs.Warning("cellFsStReadStop(fd=%d)", fd); + cellFs.warning("cellFsStReadStop(fd=%d)", fd); const auto file = idm::get(fd); @@ -579,7 +579,7 @@ s32 cellFsStReadStop(u32 fd) s32 cellFsStRead(u32 fd, vm::ptr buf, u64 size, vm::ptr rsize) { - cellFs.Warning("cellFsStRead(fd=%d, buf=*0x%x, size=0x%llx, rsize=*0x%x)", fd, buf, size, rsize); + cellFs.warning("cellFsStRead(fd=%d, buf=*0x%x, size=0x%llx, rsize=*0x%x)", fd, buf, size, rsize); const auto file = idm::get(fd); @@ -613,7 +613,7 @@ s32 cellFsStRead(u32 fd, vm::ptr buf, u64 size, vm::ptr rsize) s32 cellFsStReadGetCurrentAddr(u32 fd, vm::ptr addr, vm::ptr size) { - cellFs.Warning("cellFsStReadGetCurrentAddr(fd=%d, addr=*0x%x, size=*0x%x)", fd, addr, size); + cellFs.warning("cellFsStReadGetCurrentAddr(fd=%d, addr=*0x%x, size=*0x%x)", fd, addr, size); const auto file = idm::get(fd); @@ -646,7 +646,7 @@ s32 cellFsStReadGetCurrentAddr(u32 fd, vm::ptr addr, vm::ptr size) s32 cellFsStReadPutCurrentAddr(u32 fd, vm::ptr addr, u64 size) { - cellFs.Warning("cellFsStReadPutCurrentAddr(fd=%d, addr=*0x%x, size=0x%llx)", fd, addr, size); + cellFs.warning("cellFsStReadPutCurrentAddr(fd=%d, addr=*0x%x, size=0x%llx)", fd, addr, size); const auto file = idm::get(fd); @@ -673,7 +673,7 @@ s32 cellFsStReadPutCurrentAddr(u32 fd, vm::ptr addr, u64 size) s32 cellFsStReadWait(u32 fd, u64 size) { - cellFs.Warning("cellFsStReadWait(fd=%d, size=0x%llx)", fd, size); + cellFs.warning("cellFsStReadWait(fd=%d, size=0x%llx)", fd, size); const auto file = idm::get(fd); @@ -702,7 +702,7 @@ s32 cellFsStReadWait(u32 fd, u64 size) s32 cellFsStReadWaitCallback(u32 fd, u64 size, fs_st_cb_t func) { - cellFs.Warning("cellFsStReadWaitCallback(fd=%d, size=0x%llx, func=*0x%x)", fd, size, func); + cellFs.warning("cellFsStReadWaitCallback(fd=%d, size=0x%llx, func=*0x%x)", fd, size, func); const auto file = idm::get(fd); @@ -757,13 +757,13 @@ s32 sdata_unpack(const std::string& packed_file, const std::string& unpacked_fil if (!packed_stream || !packed_stream->IsOpened()) { - cellFs.Error("File '%s' not found!", packed_file.c_str()); + cellFs.error("File '%s' not found!", packed_file.c_str()); return CELL_ENOENT; } if (!unpacked_stream || !unpacked_stream->IsOpened()) { - cellFs.Error("File '%s' couldn't be created!", unpacked_file.c_str()); + cellFs.error("File '%s' couldn't be created!", unpacked_file.c_str()); return CELL_ENOENT; } @@ -772,7 +772,7 @@ s32 sdata_unpack(const std::string& packed_file, const std::string& unpacked_fil u32 format = *(be_t*)&buffer[0]; if (format != 0x4E504400) // "NPD\x00" { - cellFs.Error("Illegal format. Expected 0x4E504400, but got 0x%08x", format); + cellFs.error("Illegal format. Expected 0x4E504400, but got 0x%08x", format); return CELL_EFSSPECIFIC; } @@ -786,7 +786,7 @@ s32 sdata_unpack(const std::string& packed_file, const std::string& unpacked_fil // SDATA file is compressed if (flags & 0x1) { - cellFs.Warning("cellFsSdataOpen: Compressed SDATA files are not supported yet."); + cellFs.warning("cellFsSdataOpen: Compressed SDATA files are not supported yet."); return CELL_EFSSPECIFIC; } // SDATA file is NOT compressed @@ -798,7 +798,7 @@ s32 sdata_unpack(const std::string& packed_file, const std::string& unpacked_fil if (!sdata_check(version, flags, filesizeInput, filesizeTmp)) { - cellFs.Error("cellFsSdataOpen: Wrong header information."); + cellFs.error("cellFsSdataOpen: Wrong header information."); return CELL_EFSSPECIFIC; } @@ -835,7 +835,7 @@ s32 sdata_unpack(const std::string& packed_file, const std::string& unpacked_fil s32 cellFsSdataOpen(vm::cptr path, s32 flags, vm::ptr fd, vm::cptr arg, u64 size) { - cellFs.Notice("cellFsSdataOpen(path=*0x%x, flags=%#o, fd=*0x%x, arg=*0x%x, size=0x%llx)", path, flags, fd, arg, size); + cellFs.notice("cellFsSdataOpen(path=*0x%x, flags=%#o, fd=*0x%x, arg=*0x%x, size=0x%llx)", path, flags, fd, arg, size); if (flags != CELL_FS_O_RDONLY) { @@ -865,7 +865,7 @@ s32 cellFsSdataOpen(vm::cptr path, s32 flags, vm::ptr fd, vm::cptr sdata_fd, u64 offset, vm::cptr arg, u64 size) { - cellFs.Todo("cellFsSdataOpenByFd(mself_fd=0x%x, flags=%#o, sdata_fd=*0x%x, offset=0x%llx, arg=*0x%x, size=0x%llx)", mself_fd, flags, sdata_fd, offset, arg, size); + cellFs.todo("cellFsSdataOpenByFd(mself_fd=0x%x, flags=%#o, sdata_fd=*0x%x, offset=0x%llx, arg=*0x%x, size=0x%llx)", mself_fd, flags, sdata_fd, offset, arg, size); // TODO: @@ -876,7 +876,7 @@ using fs_aio_cb_t = vm::ptr xaio, s32 error, s32 xid, u6 void fsAio(vm::ptr aio, bool write, s32 xid, fs_aio_cb_t func) { - cellFs.Notice("FS AIO Request(%d): fd=%d, offset=0x%llx, buf=*0x%x, size=0x%llx, user_data=0x%llx", xid, aio->fd, aio->offset, aio->buf, aio->size, aio->user_data); + cellFs.notice("FS AIO Request(%d): fd=%d, offset=0x%llx, buf=*0x%x, size=0x%llx, user_data=0x%llx", xid, aio->fd, aio->offset, aio->buf, aio->size, aio->user_data); s32 error = CELL_OK; u64 result = 0; @@ -909,8 +909,8 @@ void fsAio(vm::ptr aio, bool write, s32 xid, fs_aio_cb_t func) s32 cellFsAioInit(vm::cptr mount_point) { - cellFs.Warning("cellFsAioInit(mount_point=*0x%x)", mount_point); - cellFs.Warning("*** mount_point = '%s'", mount_point.get_ptr()); + cellFs.warning("cellFsAioInit(mount_point=*0x%x)", mount_point); + cellFs.warning("*** mount_point = '%s'", mount_point.get_ptr()); // TODO: create AIO thread (if not exists) for specified mount point @@ -919,8 +919,8 @@ s32 cellFsAioInit(vm::cptr mount_point) s32 cellFsAioFinish(vm::cptr mount_point) { - cellFs.Warning("cellFsAioFinish(mount_point=*0x%x)", mount_point); - cellFs.Warning("*** mount_point = '%s'", mount_point.get_ptr()); + cellFs.warning("cellFsAioFinish(mount_point=*0x%x)", mount_point); + cellFs.warning("*** mount_point = '%s'", mount_point.get_ptr()); // TODO: delete existing AIO thread for specified mount point @@ -931,7 +931,7 @@ std::atomic g_fs_aio_id; s32 cellFsAioRead(vm::ptr aio, vm::ptr id, fs_aio_cb_t func) { - cellFs.Warning("cellFsAioRead(aio=*0x%x, id=*0x%x, func=*0x%x)", aio, id, func); + cellFs.warning("cellFsAioRead(aio=*0x%x, id=*0x%x, func=*0x%x)", aio, id, func); // TODO: detect mount point and send AIO request to the AIO thread of this mount point @@ -944,7 +944,7 @@ s32 cellFsAioRead(vm::ptr aio, vm::ptr id, fs_aio_cb_t func) s32 cellFsAioWrite(vm::ptr aio, vm::ptr id, fs_aio_cb_t func) { - cellFs.Warning("cellFsAioWrite(aio=*0x%x, id=*0x%x, func=*0x%x)", aio, id, func); + cellFs.warning("cellFsAioWrite(aio=*0x%x, id=*0x%x, func=*0x%x)", aio, id, func); // TODO: detect mount point and send AIO request to the AIO thread of this mount point @@ -957,7 +957,7 @@ s32 cellFsAioWrite(vm::ptr aio, vm::ptr id, fs_aio_cb_t func) s32 cellFsAioCancel(s32 id) { - cellFs.Warning("cellFsAioCancel(id=%d) -> CELL_FS_EINVAL", id); + cellFs.warning("cellFsAioCancel(id=%d) -> CELL_FS_EINVAL", id); // TODO: cancelled requests return CELL_FS_ECANCELED through their own callbacks @@ -966,14 +966,14 @@ s32 cellFsAioCancel(s32 id) s32 cellFsSetDefaultContainer(u32 id, u32 total_limit) { - cellFs.Todo("cellFsSetDefaultContainer(id=0x%x, total_limit=%d)", id, total_limit); + cellFs.todo("cellFsSetDefaultContainer(id=0x%x, total_limit=%d)", id, total_limit); return CELL_OK; } s32 cellFsSetIoBufferFromDefaultContainer(u32 fd, u32 buffer_size, u32 page_type) { - cellFs.Todo("cellFsSetIoBufferFromDefaultContainer(fd=%d, buffer_size=%d, page_type=%d)", fd, buffer_size, page_type); + cellFs.todo("cellFsSetIoBufferFromDefaultContainer(fd=%d, buffer_size=%d, page_type=%d)", fd, buffer_size, page_type); const auto file = idm::get(fd); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp index 504d7acfc6..a5c646a99e 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp @@ -47,7 +47,7 @@ struct content_permission_t final s32 cellHddGameCheck(PPUThread& ppu, u32 version, vm::cptr dirName, u32 errDialog, vm::ptr funcStat, u32 container) { - cellGame.Warning("cellHddGameCheck(version=%d, dirName=*0x%x, errDialog=%d, funcStat=*0x%x, container=%d)", version, dirName, errDialog, funcStat, container); + cellGame.warning("cellHddGameCheck(version=%d, dirName=*0x%x, errDialog=%d, funcStat=*0x%x, container=%d)", version, dirName, errDialog, funcStat, container); std::string dir = dirName.get_ptr(); @@ -155,7 +155,7 @@ s32 cellGameDataExitBroken() s32 cellGameBootCheck(vm::ptr type, vm::ptr attributes, vm::ptr size, vm::ptr dirName) { - cellGame.Warning("cellGameBootCheck(type=*0x%x, attributes=*0x%x, size=*0x%x, dirName=*0x%x)", type, attributes, size, dirName); + cellGame.warning("cellGameBootCheck(type=*0x%x, attributes=*0x%x, size=*0x%x, dirName=*0x%x)", type, attributes, size, dirName); if (size) { @@ -173,7 +173,7 @@ s32 cellGameBootCheck(vm::ptr type, vm::ptr attributes, vm::ptr type, vm::ptr attributes, vm::ptr type, vm::ptr attributes, vm::ptr size, vm::ptr reserved) { - cellGame.Warning("cellGamePatchCheck(size=*0x%x, reserved=*0x%x)", size, reserved); + cellGame.warning("cellGamePatchCheck(size=*0x%x, reserved=*0x%x)", size, reserved); if (size) { @@ -238,14 +238,14 @@ s32 cellGamePatchCheck(vm::ptr size, vm::ptr reserved const PSFLoader psf(f); if (!psf) { - cellGame.Error("cellGamePatchCheck(): CELL_GAME_ERROR_ACCESS_ERROR (cannot read PARAM.SFO)"); + cellGame.error("cellGamePatchCheck(): CELL_GAME_ERROR_ACCESS_ERROR (cannot read PARAM.SFO)"); return CELL_GAME_ERROR_ACCESS_ERROR; } std::string category = psf.GetString("CATEGORY"); if (category.substr(0, 2) != "GD") { - cellGame.Error("cellGamePatchCheck(): CELL_GAME_ERROR_NOTPATCH"); + cellGame.error("cellGamePatchCheck(): CELL_GAME_ERROR_NOTPATCH"); return CELL_GAME_ERROR_NOTPATCH; } @@ -259,11 +259,11 @@ s32 cellGamePatchCheck(vm::ptr size, vm::ptr reserved s32 cellGameDataCheck(u32 type, vm::cptr dirName, vm::ptr size) { - cellGame.Warning("cellGameDataCheck(type=%d, dirName=*0x%x, size=*0x%x)", type, dirName, size); + cellGame.warning("cellGameDataCheck(type=%d, dirName=*0x%x, size=*0x%x)", type, dirName, size); if ((type - 1) >= 3) { - cellGame.Error("cellGameDataCheck(): CELL_GAME_ERROR_PARAM"); + cellGame.error("cellGameDataCheck(): CELL_GAME_ERROR_PARAM"); return CELL_GAME_ERROR_PARAM; } @@ -283,7 +283,7 @@ s32 cellGameDataCheck(u32 type, vm::cptr dirName, vm::ptr dirName, vm::ptr dirName, vm::ptr contentInfoPath, vm::ptr usrdirPath) { - cellGame.Warning("cellGameContentPermit(contentInfoPath=*0x%x, usrdirPath=*0x%x)", contentInfoPath, usrdirPath); + cellGame.warning("cellGameContentPermit(contentInfoPath=*0x%x, usrdirPath=*0x%x)", contentInfoPath, usrdirPath); if (!contentInfoPath && !usrdirPath) { @@ -334,7 +334,7 @@ s32 cellGameContentPermit(vm::ptr contentInfoPath, vm: // make temporary directory persistent if (Emu.GetVFS().Rename("/dev_hdd1/game/" + path_set->dir, dir)) { - cellGame.Success("cellGameContentPermit(): '%s' directory created", dir); + cellGame.success("cellGameContentPermit(): '%s' directory created", dir); } else { @@ -358,11 +358,11 @@ s32 cellGameContentPermit(vm::ptr contentInfoPath, vm: s32 cellGameDataCheckCreate2(PPUThread& ppu, u32 version, vm::cptr dirName, u32 errDialog, vm::ptr funcStat, u32 container) { - cellGame.Warning("cellGameDataCheckCreate2(version=0x%x, dirName=*0x%x, errDialog=0x%x, funcStat=*0x%x, container=%d)", version, dirName, errDialog, funcStat, container); + cellGame.warning("cellGameDataCheckCreate2(version=0x%x, dirName=*0x%x, errDialog=0x%x, funcStat=*0x%x, container=%d)", version, dirName, errDialog, funcStat, container); if (version != CELL_GAMEDATA_VERSION_CURRENT || errDialog > 1) { - cellGame.Error("cellGameDataCheckCreate2(): CELL_GAMEDATA_ERROR_PARAM"); + cellGame.error("cellGameDataCheckCreate2(): CELL_GAMEDATA_ERROR_PARAM"); return CELL_GAMEDATA_ERROR_PARAM; } @@ -372,7 +372,7 @@ s32 cellGameDataCheckCreate2(PPUThread& ppu, u32 version, vm::cptr dirName if (!Emu.GetVFS().ExistsDir(dir)) { - cellGame.Todo("cellGameDataCheckCreate2(): creating directory '%s'", dir.c_str()); + cellGame.todo("cellGameDataCheckCreate2(): creating directory '%s'", dir.c_str()); // TODO: create data return CELL_GAMEDATA_RET_OK; } @@ -381,7 +381,7 @@ s32 cellGameDataCheckCreate2(PPUThread& ppu, u32 version, vm::cptr dirName const PSFLoader psf(f); if (!psf) { - cellGame.Error("cellGameDataCheckCreate2(): CELL_GAMEDATA_ERROR_BROKEN (cannot read PARAM.SFO)"); + cellGame.error("cellGameDataCheckCreate2(): CELL_GAMEDATA_ERROR_BROKEN (cannot read PARAM.SFO)"); return CELL_GAMEDATA_ERROR_BROKEN; } @@ -417,43 +417,43 @@ s32 cellGameDataCheckCreate2(PPUThread& ppu, u32 version, vm::cptr dirName if (cbSet->setParam) { // TODO: write PARAM.SFO from cbSet - cellGame.Todo("cellGameDataCheckCreate2(): writing PARAM.SFO parameters (addr=0x%x)", cbSet->setParam); + cellGame.todo("cellGameDataCheckCreate2(): writing PARAM.SFO parameters (addr=0x%x)", cbSet->setParam); } switch ((s32)cbResult->result) { case CELL_GAMEDATA_CBRESULT_OK_CANCEL: // TODO: do not process game data - cellGame.Warning("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_OK_CANCEL"); + cellGame.warning("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_OK_CANCEL"); case CELL_GAMEDATA_CBRESULT_OK: return CELL_GAMEDATA_RET_OK; case CELL_GAMEDATA_CBRESULT_ERR_NOSPACE: // TODO: process errors, error message and needSizeKB result - cellGame.Error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_NOSPACE"); + cellGame.error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_NOSPACE"); return CELL_GAMEDATA_ERROR_CBRESULT; case CELL_GAMEDATA_CBRESULT_ERR_BROKEN: - cellGame.Error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_BROKEN"); + cellGame.error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_BROKEN"); return CELL_GAMEDATA_ERROR_CBRESULT; case CELL_GAMEDATA_CBRESULT_ERR_NODATA: - cellGame.Error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_NODATA"); + cellGame.error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_NODATA"); return CELL_GAMEDATA_ERROR_CBRESULT; case CELL_GAMEDATA_CBRESULT_ERR_INVALID: - cellGame.Error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_INVALID"); + cellGame.error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_INVALID"); return CELL_GAMEDATA_ERROR_CBRESULT; default: - cellGame.Error("cellGameDataCheckCreate2(): callback returned unknown error (code=0x%x)"); + cellGame.error("cellGameDataCheckCreate2(): callback returned unknown error (code=0x%x)"); return CELL_GAMEDATA_ERROR_CBRESULT; } } s32 cellGameDataCheckCreate(PPUThread& ppu, u32 version, vm::cptr dirName, u32 errDialog, vm::ptr funcStat, u32 container) { - cellGame.Warning("cellGameDataCheckCreate(version=0x%x, dirName=*0x%x, errDialog=0x%x, funcStat=*0x%x, container=%d)", version, dirName, errDialog, funcStat, container); + cellGame.warning("cellGameDataCheckCreate(version=0x%x, dirName=*0x%x, errDialog=0x%x, funcStat=*0x%x, container=%d)", version, dirName, errDialog, funcStat, container); // TODO: almost identical, the only difference is that this function will always calculate the size of game data return cellGameDataCheckCreate2(ppu, version, dirName, errDialog, funcStat, container); @@ -461,7 +461,7 @@ s32 cellGameDataCheckCreate(PPUThread& ppu, u32 version, vm::cptr dirName, s32 cellGameCreateGameData(vm::ptr init, vm::ptr tmp_contentInfoPath, vm::ptr tmp_usrdirPath) { - cellGame.Error("cellGameCreateGameData(init=*0x%x, tmp_contentInfoPath=*0x%x, tmp_usrdirPath=*0x%x)", init, tmp_contentInfoPath, tmp_usrdirPath); + cellGame.error("cellGameCreateGameData(init=*0x%x, tmp_contentInfoPath=*0x%x, tmp_usrdirPath=*0x%x)", init, tmp_contentInfoPath, tmp_usrdirPath); std::string dir = init->titleId; std::string tmp_contentInfo = "/dev_hdd1/game/" + dir; @@ -469,13 +469,13 @@ s32 cellGameCreateGameData(vm::ptr init, vm::ptr init, vm::ptr value) { - cellGame.Warning("cellGameGetParamInt(id=%d, value=*0x%x)", id, value); + cellGame.warning("cellGameGetParamInt(id=%d, value=*0x%x)", id, value); // TODO: Access through cellGame***Check functions vfsFile f("/app_home/../PARAM.SFO"); @@ -521,7 +521,7 @@ s32 cellGameGetParamInt(u32 id, vm::ptr value) case CELL_GAME_PARAMID_SOUND_FORMAT: *value = psf.GetInteger("SOUND_FORMAT"); break; default: - cellGame.Error("cellGameGetParamInt(): Unimplemented parameter (%d)", id); + cellGame.error("cellGameGetParamInt(): Unimplemented parameter (%d)", id); return CELL_GAME_ERROR_INVALID_ID; } @@ -530,7 +530,7 @@ s32 cellGameGetParamInt(u32 id, vm::ptr value) s32 cellGameGetParamString(u32 id, vm::ptr buf, u32 bufsize) { - cellGame.Warning("cellGameGetParamString(id=%d, buf=*0x%x, bufsize=%d)", id, buf, bufsize); + cellGame.warning("cellGameGetParamString(id=%d, buf=*0x%x, bufsize=%d)", id, buf, bufsize); // TODO: Access through cellGame***Check functions vfsFile f("/app_home/../PARAM.SFO"); @@ -570,7 +570,7 @@ s32 cellGameGetParamString(u32 id, vm::ptr buf, u32 bufsize) case CELL_GAME_PARAMID_APP_VER: data = psf.GetString("APP_VER"); break; default: - cellGame.Error("cellGameGetParamString(): Unimplemented parameter (%d)", id); + cellGame.error("cellGameGetParamString(): Unimplemented parameter (%d)", id); return CELL_GAME_ERROR_INVALID_ID; } @@ -605,7 +605,7 @@ s32 cellGameGetLocalWebContentPath() s32 cellGameContentErrorDialog(s32 type, s32 errNeedSizeKB, vm::cptr dirName) { - cellGame.Warning("cellGameContentErrorDialog(type=%d, errNeedSizeKB=%d, dirName=*0x%x)", type, errNeedSizeKB, dirName); + cellGame.warning("cellGameContentErrorDialog(type=%d, errNeedSizeKB=%d, dirName=*0x%x)", type, errNeedSizeKB, dirName); std::string errorName; switch (type) diff --git a/rpcs3/Emu/SysCalls/Modules/cellGameExec.cpp b/rpcs3/Emu/SysCalls/Modules/cellGameExec.cpp index 491d4e735d..01f08d5e30 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGameExec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGameExec.cpp @@ -13,7 +13,7 @@ s32 cellGameSetExitParam() s32 cellGameGetHomeDataExportPath(vm::ptr exportPath) { - cellGameExec.Warning("cellGameGetHomeDataExportPath(exportPath=0x%x)", exportPath); + cellGameExec.warning("cellGameGetHomeDataExportPath(exportPath=0x%x)", exportPath); // TODO: PlayStation home is defunct. @@ -37,7 +37,7 @@ s32 cellGameGetHomeLaunchOptionPath() s32 cellGameGetBootGameInfo(vm::ptr type, vm::ptr dirName, vm::ptr execData) { - cellGameExec.Todo("cellGameGetBootGameInfo(type=*0x%x, dirName=*0x%x, execData=*0x%x)", type, dirName, execData); + cellGameExec.todo("cellGameGetBootGameInfo(type=*0x%x, dirName=*0x%x, execData=*0x%x)", type, dirName, execData); // TODO: Support more boot types *type = CELL_GAME_GAMETYPE_SYS; diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp index 3ae0175f64..3f14986a60 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp @@ -80,17 +80,17 @@ void InitOffsetTable() u32 cellGcmGetLabelAddress(u8 index) { - cellGcmSys.Log("cellGcmGetLabelAddress(index=%d)", index); + cellGcmSys.trace("cellGcmGetLabelAddress(index=%d)", index); return gcm_info.label_addr + 0x10 * index; } vm::ptr cellGcmGetReportDataAddressLocation(u32 index, u32 location) { - cellGcmSys.Warning("cellGcmGetReportDataAddressLocation(index=%d, location=%d)", index, location); + cellGcmSys.warning("cellGcmGetReportDataAddressLocation(index=%d, location=%d)", index, location); if (location == CELL_GCM_LOCATION_LOCAL) { if (index >= 2048) { - cellGcmSys.Error("cellGcmGetReportDataAddressLocation: Wrong local index (%d)", index); + cellGcmSys.error("cellGcmGetReportDataAddressLocation: Wrong local index (%d)", index); return vm::null; } return vm::ptr::make(0xC0000000 + index * 0x10); @@ -98,23 +98,23 @@ vm::ptr cellGcmGetReportDataAddressLocation(u32 index, u32 lo if (location == CELL_GCM_LOCATION_MAIN) { if (index >= 1024 * 1024) { - cellGcmSys.Error("cellGcmGetReportDataAddressLocation: Wrong main index (%d)", index); + cellGcmSys.error("cellGcmGetReportDataAddressLocation: Wrong main index (%d)", index); return vm::null; } // TODO: It seems m_report_main_addr is not initialized return vm::ptr::make(Emu.GetGSManager().GetRender().report_main_addr + index * 0x10); } - cellGcmSys.Error("cellGcmGetReportDataAddressLocation: Wrong location (%d)", location); + cellGcmSys.error("cellGcmGetReportDataAddressLocation: Wrong location (%d)", location); return vm::null; } u64 cellGcmGetTimeStamp(u32 index) { - cellGcmSys.Log("cellGcmGetTimeStamp(index=%d)", index); + cellGcmSys.trace("cellGcmGetTimeStamp(index=%d)", index); if (index >= 2048) { - cellGcmSys.Error("cellGcmGetTimeStamp: Wrong local index (%d)", index); + cellGcmSys.error("cellGcmGetTimeStamp: Wrong local index (%d)", index); return 0; } return vm::read64(0xC0000000 + index * 0x10); @@ -128,7 +128,7 @@ s32 cellGcmGetCurrentField() u32 cellGcmGetNotifyDataAddress(u32 index) { - cellGcmSys.Warning("cellGcmGetNotifyDataAddress(index=%d)", index); + cellGcmSys.warning("cellGcmGetNotifyDataAddress(index=%d)", index); // If entry not in use, return NULL u16 entry = offsetTable.eaAddress[241]; @@ -149,10 +149,10 @@ vm::ptr _cellGcmFunc12() u32 cellGcmGetReport(u32 type, u32 index) { - cellGcmSys.Warning("cellGcmGetReport(type=%d, index=%d)", type, index); + cellGcmSys.warning("cellGcmGetReport(type=%d, index=%d)", type, index); if (index >= 2048) { - cellGcmSys.Error("cellGcmGetReport: Wrong local index (%d)", index); + cellGcmSys.error("cellGcmGetReport: Wrong local index (%d)", index); return -1; } @@ -166,10 +166,10 @@ u32 cellGcmGetReport(u32 type, u32 index) u32 cellGcmGetReportDataAddress(u32 index) { - cellGcmSys.Warning("cellGcmGetReportDataAddress(index=%d)", index); + cellGcmSys.warning("cellGcmGetReportDataAddress(index=%d)", index); if (index >= 2048) { - cellGcmSys.Error("cellGcmGetReportDataAddress: Wrong local index (%d)", index); + cellGcmSys.error("cellGcmGetReportDataAddress: Wrong local index (%d)", index); return 0; } return 0xC0000000 + index * 0x10; @@ -177,7 +177,7 @@ u32 cellGcmGetReportDataAddress(u32 index) u32 cellGcmGetReportDataLocation(u32 index, u32 location) { - cellGcmSys.Warning("cellGcmGetReportDataLocation(index=%d, location=%d)", index, location); + cellGcmSys.warning("cellGcmGetReportDataLocation(index=%d, location=%d)", index, location); vm::ptr report = cellGcmGetReportDataAddressLocation(index, location); return report->value; @@ -185,11 +185,11 @@ u32 cellGcmGetReportDataLocation(u32 index, u32 location) u64 cellGcmGetTimeStampLocation(u32 index, u32 location) { - cellGcmSys.Warning("cellGcmGetTimeStampLocation(index=%d, location=%d)", index, location); + cellGcmSys.warning("cellGcmGetTimeStampLocation(index=%d, location=%d)", index, location); if (location == CELL_GCM_LOCATION_LOCAL) { if (index >= 2048) { - cellGcmSys.Error("cellGcmGetTimeStampLocation: Wrong local index (%d)", index); + cellGcmSys.error("cellGcmGetTimeStampLocation: Wrong local index (%d)", index); return 0; } return vm::read64(0xC0000000 + index * 0x10); @@ -197,14 +197,14 @@ u64 cellGcmGetTimeStampLocation(u32 index, u32 location) if (location == CELL_GCM_LOCATION_MAIN) { if (index >= 1024 * 1024) { - cellGcmSys.Error("cellGcmGetTimeStampLocation: Wrong main index (%d)", index); + cellGcmSys.error("cellGcmGetTimeStampLocation: Wrong main index (%d)", index); return 0; } // TODO: It seems m_report_main_addr is not initialized return vm::read64(Emu.GetGSManager().GetRender().report_main_addr + index * 0x10); } - cellGcmSys.Error("cellGcmGetTimeStampLocation: Wrong location (%d)", location); + cellGcmSys.error("cellGcmGetTimeStampLocation: Wrong location (%d)", location); return 0; } @@ -214,32 +214,32 @@ u64 cellGcmGetTimeStampLocation(u32 index, u32 location) u32 cellGcmGetControlRegister() { - cellGcmSys.Log("cellGcmGetControlRegister()"); + cellGcmSys.trace("cellGcmGetControlRegister()"); return gcm_info.control_addr; } u32 cellGcmGetDefaultCommandWordSize() { - cellGcmSys.Log("cellGcmGetDefaultCommandWordSize()"); + cellGcmSys.trace("cellGcmGetDefaultCommandWordSize()"); return 0x400; } u32 cellGcmGetDefaultSegmentWordSize() { - cellGcmSys.Log("cellGcmGetDefaultSegmentWordSize()"); + cellGcmSys.trace("cellGcmGetDefaultSegmentWordSize()"); return 0x100; } s32 cellGcmInitDefaultFifoMode(s32 mode) { - cellGcmSys.Warning("cellGcmInitDefaultFifoMode(mode=%d)", mode); + cellGcmSys.warning("cellGcmInitDefaultFifoMode(mode=%d)", mode); return CELL_OK; } s32 cellGcmSetDefaultFifoSize(u32 bufferSize, u32 segmentSize) { - cellGcmSys.Warning("cellGcmSetDefaultFifoSize(bufferSize=0x%x, segmentSize=0x%x)", bufferSize, segmentSize); + cellGcmSys.warning("cellGcmSetDefaultFifoSize(bufferSize=0x%x, segmentSize=0x%x)", bufferSize, segmentSize); return CELL_OK; } @@ -249,11 +249,11 @@ s32 cellGcmSetDefaultFifoSize(u32 bufferSize, u32 segmentSize) s32 cellGcmBindTile(u8 index) { - cellGcmSys.Warning("cellGcmBindTile(index=%d)", index); + cellGcmSys.warning("cellGcmBindTile(index=%d)", index); if (index >= rsx::limits::tiles_count) { - cellGcmSys.Error("cellGcmBindTile: CELL_GCM_ERROR_INVALID_VALUE"); + cellGcmSys.error("cellGcmBindTile: CELL_GCM_ERROR_INVALID_VALUE"); return CELL_GCM_ERROR_INVALID_VALUE; } @@ -265,11 +265,11 @@ s32 cellGcmBindTile(u8 index) s32 cellGcmBindZcull(u8 index) { - cellGcmSys.Warning("cellGcmBindZcull(index=%d)", index); + cellGcmSys.warning("cellGcmBindZcull(index=%d)", index); if (index >= rsx::limits::zculls_count) { - cellGcmSys.Error("cellGcmBindZcull: CELL_GCM_ERROR_INVALID_VALUE"); + cellGcmSys.error("cellGcmBindZcull: CELL_GCM_ERROR_INVALID_VALUE"); return CELL_GCM_ERROR_INVALID_VALUE; } @@ -281,7 +281,7 @@ s32 cellGcmBindZcull(u8 index) s32 cellGcmGetConfiguration(vm::ptr config) { - cellGcmSys.Log("cellGcmGetConfiguration(config=*0x%x)", config); + cellGcmSys.trace("cellGcmGetConfiguration(config=*0x%x)", config); *config = current_config; @@ -292,14 +292,14 @@ s32 cellGcmGetFlipStatus() { s32 status = Emu.GetGSManager().GetRender().flip_status; - cellGcmSys.Log("cellGcmGetFlipStatus() -> %d", status); + cellGcmSys.trace("cellGcmGetFlipStatus() -> %d", status); return status; } u32 cellGcmGetTiledPitchSize(u32 size) { - cellGcmSys.Log("cellGcmGetTiledPitchSize(size=%d)", size); + cellGcmSys.trace("cellGcmGetTiledPitchSize(size=%d)", size); for (size_t i=0; i < sizeof(tiled_pitches) / sizeof(tiled_pitches[0]) - 1; i++) { if (tiled_pitches[i] < size && size <= tiled_pitches[i+1]) { @@ -311,13 +311,13 @@ u32 cellGcmGetTiledPitchSize(u32 size) void _cellGcmFunc1() { - cellGcmSys.Todo("_cellGcmFunc1()"); + cellGcmSys.todo("_cellGcmFunc1()"); return; } void _cellGcmFunc15(vm::ptr context) { - cellGcmSys.Todo("_cellGcmFunc15(context=*0x%x)", context); + cellGcmSys.todo("_cellGcmFunc15(context=*0x%x)", context); return; } @@ -326,7 +326,7 @@ u32 g_defaultCommandBufferBegin, g_defaultCommandBufferFragmentCount; // Called by cellGcmInit s32 _cellGcmInitBody(vm::pptr context, u32 cmdSize, u32 ioSize, u32 ioAddress) { - cellGcmSys.Warning("_cellGcmInitBody(context=**0x%x, cmdSize=0x%x, ioSize=0x%x, ioAddress=0x%x)", context, cmdSize, ioSize, ioAddress); + cellGcmSys.warning("_cellGcmInitBody(context=**0x%x, cmdSize=0x%x, ioSize=0x%x, ioAddress=0x%x)", context, cmdSize, ioSize, ioAddress); if (!local_size && !local_addr) { @@ -335,23 +335,23 @@ s32 _cellGcmInitBody(vm::pptr context, u32 cmdSize, u32 ioSi vm::falloc(0xC0000000, local_size, vm::video); } - cellGcmSys.Warning("*** local memory(addr=0x%x, size=0x%x)", local_addr, local_size); + cellGcmSys.warning("*** local memory(addr=0x%x, size=0x%x)", local_addr, local_size); InitOffsetTable(); if (system_mode == CELL_GCM_SYSTEM_MODE_IOMAP_512MB) { - cellGcmSys.Warning("cellGcmInit(): 512MB io address space used"); + cellGcmSys.warning("cellGcmInit(): 512MB io address space used"); RSXIOMem.SetRange(0, 0x20000000 /*512MB*/); } else { - cellGcmSys.Warning("cellGcmInit(): 256MB io address space used"); + cellGcmSys.warning("cellGcmInit(): 256MB io address space used"); RSXIOMem.SetRange(0, 0x10000000 /*256MB*/); } if (gcmMapEaIoAddress(ioAddress, 0, ioSize, false) != CELL_OK) { - cellGcmSys.Error("cellGcmInit: CELL_GCM_ERROR_FAILURE"); + cellGcmSys.error("cellGcmInit: CELL_GCM_ERROR_FAILURE"); return CELL_GCM_ERROR_FAILURE; } @@ -403,7 +403,7 @@ s32 _cellGcmInitBody(vm::pptr context, u32 cmdSize, u32 ioSi s32 cellGcmResetFlipStatus() { - cellGcmSys.Log("cellGcmResetFlipStatus()"); + cellGcmSys.trace("cellGcmResetFlipStatus()"); Emu.GetGSManager().GetRender().flip_status = CELL_GCM_DISPLAY_FLIP_STATUS_WAITING; @@ -412,7 +412,7 @@ s32 cellGcmResetFlipStatus() s32 cellGcmSetDebugOutputLevel(s32 level) { - cellGcmSys.Warning("cellGcmSetDebugOutputLevel(level=%d)", level); + cellGcmSys.warning("cellGcmSetDebugOutputLevel(level=%d)", level); switch (level) { @@ -430,11 +430,11 @@ s32 cellGcmSetDebugOutputLevel(s32 level) s32 cellGcmSetDisplayBuffer(u32 id, u32 offset, u32 pitch, u32 width, u32 height) { - cellGcmSys.Log("cellGcmSetDisplayBuffer(id=0x%x,offset=0x%x,pitch=%d,width=%d,height=%d)", id, offset, width ? pitch / width : pitch, width, height); + cellGcmSys.trace("cellGcmSetDisplayBuffer(id=0x%x,offset=0x%x,pitch=%d,width=%d,height=%d)", id, offset, width ? pitch / width : pitch, width, height); if (id > 7) { - cellGcmSys.Error("cellGcmSetDisplayBuffer: CELL_EINVAL"); + cellGcmSys.error("cellGcmSetDisplayBuffer: CELL_EINVAL"); return CELL_EINVAL; } @@ -455,14 +455,14 @@ s32 cellGcmSetDisplayBuffer(u32 id, u32 offset, u32 pitch, u32 width, u32 height void cellGcmSetFlipHandler(vm::ptr handler) { - cellGcmSys.Warning("cellGcmSetFlipHandler(handler=*0x%x)", handler); + cellGcmSys.warning("cellGcmSetFlipHandler(handler=*0x%x)", handler); Emu.GetGSManager().GetRender().flip_handler = handler; } s32 cellGcmSetFlipMode(u32 mode) { - cellGcmSys.Warning("cellGcmSetFlipMode(mode=%d)", mode); + cellGcmSys.warning("cellGcmSetFlipMode(mode=%d)", mode); switch (mode) { @@ -481,18 +481,18 @@ s32 cellGcmSetFlipMode(u32 mode) void cellGcmSetFlipStatus() { - cellGcmSys.Warning("cellGcmSetFlipStatus()"); + cellGcmSys.warning("cellGcmSetFlipStatus()"); Emu.GetGSManager().GetRender().flip_status = 0; } s32 cellGcmSetPrepareFlip(PPUThread& ppu, vm::ptr ctxt, u32 id) { - cellGcmSys.Log("cellGcmSetPrepareFlip(ctx=*0x%x, id=0x%x)", ctxt, id); + cellGcmSys.trace("cellGcmSetPrepareFlip(ctx=*0x%x, id=0x%x)", ctxt, id); if (id > 7) { - cellGcmSys.Error("cellGcmSetPrepareFlip: CELL_GCM_ERROR_FAILURE"); + cellGcmSys.error("cellGcmSetPrepareFlip: CELL_GCM_ERROR_FAILURE"); return CELL_GCM_ERROR_FAILURE; } @@ -500,7 +500,7 @@ s32 cellGcmSetPrepareFlip(PPUThread& ppu, vm::ptr ctxt, u32 { if (s32 res = ctxt->callback(ppu, ctxt, 8 /* ??? */)) { - cellGcmSys.Error("cellGcmSetPrepareFlip: callback failed (0x%08x)", res); + cellGcmSys.error("cellGcmSetPrepareFlip: callback failed (0x%08x)", res); return res; } } @@ -527,7 +527,7 @@ s32 cellGcmSetPrepareFlip(PPUThread& ppu, vm::ptr ctxt, u32 s32 cellGcmSetFlip(PPUThread& ppu, vm::ptr ctxt, u32 id) { - cellGcmSys.Log("cellGcmSetFlip(ctxt=*0x%x, id=0x%x)", ctxt, id); + cellGcmSys.trace("cellGcmSetFlip(ctxt=*0x%x, id=0x%x)", ctxt, id); if (s32 res = cellGcmSetPrepareFlip(ppu, ctxt, id)) { @@ -539,17 +539,17 @@ s32 cellGcmSetFlip(PPUThread& ppu, vm::ptr ctxt, u32 id) s32 cellGcmSetSecondVFrequency(u32 freq) { - cellGcmSys.Warning("cellGcmSetSecondVFrequency(level=%d)", freq); + cellGcmSys.warning("cellGcmSetSecondVFrequency(level=%d)", freq); switch (freq) { case CELL_GCM_DISPLAY_FREQUENCY_59_94HZ: Emu.GetGSManager().GetRender().frequency_mode = freq; Emu.GetGSManager().GetRender().fps_limit = 59.94; break; case CELL_GCM_DISPLAY_FREQUENCY_SCANOUT: - Emu.GetGSManager().GetRender().frequency_mode = freq; cellGcmSys.Todo("Unimplemented display frequency: Scanout"); break; + Emu.GetGSManager().GetRender().frequency_mode = freq; cellGcmSys.todo("Unimplemented display frequency: Scanout"); break; case CELL_GCM_DISPLAY_FREQUENCY_DISABLE: - Emu.GetGSManager().GetRender().frequency_mode = freq; cellGcmSys.Todo("Unimplemented display frequency: Disabled"); break; - default: cellGcmSys.Error("Improper display frequency specified!"); return CELL_OK; + Emu.GetGSManager().GetRender().frequency_mode = freq; cellGcmSys.todo("Unimplemented display frequency: Disabled"); break; + default: cellGcmSys.error("Improper display frequency specified!"); return CELL_OK; } return CELL_OK; @@ -557,30 +557,30 @@ s32 cellGcmSetSecondVFrequency(u32 freq) s32 cellGcmSetTileInfo(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 comp, u16 base, u8 bank) { - cellGcmSys.Warning("cellGcmSetTileInfo(index=%d, location=%d, offset=%d, size=%d, pitch=%d, comp=%d, base=%d, bank=%d)", + cellGcmSys.warning("cellGcmSetTileInfo(index=%d, location=%d, offset=%d, size=%d, pitch=%d, comp=%d, base=%d, bank=%d)", index, location, offset, size, pitch, comp, base, bank); if (index >= rsx::limits::tiles_count || base >= 2048 || bank >= 4) { - cellGcmSys.Error("cellGcmSetTileInfo: CELL_GCM_ERROR_INVALID_VALUE"); + cellGcmSys.error("cellGcmSetTileInfo: CELL_GCM_ERROR_INVALID_VALUE"); return CELL_GCM_ERROR_INVALID_VALUE; } if (offset & 0xffff || size & 0xffff || pitch & 0xf) { - cellGcmSys.Error("cellGcmSetTileInfo: CELL_GCM_ERROR_INVALID_ALIGNMENT"); + cellGcmSys.error("cellGcmSetTileInfo: CELL_GCM_ERROR_INVALID_ALIGNMENT"); return CELL_GCM_ERROR_INVALID_ALIGNMENT; } if (location >= 2 || (comp != 0 && (comp < 7 || comp > 12))) { - cellGcmSys.Error("cellGcmSetTileInfo: CELL_GCM_ERROR_INVALID_ALIGNMENT"); + cellGcmSys.error("cellGcmSetTileInfo: CELL_GCM_ERROR_INVALID_ALIGNMENT"); return CELL_GCM_ERROR_INVALID_ENUM; } if (comp) { - cellGcmSys.Error("cellGcmSetTileInfo: bad compression mode! (%d)", comp); + cellGcmSys.error("cellGcmSetTileInfo: bad compression mode! (%d)", comp); } auto& tile = Emu.GetGSManager().GetRender().tiles[index]; @@ -598,7 +598,7 @@ s32 cellGcmSetTileInfo(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u void cellGcmSetUserHandler(vm::ptr handler) { - cellGcmSys.Warning("cellGcmSetUserHandler(handler=*0x%x)", handler); + cellGcmSys.warning("cellGcmSetUserHandler(handler=*0x%x)", handler); Emu.GetGSManager().GetRender().user_handler = handler; } @@ -610,14 +610,14 @@ s32 cellGcmSetUserCommand() void cellGcmSetVBlankHandler(vm::ptr handler) { - cellGcmSys.Warning("cellGcmSetVBlankHandler(handler=*0x%x)", handler); + cellGcmSys.warning("cellGcmSetVBlankHandler(handler=*0x%x)", handler); Emu.GetGSManager().GetRender().vblank_handler = handler; } s32 cellGcmSetWaitFlip(vm::ptr ctxt) { - cellGcmSys.Warning("cellGcmSetWaitFlip(ctx=*0x%x)", ctxt); + cellGcmSys.warning("cellGcmSetWaitFlip(ctx=*0x%x)", ctxt); // TODO: emit RSX command for "wait flip" operation @@ -631,12 +631,12 @@ s32 cellGcmSetWaitFlipUnsafe() 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) { - cellGcmSys.Todo("cellGcmSetZcull(index=%d, offset=0x%x, width=%d, height=%d, cullStart=0x%x, zFormat=0x%x, aaFormat=0x%x, zCullDir=0x%x, zCullFormat=0x%x, sFunc=0x%x, sRef=0x%x, sMask=0x%x)", + cellGcmSys.todo("cellGcmSetZcull(index=%d, offset=0x%x, width=%d, height=%d, cullStart=0x%x, zFormat=0x%x, aaFormat=0x%x, zCullDir=0x%x, zCullFormat=0x%x, sFunc=0x%x, sRef=0x%x, sMask=0x%x)", index, offset, width, height, cullStart, zFormat, aaFormat, zCullDir, zCullFormat, sFunc, sRef, sMask); if (index >= rsx::limits::zculls_count) { - cellGcmSys.Error("cellGcmSetZcull: CELL_GCM_ERROR_INVALID_VALUE"); + cellGcmSys.error("cellGcmSetZcull: CELL_GCM_ERROR_INVALID_VALUE"); return CELL_GCM_ERROR_INVALID_VALUE; } @@ -659,11 +659,11 @@ s32 cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart, s32 cellGcmUnbindTile(u8 index) { - cellGcmSys.Warning("cellGcmUnbindTile(index=%d)", index); + cellGcmSys.warning("cellGcmUnbindTile(index=%d)", index); if (index >= rsx::limits::tiles_count) { - cellGcmSys.Error("cellGcmUnbindTile: CELL_GCM_ERROR_INVALID_VALUE"); + cellGcmSys.error("cellGcmUnbindTile: CELL_GCM_ERROR_INVALID_VALUE"); return CELL_GCM_ERROR_INVALID_VALUE; } @@ -675,11 +675,11 @@ s32 cellGcmUnbindTile(u8 index) s32 cellGcmUnbindZcull(u8 index) { - cellGcmSys.Warning("cellGcmUnbindZcull(index=%d)", index); + cellGcmSys.warning("cellGcmUnbindZcull(index=%d)", index); if (index >= 8) { - cellGcmSys.Error("cellGcmUnbindZcull: CELL_EINVAL"); + cellGcmSys.error("cellGcmUnbindZcull: CELL_EINVAL"); return CELL_EINVAL; } @@ -691,25 +691,25 @@ s32 cellGcmUnbindZcull(u8 index) u32 cellGcmGetTileInfo() { - cellGcmSys.Warning("cellGcmGetTileInfo()"); + cellGcmSys.warning("cellGcmGetTileInfo()"); return Emu.GetGSManager().GetRender().tiles_addr; } u32 cellGcmGetZcullInfo() { - cellGcmSys.Warning("cellGcmGetZcullInfo()"); + cellGcmSys.warning("cellGcmGetZcullInfo()"); return Emu.GetGSManager().GetRender().zculls_addr; } u32 cellGcmGetDisplayInfo() { - cellGcmSys.Warning("cellGcmGetDisplayInfo() = 0x%x", Emu.GetGSManager().GetRender().gcm_buffers.addr()); + cellGcmSys.warning("cellGcmGetDisplayInfo() = 0x%x", Emu.GetGSManager().GetRender().gcm_buffers.addr()); return Emu.GetGSManager().GetRender().gcm_buffers.addr(); } s32 cellGcmGetCurrentDisplayBufferId(vm::ptr id) { - cellGcmSys.Warning("cellGcmGetCurrentDisplayBufferId(id=*0x%x)", id); + cellGcmSys.warning("cellGcmGetCurrentDisplayBufferId(id=*0x%x)", id); if (Emu.GetGSManager().GetRender().gcm_current_buffer > UINT8_MAX) { @@ -746,20 +746,20 @@ s32 cellGcmGetDisplayBufferByFlipIndex() u64 cellGcmGetLastFlipTime() { - cellGcmSys.Log("cellGcmGetLastFlipTime()"); + cellGcmSys.trace("cellGcmGetLastFlipTime()"); return Emu.GetGSManager().GetRender().last_flip_time; } u64 cellGcmGetLastSecondVTime() { - cellGcmSys.Todo("cellGcmGetLastSecondVTime()"); + cellGcmSys.todo("cellGcmGetLastSecondVTime()"); return CELL_OK; } u64 cellGcmGetVBlankCount() { - cellGcmSys.Log("cellGcmGetVBlankCount()"); + cellGcmSys.trace("cellGcmGetVBlankCount()"); return Emu.GetGSManager().GetRender().vblank_count; } @@ -771,7 +771,7 @@ s32 cellGcmSysGetLastVBlankTime() s32 cellGcmInitSystemMode(u64 mode) { - cellGcmSys.Log("cellGcmInitSystemMode(mode=0x%x)", mode); + cellGcmSys.trace("cellGcmInitSystemMode(mode=0x%x)", mode); system_mode = mode; @@ -780,11 +780,11 @@ s32 cellGcmInitSystemMode(u64 mode) s32 cellGcmSetFlipImmediate(u8 id) { - cellGcmSys.Todo("cellGcmSetFlipImmediate(fid=0x%x)", id); + cellGcmSys.todo("cellGcmSetFlipImmediate(fid=0x%x)", id); if (id > 7) { - cellGcmSys.Error("cellGcmSetFlipImmediate: CELL_GCM_ERROR_FAILURE"); + cellGcmSys.error("cellGcmSetFlipImmediate: CELL_GCM_ERROR_FAILURE"); return CELL_GCM_ERROR_FAILURE; } @@ -828,7 +828,7 @@ s32 cellGcmSortRemapEaIoAddress() //---------------------------------------------------------------------------- s32 cellGcmAddressToOffset(u32 address, vm::ptr offset) { - cellGcmSys.Log("cellGcmAddressToOffset(address=0x%x, offset=*0x%x)", address, offset); + cellGcmSys.trace("cellGcmAddressToOffset(address=0x%x, offset=*0x%x)", address, offset); // Address not on main memory or local memory if (address >= 0xD0000000) @@ -865,14 +865,14 @@ s32 cellGcmAddressToOffset(u32 address, vm::ptr offset) u32 cellGcmGetMaxIoMapSize() { - cellGcmSys.Log("cellGcmGetMaxIoMapSize()"); + cellGcmSys.trace("cellGcmGetMaxIoMapSize()"); return RSXIOMem.GetSize() - RSXIOMem.GetReservedAmount(); } void cellGcmGetOffsetTable(vm::ptr table) { - cellGcmSys.Log("cellGcmGetOffsetTable(table=*0x%x)", table); + cellGcmSys.trace("cellGcmGetOffsetTable(table=*0x%x)", table); table->ioAddress = offsetTable.ioAddress; table->eaAddress = offsetTable.eaAddress; @@ -880,7 +880,7 @@ void cellGcmGetOffsetTable(vm::ptr table) s32 cellGcmIoOffsetToAddress(u32 ioOffset, vm::ptr address) { - cellGcmSys.Log("cellGcmIoOffsetToAddress(ioOffset=0x%x, address=*0x%x)", ioOffset, address); + cellGcmSys.trace("cellGcmIoOffsetToAddress(ioOffset=0x%x, address=*0x%x)", ioOffset, address); u32 realAddr; @@ -909,7 +909,7 @@ s32 gcmMapEaIoAddress(u32 ea, u32 io, u32 size, bool is_strict) } else { - cellGcmSys.Error("cellGcmMapEaIoAddress: CELL_GCM_ERROR_FAILURE"); + cellGcmSys.error("cellGcmMapEaIoAddress: CELL_GCM_ERROR_FAILURE"); return CELL_GCM_ERROR_FAILURE; } @@ -918,14 +918,14 @@ s32 gcmMapEaIoAddress(u32 ea, u32 io, u32 size, bool is_strict) s32 cellGcmMapEaIoAddress(u32 ea, u32 io, u32 size) { - cellGcmSys.Warning("cellGcmMapEaIoAddress(ea=0x%x, io=0x%x, size=0x%x)", ea, io, size); + cellGcmSys.warning("cellGcmMapEaIoAddress(ea=0x%x, io=0x%x, size=0x%x)", ea, io, size); return gcmMapEaIoAddress(ea, io, size, false); } s32 cellGcmMapEaIoAddressWithFlags(u32 ea, u32 io, u32 size, u32 flags) { - cellGcmSys.Warning("cellGcmMapEaIoAddressWithFlags(ea=0x%x, io=0x%x, size=0x%x, flags=0x%x)", ea, io, size, flags); + cellGcmSys.warning("cellGcmMapEaIoAddressWithFlags(ea=0x%x, io=0x%x, size=0x%x, flags=0x%x)", ea, io, size, flags); assert(flags == 2 /*CELL_GCM_IOMAP_FLAG_STRICT_ORDERING*/); @@ -934,7 +934,7 @@ s32 cellGcmMapEaIoAddressWithFlags(u32 ea, u32 io, u32 size, u32 flags) s32 cellGcmMapLocalMemory(vm::ptr address, vm::ptr size) { - cellGcmSys.Warning("cellGcmMapLocalMemory(address=*0x%x, size=*0x%x)", address, size); + cellGcmSys.warning("cellGcmMapLocalMemory(address=*0x%x, size=*0x%x)", address, size); if (!local_addr && !local_size && vm::falloc(local_addr = 0xC0000000, local_size = 0xf900000 /* TODO */, vm::video)) { @@ -943,7 +943,7 @@ s32 cellGcmMapLocalMemory(vm::ptr address, vm::ptr size) } else { - cellGcmSys.Error("RSX local memory already mapped"); + cellGcmSys.error("RSX local memory already mapped"); return CELL_GCM_ERROR_FAILURE; } @@ -952,7 +952,7 @@ s32 cellGcmMapLocalMemory(vm::ptr address, vm::ptr size) s32 cellGcmMapMainMemory(u32 ea, u32 size, vm::ptr offset) { - cellGcmSys.Warning("cellGcmMapMainMemory(ea=0x%x, size=0x%x, offset=*0x%x)", ea, size, offset); + cellGcmSys.warning("cellGcmMapMainMemory(ea=0x%x, size=0x%x, offset=*0x%x)", ea, size, offset); if ((ea & 0xFFFFF) || (size & 0xFFFFF)) return CELL_GCM_ERROR_FAILURE; @@ -973,7 +973,7 @@ s32 cellGcmMapMainMemory(u32 ea, u32 size, vm::ptr offset) } else { - cellGcmSys.Error("cellGcmMapMainMemory: CELL_GCM_ERROR_NO_IO_PAGE_TABLE"); + cellGcmSys.error("cellGcmMapMainMemory: CELL_GCM_ERROR_NO_IO_PAGE_TABLE"); return CELL_GCM_ERROR_NO_IO_PAGE_TABLE; } @@ -984,17 +984,17 @@ s32 cellGcmMapMainMemory(u32 ea, u32 size, vm::ptr offset) s32 cellGcmReserveIoMapSize(u32 size) { - cellGcmSys.Log("cellGcmReserveIoMapSize(size=0x%x)", size); + cellGcmSys.trace("cellGcmReserveIoMapSize(size=0x%x)", size); if (size & 0xFFFFF) { - cellGcmSys.Error("cellGcmReserveIoMapSize: CELL_GCM_ERROR_INVALID_ALIGNMENT"); + cellGcmSys.error("cellGcmReserveIoMapSize: CELL_GCM_ERROR_INVALID_ALIGNMENT"); return CELL_GCM_ERROR_INVALID_ALIGNMENT; } if (size > cellGcmGetMaxIoMapSize()) { - cellGcmSys.Error("cellGcmReserveIoMapSize: CELL_GCM_ERROR_INVALID_VALUE"); + cellGcmSys.error("cellGcmReserveIoMapSize: CELL_GCM_ERROR_INVALID_VALUE"); return CELL_GCM_ERROR_INVALID_VALUE; } @@ -1004,7 +1004,7 @@ s32 cellGcmReserveIoMapSize(u32 size) s32 cellGcmUnmapEaIoAddress(u32 ea) { - cellGcmSys.Log("cellGcmUnmapEaIoAddress(ea=0x%x)", ea); + cellGcmSys.trace("cellGcmUnmapEaIoAddress(ea=0x%x)", ea); u32 size; if (RSXIOMem.UnmapRealAddress(ea, size)) @@ -1019,7 +1019,7 @@ s32 cellGcmUnmapEaIoAddress(u32 ea) } else { - cellGcmSys.Error("cellGcmUnmapEaIoAddress(ea=0x%x): UnmapRealAddress() failed"); + cellGcmSys.error("cellGcmUnmapEaIoAddress(ea=0x%x): UnmapRealAddress() failed"); return CELL_GCM_ERROR_FAILURE; } @@ -1028,7 +1028,7 @@ s32 cellGcmUnmapEaIoAddress(u32 ea) s32 cellGcmUnmapIoAddress(u32 io) { - cellGcmSys.Log("cellGcmUnmapIoAddress(io=0x%x)", io); + cellGcmSys.trace("cellGcmUnmapIoAddress(io=0x%x)", io); u32 size; if (RSXIOMem.UnmapAddress(io, size)) @@ -1043,7 +1043,7 @@ s32 cellGcmUnmapIoAddress(u32 io) } else { - cellGcmSys.Error("cellGcmUnmapIoAddress(io=0x%x): UnmapAddress() failed"); + cellGcmSys.error("cellGcmUnmapIoAddress(io=0x%x): UnmapAddress() failed"); return CELL_GCM_ERROR_FAILURE; } @@ -1052,17 +1052,17 @@ s32 cellGcmUnmapIoAddress(u32 io) s32 cellGcmUnreserveIoMapSize(u32 size) { - cellGcmSys.Log("cellGcmUnreserveIoMapSize(size=0x%x)", size); + cellGcmSys.trace("cellGcmUnreserveIoMapSize(size=0x%x)", size); if (size & 0xFFFFF) { - cellGcmSys.Error("cellGcmReserveIoMapSize: CELL_GCM_ERROR_INVALID_ALIGNMENT"); + cellGcmSys.error("cellGcmReserveIoMapSize: CELL_GCM_ERROR_INVALID_ALIGNMENT"); return CELL_GCM_ERROR_INVALID_ALIGNMENT; } if (size > RSXIOMem.GetReservedAmount()) { - cellGcmSys.Error("cellGcmReserveIoMapSize: CELL_GCM_ERROR_INVALID_VALUE"); + cellGcmSys.error("cellGcmReserveIoMapSize: CELL_GCM_ERROR_INVALID_VALUE"); return CELL_GCM_ERROR_INVALID_VALUE; } @@ -1116,7 +1116,7 @@ s32 cellGcmSetCursorImageOffset(u32 offset) void cellGcmSetDefaultCommandBuffer() { - cellGcmSys.Warning("cellGcmSetDefaultCommandBuffer()"); + cellGcmSys.warning("cellGcmSetDefaultCommandBuffer()"); vm::write32(Emu.GetGSManager().GetRender().ctxt_addr, gcm_info.context_addr); } @@ -1131,14 +1131,14 @@ s32 cellGcmSetDefaultCommandBufferAndSegmentWordSize() s32 _cellGcmSetFlipCommand(PPUThread& ppu, vm::ptr ctx, u32 id) { - cellGcmSys.Log("cellGcmSetFlipCommand(ctx=*0x%x, id=0x%x)", ctx, id); + cellGcmSys.trace("cellGcmSetFlipCommand(ctx=*0x%x, id=0x%x)", ctx, id); return cellGcmSetPrepareFlip(ppu, ctx, id); } s32 _cellGcmSetFlipCommandWithWaitLabel(PPUThread& ppu, vm::ptr ctx, u32 id, u32 label_index, u32 label_value) { - cellGcmSys.Log("cellGcmSetFlipCommandWithWaitLabel(ctx=*0x%x, id=0x%x, label_index=0x%x, label_value=0x%x)", ctx, id, label_index, label_value); + cellGcmSys.trace("cellGcmSetFlipCommandWithWaitLabel(ctx=*0x%x, id=0x%x, label_index=0x%x, label_value=0x%x)", ctx, id, label_index, label_value); s32 res = cellGcmSetPrepareFlip(ppu, ctx, id); vm::write32(gcm_info.label_addr + 0x10 * label_index, label_value); @@ -1147,31 +1147,31 @@ s32 _cellGcmSetFlipCommandWithWaitLabel(PPUThread& ppu, vm::ptr= rsx::limits::tiles_count || base >= 2048 || bank >= 4) { - cellGcmSys.Error("cellGcmSetTile: CELL_GCM_ERROR_INVALID_VALUE"); + cellGcmSys.error("cellGcmSetTile: CELL_GCM_ERROR_INVALID_VALUE"); return CELL_GCM_ERROR_INVALID_VALUE; } if (offset & 0xffff || size & 0xffff || pitch & 0xf) { - cellGcmSys.Error("cellGcmSetTile: CELL_GCM_ERROR_INVALID_ALIGNMENT"); + cellGcmSys.error("cellGcmSetTile: CELL_GCM_ERROR_INVALID_ALIGNMENT"); return CELL_GCM_ERROR_INVALID_ALIGNMENT; } if (location >= 2 || (comp != 0 && (comp < 7 || comp > 12))) { - cellGcmSys.Error("cellGcmSetTile: CELL_GCM_ERROR_INVALID_ENUM"); + cellGcmSys.error("cellGcmSetTile: CELL_GCM_ERROR_INVALID_ENUM"); return CELL_GCM_ERROR_INVALID_ENUM; } if (comp) { - cellGcmSys.Error("cellGcmSetTile: bad compression mode! (%d)", comp); + cellGcmSys.error("cellGcmSetTile: bad compression mode! (%d)", comp); } auto& tile = Emu.GetGSManager().GetRender().tiles[index]; @@ -1272,7 +1272,7 @@ static bool isInCommandBufferExcept(u32 getPos, u32 bufferBegin, u32 bufferEnd) // TODO: Avoid using syscall 1023 for calling this function s32 cellGcmCallback(vm::ptr context, u32 count) { - cellGcmSys.Log("cellGcmCallback(context=*0x%x, count=0x%x)", context, count); + cellGcmSys.trace("cellGcmCallback(context=*0x%x, count=0x%x)", context, count); auto& ctrl = vm::_ref(gcm_info.control_addr); const std::chrono::time_point enterWait = std::chrono::system_clock::now(); @@ -1297,7 +1297,7 @@ s32 cellGcmCallback(vm::ptr context, u32 count) std::chrono::time_point waitPoint = std::chrono::system_clock::now(); long long elapsedTime = std::chrono::duration_cast(waitPoint - enterWait).count(); if (elapsedTime > 0) - cellGcmSys.Error("Has wait for more than a second for command buffer to be released by RSX"); + cellGcmSys.error("Has wait for more than a second for command buffer to be released by RSX"); std::this_thread::yield(); } diff --git a/rpcs3/Emu/SysCalls/Modules/cellGem.cpp b/rpcs3/Emu/SysCalls/Modules/cellGem.cpp index d2e44789ee..a2e3910fad 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGem.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGem.cpp @@ -50,7 +50,7 @@ s32 cellGemEnableMagnetometer() s32 cellGemEnd() { - cellGem.Warning("cellGemEnd()"); + cellGem.warning("cellGemEnd()"); if (!fxm::remove()) { @@ -116,7 +116,7 @@ s32 cellGemGetInertialState() s32 cellGemGetInfo(vm::ptr info) { - cellGem.Todo("cellGemGetInfo(info=*0x%x)", info); + cellGem.todo("cellGemGetInfo(info=*0x%x)", info); const auto gem = fxm::get(); @@ -139,7 +139,7 @@ s32 cellGemGetInfo(vm::ptr info) s32 cellGemGetMemorySize(s32 max_connect) { - cellGem.Warning("cellGemGetMemorySize(max_connect=%d)", max_connect); + cellGem.warning("cellGemGetMemorySize(max_connect=%d)", max_connect); if (max_connect > CELL_GEM_MAX_NUM || max_connect <= 0) { @@ -187,7 +187,7 @@ s32 cellGemHSVtoRGB() s32 cellGemInit(vm::cptr attribute) { - cellGem.Warning("cellGemInit(attribute=*0x%x)", attribute); + cellGem.warning("cellGemInit(attribute=*0x%x)", attribute); const auto gem = fxm::make(); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp index 5179971803..41049ae319 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp @@ -48,7 +48,7 @@ s32 cellGifDecExtCreate(PPMainHandle mainHandle, PThreadInParam threadInParam, P s32 cellGifDecOpen(PMainHandle mainHandle, PPSubHandle subHandle, PSrc src, POpenInfo openInfo) { - cellGifDec.Warning("cellGifDecOpen(mainHandle=*0x%x, subHandle=**0x%x, src=*0x%x, openInfo=*0x%x)", mainHandle, subHandle, src, openInfo); + cellGifDec.warning("cellGifDecOpen(mainHandle=*0x%x, subHandle=**0x%x, src=*0x%x, openInfo=*0x%x)", mainHandle, subHandle, src, openInfo); GifStream current_subHandle; current_subHandle.fd = 0; @@ -86,7 +86,7 @@ s32 cellGifDecExtOpen() s32 cellGifDecReadHeader(PMainHandle mainHandle, PSubHandle subHandle, PInfo info) { - cellGifDec.Warning("cellGifDecReadHeader(mainHandle=*0x%x, subHandle=*0x%x, info=*0x%x)", mainHandle, subHandle, info); + cellGifDec.warning("cellGifDecReadHeader(mainHandle=*0x%x, subHandle=*0x%x, info=*0x%x)", mainHandle, subHandle, info); const u32& fd = subHandle->fd; const u64& fileSize = subHandle->fileSize; @@ -138,7 +138,7 @@ s32 cellGifDecExtReadHeader() s32 cellGifDecSetParameter(PMainHandle mainHandle, PSubHandle subHandle, PInParam inParam, POutParam outParam) { - cellGifDec.Warning("cellGifDecSetParameter(mainHandle=*0x%x, subHandle=*0x%x, inParam=*0x%x, outParam=*0x%x)", mainHandle, subHandle, inParam, outParam); + cellGifDec.warning("cellGifDecSetParameter(mainHandle=*0x%x, subHandle=*0x%x, inParam=*0x%x, outParam=*0x%x)", mainHandle, subHandle, inParam, outParam); CellGifDecInfo& current_info = subHandle->info; CellGifDecOutParam& current_outParam = subHandle->outParam; @@ -168,7 +168,7 @@ s32 cellGifDecExtSetParameter() s32 cellGifDecDecodeData(PMainHandle mainHandle, PSubHandle subHandle, vm::ptr data, PDataCtrlParam dataCtrlParam, PDataOutInfo dataOutInfo) { - cellGifDec.Warning("cellGifDecDecodeData(mainHandle=*0x%x, subHandle=*0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x)", mainHandle, subHandle, data, dataCtrlParam, dataOutInfo); + cellGifDec.warning("cellGifDecDecodeData(mainHandle=*0x%x, subHandle=*0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x)", mainHandle, subHandle, data, dataCtrlParam, dataOutInfo); dataOutInfo->status = CELL_GIFDEC_DEC_STATUS_STOP; @@ -287,7 +287,7 @@ s32 cellGifDecExtDecodeData() s32 cellGifDecClose(PMainHandle mainHandle, PSubHandle subHandle) { - cellGifDec.Warning("cellGifDecClose(mainHandle=*0x%x, subHandle=*0x%x)", mainHandle, subHandle); + cellGifDec.warning("cellGifDecClose(mainHandle=*0x%x, subHandle=*0x%x)", mainHandle, subHandle); idm::remove(subHandle->fd); diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp index 3216c1c4f5..59f6ff6b39 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp @@ -37,7 +37,7 @@ s32 cellJpgDecDestroy(u32 mainHandle) s32 cellJpgDecOpen(u32 mainHandle, vm::ptr subHandle, vm::ptr src, vm::ptr openInfo) { - cellJpgDec.Warning("cellJpgDecOpen(mainHandle=0x%x, subHandle=*0x%x, src=*0x%x, openInfo=*0x%x)", mainHandle, subHandle, src, openInfo); + cellJpgDec.warning("cellJpgDecOpen(mainHandle=0x%x, subHandle=*0x%x, src=*0x%x, openInfo=*0x%x)", mainHandle, subHandle, src, openInfo); CellJpgDecSubHandle current_subHandle; @@ -75,7 +75,7 @@ s32 cellJpgDecExtOpen() s32 cellJpgDecClose(u32 mainHandle, u32 subHandle) { - cellJpgDec.Warning("cellJpgDecOpen(mainHandle=0x%x, subHandle=0x%x)", mainHandle, subHandle); + cellJpgDec.warning("cellJpgDecOpen(mainHandle=0x%x, subHandle=0x%x)", mainHandle, subHandle); const auto subHandle_data = idm::get(subHandle); @@ -92,7 +92,7 @@ s32 cellJpgDecClose(u32 mainHandle, u32 subHandle) s32 cellJpgDecReadHeader(u32 mainHandle, u32 subHandle, vm::ptr info) { - cellJpgDec.Log("cellJpgDecReadHeader(mainHandle=0x%x, subHandle=0x%x, info=*0x%x)", mainHandle, subHandle, info); + cellJpgDec.trace("cellJpgDecReadHeader(mainHandle=0x%x, subHandle=0x%x, info=*0x%x)", mainHandle, subHandle, info); const auto subHandle_data = idm::get(subHandle); @@ -169,7 +169,7 @@ s32 cellJpgDecExtReadHeader() s32 cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr data, vm::cptr dataCtrlParam, vm::ptr dataOutInfo) { - cellJpgDec.Log("cellJpgDecDecodeData(mainHandle=0x%x, subHandle=0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x)", mainHandle, subHandle, data, dataCtrlParam, dataOutInfo); + cellJpgDec.trace("cellJpgDecDecodeData(mainHandle=0x%x, subHandle=0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x)", mainHandle, subHandle, data, dataCtrlParam, dataOutInfo); dataOutInfo->status = CELL_JPGDEC_DEC_STATUS_STOP; @@ -288,7 +288,7 @@ s32 cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr data, vm::cp case CELL_JPG_UPSAMPLE_ONLY: case CELL_JPG_GRAYSCALE_TO_ALPHA_RGBA: case CELL_JPG_GRAYSCALE_TO_ALPHA_ARGB: - cellJpgDec.Error("cellJpgDecDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace); + cellJpgDec.error("cellJpgDecDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace); break; default: @@ -310,7 +310,7 @@ s32 cellJpgDecExtDecodeData() s32 cellJpgDecSetParameter(u32 mainHandle, u32 subHandle, vm::cptr inParam, vm::ptr outParam) { - cellJpgDec.Log("cellJpgDecSetParameter(mainHandle=0x%x, subHandle=0x%x, inParam=*0x%x, outParam=*0x%x)", mainHandle, subHandle, inParam, outParam); + cellJpgDec.trace("cellJpgDecSetParameter(mainHandle=0x%x, subHandle=0x%x, inParam=*0x%x, outParam=*0x%x)", mainHandle, subHandle, inParam, outParam); const auto subHandle_data = idm::get(subHandle); diff --git a/rpcs3/Emu/SysCalls/Modules/cellKb.cpp b/rpcs3/Emu/SysCalls/Modules/cellKb.cpp index bd55bef6f6..bab63108c2 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellKb.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellKb.cpp @@ -10,7 +10,7 @@ extern Module<> sys_io; s32 cellKbInit(u32 max_connect) { - sys_io.Warning("cellKbInit(max_connect=%d)", max_connect); + sys_io.warning("cellKbInit(max_connect=%d)", max_connect); if (Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_ALREADY_INITIALIZED; @@ -24,7 +24,7 @@ s32 cellKbInit(u32 max_connect) s32 cellKbEnd() { - sys_io.Log("cellKbEnd()"); + sys_io.trace("cellKbEnd()"); if (!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED; @@ -35,7 +35,7 @@ s32 cellKbEnd() s32 cellKbClearBuf(u32 port_no) { - sys_io.Log("cellKbClearBuf(port_no=%d)", port_no); + sys_io.trace("cellKbClearBuf(port_no=%d)", port_no); if (!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED; @@ -50,7 +50,7 @@ s32 cellKbClearBuf(u32 port_no) u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode) { - sys_io.Log("cellKbCnvRawCode(arrange=%d,mkey=%d,led=%d,rawcode=%d)", arrange, mkey, led, rawcode); + sys_io.trace("cellKbCnvRawCode(arrange=%d,mkey=%d,led=%d,rawcode=%d)", arrange, mkey, led, rawcode); // CELL_KB_RAWDAT if (rawcode <= 0x03 || rawcode == 0x29 || rawcode == 0x35 || (rawcode >= 0x39 && rawcode <= 0x53) || rawcode == 0x65 || rawcode == 0x88 || rawcode == 0x8A || rawcode == 0x8B) @@ -96,7 +96,7 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode) s32 cellKbGetInfo(vm::ptr info) { - sys_io.Log("cellKbGetInfo(info=*0x%x)", info); + sys_io.trace("cellKbGetInfo(info=*0x%x)", info); if (!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED; @@ -116,7 +116,7 @@ s32 cellKbGetInfo(vm::ptr info) s32 cellKbRead(u32 port_no, vm::ptr data) { - sys_io.Log("cellKbRead(port_no=%d, data=*0x%x)", port_no, data); + sys_io.trace("cellKbRead(port_no=%d, data=*0x%x)", port_no, data); const std::vector& keyboards = Emu.GetKeyboardManager().GetKeyboards(); if (!Emu.GetKeyboardManager().IsInited()) @@ -142,7 +142,7 @@ s32 cellKbRead(u32 port_no, vm::ptr data) s32 cellKbSetCodeType(u32 port_no, u32 type) { - sys_io.Log("cellKbSetCodeType(port_no=%d,type=%d)", port_no, type); + sys_io.trace("cellKbSetCodeType(port_no=%d,type=%d)", port_no, type); if (!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED; @@ -160,7 +160,7 @@ s32 cellKbSetLEDStatus(u32 port_no, u8 led) s32 cellKbSetReadMode(u32 port_no, u32 rmode) { - sys_io.Log("cellKbSetReadMode(port_no=%d,rmode=%d)", port_no, rmode); + sys_io.trace("cellKbSetReadMode(port_no=%d,rmode=%d)", port_no, rmode); if (!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED; @@ -173,7 +173,7 @@ s32 cellKbSetReadMode(u32 port_no, u32 rmode) s32 cellKbGetConfiguration(u32 port_no, vm::ptr config) { - sys_io.Log("cellKbGetConfiguration(port_no=%d, config=*0x%x)", port_no, config); + sys_io.trace("cellKbGetConfiguration(port_no=%d, config=*0x%x)", port_no, config); if (!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED; diff --git a/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp b/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp index fb4568d9d3..21be193baa 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp @@ -474,7 +474,7 @@ s32 ARIBstoUTF8s() s32 SJISstoUTF8s(vm::cptr src, vm::cptr src_len, vm::ptr dst, vm::ptr dst_len) { - cellL10n.Warning("SJISstoUTF8s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len); + cellL10n.warning("SJISstoUTF8s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len); return _L10nConvertStr(L10N_CODEPAGE_932, src, src_len, L10N_UTF8, dst, dst_len); } @@ -580,7 +580,7 @@ s32 EUCKRtoUHC() s32 UCS2toSJIS(u16 ch, vm::ptr dst) { - cellL10n.Warning("UCS2toSJIS(ch=%d, dst=*0x%x)", ch, dst); + cellL10n.warning("UCS2toSJIS(ch=%d, dst=*0x%x)", ch, dst); return _L10nConvertCharNoResult(L10N_UTF8, &ch, sizeof(ch), L10N_CODEPAGE_932, dst); } @@ -721,7 +721,7 @@ s32 UTF8toUTF32() s32 jstrchk(vm::cptr jstr) { - cellL10n.Warning("jstrchk(jstr=*0x%x) -> utf8", jstr); + cellL10n.warning("jstrchk(jstr=*0x%x) -> utf8", jstr); return L10N_STR_UTF8; } @@ -803,7 +803,7 @@ s32 UHCtoUCS2() s32 L10nConvertStr(s32 src_code, vm::cptr src, vm::ptr src_len, s32 dst_code, vm::ptr dst, vm::ptr dst_len) { - cellL10n.Error("L10nConvertStr(src_code=%d, src=*0x%x, src_len=*0x%x, dst_code=%d, dst=*0x%x, dst_len=*0x%x)", src_code, src, src_len, dst_code, dst, dst_len); + cellL10n.error("L10nConvertStr(src_code=%d, src=*0x%x, src_len=*0x%x, dst_code=%d, dst=*0x%x, dst_len=*0x%x)", src_code, src, src_len, dst_code, dst, dst_len); return _L10nConvertStr(src_code, src, src_len, dst_code, dst, dst_len); } @@ -889,7 +889,7 @@ s32 UTF16toUTF32() s32 l10n_convert_str(s32 cd, vm::cptr src, vm::ptr src_len, vm::ptr dst, vm::ptr dst_len) { - cellL10n.Warning("l10n_convert_str(cd=%d, src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", cd, src, src_len, dst, dst_len); + cellL10n.warning("l10n_convert_str(cd=%d, src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", cd, src, src_len, dst, dst_len); s32 src_code = cd >> 16; s32 dst_code = cd & 0xffff; @@ -999,7 +999,7 @@ s32 MSJISstoUCS2s() s32 l10n_get_converter(u32 src_code, u32 dst_code) { - cellL10n.Warning("l10n_get_converter(src_code=%d, dst_code=%d)", src_code, dst_code); + cellL10n.warning("l10n_get_converter(src_code=%d, dst_code=%d)", src_code, dst_code); return (src_code << 16) | dst_code; } @@ -1060,7 +1060,7 @@ s32 UTF8toBIG5() s32 UTF16stoUTF8s(vm::cptr utf16, vm::ref utf16_len, vm::ptr utf8, vm::ref utf8_len) { - cellL10n.Error("UTF16stoUTF8s(utf16=*0x%x, utf16_len=*0x%x, utf8=*0x%x, utf8_len=*0x%x)", utf16, utf16_len, utf8, utf8_len); + cellL10n.error("UTF16stoUTF8s(utf16=*0x%x, utf16_len=*0x%x, utf8=*0x%x, utf8_len=*0x%x)", utf16, utf16_len, utf8, utf8_len); const u32 max_len = utf8_len; utf8_len = 0; @@ -1112,7 +1112,7 @@ s32 GB18030toUTF8() s32 UTF8toSJIS(u8 ch, vm::ptr dst, vm::ptr dst_len) { - cellL10n.Warning("UTF8toSJIS(ch=%d, dst=*0x%x, dst_len=*0x%x)", ch, dst, dst_len); + cellL10n.warning("UTF8toSJIS(ch=%d, dst=*0x%x, dst_len=*0x%x)", ch, dst, dst_len); return _L10nConvertChar(L10N_UTF8, &ch, sizeof(ch), L10N_CODEPAGE_932, dst, dst_len); } @@ -1153,7 +1153,7 @@ s32 UTF8stoUTF16s() s32 SJISstoUCS2s(vm::cptr src, vm::cptr src_len, vm::ptr dst, vm::ptr dst_len) { - cellL10n.Warning("SJISstoUCS2s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len); + cellL10n.warning("SJISstoUCS2s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len); return _L10nConvertStr(L10N_CODEPAGE_932, src, src_len, L10N_UCS2, dst, dst_len); } diff --git a/rpcs3/Emu/SysCalls/Modules/cellMic.cpp b/rpcs3/Emu/SysCalls/Modules/cellMic.cpp index 541db53ade..e5e3a9bce5 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMic.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMic.cpp @@ -9,14 +9,14 @@ extern Module<> cellMic; s32 cellMicInit() { - cellMic.Warning("cellMicInit()"); + cellMic.warning("cellMicInit()"); return CELL_OK; } s32 cellMicEnd() { - cellMic.Warning("cellMicEnd()"); + cellMic.warning("cellMicEnd()"); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellMouse.cpp b/rpcs3/Emu/SysCalls/Modules/cellMouse.cpp index ca06448886..e4aae28a40 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMouse.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMouse.cpp @@ -10,7 +10,7 @@ extern Module<> sys_io; s32 cellMouseInit(u32 max_connect) { - sys_io.Warning("cellMouseInit(max_connect=%d)", max_connect); + sys_io.warning("cellMouseInit(max_connect=%d)", max_connect); if (Emu.GetMouseManager().IsInited()) { @@ -29,7 +29,7 @@ s32 cellMouseInit(u32 max_connect) s32 cellMouseClearBuf(u32 port_no) { - sys_io.Log("cellMouseClearBuf(port_no=%d)", port_no); + sys_io.trace("cellMouseClearBuf(port_no=%d)", port_no); if (!Emu.GetMouseManager().IsInited()) { @@ -48,7 +48,7 @@ s32 cellMouseClearBuf(u32 port_no) s32 cellMouseEnd() { - sys_io.Log("cellMouseEnd()"); + sys_io.trace("cellMouseEnd()"); if (!Emu.GetMouseManager().IsInited()) { @@ -61,7 +61,7 @@ s32 cellMouseEnd() s32 cellMouseGetInfo(vm::ptr info) { - sys_io.Log("cellMouseGetInfo(info=*0x%x)", info); + sys_io.trace("cellMouseGetInfo(info=*0x%x)", info); if (!Emu.GetMouseManager().IsInited()) { @@ -81,7 +81,7 @@ s32 cellMouseGetInfo(vm::ptr info) s32 cellMouseInfoTabletMode(u32 port_no, vm::ptr info) { - sys_io.Log("cellMouseInfoTabletMode(port_no=%d, info=*0x%x)", port_no, info); + sys_io.trace("cellMouseInfoTabletMode(port_no=%d, info=*0x%x)", port_no, info); if (!Emu.GetMouseManager().IsInited()) { return CELL_MOUSE_ERROR_UNINITIALIZED; @@ -100,7 +100,7 @@ s32 cellMouseInfoTabletMode(u32 port_no, vm::ptr info) s32 cellMouseGetData(u32 port_no, vm::ptr data) { - sys_io.Log("cellMouseGetData(port_no=%d, data=*0x%x)", port_no, data); + sys_io.trace("cellMouseGetData(port_no=%d, data=*0x%x)", port_no, data); if (!Emu.GetMouseManager().IsInited()) { return CELL_MOUSE_ERROR_UNINITIALIZED; @@ -149,7 +149,7 @@ s32 cellMouseGetTabletDataList(u32 port_no, u32 data_addr) s32 cellMouseGetRawData(u32 port_no, vm::ptr data) { - sys_io.Todo("cellMouseGetRawData(port_no=%d, data=*0x%x)", port_no, data); + sys_io.todo("cellMouseGetRawData(port_no=%d, data=*0x%x)", port_no, data); /*if (!Emu.GetMouseManager().IsInited()) return CELL_MOUSE_ERROR_UNINITIALIZED; if (port_no >= Emu.GetMouseManager().GetMice().size()) return CELL_MOUSE_ERROR_NO_DEVICE; diff --git a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp index 621145f57e..bbba03473d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp @@ -17,7 +17,7 @@ s32 cellMsgDialogOpen() s32 cellMsgDialogOpen2(u32 type, vm::cptr msgString, vm::ptr callback, vm::ptr userData, vm::ptr extParam) { - cellSysutil.Warning("cellMsgDialogOpen2(type=0x%x, msgString=*0x%x, callback=*0x%x, userData=*0x%x, extParam=*0x%x)", type, msgString, callback, userData, extParam); + cellSysutil.warning("cellMsgDialogOpen2(type=0x%x, msgString=*0x%x, callback=*0x%x, userData=*0x%x, extParam=*0x%x)", type, msgString, callback, userData, extParam); if (!msgString || std::strlen(msgString.get_ptr()) >= 0x200 || type & -0x33f8) { @@ -75,11 +75,11 @@ s32 cellMsgDialogOpen2(u32 type, vm::cptr msgString, vm::ptrtype = _type; @@ -111,7 +111,7 @@ s32 cellMsgDialogOpen2(u32 type, vm::cptr msgString, vm::ptr callback, vm::ptr userData, vm::ptr extParam) { - cellSysutil.Warning("cellMsgDialogOpenErrorCode(errorCode=0x%x, callback=*0x%x, userData=*0x%x, extParam=*0x%x)", errorCode, callback, userData, extParam); + cellSysutil.warning("cellMsgDialogOpenErrorCode(errorCode=0x%x, callback=*0x%x, userData=*0x%x, extParam=*0x%x)", errorCode, callback, userData, extParam); std::string error; @@ -193,7 +193,7 @@ s32 cellMsgDialogOpenSimulViewWarning() s32 cellMsgDialogClose(f32 delay) { - cellSysutil.Warning("cellMsgDialogClose(delay=%f)", delay); + cellSysutil.warning("cellMsgDialogClose(delay=%f)", delay); const auto dlg = fxm::get(); @@ -223,7 +223,7 @@ s32 cellMsgDialogClose(f32 delay) s32 cellMsgDialogAbort() { - cellSysutil.Warning("cellMsgDialogAbort()"); + cellSysutil.warning("cellMsgDialogAbort()"); const auto dlg = fxm::get(); @@ -247,7 +247,7 @@ s32 cellMsgDialogAbort() s32 cellMsgDialogProgressBarSetMsg(u32 progressBarIndex, vm::cptr msgString) { - cellSysutil.Warning("cellMsgDialogProgressBarSetMsg(progressBarIndex=%d, msgString=*0x%x)", progressBarIndex, msgString); + cellSysutil.warning("cellMsgDialogProgressBarSetMsg(progressBarIndex=%d, msgString=*0x%x)", progressBarIndex, msgString); const auto dlg = fxm::get(); @@ -271,7 +271,7 @@ s32 cellMsgDialogProgressBarSetMsg(u32 progressBarIndex, vm::cptr msgStrin s32 cellMsgDialogProgressBarReset(u32 progressBarIndex) { - cellSysutil.Warning("cellMsgDialogProgressBarReset(progressBarIndex=%d)", progressBarIndex); + cellSysutil.warning("cellMsgDialogProgressBarReset(progressBarIndex=%d)", progressBarIndex); const auto dlg = fxm::get(); @@ -292,7 +292,7 @@ s32 cellMsgDialogProgressBarReset(u32 progressBarIndex) s32 cellMsgDialogProgressBarInc(u32 progressBarIndex, u32 delta) { - cellSysutil.Warning("cellMsgDialogProgressBarInc(progressBarIndex=%d, delta=%d)", progressBarIndex, delta); + cellSysutil.warning("cellMsgDialogProgressBarInc(progressBarIndex=%d, delta=%d)", progressBarIndex, delta); const auto dlg = fxm::get(); diff --git a/rpcs3/Emu/SysCalls/Modules/cellMusic.cpp b/rpcs3/Emu/SysCalls/Modules/cellMusic.cpp index 66de4158a1..38525e4f7d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMusic.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMusic.cpp @@ -112,11 +112,11 @@ s32 cellMusicSelectContents() s32 cellMusicInitialize2(s32 mode, s32 spuPriority, vm::ptr func, vm::ptr userData) { - cellMusic.Todo("cellMusicInitialize2(mode=%d, spuPriority=%d, func=*0x%x, userData=*0x%x)", mode, spuPriority, func, userData); + cellMusic.todo("cellMusicInitialize2(mode=%d, spuPriority=%d, func=*0x%x, userData=*0x%x)", mode, spuPriority, func, userData); if (mode != CELL_MUSIC2_PLAYER_MODE_NORMAL) { - cellMusic.Todo("Unknown player mode: 0x%x", mode); + cellMusic.todo("Unknown player mode: 0x%x", mode); return CELL_MUSIC2_ERROR_PARAM; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp index 50875b1c6a..170e405e9e 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp @@ -31,21 +31,21 @@ extern Module<> cellNetCtl; s32 cellNetCtlInit() { - cellNetCtl.Warning("cellNetCtlInit()"); + cellNetCtl.warning("cellNetCtlInit()"); return CELL_OK; } s32 cellNetCtlTerm() { - cellNetCtl.Warning("cellNetCtlTerm()"); + cellNetCtl.warning("cellNetCtlTerm()"); return CELL_OK; } s32 cellNetCtlGetState(vm::ptr state) { - cellNetCtl.Log("cellNetCtlGetState(state=*0x%x)", state); + cellNetCtl.trace("cellNetCtlGetState(state=*0x%x)", state); switch (rpcs3::config.misc.net.status.value()) { @@ -62,21 +62,21 @@ s32 cellNetCtlGetState(vm::ptr state) s32 cellNetCtlAddHandler(vm::ptr handler, vm::ptr arg, vm::ptr hid) { - cellNetCtl.Todo("cellNetCtlAddHandler(handler=*0x%x, arg=*0x%x, hid=*0x%x)", handler, arg, hid); + cellNetCtl.todo("cellNetCtlAddHandler(handler=*0x%x, arg=*0x%x, hid=*0x%x)", handler, arg, hid); return CELL_OK; } s32 cellNetCtlDelHandler(s32 hid) { - cellNetCtl.Todo("cellNetCtlDelHandler(hid=0x%x)", hid); + cellNetCtl.todo("cellNetCtlDelHandler(hid=0x%x)", hid); return CELL_OK; } s32 cellNetCtlGetInfo(s32 code, vm::ptr info) { - cellNetCtl.Todo("cellNetCtlGetInfo(code=0x%x (%s), info=*0x%x)", code, InfoCodeToName(code), info); + cellNetCtl.todo("cellNetCtlGetInfo(code=0x%x (%s), info=*0x%x)", code, InfoCodeToName(code), info); if (code == CELL_NET_CTL_INFO_MTU) { @@ -89,13 +89,13 @@ s32 cellNetCtlGetInfo(s32 code, vm::ptr info) if (ret == ERROR_BUFFER_OVERFLOW) { - cellNetCtl.Error("cellNetCtlGetInfo(INFO_MTU): GetAdaptersAddresses buffer overflow."); + cellNetCtl.error("cellNetCtlGetInfo(INFO_MTU): GetAdaptersAddresses buffer overflow."); free(pAddresses); pAddresses = (PIP_ADAPTER_ADDRESSES)malloc(bufLen); if (pAddresses == nullptr) { - cellNetCtl.Error("cellNetCtlGetInfo(INFO_MTU): Unable to allocate memory for pAddresses."); + cellNetCtl.error("cellNetCtlGetInfo(INFO_MTU): Unable to allocate memory for pAddresses."); return CELL_NET_CTL_ERROR_NET_CABLE_NOT_CONNECTED; } } @@ -115,7 +115,7 @@ s32 cellNetCtlGetInfo(s32 code, vm::ptr info) } else { - cellNetCtl.Error("cellNetCtlGetInfo(INFO_MTU): Call to GetAdaptersAddresses failed. (%d)", ret); + cellNetCtl.error("cellNetCtlGetInfo(INFO_MTU): Call to GetAdaptersAddresses failed. (%d)", ret); info->mtu = 1500; // Seems to be the default value on Windows 10. } @@ -126,7 +126,7 @@ s32 cellNetCtlGetInfo(s32 code, vm::ptr info) if (getifaddrs(&ifaddr) == -1) { - cellNetCtl.Error("cellNetCtlGetInfo(INFO_MTU): Call to getifaddrs returned negative."); + cellNetCtl.error("cellNetCtlGetInfo(INFO_MTU): Call to getifaddrs returned negative."); } for (ifa = ifaddr, n = 0; ifa != nullptr; ifa = ifa->ifa_next, n++) @@ -150,7 +150,7 @@ s32 cellNetCtlGetInfo(s32 code, vm::ptr info) if (ioctl(fd, SIOCGIFMTU, &freq) == -1) { - cellNetCtl.Error("cellNetCtlGetInfo(INFO_MTU): Call to ioctl failed."); + cellNetCtl.error("cellNetCtlGetInfo(INFO_MTU): Call to ioctl failed."); } else { @@ -189,13 +189,13 @@ s32 cellNetCtlGetInfo(s32 code, vm::ptr info) if (ret == ERROR_BUFFER_OVERFLOW) { - cellNetCtl.Error("cellNetCtlGetInfo(IP_ADDRESS): GetAdaptersInfo buffer overflow."); + cellNetCtl.error("cellNetCtlGetInfo(IP_ADDRESS): GetAdaptersInfo buffer overflow."); free(pAdapterInfo); pAdapterInfo = (IP_ADAPTER_INFO*)malloc(bufLen); if (pAdapterInfo == nullptr) { - cellNetCtl.Error("cellNetCtlGetInfo(IP_ADDRESS): Unable to allocate memory for pAddresses."); + cellNetCtl.error("cellNetCtlGetInfo(IP_ADDRESS): Unable to allocate memory for pAddresses."); return CELL_NET_CTL_ERROR_NET_CABLE_NOT_CONNECTED; } } @@ -215,7 +215,7 @@ s32 cellNetCtlGetInfo(s32 code, vm::ptr info) } else { - cellNetCtl.Error("cellNetCtlGetInfo(IP_ADDRESS): Call to GetAdaptersInfo failed. (%d)", ret); + cellNetCtl.error("cellNetCtlGetInfo(IP_ADDRESS): Call to GetAdaptersInfo failed. (%d)", ret); } free(pAdapterInfo); @@ -225,7 +225,7 @@ s32 cellNetCtlGetInfo(s32 code, vm::ptr info) if (getifaddrs(&ifaddr) == -1) { - cellNetCtl.Error("cellNetCtlGetInfo(IP_ADDRESS): Call to getifaddrs returned negative."); + cellNetCtl.error("cellNetCtlGetInfo(IP_ADDRESS): Call to getifaddrs returned negative."); } for (ifa = ifaddr, n = 0; ifa != nullptr; ifa = ifa->ifa_next, n++) @@ -262,13 +262,13 @@ s32 cellNetCtlGetInfo(s32 code, vm::ptr info) if (ret == ERROR_BUFFER_OVERFLOW) { - cellNetCtl.Error("cellNetCtlGetInfo(INFO_NETMASK): GetAdaptersInfo buffer overflow."); + cellNetCtl.error("cellNetCtlGetInfo(INFO_NETMASK): GetAdaptersInfo buffer overflow."); free(pAdapterInfo); pAdapterInfo = (IP_ADAPTER_INFO*)malloc(bufLen); if (pAdapterInfo == nullptr) { - cellNetCtl.Error("cellNetCtlGetInfo(INFO_NETMASK): Unable to allocate memory for pAddresses."); + cellNetCtl.error("cellNetCtlGetInfo(INFO_NETMASK): Unable to allocate memory for pAddresses."); return CELL_NET_CTL_ERROR_NET_CABLE_NOT_CONNECTED; } } @@ -291,7 +291,7 @@ s32 cellNetCtlGetInfo(s32 code, vm::ptr info) } else { - cellNetCtl.Error("cellNetCtlGetInfo(INFO_NETMASK): Call to GetAdaptersInfo failed. (%d)", ret); + cellNetCtl.error("cellNetCtlGetInfo(INFO_NETMASK): Call to GetAdaptersInfo failed. (%d)", ret); // TODO: Is this the default netmask? info->netmask[0] = 255; info->netmask[1] = 255; @@ -306,7 +306,7 @@ s32 cellNetCtlGetInfo(s32 code, vm::ptr info) if (getifaddrs(&ifaddr) == -1) { - cellNetCtl.Error("cellNetCtlGetInfo(INFO_NETMASK): Call to getifaddrs returned negative."); + cellNetCtl.error("cellNetCtlGetInfo(INFO_NETMASK): Call to getifaddrs returned negative."); } for (ifa = ifaddr, n = 0; ifa != nullptr; ifa = ifa->ifa_next, n++) @@ -338,7 +338,7 @@ s32 cellNetCtlGetInfo(s32 code, vm::ptr info) s32 cellNetCtlNetStartDialogLoadAsync(vm::ptr param) { - cellNetCtl.Error("cellNetCtlNetStartDialogLoadAsync(param=*0x%x)", param); + cellNetCtl.error("cellNetCtlNetStartDialogLoadAsync(param=*0x%x)", param); // TODO: Actually sign into PSN or an emulated network similar to PSN (ESN) // TODO: Properly open the dialog prompt for sign in @@ -350,14 +350,14 @@ s32 cellNetCtlNetStartDialogLoadAsync(vm::ptr par s32 cellNetCtlNetStartDialogAbortAsync() { - cellNetCtl.Error("cellNetCtlNetStartDialogAbortAsync()"); + cellNetCtl.error("cellNetCtlNetStartDialogAbortAsync()"); return CELL_OK; } s32 cellNetCtlNetStartDialogUnloadAsync(vm::ptr result) { - cellNetCtl.Warning("cellNetCtlNetStartDialogUnloadAsync(result=*0x%x)", result); + cellNetCtl.warning("cellNetCtlNetStartDialogUnloadAsync(result=*0x%x)", result); result->result = CELL_NET_CTL_ERROR_DIALOG_CANCELED; sysutilSendSystemCommand(CELL_SYSUTIL_NET_CTL_NETSTART_UNLOADED, 0); @@ -367,11 +367,11 @@ s32 cellNetCtlNetStartDialogUnloadAsync(vm::ptr s32 cellNetCtlGetNatInfo(vm::ptr natInfo) { - cellNetCtl.Todo("cellNetCtlGetNatInfo(natInfo=*0x%x)", natInfo); + cellNetCtl.todo("cellNetCtlGetNatInfo(natInfo=*0x%x)", natInfo); if (natInfo->size == 0) { - cellNetCtl.Error("cellNetCtlGetNatInfo : CELL_NET_CTL_ERROR_INVALID_SIZE"); + cellNetCtl.error("cellNetCtlGetNatInfo : CELL_NET_CTL_ERROR_INVALID_SIZE"); return CELL_NET_CTL_ERROR_INVALID_SIZE; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp b/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp index ca2814c1d8..ce14d263d5 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp @@ -16,7 +16,7 @@ enum s32 cellOvisGetOverlayTableSize(vm::cptr elf) { - cellOvis.Todo("cellOvisGetOverlayTableSize(elf=*0x%x)", elf); + cellOvis.todo("cellOvisGetOverlayTableSize(elf=*0x%x)", elf); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellPad.cpp b/rpcs3/Emu/SysCalls/Modules/cellPad.cpp index 8d76b05def..d691ff3023 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPad.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPad.cpp @@ -10,7 +10,7 @@ extern Module<> sys_io; s32 cellPadInit(u32 max_connect) { - sys_io.Warning("cellPadInit(max_connect=%d)", max_connect); + sys_io.warning("cellPadInit(max_connect=%d)", max_connect); if (Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_ALREADY_INITIALIZED; @@ -25,7 +25,7 @@ s32 cellPadInit(u32 max_connect) s32 cellPadEnd() { - sys_io.Log("cellPadEnd()"); + sys_io.trace("cellPadEnd()"); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -37,7 +37,7 @@ s32 cellPadEnd() s32 cellPadClearBuf(u32 port_no) { - sys_io.Log("cellPadClearBuf(port_no=%d)", port_no); + sys_io.trace("cellPadClearBuf(port_no=%d)", port_no); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -72,7 +72,7 @@ s32 cellPadClearBuf(u32 port_no) s32 cellPadPeriphGetInfo(vm::ptr info) { - sys_io.Todo("cellPadPeriphGetInfo(info=*0x%x)", info); + sys_io.todo("cellPadPeriphGetInfo(info=*0x%x)", info); if (!Emu.GetPadManager().IsInited()) { @@ -111,7 +111,7 @@ s32 cellPadPeriphGetData() s32 cellPadGetData(u32 port_no, vm::ptr data) { - sys_io.Log("cellPadGetData(port_no=%d, data=*0x%x)", port_no, data); + sys_io.trace("cellPadGetData(port_no=%d, data=*0x%x)", port_no, data); std::vector& pads = Emu.GetPadManager().GetPads(); @@ -295,7 +295,7 @@ s32 cellPadGetRawData(u32 port_no, vm::ptr data) s32 cellPadGetDataExtra(u32 port_no, vm::ptr device_type, vm::ptr data) { - sys_io.Log("cellPadGetDataExtra(port_no=%d, device_type=*0x%x, device_type=*0x%x)", port_no, device_type, data); + sys_io.trace("cellPadGetDataExtra(port_no=%d, device_type=*0x%x, device_type=*0x%x)", port_no, device_type, data); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -312,7 +312,7 @@ s32 cellPadGetDataExtra(u32 port_no, vm::ptr device_type, vm::ptr param) { - sys_io.Log("cellPadSetActDirect(port_no=%d, param=*0x%x)", port_no, param); + sys_io.trace("cellPadSetActDirect(port_no=%d, param=*0x%x)", port_no, param); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -329,7 +329,7 @@ s32 cellPadSetActDirect(u32 port_no, vm::ptr param) s32 cellPadGetInfo(vm::ptr info) { - sys_io.Log("cellPadGetInfo(info=*0x%x)", info); + sys_io.trace("cellPadGetInfo(info=*0x%x)", info); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -358,7 +358,7 @@ s32 cellPadGetInfo(vm::ptr info) s32 cellPadGetInfo2(vm::ptr info) { - sys_io.Log("cellPadGetInfo2(info=*0x%x)", info); + sys_io.trace("cellPadGetInfo2(info=*0x%x)", info); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -387,7 +387,7 @@ s32 cellPadGetInfo2(vm::ptr info) s32 cellPadGetCapabilityInfo(u32 port_no, vm::ptr info) { - sys_io.Log("cellPadGetCapabilityInfo(port_no=%d, data_addr:=0x%x)", port_no, info.addr()); + sys_io.trace("cellPadGetCapabilityInfo(port_no=%d, data_addr:=0x%x)", port_no, info.addr()); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -409,7 +409,7 @@ s32 cellPadGetCapabilityInfo(u32 port_no, vm::ptr info) s32 cellPadSetPortSetting(u32 port_no, u32 port_setting) { - sys_io.Log("cellPadSetPortSetting(port_no=%d, port_setting=0x%x)", port_no, port_setting); + sys_io.trace("cellPadSetPortSetting(port_no=%d, port_setting=0x%x)", port_no, port_setting); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -429,7 +429,7 @@ s32 cellPadSetPortSetting(u32 port_no, u32 port_setting) s32 cellPadInfoPressMode(u32 port_no) { - sys_io.Log("cellPadInfoPressMode(port_no=%d)", port_no); + sys_io.trace("cellPadInfoPressMode(port_no=%d)", port_no); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -448,7 +448,7 @@ s32 cellPadInfoPressMode(u32 port_no) s32 cellPadInfoSensorMode(u32 port_no) { - sys_io.Log("cellPadInfoSensorMode(port_no=%d)", port_no); + sys_io.trace("cellPadInfoSensorMode(port_no=%d)", port_no); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -467,7 +467,7 @@ s32 cellPadInfoSensorMode(u32 port_no) s32 cellPadSetPressMode(u32 port_no, u32 mode) { - sys_io.Log("cellPadSetPressMode(port_no=%d, mode=%d)", port_no, mode); + sys_io.trace("cellPadSetPressMode(port_no=%d, mode=%d)", port_no, mode); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -493,7 +493,7 @@ s32 cellPadSetPressMode(u32 port_no, u32 mode) s32 cellPadSetSensorMode(u32 port_no, u32 mode) { - sys_io.Log("cellPadSetSensorMode(port_no=%d, mode=%d)", port_no, mode); + sys_io.trace("cellPadSetSensorMode(port_no=%d, mode=%d)", port_no, mode); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -519,7 +519,7 @@ s32 cellPadSetSensorMode(u32 port_no, u32 mode) s32 cellPadLddRegisterController() { - sys_io.Todo("cellPadLddRegisterController()"); + sys_io.todo("cellPadLddRegisterController()"); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -529,7 +529,7 @@ s32 cellPadLddRegisterController() s32 cellPadLddDataInsert(s32 handle, vm::ptr data) { - sys_io.Todo("cellPadLddDataInsert(handle=%d, data=*0x%x)", handle, data); + sys_io.todo("cellPadLddDataInsert(handle=%d, data=*0x%x)", handle, data); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -539,7 +539,7 @@ s32 cellPadLddDataInsert(s32 handle, vm::ptr data) s32 cellPadLddGetPortNo(s32 handle) { - sys_io.Todo("cellPadLddGetPortNo(handle=%d)", handle); + sys_io.todo("cellPadLddGetPortNo(handle=%d)", handle); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; @@ -549,7 +549,7 @@ s32 cellPadLddGetPortNo(s32 handle) s32 cellPadLddUnregisterController(s32 handle) { - sys_io.Todo("cellPadLddUnregisterController(handle=%d)", handle); + sys_io.todo("cellPadLddUnregisterController(handle=%d)", handle); if (!Emu.GetPadManager().IsInited()) return CELL_PAD_ERROR_UNINITIALIZED; diff --git a/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp b/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp index bfac839b10..36f26bcea9 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp @@ -98,7 +98,7 @@ s32 pamfStreamTypeToEsFilterId(u8 type, u8 ch, CellCodecEsFilterId& pEsFilterId) default: { - cellPamf.Error("pamfStreamTypeToEsFilterId(): unknown type (%d, ch=%d)", type, ch); + cellPamf.error("pamfStreamTypeToEsFilterId(): unknown type (%d, ch=%d)", type, ch); Emu.Pause(); return CELL_PAMF_ERROR_INVALID_ARG; } @@ -123,7 +123,7 @@ u8 pamfGetStreamType(vm::ptr pSelf, u32 stream) case 0xdd: return CELL_PAMF_STREAM_TYPE_USER_DATA; } - cellPamf.Todo("pamfGetStreamType(): unsupported stream type found(0x%x)", header.type); + cellPamf.todo("pamfGetStreamType(): unsupported stream type found(0x%x)", header.type); Emu.Pause(); return 0xff; } @@ -166,14 +166,14 @@ u8 pamfGetStreamChannel(vm::ptr pSelf, u32 stream) } } - cellPamf.Todo("pamfGetStreamChannel(): unsupported stream type found(0x%x)", header.type); + cellPamf.todo("pamfGetStreamChannel(): unsupported stream type found(0x%x)", header.type); Emu.Pause(); return 0xff; } s32 cellPamfGetHeaderSize(vm::ptr pAddr, u64 fileSize, vm::ptr pSize) { - cellPamf.Warning("cellPamfGetHeaderSize(pAddr=*0x%x, fileSize=0x%llx, pSize=*0x%x)", pAddr, fileSize, pSize); + cellPamf.warning("cellPamfGetHeaderSize(pAddr=*0x%x, fileSize=0x%llx, pSize=*0x%x)", pAddr, fileSize, pSize); //if ((u32)pAddr->magic != 0x464d4150) return CELL_PAMF_ERROR_UNKNOWN_TYPE; @@ -184,7 +184,7 @@ s32 cellPamfGetHeaderSize(vm::ptr pAddr, u64 fileSize, vm::ptr s32 cellPamfGetHeaderSize2(vm::ptr pAddr, u64 fileSize, u32 attribute, vm::ptr pSize) { - cellPamf.Warning("cellPamfGetHeaderSize2(pAddr=*0x%x, fileSize=0x%llx, attribute=0x%x, pSize=*0x%x)", pAddr, fileSize, attribute, pSize); + cellPamf.warning("cellPamfGetHeaderSize2(pAddr=*0x%x, fileSize=0x%llx, attribute=0x%x, pSize=*0x%x)", pAddr, fileSize, attribute, pSize); //if ((u32)pAddr->magic != 0x464d4150) return CELL_PAMF_ERROR_UNKNOWN_TYPE; @@ -195,7 +195,7 @@ s32 cellPamfGetHeaderSize2(vm::ptr pAddr, u64 fileSize, u32 attribut s32 cellPamfGetStreamOffsetAndSize(vm::ptr pAddr, u64 fileSize, vm::ptr pOffset, vm::ptr pSize) { - cellPamf.Warning("cellPamfGetStreamOffsetAndSize(pAddr=*0x%x, fileSize=0x%llx, pOffset=*0x%x, pSize=*0x%x)", pAddr, fileSize, pOffset, pSize); + cellPamf.warning("cellPamfGetStreamOffsetAndSize(pAddr=*0x%x, fileSize=0x%llx, pOffset=*0x%x, pSize=*0x%x)", pAddr, fileSize, pOffset, pSize); //if ((u32)pAddr->magic != 0x464d4150) return CELL_PAMF_ERROR_UNKNOWN_TYPE; @@ -208,7 +208,7 @@ s32 cellPamfGetStreamOffsetAndSize(vm::ptr pAddr, u64 fileSize, vm:: s32 cellPamfVerify(vm::ptr pAddr, u64 fileSize) { - cellPamf.Todo("cellPamfVerify(pAddr=*0x%x, fileSize=0x%llx)", pAddr, fileSize); + cellPamf.todo("cellPamfVerify(pAddr=*0x%x, fileSize=0x%llx)", pAddr, fileSize); // TODO return CELL_OK; @@ -216,7 +216,7 @@ s32 cellPamfVerify(vm::ptr pAddr, u64 fileSize) s32 cellPamfReaderInitialize(vm::ptr pSelf, vm::cptr pAddr, u64 fileSize, u32 attribute) { - cellPamf.Warning("cellPamfReaderInitialize(pSelf=*0x%x, pAddr=*0x%x, fileSize=0x%llx, attribute=0x%x)", pSelf, pAddr, fileSize, attribute); + cellPamf.warning("cellPamfReaderInitialize(pSelf=*0x%x, pAddr=*0x%x, fileSize=0x%llx, attribute=0x%x)", pSelf, pAddr, fileSize, attribute); if (fileSize) { @@ -231,7 +231,7 @@ s32 cellPamfReaderInitialize(vm::ptr pSelf, vm::cptr if (attribute & CELL_PAMF_ATTRIBUTE_VERIFY_ON) { // TODO - cellPamf.Todo("cellPamfReaderInitialize(): verification"); + cellPamf.todo("cellPamfReaderInitialize(): verification"); } pSelf->stream = 0; // currently set stream @@ -240,7 +240,7 @@ s32 cellPamfReaderInitialize(vm::ptr pSelf, vm::cptr s32 cellPamfReaderGetPresentationStartTime(vm::ptr pSelf, vm::ptr pTimeStamp) { - cellPamf.Warning("cellPamfReaderGetPresentationStartTime(pSelf=*0x%x, pTimeStamp=*0x%x)", pSelf, pTimeStamp); + cellPamf.warning("cellPamfReaderGetPresentationStartTime(pSelf=*0x%x, pTimeStamp=*0x%x)", pSelf, pTimeStamp); // always returns CELL_OK @@ -251,7 +251,7 @@ s32 cellPamfReaderGetPresentationStartTime(vm::ptr pSelf, vm::pt s32 cellPamfReaderGetPresentationEndTime(vm::ptr pSelf, vm::ptr pTimeStamp) { - cellPamf.Warning("cellPamfReaderGetPresentationEndTime(pSelf=*0x%x, pTimeStamp=*0x%x)", pSelf, pTimeStamp); + cellPamf.warning("cellPamfReaderGetPresentationEndTime(pSelf=*0x%x, pTimeStamp=*0x%x)", pSelf, pTimeStamp); // always returns CELL_OK @@ -262,7 +262,7 @@ s32 cellPamfReaderGetPresentationEndTime(vm::ptr pSelf, vm::ptr< u32 cellPamfReaderGetMuxRateBound(vm::ptr pSelf) { - cellPamf.Warning("cellPamfReaderGetMuxRateBound(pSelf=*0x%x)", pSelf); + cellPamf.warning("cellPamfReaderGetMuxRateBound(pSelf=*0x%x)", pSelf); // cannot return error code return pSelf->pAddr->mux_rate_max; @@ -270,7 +270,7 @@ u32 cellPamfReaderGetMuxRateBound(vm::ptr pSelf) u8 cellPamfReaderGetNumberOfStreams(vm::ptr pSelf) { - cellPamf.Warning("cellPamfReaderGetNumberOfStreams(pSelf=*0x%x)", pSelf); + cellPamf.warning("cellPamfReaderGetNumberOfStreams(pSelf=*0x%x)", pSelf); // cannot return error code return pSelf->pAddr->stream_count; @@ -278,7 +278,7 @@ u8 cellPamfReaderGetNumberOfStreams(vm::ptr pSelf) u8 cellPamfReaderGetNumberOfSpecificStreams(vm::ptr pSelf, u8 streamType) { - cellPamf.Warning("cellPamfReaderGetNumberOfSpecificStreams(pSelf=*0x%x, streamType=%d)", pSelf, streamType); + cellPamf.warning("cellPamfReaderGetNumberOfSpecificStreams(pSelf=*0x%x, streamType=%d)", pSelf, streamType); // cannot return error code @@ -312,14 +312,14 @@ u8 cellPamfReaderGetNumberOfSpecificStreams(vm::ptr pSelf, u8 st } } - cellPamf.Todo("cellPamfReaderGetNumberOfSpecificStreams(): unsupported stream type (0x%x)", streamType); + cellPamf.todo("cellPamfReaderGetNumberOfSpecificStreams(): unsupported stream type (0x%x)", streamType); Emu.Pause(); return 0; } s32 cellPamfReaderSetStreamWithIndex(vm::ptr pSelf, u8 streamIndex) { - cellPamf.Warning("cellPamfReaderSetStreamWithIndex(pSelf=*0x%x, streamIndex=%d)", pSelf, streamIndex); + cellPamf.warning("cellPamfReaderSetStreamWithIndex(pSelf=*0x%x, streamIndex=%d)", pSelf, streamIndex); if (streamIndex >= pSelf->pAddr->stream_count) { @@ -332,12 +332,12 @@ s32 cellPamfReaderSetStreamWithIndex(vm::ptr pSelf, u8 streamInd s32 cellPamfReaderSetStreamWithTypeAndChannel(vm::ptr pSelf, u8 streamType, u8 ch) { - cellPamf.Warning("cellPamfReaderSetStreamWithTypeAndChannel(pSelf=*0x%x, streamType=%d, ch=%d)", pSelf, streamType, ch); + cellPamf.warning("cellPamfReaderSetStreamWithTypeAndChannel(pSelf=*0x%x, streamType=%d, ch=%d)", pSelf, streamType, ch); // it probably doesn't support "any audio" or "any video" argument if (streamType > 5 || ch >= 16) { - cellPamf.Error("cellPamfReaderSetStreamWithTypeAndChannel(): invalid arguments (streamType=%d, ch=%d)", streamType, ch); + cellPamf.error("cellPamfReaderSetStreamWithTypeAndChannel(): invalid arguments (streamType=%d, ch=%d)", streamType, ch); Emu.Pause(); return CELL_PAMF_ERROR_INVALID_ARG; } @@ -359,7 +359,7 @@ s32 cellPamfReaderSetStreamWithTypeAndChannel(vm::ptr pSelf, u8 s32 cellPamfReaderSetStreamWithTypeAndIndex(vm::ptr pSelf, u8 streamType, u8 streamIndex) { - cellPamf.Warning("cellPamfReaderSetStreamWithTypeAndIndex(pSelf=*0x%x, streamType=%d, streamIndex=%d)", pSelf, streamType, streamIndex); + cellPamf.warning("cellPamfReaderSetStreamWithTypeAndIndex(pSelf=*0x%x, streamType=%d, streamIndex=%d)", pSelf, streamType, streamIndex); u32 found = 0; @@ -412,7 +412,7 @@ s32 cellPamfReaderSetStreamWithTypeAndIndex(vm::ptr pSelf, u8 st s32 cellPamfStreamTypeToEsFilterId(u8 type, u8 ch, vm::ptr pEsFilterId) { - cellPamf.Warning("cellPamfStreamTypeToEsFilterId(type=%d, ch=%d, pEsFilterId=*0x%x)", type, ch, pEsFilterId); + cellPamf.warning("cellPamfStreamTypeToEsFilterId(type=%d, ch=%d, pEsFilterId=*0x%x)", type, ch, pEsFilterId); if (!pEsFilterId) { @@ -424,7 +424,7 @@ s32 cellPamfStreamTypeToEsFilterId(u8 type, u8 ch, vm::ptr s32 cellPamfReaderGetStreamIndex(vm::ptr pSelf) { - cellPamf.Log("cellPamfReaderGetStreamIndex(pSelf=*0x%x)", pSelf); + cellPamf.trace("cellPamfReaderGetStreamIndex(pSelf=*0x%x)", pSelf); // seems that CELL_PAMF_ERROR_INVALID_PAMF must be already written in pSelf->stream if it's the case return pSelf->stream; @@ -432,7 +432,7 @@ s32 cellPamfReaderGetStreamIndex(vm::ptr pSelf) s32 cellPamfReaderGetStreamTypeAndChannel(vm::ptr pSelf, vm::ptr pType, vm::ptr pCh) { - cellPamf.Warning("cellPamfReaderGetStreamTypeAndChannel(pSelf=*0x%x, pType=*0x%x, pCh=*0x%x", pSelf, pType, pCh); + cellPamf.warning("cellPamfReaderGetStreamTypeAndChannel(pSelf=*0x%x, pType=*0x%x, pCh=*0x%x", pSelf, pType, pCh); // unclear @@ -443,7 +443,7 @@ s32 cellPamfReaderGetStreamTypeAndChannel(vm::ptr pSelf, vm::ptr s32 cellPamfReaderGetEsFilterId(vm::ptr pSelf, vm::ptr pEsFilterId) { - cellPamf.Warning("cellPamfReaderGetEsFilterId(pSelf=*0x%x, pEsFilterId=*0x%x)", pSelf, pEsFilterId); + cellPamf.warning("cellPamfReaderGetEsFilterId(pSelf=*0x%x, pEsFilterId=*0x%x)", pSelf, pEsFilterId); // always returns CELL_OK @@ -458,7 +458,7 @@ s32 cellPamfReaderGetEsFilterId(vm::ptr pSelf, vm::ptr pSelf, vm::ptr pInfo, u32 size) { - cellPamf.Warning("cellPamfReaderGetStreamInfo(pSelf=*0x%x, pInfo=*0x%x, size=%d)", pSelf, pInfo, size); + cellPamf.warning("cellPamfReaderGetStreamInfo(pSelf=*0x%x, pInfo=*0x%x, size=%d)", pSelf, pInfo, size); assert((u32)pSelf->stream < (u32)pSelf->pAddr->stream_count); auto& header = pSelf->pAddr->stream_headers[pSelf->stream]; @@ -524,7 +524,7 @@ s32 cellPamfReaderGetStreamInfo(vm::ptr pSelf, vm::ptr pIn info->nfwIdc = header.AVC.x18 & 0x03; info->maxMeanBitrate = header.AVC.maxMeanBitrate; - cellPamf.Notice("cellPamfReaderGetStreamInfo(): CELL_PAMF_STREAM_TYPE_AVC"); + cellPamf.notice("cellPamfReaderGetStreamInfo(): CELL_PAMF_STREAM_TYPE_AVC"); break; } @@ -582,7 +582,7 @@ s32 cellPamfReaderGetStreamInfo(vm::ptr pSelf, vm::ptr pIn info->matrixCoefficients = 0; } - cellPamf.Notice("cellPamfReaderGetStreamInfo(): CELL_PAMF_STREAM_TYPE_M2V"); + cellPamf.notice("cellPamfReaderGetStreamInfo(): CELL_PAMF_STREAM_TYPE_M2V"); break; } @@ -598,7 +598,7 @@ s32 cellPamfReaderGetStreamInfo(vm::ptr pSelf, vm::ptr pIn info->samplingFrequency = header.audio.freq & 0xf; info->numberOfChannels = header.audio.channels & 0xf; - cellPamf.Notice("cellPamfReaderGetStreamInfo(): CELL_PAMF_STREAM_TYPE_ATRAC3PLUS"); + cellPamf.notice("cellPamfReaderGetStreamInfo(): CELL_PAMF_STREAM_TYPE_ATRAC3PLUS"); break; } @@ -615,7 +615,7 @@ s32 cellPamfReaderGetStreamInfo(vm::ptr pSelf, vm::ptr pIn info->numberOfChannels = header.audio.channels & 0xf; info->bitsPerSample = header.audio.bps >> 6; - cellPamf.Notice("cellPamfReaderGetStreamInfo(): CELL_PAMF_STREAM_TYPE_PAMF_LPCM"); + cellPamf.notice("cellPamfReaderGetStreamInfo(): CELL_PAMF_STREAM_TYPE_PAMF_LPCM"); break; } @@ -631,13 +631,13 @@ s32 cellPamfReaderGetStreamInfo(vm::ptr pSelf, vm::ptr pIn info->samplingFrequency = header.audio.freq & 0xf; info->numberOfChannels = header.audio.channels & 0xf; - cellPamf.Notice("cellPamfReaderGetStreamInfo(): CELL_PAMF_STREAM_TYPE_AC3"); + cellPamf.notice("cellPamfReaderGetStreamInfo(): CELL_PAMF_STREAM_TYPE_AC3"); break; } case CELL_PAMF_STREAM_TYPE_USER_DATA: { - cellPamf.Error("cellPamfReaderGetStreamInfo(): invalid type CELL_PAMF_STREAM_TYPE_USER_DATA"); + cellPamf.error("cellPamfReaderGetStreamInfo(): invalid type CELL_PAMF_STREAM_TYPE_USER_DATA"); return CELL_PAMF_ERROR_INVALID_ARG; } @@ -648,7 +648,7 @@ s32 cellPamfReaderGetStreamInfo(vm::ptr pSelf, vm::ptr pIn return CELL_PAMF_ERROR_INVALID_ARG; } - cellPamf.Todo("cellPamfReaderGetStreamInfo(): type 6"); + cellPamf.todo("cellPamfReaderGetStreamInfo(): type 6"); break; } @@ -659,7 +659,7 @@ s32 cellPamfReaderGetStreamInfo(vm::ptr pSelf, vm::ptr pIn return CELL_PAMF_ERROR_INVALID_ARG; } - cellPamf.Todo("cellPamfReaderGetStreamInfo(): type 7"); + cellPamf.todo("cellPamfReaderGetStreamInfo(): type 7"); break; } @@ -670,20 +670,20 @@ s32 cellPamfReaderGetStreamInfo(vm::ptr pSelf, vm::ptr pIn return CELL_PAMF_ERROR_INVALID_ARG; } - cellPamf.Todo("cellPamfReaderGetStreamInfo(): type 8"); + cellPamf.todo("cellPamfReaderGetStreamInfo(): type 8"); break; } case 9: { - cellPamf.Error("cellPamfReaderGetStreamInfo(): invalid type 9"); + cellPamf.error("cellPamfReaderGetStreamInfo(): invalid type 9"); return CELL_PAMF_ERROR_INVALID_ARG; } default: { // invalid type or getting type/ch failed - cellPamf.Error("cellPamfReaderGetStreamInfo(): invalid type %d (ch=%d)", type, ch); + cellPamf.error("cellPamfReaderGetStreamInfo(): invalid type %d (ch=%d)", type, ch); return CELL_PAMF_ERROR_INVALID_PAMF; } } @@ -693,7 +693,7 @@ s32 cellPamfReaderGetStreamInfo(vm::ptr pSelf, vm::ptr pIn u32 cellPamfReaderGetNumberOfEp(vm::ptr pSelf) { - cellPamf.Todo("cellPamfReaderGetNumberOfEp(pSelf=*0x%x)", pSelf); + cellPamf.todo("cellPamfReaderGetNumberOfEp(pSelf=*0x%x)", pSelf); // cannot return error code return 0; //pSelf->pAddr->stream_headers[pSelf->stream].ep_num; @@ -701,7 +701,7 @@ u32 cellPamfReaderGetNumberOfEp(vm::ptr pSelf) s32 cellPamfReaderGetEpIteratorWithIndex(vm::ptr pSelf, u32 epIndex, vm::ptr pIt) { - cellPamf.Todo("cellPamfReaderGetEpIteratorWithIndex(pSelf=*0x%x, epIndex=%d, pIt=*0x%x)", pSelf, epIndex, pIt); + cellPamf.todo("cellPamfReaderGetEpIteratorWithIndex(pSelf=*0x%x, epIndex=%d, pIt=*0x%x)", pSelf, epIndex, pIt); // TODO return CELL_OK; @@ -709,7 +709,7 @@ s32 cellPamfReaderGetEpIteratorWithIndex(vm::ptr pSelf, u32 epIn s32 cellPamfReaderGetEpIteratorWithTimeStamp(vm::ptr pSelf, vm::ptr pTimeStamp, vm::ptr pIt) { - cellPamf.Todo("cellPamfReaderGetEpIteratorWithTimeStamp(pSelf=*0x%x, pTimeStamp=*0x%x, pIt=*0x%x)", pSelf, pTimeStamp, pIt); + cellPamf.todo("cellPamfReaderGetEpIteratorWithTimeStamp(pSelf=*0x%x, pTimeStamp=*0x%x, pIt=*0x%x)", pSelf, pTimeStamp, pIt); // TODO return CELL_OK; @@ -717,7 +717,7 @@ s32 cellPamfReaderGetEpIteratorWithTimeStamp(vm::ptr pSelf, vm:: s32 cellPamfEpIteratorGetEp(vm::ptr pIt, vm::ptr pEp) { - cellPamf.Todo("cellPamfEpIteratorGetEp(pIt=*0x%x, pEp=*0x%x)", pIt, pEp); + cellPamf.todo("cellPamfEpIteratorGetEp(pIt=*0x%x, pEp=*0x%x)", pIt, pEp); // always returns CELL_OK // TODO @@ -726,7 +726,7 @@ s32 cellPamfEpIteratorGetEp(vm::ptr pIt, vm::ptr s32 cellPamfEpIteratorMove(vm::ptr pIt, s32 steps, vm::ptr pEp) { - cellPamf.Todo("cellPamfEpIteratorMove(pIt=*0x%x, steps=%d, pEp=*0x%x)", pIt, steps, pEp); + cellPamf.todo("cellPamfEpIteratorMove(pIt=*0x%x, steps=%d, pEp=*0x%x)", pIt, steps, pEp); // cannot return error code // TODO diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp index 82edc07441..11173ff8e6 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp @@ -179,7 +179,7 @@ s32 pngReadHeader(PSubHandle stream, vm::ptr info, PExtInfo extI case 4: current_info.colorSpace = CELL_PNGDEC_GRAYSCALE_ALPHA; current_info.numComponents = 2; break; case 6: current_info.colorSpace = CELL_PNGDEC_RGBA; current_info.numComponents = 4; break; default: - cellPngDec.Error("cellPngDecDecodeData: Unsupported color space (%d)", (u32)buffer[25]); + cellPngDec.error("cellPngDecDecodeData: Unsupported color space (%d)", (u32)buffer[25]); return CELL_PNGDEC_ERROR_HEADER; } @@ -226,7 +226,7 @@ s32 pngDecSetParameter(PSubHandle stream, PInParam inParam, POutParam outParam, current_outParam.outputComponents = 4; break; default: - cellPngDec.Error("pngDecSetParameter: Unsupported color space (%d)", current_outParam.outputColorSpace); + cellPngDec.error("pngDecSetParameter: Unsupported color space (%d)", current_outParam.outputColorSpace); return CELL_PNGDEC_ERROR_ARG; } @@ -274,7 +274,7 @@ s32 pngDecodeData(PSubHandle stream, vm::ptr data, PDataCtrlParam dataCtrlPa ); if (!image) { - cellPngDec.Error("pngDecodeData: stbi_load_from_memory failed"); + cellPngDec.error("pngDecodeData: stbi_load_from_memory failed"); return CELL_PNGDEC_ERROR_STREAM_FORMAT; } @@ -351,11 +351,11 @@ s32 pngDecodeData(PSubHandle stream, vm::ptr data, PDataCtrlParam dataCtrlPa case CELL_PNGDEC_GRAYSCALE: case CELL_PNGDEC_PALETTE: case CELL_PNGDEC_GRAYSCALE_ALPHA: - cellPngDec.Error("pngDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace); + cellPngDec.error("pngDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace); break; default: - cellPngDec.Error("pngDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace); + cellPngDec.error("pngDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace); return CELL_PNGDEC_ERROR_ARG; } @@ -366,7 +366,7 @@ s32 pngDecodeData(PSubHandle stream, vm::ptr data, PDataCtrlParam dataCtrlPa s32 cellPngDecCreate(PPMainHandle mainHandle, PThreadInParam threadInParam, PThreadOutParam threadOutParam) { - cellPngDec.Warning("cellPngDecCreate(mainHandle=**0x%x, threadInParam=*0x%x, threadOutParam=*0x%x)", mainHandle, threadInParam, threadOutParam); + cellPngDec.warning("cellPngDecCreate(mainHandle=**0x%x, threadInParam=*0x%x, threadOutParam=*0x%x)", mainHandle, threadInParam, threadOutParam); // create decoder if (auto res = pngDecCreate(mainHandle, threadInParam)) return res; @@ -379,7 +379,7 @@ s32 cellPngDecCreate(PPMainHandle mainHandle, PThreadInParam threadInParam, PThr s32 cellPngDecExtCreate(PPMainHandle mainHandle, PThreadInParam threadInParam, PThreadOutParam threadOutParam, PExtThreadInParam extThreadInParam, PExtThreadOutParam extThreadOutParam) { - cellPngDec.Warning("cellPngDecCreate(mainHandle=**0x%x, threadInParam=*0x%x, threadOutParam=*0x%x, extThreadInParam=*0x%x, extThreadOutParam=*0x%x)", + cellPngDec.warning("cellPngDecCreate(mainHandle=**0x%x, threadInParam=*0x%x, threadOutParam=*0x%x, extThreadInParam=*0x%x, extThreadOutParam=*0x%x)", mainHandle, threadInParam, threadOutParam, extThreadInParam, extThreadOutParam); // create decoder @@ -395,7 +395,7 @@ s32 cellPngDecExtCreate(PPMainHandle mainHandle, PThreadInParam threadInParam, P s32 cellPngDecDestroy(PMainHandle mainHandle) { - cellPngDec.Warning("cellPngDecDestroy(mainHandle=*0x%x)", mainHandle); + cellPngDec.warning("cellPngDecDestroy(mainHandle=*0x%x)", mainHandle); // destroy decoder return pngDecDestroy(mainHandle); @@ -403,7 +403,7 @@ s32 cellPngDecDestroy(PMainHandle mainHandle) s32 cellPngDecOpen(PMainHandle mainHandle, PPSubHandle subHandle, PSrc src, POpenInfo openInfo) { - cellPngDec.Warning("cellPngDecOpen(mainHandle=*0x%x, subHandle=**0x%x, src=*0x%x, openInfo=*0x%x)", mainHandle, subHandle, src, openInfo); + cellPngDec.warning("cellPngDecOpen(mainHandle=*0x%x, subHandle=**0x%x, src=*0x%x, openInfo=*0x%x)", mainHandle, subHandle, src, openInfo); // create stream handle return pngDecOpen(mainHandle, subHandle, src, openInfo); @@ -411,7 +411,7 @@ s32 cellPngDecOpen(PMainHandle mainHandle, PPSubHandle subHandle, PSrc src, POpe s32 cellPngDecExtOpen(PMainHandle mainHandle, PPSubHandle subHandle, PSrc src, POpenInfo openInfo, vm::cptr cbCtrlStrm, vm::cptr opnParam) { - cellPngDec.Warning("cellPngDecExtOpen(mainHandle=*0x%x, subHandle=**0x%x, src=*0x%x, openInfo=*0x%x, cbCtrlStrm=*0x%x, opnParam=*0x%x)", mainHandle, subHandle, src, openInfo, cbCtrlStrm, opnParam); + cellPngDec.warning("cellPngDecExtOpen(mainHandle=*0x%x, subHandle=**0x%x, src=*0x%x, openInfo=*0x%x, cbCtrlStrm=*0x%x, opnParam=*0x%x)", mainHandle, subHandle, src, openInfo, cbCtrlStrm, opnParam); // create stream handle return pngDecOpen(mainHandle, subHandle, src, openInfo, cbCtrlStrm, opnParam); @@ -419,35 +419,35 @@ s32 cellPngDecExtOpen(PMainHandle mainHandle, PPSubHandle subHandle, PSrc src, P s32 cellPngDecClose(PMainHandle mainHandle, PSubHandle subHandle) { - cellPngDec.Warning("cellPngDecClose(mainHandle=*0x%x, subHandle=*0x%x)", mainHandle, subHandle); + cellPngDec.warning("cellPngDecClose(mainHandle=*0x%x, subHandle=*0x%x)", mainHandle, subHandle); return pngDecClose(subHandle); } s32 cellPngDecReadHeader(PMainHandle mainHandle, PSubHandle subHandle, PInfo info) { - cellPngDec.Warning("cellPngDecReadHeader(mainHandle=*0x%x, subHandle=*0x%x, info=*0x%x)", mainHandle, subHandle, info); + cellPngDec.warning("cellPngDecReadHeader(mainHandle=*0x%x, subHandle=*0x%x, info=*0x%x)", mainHandle, subHandle, info); return pngReadHeader(subHandle, info); } s32 cellPngDecExtReadHeader(PMainHandle mainHandle, PSubHandle subHandle, PInfo info, PExtInfo extInfo) { - cellPngDec.Warning("cellPngDecExtReadHeader(mainHandle=*0x%x, subHandle=*0x%x, info=*0x%x, extInfo=*0x%x)", mainHandle, subHandle, info, extInfo); + cellPngDec.warning("cellPngDecExtReadHeader(mainHandle=*0x%x, subHandle=*0x%x, info=*0x%x, extInfo=*0x%x)", mainHandle, subHandle, info, extInfo); return pngReadHeader(subHandle, info, extInfo); } s32 cellPngDecSetParameter(PMainHandle mainHandle, PSubHandle subHandle, PInParam inParam, POutParam outParam) { - cellPngDec.Warning("cellPngDecSetParameter(mainHandle=*0x%x, subHandle=*0x%x, inParam=*0x%x, outParam=*0x%x)", mainHandle, subHandle, inParam, outParam); + cellPngDec.warning("cellPngDecSetParameter(mainHandle=*0x%x, subHandle=*0x%x, inParam=*0x%x, outParam=*0x%x)", mainHandle, subHandle, inParam, outParam); return pngDecSetParameter(subHandle, inParam, outParam); } s32 cellPngDecExtSetParameter(PMainHandle mainHandle, PSubHandle subHandle, PInParam inParam, POutParam outParam, PExtInParam extInParam, PExtOutParam extOutParam) { - cellPngDec.Warning("cellPngDecExtSetParameter(mainHandle=*0x%x, subHandle=*0x%x, inParam=*0x%x, outParam=*0x%x, extInParam=*0x%x, extOutParam=*0x%x", + cellPngDec.warning("cellPngDecExtSetParameter(mainHandle=*0x%x, subHandle=*0x%x, inParam=*0x%x, outParam=*0x%x, extInParam=*0x%x, extOutParam=*0x%x", mainHandle, subHandle, inParam, outParam, extInParam, extOutParam); return pngDecSetParameter(subHandle, inParam, outParam, extInParam, extOutParam); @@ -455,7 +455,7 @@ s32 cellPngDecExtSetParameter(PMainHandle mainHandle, PSubHandle subHandle, PInP s32 cellPngDecDecodeData(PMainHandle mainHandle, PSubHandle subHandle, vm::ptr data, PDataCtrlParam dataCtrlParam, PDataOutInfo dataOutInfo) { - cellPngDec.Warning("cellPngDecDecodeData(mainHandle=*0x%x, subHandle=*0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x)", + cellPngDec.warning("cellPngDecDecodeData(mainHandle=*0x%x, subHandle=*0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x)", mainHandle, subHandle, data, dataCtrlParam, dataOutInfo); return pngDecodeData(subHandle, data, dataCtrlParam, dataOutInfo); @@ -463,7 +463,7 @@ s32 cellPngDecDecodeData(PMainHandle mainHandle, PSubHandle subHandle, vm::ptr data, PDataCtrlParam dataCtrlParam, PDataOutInfo dataOutInfo, PCbCtrlDisp cbCtrlDisp, PDispParam dispParam) { - cellPngDec.Warning("cellPngDecExtDecodeData(mainHandle=*0x%x, subHandle=*0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x, cbCtrlDisp=*0x%x, dispParam=*0x%x)", + cellPngDec.warning("cellPngDecExtDecodeData(mainHandle=*0x%x, subHandle=*0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x, cbCtrlDisp=*0x%x, dispParam=*0x%x)", mainHandle, subHandle, data, dataCtrlParam, dataOutInfo, cbCtrlDisp, dispParam); return pngDecodeData(subHandle, data, dataCtrlParam, dataOutInfo, cbCtrlDisp, dispParam); diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp index c24de449c5..10e4b3328f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp @@ -573,17 +573,17 @@ void SetupSurfaces(vm::ptr& cntxt) // Module<> Functions s32 cellRescInit(vm::ptr initConfig) { - cellResc.Warning("cellRescInit(initConfig=*0x%x)", initConfig); + cellResc.warning("cellRescInit(initConfig=*0x%x)", initConfig); if (s_rescInternalInstance->m_bInitialized) { - cellResc.Error("cellRescInit : CELL_RESC_ERROR_REINITIALIZED"); + cellResc.error("cellRescInit : CELL_RESC_ERROR_REINITIALIZED"); return CELL_RESC_ERROR_REINITIALIZED; } if (InternalVersion(initConfig) == -1 || !CheckInitConfig(initConfig)) { - cellResc.Error("cellRescInit : CELL_RESC_ERROR_BAD_ARGUMENT"); + cellResc.error("cellRescInit : CELL_RESC_ERROR_BAD_ARGUMENT"); return CELL_RESC_ERROR_BAD_ARGUMENT; } @@ -596,11 +596,11 @@ s32 cellRescInit(vm::ptr initConfig) void cellRescExit() { - cellResc.Warning("cellRescExit()"); + cellResc.warning("cellRescExit()"); if (!s_rescInternalInstance->m_bInitialized) { - cellResc.Error("cellRescExit(): not initialized"); + cellResc.error("cellRescExit(): not initialized"); return; } @@ -616,7 +616,7 @@ void cellRescExit() //s32 ret = ExitSystemResource(); //if (ret != CELL_OK) //{ - // cellResc.Error("failed to clean up system resources.. continue. 0x%x\n", ret); + // cellResc.error("failed to clean up system resources.. continue. 0x%x\n", ret); //} } } @@ -626,7 +626,7 @@ void cellRescExit() s32 cellRescVideoOutResolutionId2RescBufferMode(u32 resolutionId, vm::ptr bufferMode) { - cellResc.Log("cellRescVideoOutResolutionId2RescBufferMode(resolutionId=%d, bufferMode=*0x%x)", resolutionId, bufferMode); + cellResc.trace("cellRescVideoOutResolutionId2RescBufferMode(resolutionId=%d, bufferMode=*0x%x)", resolutionId, bufferMode); switch (resolutionId) { @@ -643,7 +643,7 @@ s32 cellRescVideoOutResolutionId2RescBufferMode(u32 resolutionId, vm::ptr b *bufferMode = CELL_RESC_720x576; break; default: - cellResc.Error("cellRescVideoOutResolutionId2RescBufferMod : CELL_RESC_ERROR_BAD_ARGUMENT"); + cellResc.error("cellRescVideoOutResolutionId2RescBufferMod : CELL_RESC_ERROR_BAD_ARGUMENT"); return CELL_RESC_ERROR_BAD_ARGUMENT; } @@ -652,17 +652,17 @@ s32 cellRescVideoOutResolutionId2RescBufferMode(u32 resolutionId, vm::ptr b s32 cellRescSetDsts(u32 dstsMode, vm::ptr dsts) { - cellResc.Log("cellRescSetDsts(dstsMode=%d, dsts=*0x%x)", dstsMode, dsts); + cellResc.trace("cellRescSetDsts(dstsMode=%d, dsts=*0x%x)", dstsMode, dsts); if (!s_rescInternalInstance->m_bInitialized) { - cellResc.Error("cellRescSetDst : CELL_RESC_ERROR_NOT_INITIALIZED"); + cellResc.error("cellRescSetDst : CELL_RESC_ERROR_NOT_INITIALIZED"); return CELL_RESC_ERROR_NOT_INITIALIZED; } if ((dstsMode != CELL_RESC_720x480) && (dstsMode != CELL_RESC_720x576) && (dstsMode != CELL_RESC_1280x720) && (dstsMode != CELL_RESC_1920x1080)) { - cellResc.Error("cellRescSetDsts : CELL_RESC_ERROR_BAD_ARGUMENT"); + cellResc.error("cellRescSetDsts : CELL_RESC_ERROR_BAD_ARGUMENT"); return CELL_RESC_ERROR_BAD_ARGUMENT; } @@ -719,24 +719,24 @@ void SetFlipHandler(vm::ptr handler) s32 cellRescSetDisplayMode(u32 displayMode) { - cellResc.Warning("cellRescSetDisplayMode(displayMode=%d)", displayMode); + cellResc.warning("cellRescSetDisplayMode(displayMode=%d)", displayMode); if (!s_rescInternalInstance->m_bInitialized) { - cellResc.Error("cellRescSetDisplayMode : CELL_RESC_ERROR_NOT_INITIALIZED"); + cellResc.error("cellRescSetDisplayMode : CELL_RESC_ERROR_NOT_INITIALIZED"); return CELL_RESC_ERROR_NOT_INITIALIZED; } if (!(s_rescInternalInstance->m_initConfig.supportModes & displayMode)) { - cellResc.Error("cellRescSetDisplayMode : CELL_RESC_ERROR_BAD_ARGUMENT"); + cellResc.error("cellRescSetDisplayMode : CELL_RESC_ERROR_BAD_ARGUMENT"); return CELL_RESC_ERROR_BAD_ARGUMENT; } if ((displayMode != CELL_RESC_720x480) && (displayMode != CELL_RESC_720x576) && (displayMode != CELL_RESC_1280x720) && (displayMode != CELL_RESC_1920x1080)) { - cellResc.Error("cellRescSetDisplayMode : CELL_RESC_ERROR_BAD_ARGUMENT"); + cellResc.error("cellRescSetDisplayMode : CELL_RESC_ERROR_BAD_ARGUMENT"); return CELL_RESC_ERROR_BAD_ARGUMENT; } @@ -744,13 +744,13 @@ s32 cellRescSetDisplayMode(u32 displayMode) if ((IsPalInterpolate() || IsPalDrop()) && s_rescInternalInstance->m_initConfig.flipMode == CELL_RESC_DISPLAY_HSYNC) { - cellResc.Error("cellRescSetDisplayMode : CELL_RESC_ERROR_BAD_COMBINATIONT"); + cellResc.error("cellRescSetDisplayMode : CELL_RESC_ERROR_BAD_COMBINATIONT"); return CELL_RESC_ERROR_BAD_COMBINATION; } if (IsPal60Hsync() && s_rescInternalInstance->m_initConfig.flipMode==CELL_RESC_DISPLAY_VSYNC) { - cellResc.Error("cellRescSetDisplayMode : CELL_RESC_ERROR_BAD_COMBINATIONT"); + cellResc.error("cellRescSetDisplayMode : CELL_RESC_ERROR_BAD_COMBINATIONT"); return CELL_RESC_ERROR_BAD_COMBINATION; } @@ -809,17 +809,17 @@ s32 cellRescSetDisplayMode(u32 displayMode) s32 cellRescAdjustAspectRatio(float horizontal, float vertical) { - cellResc.Warning("cellRescAdjustAspectRatio(horizontal=%f, vertical=%f)", horizontal, vertical); + cellResc.warning("cellRescAdjustAspectRatio(horizontal=%f, vertical=%f)", horizontal, vertical); if (!s_rescInternalInstance->m_bInitialized) { - cellResc.Error("cellRescAdjustAspectRatio : CELL_RESC_ERROR_NOT_INITIALIZED"); + cellResc.error("cellRescAdjustAspectRatio : CELL_RESC_ERROR_NOT_INITIALIZED"); return CELL_RESC_ERROR_NOT_INITIALIZED; } if ((horizontal < 0.5f || 2.f < horizontal) || (vertical < 0.5f || 2.f < vertical)) { - cellResc.Error("cellRescAdjustAspectRatio : CELL_RESC_ERROR_BAD_ARGUMENT"); + cellResc.error("cellRescAdjustAspectRatio : CELL_RESC_ERROR_BAD_ARGUMENT"); return CELL_RESC_ERROR_BAD_ARGUMENT; } @@ -843,17 +843,17 @@ s32 cellRescAdjustAspectRatio(float horizontal, float vertical) s32 cellRescSetPalInterpolateDropFlexRatio(float ratio) { - cellResc.Warning("cellRescSetPalInterpolateDropFlexRatio(ratio=%f)", ratio); + cellResc.warning("cellRescSetPalInterpolateDropFlexRatio(ratio=%f)", ratio); if (!s_rescInternalInstance->m_bInitialized) { - cellResc.Error("cellRescSetPalInterpolateDropFlexRatio : CELL_RESC_ERROR_NOT_INITIALIZED"); + cellResc.error("cellRescSetPalInterpolateDropFlexRatio : CELL_RESC_ERROR_NOT_INITIALIZED"); return CELL_RESC_ERROR_NOT_INITIALIZED; } if (ratio < 0.f || 1.f < ratio) { - cellResc.Error("cellRescSetPalInterpolateDropFlexRatio : CELL_RESC_ERROR_BAD_ARGUMENT"); + cellResc.error("cellRescSetPalInterpolateDropFlexRatio : CELL_RESC_ERROR_BAD_ARGUMENT"); return CELL_RESC_ERROR_BAD_ARGUMENT; } @@ -864,11 +864,11 @@ s32 cellRescSetPalInterpolateDropFlexRatio(float ratio) s32 cellRescGetBufferSize(vm::ptr colorBuffers, vm::ptr vertexArray, vm::ptr fragmentShader) { - cellResc.Warning("cellRescGetBufferSize(colorBuffers=*0x%x, vertexArray=*0x%x, fragmentShader=*0x%x)", colorBuffers, vertexArray, fragmentShader); + cellResc.warning("cellRescGetBufferSize(colorBuffers=*0x%x, vertexArray=*0x%x, fragmentShader=*0x%x)", colorBuffers, vertexArray, fragmentShader); if (!s_rescInternalInstance->m_bInitialized) { - cellResc.Error("cellRescGetBufferSize : CELL_RESC_ERROR_NOT_INITIALIZED"); + cellResc.error("cellRescGetBufferSize : CELL_RESC_ERROR_NOT_INITIALIZED"); return CELL_RESC_ERROR_NOT_INITIALIZED; } @@ -907,11 +907,11 @@ s32 cellRescGetBufferSize(vm::ptr colorBuffers, vm::ptr vertexArray, v s32 cellRescGetNumColorBuffers(u32 dstMode, u32 palTemporalMode, u32 reserved) { - cellResc.Log("cellRescGetNumColorBuffers(dstMode=%d, palTemporalMode=%d, reserved=%d)", dstMode, palTemporalMode, reserved); + cellResc.trace("cellRescGetNumColorBuffers(dstMode=%d, palTemporalMode=%d, reserved=%d)", dstMode, palTemporalMode, reserved); if (reserved != 0) { - cellResc.Error("cellRescGetNumColorBuffers : CELL_RESC_ERROR_BAD_ARGUMENT"); + cellResc.error("cellRescGetNumColorBuffers : CELL_RESC_ERROR_BAD_ARGUMENT"); return CELL_RESC_ERROR_BAD_ARGUMENT; } @@ -928,7 +928,7 @@ s32 cellRescGetNumColorBuffers(u32 dstMode, u32 palTemporalMode, u32 reserved) s32 cellRescGcmSurface2RescSrc(vm::ptr gcmSurface, vm::ptr rescSrc) { - cellResc.Log("cellRescGcmSurface2RescSrc(gcmSurface=*0x%x, rescSrc=*0x%x)", gcmSurface, rescSrc); + cellResc.trace("cellRescGcmSurface2RescSrc(gcmSurface=*0x%x, rescSrc=*0x%x)", gcmSurface, rescSrc); u8 textureFormat = GcmSurfaceFormat2GcmTextureFormat(gcmSurface->colorFormat, gcmSurface->type); s32 xW = 1, xH = 1; @@ -959,25 +959,25 @@ s32 cellRescGcmSurface2RescSrc(vm::ptr gcmSurface, vm::ptr src) { - cellResc.Log("cellRescSetSrc(idx=0x%x, src=*0x%x)", idx, src); + cellResc.trace("cellRescSetSrc(idx=0x%x, src=*0x%x)", idx, src); if(!s_rescInternalInstance->m_bInitialized) { - cellResc.Error("cellRescSetSrc : CELL_RESC_ERROR_NOT_INITIALIZED"); + cellResc.error("cellRescSetSrc : CELL_RESC_ERROR_NOT_INITIALIZED"); return CELL_RESC_ERROR_NOT_INITIALIZED; } if (idx < 0 || idx >= SRC_BUFFER_NUM || src->width < 1 || src->width > 4096 || src->height < 1 || src->height > 4096) { - cellResc.Error("cellRescSetSrc : CELL_RESC_ERROR_BAD_ARGUMENT"); + cellResc.error("cellRescSetSrc : CELL_RESC_ERROR_BAD_ARGUMENT"); return CELL_RESC_ERROR_BAD_ARGUMENT; } - cellResc.Log(" *** format=0x%x", src->format); - cellResc.Log(" *** pitch=%d", src->pitch); - cellResc.Log(" *** width=%d", src->width); - cellResc.Log(" *** height=%d", src->height); - cellResc.Log(" *** offset=0x%x", src->offset); + cellResc.trace(" *** format=0x%x", src->format); + cellResc.trace(" *** pitch=%d", src->pitch); + cellResc.trace(" *** width=%d", src->width); + cellResc.trace(" *** height=%d", src->height); + cellResc.trace(" *** offset=0x%x", src->offset); s_rescInternalInstance->m_rescSrc[idx] = *src; @@ -988,17 +988,17 @@ s32 cellRescSetSrc(s32 idx, vm::ptr src) s32 cellRescSetConvertAndFlip(PPUThread& ppu, vm::ptr cntxt, s32 idx) { - cellResc.Log("cellRescSetConvertAndFlip(cntxt=*0x%x, idx=0x%x)", cntxt, idx); + cellResc.trace("cellRescSetConvertAndFlip(cntxt=*0x%x, idx=0x%x)", cntxt, idx); if(!s_rescInternalInstance->m_bInitialized) { - cellResc.Error("cellRescSetConvertAndFlip : CELL_RESC_ERROR_NOT_INITIALIZED"); + cellResc.error("cellRescSetConvertAndFlip : CELL_RESC_ERROR_NOT_INITIALIZED"); return CELL_RESC_ERROR_NOT_INITIALIZED; } if(idx < 0 || SRC_BUFFER_NUM <= idx) { - cellResc.Error("cellRescSetConvertAndFlip : CELL_RESC_ERROR_BAD_ARGUMENT"); + cellResc.error("cellRescSetConvertAndFlip : CELL_RESC_ERROR_BAD_ARGUMENT"); return CELL_RESC_ERROR_BAD_ARGUMENT; } @@ -1026,7 +1026,7 @@ s32 cellRescSetConvertAndFlip(PPUThread& ppu, vm::ptr cntxt, s32 cellRescSetWaitFlip() { - cellResc.Warning("cellRescSetWaitFlip()"); + cellResc.warning("cellRescSetWaitFlip()"); // TODO: emit RSX command for "wait flip" operation @@ -1035,17 +1035,17 @@ s32 cellRescSetWaitFlip() s32 cellRescSetBufferAddress(vm::ptr colorBuffers, vm::ptr vertexArray, vm::ptr fragmentShader) { - cellResc.Warning("cellRescSetBufferAddress(colorBuffers=*0x%x, vertexArray=*0x%x, fragmentShader=*0x%x)", colorBuffers, vertexArray, fragmentShader); + cellResc.warning("cellRescSetBufferAddress(colorBuffers=*0x%x, vertexArray=*0x%x, fragmentShader=*0x%x)", colorBuffers, vertexArray, fragmentShader); if(!s_rescInternalInstance->m_bInitialized) { - cellResc.Error("cellRescSetBufferAddress : CELL_RESC_ERROR_NOT_INITIALIZED"); + cellResc.error("cellRescSetBufferAddress : CELL_RESC_ERROR_NOT_INITIALIZED"); return CELL_RESC_ERROR_NOT_INITIALIZED; } if(colorBuffers.addr() % COLOR_BUFFER_ALIGNMENT || vertexArray.addr() % VERTEX_BUFFER_ALIGNMENT || fragmentShader.addr() % FRAGMENT_SHADER_ALIGNMENT) { - cellResc.Error("cellRescSetBufferAddress : CELL_RESC_ERROR_BAD_ALIGNMENT"); + cellResc.error("cellRescSetBufferAddress : CELL_RESC_ERROR_BAD_ALIGNMENT"); return CELL_RESC_ERROR_BAD_ALIGNMENT; } @@ -1079,21 +1079,21 @@ s32 cellRescSetBufferAddress(vm::ptr colorBuffers, vm::ptr vertexArray void cellRescSetFlipHandler(vm::ptr handler) { - cellResc.Warning("cellRescSetFlipHandler(handler=*0x%x)", handler); + cellResc.warning("cellRescSetFlipHandler(handler=*0x%x)", handler); Emu.GetGSManager().GetRender().flip_handler = handler; } void cellRescResetFlipStatus() { - cellResc.Log("cellRescResetFlipStatus()"); + cellResc.trace("cellRescResetFlipStatus()"); Emu.GetGSManager().GetRender().flip_status = 1; } s32 cellRescGetFlipStatus() { - cellResc.Log("cellRescGetFlipStatus()"); + cellResc.trace("cellRescGetFlipStatus()"); return Emu.GetGSManager().GetRender().flip_status; } @@ -1106,7 +1106,7 @@ s32 cellRescGetRegisterCount() u64 cellRescGetLastFlipTime() { - cellResc.Log("cellRescGetLastFlipTime()"); + cellResc.trace("cellRescGetLastFlipTime()"); return Emu.GetGSManager().GetRender().last_flip_time; } @@ -1119,7 +1119,7 @@ s32 cellRescSetRegisterCount() void cellRescSetVBlankHandler(vm::ptr handler) { - cellResc.Warning("cellRescSetVBlankHandler(handler=*0x%x)", handler); + cellResc.warning("cellRescSetVBlankHandler(handler=*0x%x)", handler); Emu.GetGSManager().GetRender().vblank_handler = handler; } @@ -1216,23 +1216,23 @@ s32 CreateInterlaceTable(u32 ea_addr, float srcH, float dstH, CellRescTableEleme s32 cellRescCreateInterlaceTable(u32 ea_addr, float srcH, CellRescTableElement depth, s32 length) { - cellResc.Warning("cellRescCreateInterlaceTable(ea_addr=0x%x, srcH=%f, depth=%d, length=%d)", ea_addr, srcH, depth, length); + cellResc.warning("cellRescCreateInterlaceTable(ea_addr=0x%x, srcH=%f, depth=%d, length=%d)", ea_addr, srcH, depth, length); if (!s_rescInternalInstance->m_bInitialized) { - cellResc.Error("cellRescCreateInterlaceTable: CELL_RESC_ERROR_NOT_INITIALIZED"); + cellResc.error("cellRescCreateInterlaceTable: CELL_RESC_ERROR_NOT_INITIALIZED"); return CELL_RESC_ERROR_NOT_INITIALIZED; } if ((ea_addr == 0) || (srcH <= 0.f) || (!(depth == CELL_RESC_ELEMENT_HALF || depth == CELL_RESC_ELEMENT_FLOAT)) || (length <= 0)) { - cellResc.Error("cellRescCreateInterlaceTable: CELL_RESC_ERROR_BAD_ARGUMENT"); + cellResc.error("cellRescCreateInterlaceTable: CELL_RESC_ERROR_BAD_ARGUMENT"); return CELL_RESC_ERROR_BAD_ARGUMENT; } if (s_rescInternalInstance->m_dstHeight == 0) { - cellResc.Error("cellRescCreateInterlaceTable: CELL_RESC_ERROR_BAD_COMBINATION"); + cellResc.error("cellRescCreateInterlaceTable: CELL_RESC_ERROR_BAD_COMBINATION"); return CELL_RESC_ERROR_BAD_COMBINATION; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp index c7345653c7..d36da41c37 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp @@ -24,7 +24,7 @@ u64 convertToWin32FILETIME(u16 seconds, u16 minutes, u16 hours, u16 days, s32 ye s32 cellRtcGetCurrentTick(vm::ptr pTick) { - cellRtc.Log("cellRtcGetCurrentTick(pTick=*0x%x)", pTick); + cellRtc.trace("cellRtcGetCurrentTick(pTick=*0x%x)", pTick); rDateTime unow = rDateTime::UNow(); pTick->tick = unow.GetTicks(); @@ -33,7 +33,7 @@ s32 cellRtcGetCurrentTick(vm::ptr pTick) s32 cellRtcGetCurrentClock(vm::ptr pClock, s32 iTimeZone) { - cellRtc.Log("cellRtcGetCurrentClock(pClock=*0x%x, time_zone=%d)", pClock, iTimeZone); + cellRtc.trace("cellRtcGetCurrentClock(pClock=*0x%x, time_zone=%d)", pClock, iTimeZone); rDateTime unow = rDateTime::UNow(); @@ -54,7 +54,7 @@ s32 cellRtcGetCurrentClock(vm::ptr pClock, s32 iTimeZone) s32 cellRtcGetCurrentClockLocalTime(vm::ptr pClock) { - cellRtc.Log("cellRtcGetCurrentClockLocalTime(pClock=*0x%x)", pClock); + cellRtc.trace("cellRtcGetCurrentClockLocalTime(pClock=*0x%x)", pClock); rDateTime unow = rDateTime::UNow(); @@ -71,7 +71,7 @@ s32 cellRtcGetCurrentClockLocalTime(vm::ptr pClock) s32 cellRtcFormatRfc2822(vm::ptr pszDateTime, vm::ptr pUtc, s32 iTimeZone) { - cellRtc.Log("cellRtcFormatRfc2822(pszDateTime=*0x%x, pUtc=*0x%x, time_zone=%d)", pszDateTime, pUtc, iTimeZone); + cellRtc.trace("cellRtcFormatRfc2822(pszDateTime=*0x%x, pUtc=*0x%x, time_zone=%d)", pszDateTime, pUtc, iTimeZone); // Add time_zone as offset in minutes. rTimeSpan tz = rTimeSpan(0, (long) iTimeZone, 0, 0); @@ -89,7 +89,7 @@ s32 cellRtcFormatRfc2822(vm::ptr pszDateTime, vm::ptr pUtc, s s32 cellRtcFormatRfc2822LocalTime(vm::ptr pszDateTime, vm::ptr pUtc) { - cellRtc.Log("cellRtcFormatRfc2822LocalTime(pszDateTime=*0x%x, pUtc=*0x%x)", pszDateTime, pUtc); + cellRtc.trace("cellRtcFormatRfc2822LocalTime(pszDateTime=*0x%x, pUtc=*0x%x)", pszDateTime, pUtc); // Get date from ticks. rDateTime date = rDateTime((time_t)pUtc->tick); @@ -103,7 +103,7 @@ s32 cellRtcFormatRfc2822LocalTime(vm::ptr pszDateTime, vm::ptr pszDateTime, vm::ptr pUtc, s32 iTimeZone) { - cellRtc.Log("cellRtcFormatRfc3339(pszDateTime=*0x%x, pUtc=*0x%x, iTimeZone=%d)", pszDateTime, pUtc, iTimeZone); + cellRtc.trace("cellRtcFormatRfc3339(pszDateTime=*0x%x, pUtc=*0x%x, iTimeZone=%d)", pszDateTime, pUtc, iTimeZone); // Add time_zone as offset in minutes. rTimeSpan tz = rTimeSpan(0, (long) iTimeZone, 0, 0); @@ -121,7 +121,7 @@ s32 cellRtcFormatRfc3339(vm::ptr pszDateTime, vm::ptr pUtc, s s32 cellRtcFormatRfc3339LocalTime(vm::ptr pszDateTime, vm::ptr pUtc) { - cellRtc.Log("cellRtcFormatRfc3339LocalTime(pszDateTime=*0x%x, pUtc=*0x%x)", pszDateTime, pUtc); + cellRtc.trace("cellRtcFormatRfc3339LocalTime(pszDateTime=*0x%x, pUtc=*0x%x)", pszDateTime, pUtc); // Get date from ticks. rDateTime date = rDateTime((time_t) pUtc->tick); @@ -135,7 +135,7 @@ s32 cellRtcFormatRfc3339LocalTime(vm::ptr pszDateTime, vm::ptr pUtc, vm::cptr pszDateTime) { - cellRtc.Log("cellRtcParseDateTime(pUtc=*0x%x, pszDateTime=*0x%x)", pUtc, pszDateTime); + cellRtc.trace("cellRtcParseDateTime(pUtc=*0x%x, pszDateTime=*0x%x)", pUtc, pszDateTime); // Get date from formatted string. rDateTime date; @@ -148,7 +148,7 @@ s32 cellRtcParseDateTime(vm::ptr pUtc, vm::cptr pszDateTime) s32 cellRtcParseRfc3339(vm::ptr pUtc, vm::cptr pszDateTime) { - cellRtc.Log("cellRtcParseRfc3339(pUtc=*0x%x, pszDateTime=*0x%x)", pUtc, pszDateTime); + cellRtc.trace("cellRtcParseRfc3339(pUtc=*0x%x, pszDateTime=*0x%x)", pUtc, pszDateTime); // Get date from RFC3339 formatted string. rDateTime date; @@ -161,7 +161,7 @@ s32 cellRtcParseRfc3339(vm::ptr pUtc, vm::cptr pszDateTime) s32 cellRtcGetTick(vm::ptr pTime, vm::ptr pTick) { - cellRtc.Log("cellRtcGetTick(pTime=*0x%x, pTick=*0x%x)", pTime, pTick); + cellRtc.trace("cellRtcGetTick(pTime=*0x%x, pTick=*0x%x)", pTime, pTick); rDateTime datetime = rDateTime(pTime->day, (rDateTime::Month)pTime->month.value(), pTime->year, pTime->hour, pTime->minute, pTime->second, (pTime->microsecond / 1000)); pTick->tick = datetime.GetTicks(); @@ -171,7 +171,7 @@ s32 cellRtcGetTick(vm::ptr pTime, vm::ptr pTick) s32 cellRtcSetTick(vm::ptr pTime, vm::ptr pTick) { - cellRtc.Log("cellRtcSetTick(pTime=*0x%x, pTick=*0x%x)", pTime, pTick); + cellRtc.trace("cellRtcSetTick(pTime=*0x%x, pTick=*0x%x)", pTime, pTick); rDateTime date = rDateTime((time_t)pTick->tick); @@ -188,7 +188,7 @@ s32 cellRtcSetTick(vm::ptr pTime, vm::ptr pTick) s32 cellRtcTickAddTicks(vm::ptr pTick0, vm::ptr pTick1, s64 lAdd) { - cellRtc.Log("cellRtcTickAddTicks(pTick0=*0x%x, pTick1=*0x%x, lAdd=%lld)", pTick0, pTick1, lAdd); + cellRtc.trace("cellRtcTickAddTicks(pTick0=*0x%x, pTick1=*0x%x, lAdd=%lld)", pTick0, pTick1, lAdd); pTick0->tick = pTick1->tick + lAdd; return CELL_OK; @@ -196,7 +196,7 @@ s32 cellRtcTickAddTicks(vm::ptr pTick0, vm::ptr pTick1 s32 cellRtcTickAddMicroseconds(vm::ptr pTick0, vm::ptr pTick1, s64 lAdd) { - cellRtc.Log("cellRtcTickAddMicroseconds(pTick0=*0x%x, pTick1=*0x%x, lAdd=%lld)", pTick0, pTick1, lAdd); + cellRtc.trace("cellRtcTickAddMicroseconds(pTick0=*0x%x, pTick1=*0x%x, lAdd=%lld)", pTick0, pTick1, lAdd); rDateTime date = rDateTime((time_t)pTick1->tick); rTimeSpan microseconds = rTimeSpan(0, 0, 0, lAdd / 1000); @@ -208,7 +208,7 @@ s32 cellRtcTickAddMicroseconds(vm::ptr pTick0, vm::ptr s32 cellRtcTickAddSeconds(vm::ptr pTick0, vm::ptr pTick1, s64 lAdd) { - cellRtc.Log("cellRtcTickAddSeconds(pTick0=*0x%x, pTick1=*0x%x, lAdd=%lld)", pTick0, pTick1, lAdd); + cellRtc.trace("cellRtcTickAddSeconds(pTick0=*0x%x, pTick1=*0x%x, lAdd=%lld)", pTick0, pTick1, lAdd); rDateTime date = rDateTime((time_t)pTick1->tick); rTimeSpan seconds = rTimeSpan(0, 0, lAdd, 0); @@ -220,7 +220,7 @@ s32 cellRtcTickAddSeconds(vm::ptr pTick0, vm::ptr pTic s32 cellRtcTickAddMinutes(vm::ptr pTick0, vm::ptr pTick1, s64 lAdd) { - cellRtc.Log("cellRtcTickAddMinutes(pTick0=*0x%x, pTick1=*0x%x, lAdd=%lld)", pTick0, pTick1, lAdd); + cellRtc.trace("cellRtcTickAddMinutes(pTick0=*0x%x, pTick1=*0x%x, lAdd=%lld)", pTick0, pTick1, lAdd); rDateTime date = rDateTime((time_t)pTick1->tick); rTimeSpan minutes = rTimeSpan(0, lAdd, 0, 0); // ??? @@ -232,7 +232,7 @@ s32 cellRtcTickAddMinutes(vm::ptr pTick0, vm::ptr pTic s32 cellRtcTickAddHours(vm::ptr pTick0, vm::ptr pTick1, s32 iAdd) { - cellRtc.Log("cellRtcTickAddHours(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd); + cellRtc.trace("cellRtcTickAddHours(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd); rDateTime date = rDateTime((time_t)pTick1->tick); rTimeSpan hours = rTimeSpan(iAdd, 0, 0, 0); // ??? @@ -244,7 +244,7 @@ s32 cellRtcTickAddHours(vm::ptr pTick0, vm::ptr pTick1 s32 cellRtcTickAddDays(vm::ptr pTick0, vm::ptr pTick1, s32 iAdd) { - cellRtc.Log("cellRtcTickAddDays(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd); + cellRtc.trace("cellRtcTickAddDays(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd); rDateTime date = rDateTime((time_t)pTick1->tick); rDateSpan days = rDateSpan(0, 0, 0, iAdd); // ??? @@ -256,7 +256,7 @@ s32 cellRtcTickAddDays(vm::ptr pTick0, vm::ptr pTick1, s32 cellRtcTickAddWeeks(vm::ptr pTick0, vm::ptr pTick1, s32 iAdd) { - cellRtc.Log("cellRtcTickAddWeeks(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd); + cellRtc.trace("cellRtcTickAddWeeks(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd); rDateTime date = rDateTime((time_t)pTick1->tick); rDateSpan weeks = rDateSpan(0, 0, iAdd, 0); @@ -268,7 +268,7 @@ s32 cellRtcTickAddWeeks(vm::ptr pTick0, vm::ptr pTick1 s32 cellRtcTickAddMonths(vm::ptr pTick0, vm::ptr pTick1, s32 iAdd) { - cellRtc.Log("cellRtcTickAddMonths(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd); + cellRtc.trace("cellRtcTickAddMonths(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd); rDateTime date = rDateTime((time_t)pTick1->tick); rDateSpan months = rDateSpan(0, iAdd, 0, 0); @@ -280,7 +280,7 @@ s32 cellRtcTickAddMonths(vm::ptr pTick0, vm::ptr pTick s32 cellRtcTickAddYears(vm::ptr pTick0, vm::ptr pTick1, s32 iAdd) { - cellRtc.Log("cellRtcTickAddYears(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd); + cellRtc.trace("cellRtcTickAddYears(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd); rDateTime date = rDateTime((time_t)pTick1->tick); rDateSpan years = rDateSpan(iAdd, 0, 0, 0); @@ -292,7 +292,7 @@ s32 cellRtcTickAddYears(vm::ptr pTick0, vm::ptr pTick1 s32 cellRtcConvertUtcToLocalTime(vm::ptr pUtc, vm::ptr pLocalTime) { - cellRtc.Log("cellRtcConvertUtcToLocalTime(pUtc=*0x%x, pLocalTime=*0x%x)", pUtc, pLocalTime); + cellRtc.trace("cellRtcConvertUtcToLocalTime(pUtc=*0x%x, pLocalTime=*0x%x)", pUtc, pLocalTime); rDateTime time = rDateTime((time_t)pUtc->tick); rDateTime local_time = time.FromUTC(false); @@ -302,7 +302,7 @@ s32 cellRtcConvertUtcToLocalTime(vm::ptr pUtc, vm::ptr s32 cellRtcConvertLocalTimeToUtc(vm::ptr pLocalTime, vm::ptr pUtc) { - cellRtc.Log("cellRtcConvertLocalTimeToUtc(pLocalTime=*0x%x, pUtc=*0x%x)", pLocalTime, pUtc); + cellRtc.trace("cellRtcConvertLocalTimeToUtc(pLocalTime=*0x%x, pUtc=*0x%x)", pLocalTime, pUtc); rDateTime time = rDateTime((time_t)pLocalTime->tick); rDateTime utc_time = time.ToUTC(false); @@ -312,7 +312,7 @@ s32 cellRtcConvertLocalTimeToUtc(vm::ptr pLocalTime, vm::ptr pDateTime, vm::ptr puiDosTime) { - cellRtc.Log("cellRtcGetDosTime(pDateTime=*0x%x, puiDosTime=*0x%x)", pDateTime, puiDosTime); + cellRtc.trace("cellRtcGetDosTime(pDateTime=*0x%x, puiDosTime=*0x%x)", pDateTime, puiDosTime); // Convert to DOS time. rDateTime date_time = rDateTime(pDateTime->day, (rDateTime::Month)pDateTime->month.value(), pDateTime->year, pDateTime->hour, pDateTime->minute, pDateTime->second, (pDateTime->microsecond / 1000)); @@ -323,7 +323,7 @@ s32 cellRtcGetDosTime(vm::ptr pDateTime, vm::ptr puiDosTim s32 cellRtcGetTime_t(vm::ptr pDateTime, vm::ptr piTime) { - cellRtc.Log("cellRtcGetTime_t(pDateTime=*0x%x, piTime=*0x%x)", pDateTime, piTime); + cellRtc.trace("cellRtcGetTime_t(pDateTime=*0x%x, piTime=*0x%x)", pDateTime, piTime); // Convert to POSIX time_t. rDateTime date_time = rDateTime(pDateTime->day, (rDateTime::Month)pDateTime->month.value(), pDateTime->year, pDateTime->hour, pDateTime->minute, pDateTime->second, (pDateTime->microsecond / 1000)); @@ -335,7 +335,7 @@ s32 cellRtcGetTime_t(vm::ptr pDateTime, vm::ptr piTime) s32 cellRtcGetWin32FileTime(vm::ptr pDateTime, vm::ptr pulWin32FileTime) { - cellRtc.Log("cellRtcGetWin32FileTime(pDateTime=*0x%x, pulWin32FileTime=*0x%x)", pDateTime, pulWin32FileTime); + cellRtc.trace("cellRtcGetWin32FileTime(pDateTime=*0x%x, pulWin32FileTime=*0x%x)", pDateTime, pulWin32FileTime); // Convert to WIN32 FILETIME. rDateTime date_time = rDateTime(pDateTime->day, (rDateTime::Month)pDateTime->month.value(), pDateTime->year, pDateTime->hour, pDateTime->minute, pDateTime->second, (pDateTime->microsecond / 1000)); @@ -347,7 +347,7 @@ s32 cellRtcGetWin32FileTime(vm::ptr pDateTime, vm::ptr pul s32 cellRtcSetDosTime(vm::ptr pDateTime, u32 uiDosTime) { - cellRtc.Log("cellRtcSetDosTime(pDateTime=*0x%x, uiDosTime=0x%x)", pDateTime, uiDosTime); + cellRtc.trace("cellRtcSetDosTime(pDateTime=*0x%x, uiDosTime=0x%x)", pDateTime, uiDosTime); rDateTime date_time; rDateTime dos_time = date_time.SetFromDOS(uiDosTime); @@ -365,7 +365,7 @@ s32 cellRtcSetDosTime(vm::ptr pDateTime, u32 uiDosTime) s32 cellRtcSetTime_t(vm::ptr pDateTime, u64 iTime) { - cellRtc.Log("cellRtcSetTime_t(pDateTime=*0x%x, iTime=0x%llx)", pDateTime, iTime); + cellRtc.trace("cellRtcSetTime_t(pDateTime=*0x%x, iTime=0x%llx)", pDateTime, iTime); rDateTime date_time = rDateTime((time_t)iTime); @@ -382,7 +382,7 @@ s32 cellRtcSetTime_t(vm::ptr pDateTime, u64 iTime) s32 cellRtcSetWin32FileTime(vm::ptr pDateTime, u64 ulWin32FileTime) { - cellRtc.Log("cellRtcSetWin32FileTime(pDateTime=*0x%x, ulWin32FileTime=0x%llx)", pDateTime, ulWin32FileTime); + cellRtc.trace("cellRtcSetWin32FileTime(pDateTime=*0x%x, ulWin32FileTime=0x%llx)", pDateTime, ulWin32FileTime); rDateTime date_time = rDateTime((time_t)ulWin32FileTime); @@ -399,7 +399,7 @@ s32 cellRtcSetWin32FileTime(vm::ptr pDateTime, u64 ulWin32FileT s32 cellRtcIsLeapYear(s32 year) { - cellRtc.Log("cellRtcIsLeapYear(year=%d)", year); + cellRtc.trace("cellRtcIsLeapYear(year=%d)", year); rDateTime datetime; return datetime.IsLeapYear(year, rDateTime::Gregorian); @@ -407,7 +407,7 @@ s32 cellRtcIsLeapYear(s32 year) s32 cellRtcGetDaysInMonth(s32 year, s32 month) { - cellRtc.Log("cellRtcGetDaysInMonth(year=%d, month=%d)", year, month); + cellRtc.trace("cellRtcGetDaysInMonth(year=%d, month=%d)", year, month); rDateTime datetime; return datetime.GetNumberOfDays((rDateTime::Month) month, year, rDateTime::Gregorian); @@ -415,7 +415,7 @@ s32 cellRtcGetDaysInMonth(s32 year, s32 month) s32 cellRtcGetDayOfWeek(s32 year, s32 month, s32 day) { - cellRtc.Log("cellRtcGetDayOfWeek(year=%d, month=%d, day=%d)", year, month, day); + cellRtc.trace("cellRtcGetDayOfWeek(year=%d, month=%d, day=%d)", year, month, day); rDateTime datetime; datetime.SetToWeekDay((rDateTime::WeekDay) day, 1, (rDateTime::Month) month, year); @@ -424,7 +424,7 @@ s32 cellRtcGetDayOfWeek(s32 year, s32 month, s32 day) s32 cellRtcCheckValid(vm::ptr pTime) { - cellRtc.Log("cellRtcCheckValid(pTime=*0x%x)", pTime); + cellRtc.trace("cellRtcCheckValid(pTime=*0x%x)", pTime); if ((pTime->year < 1) || (pTime->year > 9999)) return CELL_RTC_ERROR_INVALID_YEAR; else if ((pTime->month < 1) || (pTime->month > 12)) return CELL_RTC_ERROR_INVALID_MONTH; @@ -438,7 +438,7 @@ s32 cellRtcCheckValid(vm::ptr pTime) s32 cellRtcCompareTick(vm::ptr pTick0, vm::ptr pTick1) { - cellRtc.Log("cellRtcCompareTick(pTick0=*0x%x, pTick1=*0x%x)", pTick0, pTick1); + cellRtc.trace("cellRtcCompareTick(pTick0=*0x%x, pTick1=*0x%x)", pTick0, pTick1); if (pTick0->tick < pTick1->tick) return -1; else if (pTick0->tick > pTick1->tick) return 1; diff --git a/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp b/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp index bf7db19e23..f9f22f9710 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp @@ -21,7 +21,7 @@ struct rudp_t s32 cellRudpInit(vm::ptr allocator) { - cellRudp.Warning("cellRudpInit(allocator=*0x%x)", allocator); + cellRudp.warning("cellRudpInit(allocator=*0x%x)", allocator); const auto rudp = fxm::make(); @@ -56,7 +56,7 @@ s32 cellRudpInit(vm::ptr allocator) s32 cellRudpEnd() { - cellRudp.Warning("cellRudpEnd()"); + cellRudp.warning("cellRudpEnd()"); if (!fxm::remove()) { @@ -74,7 +74,7 @@ s32 cellRudpEnableInternalIOThread() s32 cellRudpSetEventHandler(vm::ptr handler, vm::ptr arg) { - cellRudp.Todo("cellRudpSetEventHandler(handler=*0x%x, arg=*0x%x)", handler, arg); + cellRudp.todo("cellRudpSetEventHandler(handler=*0x%x, arg=*0x%x)", handler, arg); const auto rudp = fxm::get(); @@ -91,7 +91,7 @@ s32 cellRudpSetEventHandler(vm::ptr handler, vm::ptr s32 cellRudpSetMaxSegmentSize(u16 mss) { - cellRudp.Todo("cellRudpSetMaxSegmentSize(mss=%d)", mss); + cellRudp.todo("cellRudpSetMaxSegmentSize(mss=%d)", mss); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp index f9a28b7bd6..bce818099c 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp @@ -34,7 +34,7 @@ void playerBoot(vm::ptr pSelf, u64 userParam) s32 cellSailMemAllocatorInitialize(vm::ptr pSelf, vm::ptr pCallbacks) { - cellSail.Warning("cellSailMemAllocatorInitialize(pSelf=*0x%x, pCallbacks=*0x%x)", pSelf, pCallbacks); + cellSail.warning("cellSailMemAllocatorInitialize(pSelf=*0x%x, pCallbacks=*0x%x)", pSelf, pCallbacks); pSelf->callbacks = pCallbacks; @@ -43,37 +43,37 @@ s32 cellSailMemAllocatorInitialize(vm::ptr pSelf, vm::ptr< s32 cellSailFutureInitialize(vm::ptr pSelf) { - cellSail.Todo("cellSailFutureInitialize(pSelf=*0x%x)", pSelf); + cellSail.todo("cellSailFutureInitialize(pSelf=*0x%x)", pSelf); return CELL_OK; } s32 cellSailFutureFinalize(vm::ptr pSelf) { - cellSail.Todo("cellSailFutureFinalize(pSelf=*0x%x)", pSelf); + cellSail.todo("cellSailFutureFinalize(pSelf=*0x%x)", pSelf); return CELL_OK; } s32 cellSailFutureReset(vm::ptr pSelf, b8 wait) { - cellSail.Todo("cellSailFutureReset(pSelf=*0x%x, wait=%d)", pSelf, wait); + cellSail.todo("cellSailFutureReset(pSelf=*0x%x, wait=%d)", pSelf, wait); return CELL_OK; } s32 cellSailFutureSet(vm::ptr pSelf, s32 result) { - cellSail.Todo("cellSailFutureSet(pSelf=*0x%x, result=%d)", pSelf, result); + cellSail.todo("cellSailFutureSet(pSelf=*0x%x, result=%d)", pSelf, result); return CELL_OK; } s32 cellSailFutureGet(vm::ptr pSelf, u64 timeout, vm::ptr pResult) { - cellSail.Todo("cellSailFutureGet(pSelf=*0x%x, timeout=%lld, result=*0x%x)", pSelf, timeout, pResult); + cellSail.todo("cellSailFutureGet(pSelf=*0x%x, timeout=%lld, result=*0x%x)", pSelf, timeout, pResult); return CELL_OK; } s32 cellSailFutureIsDone(vm::ptr pSelf, vm::ptr pResult) { - cellSail.Todo("cellSailFutureIsDone(pSelf=*0x%x, result=*0x%x)", pSelf, pResult); + cellSail.todo("cellSailFutureIsDone(pSelf=*0x%x, result=*0x%x)", pSelf, pResult); return CELL_OK; } @@ -97,7 +97,7 @@ s32 cellSailDescriptorGetMediaInfo() s32 cellSailDescriptorSetAutoSelection(vm::ptr pSelf, b8 autoSelection) { - cellSail.Warning("cellSailDescriptorSetAutoSelection(pSelf=*0x%x, autoSelection=%d)", pSelf, autoSelection); + cellSail.warning("cellSailDescriptorSetAutoSelection(pSelf=*0x%x, autoSelection=%d)", pSelf, autoSelection); if (pSelf) { @@ -110,7 +110,7 @@ s32 cellSailDescriptorSetAutoSelection(vm::ptr pSelf, b8 aut s32 cellSailDescriptorIsAutoSelection(vm::ptr pSelf) { - cellSail.Warning("cellSailDescriptorIsAutoSelection(pSelf=*0x%x)", pSelf); + cellSail.warning("cellSailDescriptorIsAutoSelection(pSelf=*0x%x)", pSelf); if (pSelf) { @@ -122,7 +122,7 @@ s32 cellSailDescriptorIsAutoSelection(vm::ptr pSelf) s32 cellSailDescriptorCreateDatabase(vm::ptr pSelf, vm::ptr pDatabase, u32 size, u64 arg) { - cellSail.Warning("cellSailDescriptorCreateDatabase(pSelf=*0x%x, pDatabase=*0x%x, size=0x%x, arg=0x%llx)", pSelf, pDatabase, size, arg); + cellSail.warning("cellSailDescriptorCreateDatabase(pSelf=*0x%x, pDatabase=*0x%x, size=0x%x, arg=0x%llx)", pSelf, pDatabase, size, arg); switch ((s32)pSelf->streamType) { @@ -134,7 +134,7 @@ s32 cellSailDescriptorCreateDatabase(vm::ptr pSelf, vm::ptr< break; } default: - cellSail.Error("Unhandled stream type: %d", pSelf->streamType); + cellSail.error("Unhandled stream type: %d", pSelf->streamType); } return CELL_OK; @@ -190,7 +190,7 @@ s32 cellSailDescriptorSetParameter() s32 cellSailSoundAdapterInitialize(vm::ptr pSelf, vm::cptr pCallbacks, vm::ptr pArg) { - cellSail.Warning("cellSailSoundAdapterInitialize(pSelf=*0x%x, pCallbacks=*0x%x, pArg=*0x%x)", pSelf, pCallbacks, pArg); + cellSail.warning("cellSailSoundAdapterInitialize(pSelf=*0x%x, pCallbacks=*0x%x, pArg=*0x%x)", pSelf, pCallbacks, pArg); if (pSelf->initialized) { @@ -214,7 +214,7 @@ s32 cellSailSoundAdapterInitialize(vm::ptr pSelf, vm::cptr s32 cellSailSoundAdapterFinalize(vm::ptr pSelf) { - cellSail.Warning("cellSailSoundAdapterFinalize(pSelf=*0x%x)", pSelf); + cellSail.warning("cellSailSoundAdapterFinalize(pSelf=*0x%x)", pSelf); if (!pSelf->initialized) { @@ -231,7 +231,7 @@ s32 cellSailSoundAdapterFinalize(vm::ptr pSelf) s32 cellSailSoundAdapterSetPreferredFormat(vm::ptr pSelf, vm::cptr pFormat) { - cellSail.Warning("cellSailSoundAdapterSetPreferredFormat(pSelf=*0x%x, pFormat=*0x%x)", pSelf, pFormat); + cellSail.warning("cellSailSoundAdapterSetPreferredFormat(pSelf=*0x%x, pFormat=*0x%x)", pSelf, pFormat); pSelf->format = *pFormat; @@ -240,7 +240,7 @@ s32 cellSailSoundAdapterSetPreferredFormat(vm::ptr pSelf, s32 cellSailSoundAdapterGetFrame(vm::ptr pSelf, u32 samples, vm::ptr pInfo) { - cellSail.Todo("cellSailSoundAdapterGetFrame(pSelf=*0x%x, samples=%d, pInfo=*0x%x)", pSelf, samples, pInfo); + cellSail.todo("cellSailSoundAdapterGetFrame(pSelf=*0x%x, samples=%d, pInfo=*0x%x)", pSelf, samples, pInfo); if (!pSelf->initialized) { @@ -262,7 +262,7 @@ s32 cellSailSoundAdapterGetFrame(vm::ptr pSelf, u32 sample s32 cellSailSoundAdapterGetFormat(vm::ptr pSelf, vm::ptr pFormat) { - cellSail.Warning("cellSailSoundAdapterGetFormat(pSelf=*0x%x, pFormat=*0x%x)", pSelf, pFormat); + cellSail.warning("cellSailSoundAdapterGetFormat(pSelf=*0x%x, pFormat=*0x%x)", pSelf, pFormat); *pFormat = pSelf->format; @@ -283,7 +283,7 @@ s32 cellSailSoundAdapterPtsToTimePosition() s32 cellSailGraphicsAdapterInitialize(vm::ptr pSelf, vm::cptr pCallbacks, vm::ptr pArg) { - cellSail.Warning("cellSailGraphicsAdapterInitialize(pSelf=*0x%x, pCallbacks=*0x%x, pArg=*0x%x)", pSelf, pCallbacks, pArg); + cellSail.warning("cellSailGraphicsAdapterInitialize(pSelf=*0x%x, pCallbacks=*0x%x, pArg=*0x%x)", pSelf, pCallbacks, pArg); if (pSelf->initialized) { @@ -309,7 +309,7 @@ s32 cellSailGraphicsAdapterInitialize(vm::ptr pSelf, vm s32 cellSailGraphicsAdapterFinalize(vm::ptr pSelf) { - cellSail.Todo("cellSailGraphicsAdapterFinalize(pSelf=*0x%x)", pSelf); + cellSail.todo("cellSailGraphicsAdapterFinalize(pSelf=*0x%x)", pSelf); if (!pSelf->initialized) { @@ -326,7 +326,7 @@ s32 cellSailGraphicsAdapterFinalize(vm::ptr pSelf) s32 cellSailGraphicsAdapterSetPreferredFormat(vm::ptr pSelf, vm::cptr pFormat) { - cellSail.Warning("cellSailGraphicsAdapterSetPreferredFormat(pSelf=*0x%x, pFormat=*0x%x)", pSelf, pFormat); + cellSail.warning("cellSailGraphicsAdapterSetPreferredFormat(pSelf=*0x%x, pFormat=*0x%x)", pSelf, pFormat); pSelf->format = *pFormat; @@ -335,20 +335,20 @@ s32 cellSailGraphicsAdapterSetPreferredFormat(vm::ptr p s32 cellSailGraphicsAdapterGetFrame(vm::ptr pSelf, vm::ptr pInfo) { - cellSail.Todo("cellSailGraphicsAdapterGetFrame(pSelf=*0x%x, pInfo=*0x%x)", pSelf, pInfo); + cellSail.todo("cellSailGraphicsAdapterGetFrame(pSelf=*0x%x, pInfo=*0x%x)", pSelf, pInfo); return CELL_OK; } s32 cellSailGraphicsAdapterGetFrame2(vm::ptr pSelf, vm::ptr pInfo, vm::ptr pPrevInfo, vm::ptr pFlipTime, u64 flags) { - cellSail.Todo("cellSailGraphicsAdapterGetFrame2(pSelf=*0x%x, pInfo=*0x%x, pPrevInfo=*0x%x, flipTime=*0x%x, flags=0x%llx)", pSelf, pInfo, pPrevInfo, pFlipTime, flags); + cellSail.todo("cellSailGraphicsAdapterGetFrame2(pSelf=*0x%x, pInfo=*0x%x, pPrevInfo=*0x%x, flipTime=*0x%x, flags=0x%llx)", pSelf, pInfo, pPrevInfo, pFlipTime, flags); return CELL_OK; } s32 cellSailGraphicsAdapterGetFormat(vm::ptr pSelf, vm::ptr pFormat) { - cellSail.Warning("cellSailGraphicsAdapterGetFormat(pSelf=*0x%x, pFormat=*0x%x)", pSelf, pFormat); + cellSail.warning("cellSailGraphicsAdapterGetFormat(pSelf=*0x%x, pFormat=*0x%x)", pSelf, pFormat); *pFormat = pSelf->format; @@ -622,7 +622,7 @@ s32 cellSailPlayerInitialize2( vm::ptr pAttribute, vm::ptr pResource) { - cellSail.Warning("cellSailPlayerInitialize2(pSelf=*0x%x, pAllocator=*0x%x, pCallback=*0x%x, callbackArg=*0x%x, pAttribute=*0x%x, pResource=*0x%x)", + cellSail.warning("cellSailPlayerInitialize2(pSelf=*0x%x, pAllocator=*0x%x, pCallback=*0x%x, callbackArg=*0x%x, pAttribute=*0x%x, pResource=*0x%x)", pSelf, pAllocator, pCallback, callbackArg, pAttribute, pResource); pSelf->allocator = *pAllocator; @@ -646,7 +646,7 @@ s32 cellSailPlayerInitialize2( s32 cellSailPlayerFinalize(vm::ptr pSelf) { - cellSail.Todo("cellSailPlayerFinalize(pSelf=*0x%x)", pSelf); + cellSail.todo("cellSailPlayerFinalize(pSelf=*0x%x)", pSelf); if (pSelf->sAdapter) { @@ -675,7 +675,7 @@ s32 cellSailPlayerGetRegisteredProtocols() s32 cellSailPlayerSetSoundAdapter(vm::ptr pSelf, u32 index, vm::ptr pAdapter) { - cellSail.Warning("cellSailPlayerSetSoundAdapter(pSelf=*0x%x, index=%d, pAdapter=*0x%x)", pSelf, index, pAdapter); + cellSail.warning("cellSailPlayerSetSoundAdapter(pSelf=*0x%x, index=%d, pAdapter=*0x%x)", pSelf, index, pAdapter); if (index > pSelf->attribute.maxAudioStreamNum) { @@ -691,7 +691,7 @@ s32 cellSailPlayerSetSoundAdapter(vm::ptr pSelf, u32 index, vm:: s32 cellSailPlayerSetGraphicsAdapter(vm::ptr pSelf, u32 index, vm::ptr pAdapter) { - cellSail.Warning("cellSailPlayerSetGraphicsAdapter(pSelf=*0x%x, index=%d, pAdapter=*0x%x)", pSelf, index, pAdapter); + cellSail.warning("cellSailPlayerSetGraphicsAdapter(pSelf=*0x%x, index=%d, pAdapter=*0x%x)", pSelf, index, pAdapter); if (index > pSelf->attribute.maxVideoStreamNum) { @@ -725,14 +725,14 @@ s32 cellSailPlayerSetRendererVideo() s32 cellSailPlayerSetParameter(vm::ptr pSelf, s32 parameterType, u64 param0, u64 param1) { - cellSail.Warning("cellSailPlayerSetParameter(pSelf=*0x%x, parameterType=0x%x, param0=0x%llx, param1=0x%llx)", pSelf, parameterType, param0, param1); + cellSail.warning("cellSailPlayerSetParameter(pSelf=*0x%x, parameterType=0x%x, param0=0x%llx, param1=0x%llx)", pSelf, parameterType, param0, param1); switch (parameterType) { case CELL_SAIL_PARAMETER_GRAPHICS_ADAPTER_BUFFER_RELEASE_DELAY: pSelf->graphics_adapter_buffer_release_delay = param1; break; // TODO: Stream index case CELL_SAIL_PARAMETER_CONTROL_PPU_THREAD_STACK_SIZE: pSelf->control_ppu_thread_stack_size = param0; break; case CELL_SAIL_PARAMETER_ENABLE_APOST_SRC: pSelf->enable_apost_src = param1; break; // TODO: Stream index - default: cellSail.Todo("cellSailPlayerSetParameter(): unimplemented parameter %s", ParameterCodeToName(parameterType)); + default: cellSail.todo("cellSailPlayerSetParameter(): unimplemented parameter %s", ParameterCodeToName(parameterType)); } return CELL_OK; @@ -740,11 +740,11 @@ s32 cellSailPlayerSetParameter(vm::ptr pSelf, s32 parameterType, s32 cellSailPlayerGetParameter(vm::ptr pSelf, s32 parameterType, vm::ptr pParam0, vm::ptr pParam1) { - cellSail.Todo("cellSailPlayerGetParameter(pSelf=*0x%x, parameterType=0x%x, param0=*0x%x, param1=*0x%x)", pSelf, parameterType, pParam0, pParam1); + cellSail.todo("cellSailPlayerGetParameter(pSelf=*0x%x, parameterType=0x%x, param0=*0x%x, param1=*0x%x)", pSelf, parameterType, pParam0, pParam1); switch (parameterType) { - default: cellSail.Error("cellSailPlayerGetParameter(): unimplemented parameter %s", ParameterCodeToName(parameterType)); + default: cellSail.error("cellSailPlayerGetParameter(): unimplemented parameter %s", ParameterCodeToName(parameterType)); } return CELL_OK; @@ -770,7 +770,7 @@ s32 cellSailPlayerReplaceEventHandler() s32 cellSailPlayerBoot(PPUThread& ppu, vm::ptr pSelf, u64 userParam) { - cellSail.Warning("cellSailPlayerBoot(pSelf=*0x%x, userParam=%d)", pSelf, userParam); + cellSail.warning("cellSailPlayerBoot(pSelf=*0x%x, userParam=%d)", pSelf, userParam); playerBoot(pSelf, userParam); @@ -779,7 +779,7 @@ s32 cellSailPlayerBoot(PPUThread& ppu, vm::ptr pSelf, u64 userPa s32 cellSailPlayerAddDescriptor(vm::ptr pSelf, vm::ptr pDesc) { - cellSail.Warning("cellSailPlayerAddDescriptor(pSelf=*0x%x, pDesc=*0x%x)", pSelf, pDesc); + cellSail.warning("cellSailPlayerAddDescriptor(pSelf=*0x%x, pDesc=*0x%x)", pSelf, pDesc); if (pSelf && pSelf->descriptors < 3 && pDesc) { @@ -789,7 +789,7 @@ s32 cellSailPlayerAddDescriptor(vm::ptr pSelf, vm::ptr pSelf, vm::ptr pSelf, s32 streamType, vm::ptr pMediaInfo, vm::cptr pUri, vm::pptr ppDesc) { - cellSail.Todo("cellSailPlayerCreateDescriptor(pSelf=*0x%x, streamType=%d, pMediaInfo=*0x%x, pUri=*0x%x, ppDesc=**0x%x)", pSelf, streamType, pMediaInfo, pUri, ppDesc); + cellSail.todo("cellSailPlayerCreateDescriptor(pSelf=*0x%x, streamType=%d, pMediaInfo=*0x%x, pUri=*0x%x, ppDesc=**0x%x)", pSelf, streamType, pMediaInfo, pUri, ppDesc); u32 descriptorAddress = vm::alloc(sizeof(CellSailDescriptor), vm::main); auto descriptor = vm::ptr::make(descriptorAddress); @@ -833,17 +833,17 @@ s32 cellSailPlayerCreateDescriptor(vm::ptr pSelf, s32 streamType } else { - cellSail.Warning("Couldn't open PAMF: %s", uri.c_str()); + cellSail.warning("Couldn't open PAMF: %s", uri.c_str()); } } else { - cellSail.Warning("Unhandled uri: %s", uri.c_str()); + cellSail.warning("Unhandled uri: %s", uri.c_str()); } break; } default: - cellSail.Error("Unhandled stream type: %d", streamType); + cellSail.error("Unhandled stream type: %d", streamType); } return CELL_OK; @@ -851,7 +851,7 @@ s32 cellSailPlayerCreateDescriptor(vm::ptr pSelf, s32 streamType s32 cellSailPlayerDestroyDescriptor(vm::ptr pSelf, vm::ptr pDesc) { - cellSail.Todo("cellSailPlayerAddDescriptor(pSelf=*0x%x, pDesc=*0x%x)", pSelf, pDesc); + cellSail.todo("cellSailPlayerAddDescriptor(pSelf=*0x%x, pDesc=*0x%x)", pSelf, pDesc); if (pDesc->registered) return CELL_SAIL_ERROR_INVALID_STATE; @@ -861,7 +861,7 @@ s32 cellSailPlayerDestroyDescriptor(vm::ptr pSelf, vm::ptr pSelf, vm::ptr ppDesc) { - cellSail.Warning("cellSailPlayerAddDescriptor(pSelf=*0x%x, pDesc=*0x%x)", pSelf, ppDesc); + cellSail.warning("cellSailPlayerAddDescriptor(pSelf=*0x%x, pDesc=*0x%x)", pSelf, ppDesc); if (pSelf->descriptors > 0) { @@ -876,7 +876,7 @@ s32 cellSailPlayerRemoveDescriptor(vm::ptr pSelf, vm::ptr pSelf) { - cellSail.Warning("cellSailPlayerGetDescriptorCount(pSelf=*0x%x)", pSelf); + cellSail.warning("cellSailPlayerGetDescriptorCount(pSelf=*0x%x)", pSelf); return pSelf->descriptors; } @@ -978,19 +978,19 @@ s32 cellSailPlayerCancel() s32 cellSailPlayerSetPaused(vm::ptr pSelf, b8 paused) { - cellSail.Todo("cellSailPlayerSetPaused(pSelf=*0x%x, paused=%d)", pSelf, paused); + cellSail.todo("cellSailPlayerSetPaused(pSelf=*0x%x, paused=%d)", pSelf, paused); return CELL_OK; } s32 cellSailPlayerIsPaused(vm::ptr pSelf) { - cellSail.Warning("cellSailPlayerIsPaused(pSelf=*0x%x)", pSelf); + cellSail.warning("cellSailPlayerIsPaused(pSelf=*0x%x)", pSelf); return pSelf->paused; } s32 cellSailPlayerSetRepeatMode(vm::ptr pSelf, s32 repeatMode, vm::ptr pCommand) { - cellSail.Warning("cellSailPlayerSetRepeatMode(pSelf=*0x%x, repeatMode=%d, pCommand=*0x%x)", pSelf, repeatMode, pCommand); + cellSail.warning("cellSailPlayerSetRepeatMode(pSelf=*0x%x, repeatMode=%d, pCommand=*0x%x)", pSelf, repeatMode, pCommand); pSelf->repeatMode = repeatMode; pSelf->playbackCommand = pCommand; @@ -1000,7 +1000,7 @@ s32 cellSailPlayerSetRepeatMode(vm::ptr pSelf, s32 repeatMode, v s32 cellSailPlayerGetRepeatMode(vm::ptr pSelf, vm::ptr pCommand) { - cellSail.Warning("cellSailPlayerGetRepeatMode(pSelf=*0x%x, pCommand=*0x%x)", pSelf, pCommand); + cellSail.warning("cellSailPlayerGetRepeatMode(pSelf=*0x%x, pCommand=*0x%x)", pSelf, pCommand); pCommand = pSelf->playbackCommand; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp index f23eaa48e7..af0d443c99 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp @@ -185,7 +185,7 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt if (result->result < 0) { - cellSysutil.Warning("savedata_op(): funcList returned < 0."); + cellSysutil.warning("savedata_op(): funcList returned < 0."); return CELL_SAVEDATA_ERROR_CBRESULT; } @@ -267,7 +267,7 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt } default: { - cellSysutil.Error("savedata_op(): unknown listSet->focusPosition (0x%x)", pos_type); + cellSysutil.error("savedata_op(): unknown listSet->focusPosition (0x%x)", pos_type); return CELL_SAVEDATA_ERROR_PARAM; } } @@ -295,7 +295,7 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt if (result->result < 0) { - cellSysutil.Warning("savedata_op(): funcFixed returned < 0."); + cellSysutil.warning("savedata_op(): funcFixed returned < 0."); return CELL_SAVEDATA_ERROR_CBRESULT; } @@ -432,7 +432,7 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt if (result->result < 0) { - cellSysutil.Warning("savedata_op(): funcStat returned < 0."); + cellSysutil.warning("savedata_op(): funcStat returned < 0."); return CELL_SAVEDATA_ERROR_CBRESULT; } @@ -464,7 +464,7 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt { case CELL_SAVEDATA_RECREATE_NO: { - cellSaveData.Error("Savedata %s considered broken", save_entry.dirName); + cellSaveData.error("Savedata %s considered broken", save_entry.dirName); // fallthrough } @@ -488,7 +488,7 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt if (!statSet->setParam) { // Savedata deleted and setParam is NULL: delete directory and abort operation - if (Emu.GetVFS().RemoveDir(dir_path)) cellSysutil.Error("savedata_op(): savedata directory %s deleted", save_entry.dirName); + if (Emu.GetVFS().RemoveDir(dir_path)) cellSysutil.error("savedata_op(): savedata directory %s deleted", save_entry.dirName); return CELL_OK; } @@ -498,7 +498,7 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt default: { - cellSysutil.Error("savedata_op(): unknown statSet->reCreateMode (0x%x)", statSet->reCreateMode); + cellSysutil.error("savedata_op(): unknown statSet->reCreateMode (0x%x)", statSet->reCreateMode); return CELL_SAVEDATA_ERROR_PARAM; } } @@ -521,7 +521,7 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt if (result->result < 0) { - cellSysutil.Warning("savedata_op(): funcFile returned < 0."); + cellSysutil.warning("savedata_op(): funcFile returned < 0."); return CELL_SAVEDATA_ERROR_CBRESULT; } @@ -567,7 +567,7 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt default: { - cellSysutil.Error("savedata_op(): unknown fileSet->fileType (0x%x)", type); + cellSysutil.error("savedata_op(): unknown fileSet->fileType (0x%x)", type); return CELL_SAVEDATA_ERROR_PARAM; } } @@ -614,7 +614,7 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt default: { - cellSysutil.Error("savedata_op(): unknown fileSet->fileOperation (0x%x)", op); + cellSysutil.error("savedata_op(): unknown fileSet->fileOperation (0x%x)", op); return CELL_SAVEDATA_ERROR_PARAM; } } @@ -634,7 +634,7 @@ never_inline s32 savedata_op(PPUThread& ppu, u32 operation, u32 version, vm::cpt s32 cellSaveDataListSave2(PPUThread& ppu, u32 version, PSetList setList, PSetBuf setBuf, PFuncList funcList, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Warning("cellSaveDataListSave2(version=%d, setList=*0x%x, setBuf=*0x%x, funcList=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.warning("cellSaveDataListSave2(version=%d, setList=*0x%x, setBuf=*0x%x, funcList=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, setList, setBuf, funcList, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_LIST_SAVE, version, vm::null, 1, setList, setBuf, funcList, vm::null, funcStat, funcFile, container, 2, userdata, 0, vm::null); @@ -643,7 +643,7 @@ s32 cellSaveDataListSave2(PPUThread& ppu, u32 version, PSetList setList, PSetBuf s32 cellSaveDataListLoad2(PPUThread& ppu, u32 version, PSetList setList, PSetBuf setBuf, PFuncList funcList, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Warning("cellSaveDataListLoad2(version=%d, setList=*0x%x, setBuf=*0x%x, funcList=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.warning("cellSaveDataListLoad2(version=%d, setList=*0x%x, setBuf=*0x%x, funcList=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, setList, setBuf, funcList, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_LIST_LOAD, version, vm::null, 1, setList, setBuf, funcList, vm::null, funcStat, funcFile, container, 2, userdata, 0, vm::null); @@ -652,7 +652,7 @@ s32 cellSaveDataListLoad2(PPUThread& ppu, u32 version, PSetList setList, PSetBuf s32 cellSaveDataListSave(PPUThread& ppu, u32 version, PSetList setList, PSetBuf setBuf, PFuncList funcList, PFuncStat funcStat, PFuncFile funcFile, u32 container) { - cellSysutil.Warning("cellSaveDataListSave(version=%d, setList=*0x%x, setBuf=*0x%x, funcList=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x)", + cellSysutil.warning("cellSaveDataListSave(version=%d, setList=*0x%x, setBuf=*0x%x, funcList=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x)", version, setList, setBuf, funcList, funcStat, funcFile, container); return savedata_op(ppu, SAVEDATA_OP_LIST_SAVE, version, vm::null, 1, setList, setBuf, funcList, vm::null, funcStat, funcFile, container, 2, vm::null, 0, vm::null); @@ -661,7 +661,7 @@ s32 cellSaveDataListSave(PPUThread& ppu, u32 version, PSetList setList, PSetBuf s32 cellSaveDataListLoad(PPUThread& ppu, u32 version, PSetList setList, PSetBuf setBuf, PFuncList funcList, PFuncStat funcStat, PFuncFile funcFile, u32 container) { - cellSysutil.Warning("cellSaveDataListLoad(version=%d, setList=*0x%x, setBuf=*0x%x, funcList=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x)", + cellSysutil.warning("cellSaveDataListLoad(version=%d, setList=*0x%x, setBuf=*0x%x, funcList=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x)", version, setList, setBuf, funcList, funcStat, funcFile, container); return savedata_op(ppu, SAVEDATA_OP_LIST_LOAD, version, vm::null, 1, setList, setBuf, funcList, vm::null, funcStat, funcFile, container, 2, vm::null, 0, vm::null); @@ -671,7 +671,7 @@ s32 cellSaveDataListLoad(PPUThread& ppu, u32 version, PSetList setList, PSetBuf s32 cellSaveDataFixedSave2(PPUThread& ppu, u32 version, PSetList setList, PSetBuf setBuf, PFuncFixed funcFixed, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Warning("cellSaveDataFixedSave2(version=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.warning("cellSaveDataFixedSave2(version=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, setList, setBuf, funcFixed, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_FIXED_SAVE, version, vm::null, 1, setList, setBuf, vm::null, funcFixed, funcStat, funcFile, container, 2, userdata, 0, vm::null); @@ -680,7 +680,7 @@ s32 cellSaveDataFixedSave2(PPUThread& ppu, u32 version, PSetList setList, PSetBu s32 cellSaveDataFixedLoad2(PPUThread& ppu, u32 version, PSetList setList, PSetBuf setBuf, PFuncFixed funcFixed, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Warning("cellSaveDataFixedLoad2(version=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.warning("cellSaveDataFixedLoad2(version=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, setList, setBuf, funcFixed, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_FIXED_LOAD, version, vm::null, 1, setList, setBuf, vm::null, funcFixed, funcStat, funcFile, container, 2, userdata, 0, vm::null); @@ -689,7 +689,7 @@ s32 cellSaveDataFixedLoad2(PPUThread& ppu, u32 version, PSetList setList, PSetBu s32 cellSaveDataFixedSave(PPUThread& ppu, u32 version, PSetList setList, PSetBuf setBuf, PFuncFixed funcFixed, PFuncStat funcStat, PFuncFile funcFile, u32 container) { - cellSysutil.Warning("cellSaveDataFixedSave(version=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x)", + cellSysutil.warning("cellSaveDataFixedSave(version=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x)", version, setList, setBuf, funcFixed, funcStat, funcFile, container); return savedata_op(ppu, SAVEDATA_OP_FIXED_SAVE, version, vm::null, 1, setList, setBuf, vm::null, funcFixed, funcStat, funcFile, container, 2, vm::null, 0, vm::null); @@ -699,7 +699,7 @@ s32 cellSaveDataFixedSave(PPUThread& ppu, u32 version, PSetList setList, PSetBuf s32 cellSaveDataFixedLoad(PPUThread& ppu, u32 version, PSetList setList, PSetBuf setBuf, PFuncFixed funcFixed, PFuncStat funcStat, PFuncFile funcFile, u32 container) { - cellSysutil.Warning("cellSaveDataFixedLoad(version=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x)", + cellSysutil.warning("cellSaveDataFixedLoad(version=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x)", version, setList, setBuf, funcFixed, funcStat, funcFile, container); return savedata_op(ppu, SAVEDATA_OP_FIXED_LOAD, version, vm::null, 1, setList, setBuf, vm::null, funcFixed, funcStat, funcFile, container, 2, vm::null, 0, vm::null); @@ -708,7 +708,7 @@ s32 cellSaveDataFixedLoad(PPUThread& ppu, u32 version, PSetList setList, PSetBuf s32 cellSaveDataAutoSave2(PPUThread& ppu, u32 version, vm::cptr dirName, u32 errDialog, PSetBuf setBuf, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Warning("cellSaveDataAutoSave2(version=%d, dirName=*0x%x, errDialog=%d, setBuf=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.warning("cellSaveDataAutoSave2(version=%d, dirName=*0x%x, errDialog=%d, setBuf=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, dirName, errDialog, setBuf, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_AUTO_SAVE, version, dirName, errDialog, vm::null, setBuf, vm::null, vm::null, funcStat, funcFile, container, 2, userdata, 0, vm::null); @@ -717,7 +717,7 @@ s32 cellSaveDataAutoSave2(PPUThread& ppu, u32 version, vm::cptr dirName, u s32 cellSaveDataAutoLoad2(PPUThread& ppu, u32 version, vm::cptr dirName, u32 errDialog, PSetBuf setBuf, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Warning("cellSaveDataAutoLoad2(version=%d, dirName=*0x%x, errDialog=%d, setBuf=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.warning("cellSaveDataAutoLoad2(version=%d, dirName=*0x%x, errDialog=%d, setBuf=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, dirName, errDialog, setBuf, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_AUTO_LOAD, version, dirName, errDialog, vm::null, setBuf, vm::null, vm::null, funcStat, funcFile, container, 2, userdata, 0, vm::null); @@ -726,7 +726,7 @@ s32 cellSaveDataAutoLoad2(PPUThread& ppu, u32 version, vm::cptr dirName, u s32 cellSaveDataAutoSave(PPUThread& ppu, u32 version, vm::cptr dirName, u32 errDialog, PSetBuf setBuf, PFuncStat funcStat, PFuncFile funcFile, u32 container) { - cellSysutil.Warning("cellSaveDataAutoSave(version=%d, dirName=*0x%x, errDialog=%d, setBuf=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x)", + cellSysutil.warning("cellSaveDataAutoSave(version=%d, dirName=*0x%x, errDialog=%d, setBuf=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x)", version, dirName, errDialog, setBuf, funcStat, funcFile, container); return savedata_op(ppu, SAVEDATA_OP_AUTO_SAVE, version, dirName, errDialog, vm::null, setBuf, vm::null, vm::null, funcStat, funcFile, container, 2, vm::null, 0, vm::null); @@ -735,7 +735,7 @@ s32 cellSaveDataAutoSave(PPUThread& ppu, u32 version, vm::cptr dirName, u3 s32 cellSaveDataAutoLoad(PPUThread& ppu, u32 version, vm::cptr dirName, u32 errDialog, PSetBuf setBuf, PFuncStat funcStat, PFuncFile funcFile, u32 container) { - cellSysutil.Warning("cellSaveDataAutoLoad(version=%d, dirName=*0x%x, errDialog=%d, setBuf=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x)", + cellSysutil.warning("cellSaveDataAutoLoad(version=%d, dirName=*0x%x, errDialog=%d, setBuf=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x)", version, dirName, errDialog, setBuf, funcStat, funcFile, container); return savedata_op(ppu, SAVEDATA_OP_AUTO_LOAD, version, dirName, errDialog, vm::null, setBuf, vm::null, vm::null, funcStat, funcFile, container, 2, vm::null, 0, vm::null); @@ -743,7 +743,7 @@ s32 cellSaveDataAutoLoad(PPUThread& ppu, u32 version, vm::cptr dirName, u3 s32 cellSaveDataListAutoSave(PPUThread& ppu, u32 version, u32 errDialog, PSetList setList, PSetBuf setBuf, PFuncFixed funcFixed, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Warning("cellSaveDataListAutoSave(version=%d, errDialog=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.warning("cellSaveDataListAutoSave(version=%d, errDialog=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, errDialog, setList, setBuf, funcFixed, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_LIST_AUTO_SAVE, version, vm::null, errDialog, setList, setBuf, vm::null, funcFixed, funcStat, funcFile, container, 0, userdata, 0, vm::null); @@ -751,7 +751,7 @@ s32 cellSaveDataListAutoSave(PPUThread& ppu, u32 version, u32 errDialog, PSetLis s32 cellSaveDataListAutoLoad(PPUThread& ppu, u32 version, u32 errDialog, PSetList setList, PSetBuf setBuf, PFuncFixed funcFixed, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Warning("cellSaveDataListAutoLoad(version=%d, errDialog=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.warning("cellSaveDataListAutoLoad(version=%d, errDialog=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, errDialog, setList, setBuf, funcFixed, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_LIST_AUTO_LOAD, version, vm::null, errDialog, setList, setBuf, vm::null, funcFixed, funcStat, funcFile, container, 0, userdata, 0, vm::null); @@ -759,21 +759,21 @@ s32 cellSaveDataListAutoLoad(PPUThread& ppu, u32 version, u32 errDialog, PSetLis s32 cellSaveDataDelete2(u32 container) { - cellSysutil.Todo("cellSaveDataDelete2(container=0x%x)", container); + cellSysutil.todo("cellSaveDataDelete2(container=0x%x)", container); return CELL_SAVEDATA_RET_CANCEL; } s32 cellSaveDataDelete(u32 container) { - cellSysutil.Todo("cellSaveDataDelete(container=0x%x)", container); + cellSysutil.todo("cellSaveDataDelete(container=0x%x)", container); return CELL_SAVEDATA_RET_CANCEL; } s32 cellSaveDataFixedDelete(PPUThread& ppu, PSetList setList, PSetBuf setBuf, PFuncFixed funcFixed, PFuncDone funcDone, u32 container, vm::ptr userdata) { - cellSysutil.Todo("cellSaveDataFixedDelete(setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcDone=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.todo("cellSaveDataFixedDelete(setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcDone=*0x%x, container=0x%x, userdata=*0x%x)", setList, setBuf, funcFixed, funcDone, container, userdata); return CELL_OK; @@ -781,7 +781,7 @@ s32 cellSaveDataFixedDelete(PPUThread& ppu, PSetList setList, PSetBuf setBuf, PF s32 cellSaveDataUserListSave(PPUThread& ppu, u32 version, u32 userId, PSetList setList, PSetBuf setBuf, PFuncList funcList, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Error("cellSaveDataUserListSave(version=%d, userId=%d, setList=*0x%x, setBuf=*0x%x, funcList=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.error("cellSaveDataUserListSave(version=%d, userId=%d, setList=*0x%x, setBuf=*0x%x, funcList=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, userId, setList, setBuf, funcList, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_LIST_SAVE, version, vm::null, 0, setList, setBuf, funcList, vm::null, funcStat, funcFile, container, 6, userdata, userId, vm::null); @@ -789,7 +789,7 @@ s32 cellSaveDataUserListSave(PPUThread& ppu, u32 version, u32 userId, PSetList s s32 cellSaveDataUserListLoad(PPUThread& ppu, u32 version, u32 userId, PSetList setList, PSetBuf setBuf, PFuncList funcList, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Error("cellSaveDataUserListLoad(version=%d, userId=%d, setList=*0x%x, setBuf=*0x%x, funcList=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.error("cellSaveDataUserListLoad(version=%d, userId=%d, setList=*0x%x, setBuf=*0x%x, funcList=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, userId, setList, setBuf, funcList, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_LIST_LOAD, version, vm::null, 0, setList, setBuf, funcList, vm::null, funcStat, funcFile, container, 6, userdata, userId, vm::null); @@ -797,7 +797,7 @@ s32 cellSaveDataUserListLoad(PPUThread& ppu, u32 version, u32 userId, PSetList s s32 cellSaveDataUserFixedSave(PPUThread& ppu, u32 version, u32 userId, PSetList setList, PSetBuf setBuf, PFuncFixed funcFixed, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Error("cellSaveDataUserFixedSave(version=%d, userId=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.error("cellSaveDataUserFixedSave(version=%d, userId=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, userId, setList, setBuf, funcFixed, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_FIXED_SAVE, version, vm::null, 0, setList, setBuf, vm::null, funcFixed, funcStat, funcFile, container, 6, userdata, userId, vm::null); @@ -805,7 +805,7 @@ s32 cellSaveDataUserFixedSave(PPUThread& ppu, u32 version, u32 userId, PSetList s32 cellSaveDataUserFixedLoad(PPUThread& ppu, u32 version, u32 userId, PSetList setList, PSetBuf setBuf, PFuncFixed funcFixed, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Error("cellSaveDataUserFixedLoad(version=%d, userId=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.error("cellSaveDataUserFixedLoad(version=%d, userId=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, userId, setList, setBuf, funcFixed, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_FIXED_LOAD, version, vm::null, 0, setList, setBuf, vm::null, funcFixed, funcStat, funcFile, container, 6, userdata, userId, vm::null); @@ -813,7 +813,7 @@ s32 cellSaveDataUserFixedLoad(PPUThread& ppu, u32 version, u32 userId, PSetList s32 cellSaveDataUserAutoSave(PPUThread& ppu, u32 version, u32 userId, vm::cptr dirName, u32 errDialog, PSetBuf setBuf, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Error("cellSaveDataUserAutoSave(version=%d, userId=%d, dirName=*0x%x, errDialog=%d, setBuf=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.error("cellSaveDataUserAutoSave(version=%d, userId=%d, dirName=*0x%x, errDialog=%d, setBuf=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, userId, dirName, errDialog, setBuf, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_AUTO_SAVE, version, dirName, errDialog, vm::null, setBuf, vm::null, vm::null, funcStat, funcFile, container, 6, userdata, userId, vm::null); @@ -821,7 +821,7 @@ s32 cellSaveDataUserAutoSave(PPUThread& ppu, u32 version, u32 userId, vm::cptr dirName, u32 errDialog, PSetBuf setBuf, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Error("cellSaveDataUserAutoLoad(version=%d, userId=%d, dirName=*0x%x, errDialog=%d, setBuf=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.error("cellSaveDataUserAutoLoad(version=%d, userId=%d, dirName=*0x%x, errDialog=%d, setBuf=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, userId, dirName, errDialog, setBuf, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_AUTO_LOAD, version, dirName, errDialog, vm::null, setBuf, vm::null, vm::null, funcStat, funcFile, container, 6, userdata, userId, vm::null); @@ -829,7 +829,7 @@ s32 cellSaveDataUserAutoLoad(PPUThread& ppu, u32 version, u32 userId, vm::cptr userdata) { - cellSysutil.Error("cellSaveDataUserListAutoSave(version=%d, userId=%d, errDialog=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.error("cellSaveDataUserListAutoSave(version=%d, userId=%d, errDialog=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, userId, errDialog, setList, setBuf, funcFixed, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_LIST_AUTO_SAVE, version, vm::null, errDialog, setList, setBuf, vm::null, funcFixed, funcStat, funcFile, container, 6, userdata, userId, vm::null); @@ -837,7 +837,7 @@ s32 cellSaveDataUserListAutoSave(PPUThread& ppu, u32 version, u32 userId, u32 er s32 cellSaveDataUserListAutoLoad(PPUThread& ppu, u32 version, u32 userId, u32 errDialog, PSetList setList, PSetBuf setBuf, PFuncFixed funcFixed, PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr userdata) { - cellSysutil.Error("cellSaveDataUserListAutoLoad(version=%d, userId=%d, errDialog=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.error("cellSaveDataUserListAutoLoad(version=%d, userId=%d, errDialog=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcStat=*0x%x, funcFile=*0x%x, container=0x%x, userdata=*0x%x)", version, userId, errDialog, setList, setBuf, funcFixed, funcStat, funcFile, container, userdata); return savedata_op(ppu, SAVEDATA_OP_LIST_AUTO_LOAD, version, vm::null, errDialog, setList, setBuf, vm::null, funcFixed, funcStat, funcFile, container, 6, userdata, userId, vm::null); @@ -845,7 +845,7 @@ s32 cellSaveDataUserListAutoLoad(PPUThread& ppu, u32 version, u32 userId, u32 er s32 cellSaveDataUserFixedDelete(PPUThread& ppu, u32 userId, PSetList setList, PSetBuf setBuf, PFuncFixed funcFixed, PFuncDone funcDone, u32 container, vm::ptr userdata) { - cellSysutil.Todo("cellSaveDataUserFixedDelete(userId=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcDone=*0x%x, container=0x%x, userdata=*0x%x)", + cellSysutil.todo("cellSaveDataUserFixedDelete(userId=%d, setList=*0x%x, setBuf=*0x%x, funcFixed=*0x%x, funcDone=*0x%x, container=0x%x, userdata=*0x%x)", userId, setList, setBuf, funcFixed, funcDone, container, userdata); return CELL_OK; @@ -853,7 +853,7 @@ s32 cellSaveDataUserFixedDelete(PPUThread& ppu, u32 userId, PSetList setList, PS void cellSaveDataEnableOverlay(s32 enable) { - cellSysutil.Error("cellSaveDataEnableOverlay(enable=%d)", enable); + cellSysutil.error("cellSaveDataEnableOverlay(enable=%d)", enable); return; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp b/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp index 291b470d9c..90f264f3f6 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp @@ -8,7 +8,7 @@ extern Module<> cellSearch; s32 cellSearchInitialize(CellSearchMode mode, u32 container, vm::ptr func, vm::ptr userData) { - cellSearch.Warning("cellSearchInitialize()"); + cellSearch.warning("cellSearchInitialize()"); // TODO: Store the arguments somewhere so we can use them later. @@ -17,7 +17,7 @@ s32 cellSearchInitialize(CellSearchMode mode, u32 container, vm::ptr spurs, u32 revision, u /// Initialize SPURS s32 cellSpursInitialize(PPUThread& ppu, vm::ptr spurs, s32 nSpus, s32 spuPriority, s32 ppuPriority, b8 exitIfNoWork) { - cellSpurs.Warning("cellSpursInitialize(spurs=*0x%x, nSpus=%d, spuPriority=%d, ppuPriority=%d, exitIfNoWork=%d)", spurs, nSpus, spuPriority, ppuPriority, exitIfNoWork); + cellSpurs.warning("cellSpursInitialize(spurs=*0x%x, nSpus=%d, spuPriority=%d, ppuPriority=%d, exitIfNoWork=%d)", spurs, nSpus, spuPriority, ppuPriority, exitIfNoWork); return _spurs::initialize(ppu, spurs, 0, 0, nSpus, spuPriority, ppuPriority, exitIfNoWork ? SAF_EXIT_IF_NO_WORK : SAF_NONE, vm::null, 0, 0, vm::null, 0, 0); } @@ -1193,7 +1193,7 @@ s32 cellSpursInitialize(PPUThread& ppu, vm::ptr spurs, s32 nSpus, s32 /// Initialise SPURS s32 cellSpursInitializeWithAttribute(PPUThread& ppu, vm::ptr spurs, vm::cptr attr) { - cellSpurs.Warning("cellSpursInitializeWithAttribute(spurs=*0x%x, attr=*0x%x)", spurs, attr); + cellSpurs.warning("cellSpursInitializeWithAttribute(spurs=*0x%x, attr=*0x%x)", spurs, attr); if (!attr) { @@ -1230,7 +1230,7 @@ s32 cellSpursInitializeWithAttribute(PPUThread& ppu, vm::ptr spurs, v /// Initialise SPURS s32 cellSpursInitializeWithAttribute2(PPUThread& ppu, vm::ptr spurs, vm::cptr attr) { - cellSpurs.Warning("cellSpursInitializeWithAttribute2(spurs=*0x%x, attr=*0x%x)", spurs, attr); + cellSpurs.warning("cellSpursInitializeWithAttribute2(spurs=*0x%x, attr=*0x%x)", spurs, attr); if (!attr) { @@ -1267,7 +1267,7 @@ s32 cellSpursInitializeWithAttribute2(PPUThread& ppu, vm::ptr spurs, /// Initialise SPURS attribute s32 _cellSpursAttributeInitialize(vm::ptr attr, u32 revision, u32 sdkVersion, u32 nSpus, s32 spuPriority, s32 ppuPriority, b8 exitIfNoWork) { - cellSpurs.Warning("_cellSpursAttributeInitialize(attr=*0x%x, revision=%d, sdkVersion=0x%x, nSpus=%d, spuPriority=%d, ppuPriority=%d, exitIfNoWork=%d)", + cellSpurs.warning("_cellSpursAttributeInitialize(attr=*0x%x, revision=%d, sdkVersion=0x%x, nSpus=%d, spuPriority=%d, ppuPriority=%d, exitIfNoWork=%d)", attr, revision, sdkVersion, nSpus, spuPriority, ppuPriority, exitIfNoWork); if (!attr) @@ -1293,7 +1293,7 @@ s32 _cellSpursAttributeInitialize(vm::ptr attr, u32 revision /// Set memory container ID for creating the SPU thread group s32 cellSpursAttributeSetMemoryContainerForSpuThread(vm::ptr attr, u32 container) { - cellSpurs.Warning("cellSpursAttributeSetMemoryContainerForSpuThread(attr=*0x%x, container=0x%x)", attr, container); + cellSpurs.warning("cellSpursAttributeSetMemoryContainerForSpuThread(attr=*0x%x, container=0x%x)", attr, container); if (!attr) { @@ -1318,7 +1318,7 @@ s32 cellSpursAttributeSetMemoryContainerForSpuThread(vm::ptr /// Set the prefix for SPURS s32 cellSpursAttributeSetNamePrefix(vm::ptr attr, vm::cptr prefix, u32 size) { - cellSpurs.Warning("cellSpursAttributeSetNamePrefix(attr=*0x%x, prefix=*0x%x, size=%d)", attr, prefix, size); + cellSpurs.warning("cellSpursAttributeSetNamePrefix(attr=*0x%x, prefix=*0x%x, size=%d)", attr, prefix, size); if (!attr || !prefix) { @@ -1343,7 +1343,7 @@ s32 cellSpursAttributeSetNamePrefix(vm::ptr attr, vm::cptr attr) { - cellSpurs.Warning("cellSpursAttributeEnableSpuPrintfIfAvailable(attr=*0x%x)", attr); + cellSpurs.warning("cellSpursAttributeEnableSpuPrintfIfAvailable(attr=*0x%x)", attr); if (!attr) { @@ -1362,7 +1362,7 @@ s32 cellSpursAttributeEnableSpuPrintfIfAvailable(vm::ptr att /// Set the type of SPU thread group s32 cellSpursAttributeSetSpuThreadGroupType(vm::ptr attr, s32 type) { - cellSpurs.Warning("cellSpursAttributeSetSpuThreadGroupType(attr=*0x%x, type=%d)", attr, type); + cellSpurs.warning("cellSpursAttributeSetSpuThreadGroupType(attr=*0x%x, type=%d)", attr, type); if (!attr) { @@ -1397,7 +1397,7 @@ s32 cellSpursAttributeSetSpuThreadGroupType(vm::ptr attr, s3 /// Enable the system workload s32 cellSpursAttributeEnableSystemWorkload(vm::ptr attr, vm::cptr priority, u32 maxSpu, vm::cptr isPreemptible) { - cellSpurs.Warning("cellSpursAttributeEnableSystemWorkload(attr=*0x%x, priority=*0x%x, maxSpu=%d, isPreemptible=*0x%x)", attr, priority, maxSpu, isPreemptible); + cellSpurs.warning("cellSpursAttributeEnableSystemWorkload(attr=*0x%x, priority=*0x%x, maxSpu=%d, isPreemptible=*0x%x)", attr, priority, maxSpu, isPreemptible); if (!attr) { @@ -1459,7 +1459,7 @@ s32 cellSpursAttributeEnableSystemWorkload(vm::ptr attr, vm: /// Release resources allocated for SPURS s32 cellSpursFinalize(vm::ptr spurs) { - cellSpurs.Todo("cellSpursFinalize(spurs=*0x%x)", spurs); + cellSpurs.todo("cellSpursFinalize(spurs=*0x%x)", spurs); if (!spurs) { @@ -1494,7 +1494,7 @@ s32 cellSpursFinalize(vm::ptr spurs) /// Get the SPU thread group ID s32 cellSpursGetSpuThreadGroupId(vm::ptr spurs, vm::ptr group) { - cellSpurs.Warning("cellSpursGetSpuThreadGroupId(spurs=*0x%x, group=*0x%x)", spurs, group); + cellSpurs.warning("cellSpursGetSpuThreadGroupId(spurs=*0x%x, group=*0x%x)", spurs, group); if (!spurs || !group) { @@ -1513,7 +1513,7 @@ s32 cellSpursGetSpuThreadGroupId(vm::ptr spurs, vm::ptr group) // Get the number of SPU threads s32 cellSpursGetNumSpuThread(vm::ptr spurs, vm::ptr nThreads) { - cellSpurs.Warning("cellSpursGetNumSpuThread(spurs=*0x%x, nThreads=*0x%x)", spurs, nThreads); + cellSpurs.warning("cellSpursGetNumSpuThread(spurs=*0x%x, nThreads=*0x%x)", spurs, nThreads); if (!spurs || !nThreads) { @@ -1532,7 +1532,7 @@ s32 cellSpursGetNumSpuThread(vm::ptr spurs, vm::ptr nThreads) /// Get SPU thread ids s32 cellSpursGetSpuThreadId(vm::ptr spurs, vm::ptr thread, vm::ptr nThreads) { - cellSpurs.Warning("cellSpursGetSpuThreadId(spurs=*0x%x, thread=*0x%x, nThreads=*0x%x)", spurs, thread, nThreads); + cellSpurs.warning("cellSpursGetSpuThreadId(spurs=*0x%x, thread=*0x%x, nThreads=*0x%x)", spurs, thread, nThreads); if (!spurs || !thread || !nThreads) { @@ -1558,7 +1558,7 @@ s32 cellSpursGetSpuThreadId(vm::ptr spurs, vm::ptr thread, vm::p /// Set the maximum contention for a workload s32 cellSpursSetMaxContention(vm::ptr spurs, u32 wid, u32 maxContention) { - cellSpurs.Warning("cellSpursSetMaxContention(spurs=*0x%x, wid=%d, maxContention=%d)", spurs, wid, maxContention); + cellSpurs.warning("cellSpursSetMaxContention(spurs=*0x%x, wid=%d, maxContention=%d)", spurs, wid, maxContention); if (!spurs) { @@ -1602,7 +1602,7 @@ s32 cellSpursSetMaxContention(vm::ptr spurs, u32 wid, u32 maxContenti /// Set the priority of a workload on each SPU s32 cellSpursSetPriorities(vm::ptr spurs, u32 wid, vm::cptr priorities) { - cellSpurs.Warning("cellSpursSetPriorities(spurs=*0x%x, wid=%d, priorities=*0x%x)", spurs, wid, priorities); + cellSpurs.warning("cellSpursSetPriorities(spurs=*0x%x, wid=%d, priorities=*0x%x)", spurs, wid, priorities); if (!spurs) { @@ -1657,7 +1657,7 @@ s32 cellSpursSetPriorities(vm::ptr spurs, u32 wid, vm::cptr prior /// Set the priority of a workload for the specified SPU s32 cellSpursSetPriority(vm::ptr spurs, u32 wid, u32 spuId, u32 priority) { - cellSpurs.Todo("cellSpursSetPriority(spurs=*0x%x, wid=%d, spuId=%d, priority=%d)", spurs, wid, spuId, priority); + cellSpurs.todo("cellSpursSetPriority(spurs=*0x%x, wid=%d, spuId=%d, priority=%d)", spurs, wid, spuId, priority); return CELL_OK; } @@ -1671,7 +1671,7 @@ s32 cellSpursSetPreemptionVictimHints(vm::ptr spurs, vm::cptr isP /// Attach an LV2 event queue to a SPURS instance s32 cellSpursAttachLv2EventQueue(PPUThread& ppu, vm::ptr spurs, u32 queue, vm::ptr port, s32 isDynamic) { - cellSpurs.Warning("cellSpursAttachLv2EventQueue(spurs=*0x%x, queue=0x%x, port=*0x%x, isDynamic=%d)", spurs, queue, port, isDynamic); + cellSpurs.warning("cellSpursAttachLv2EventQueue(spurs=*0x%x, queue=0x%x, port=*0x%x, isDynamic=%d)", spurs, queue, port, isDynamic); return _spurs::attach_lv2_eq(ppu, spurs, queue, port, isDynamic, false); } @@ -1679,14 +1679,14 @@ s32 cellSpursAttachLv2EventQueue(PPUThread& ppu, vm::ptr spurs, u32 q /// Detach an LV2 event queue from a SPURS instance s32 cellSpursDetachLv2EventQueue(vm::ptr spurs, u8 port) { - cellSpurs.Warning("cellSpursDetachLv2EventQueue(spurs=*0x%x, port=%d)", spurs, port); + cellSpurs.warning("cellSpursDetachLv2EventQueue(spurs=*0x%x, port=%d)", spurs, port); return _spurs::detach_lv2_eq(spurs, port, false); } s32 cellSpursEnableExceptionEventHandler(vm::ptr spurs, b8 flag) { - cellSpurs.Warning("cellSpursEnableExceptionEventHandler(spurs=*0x%x, flag=%d)", spurs, flag); + cellSpurs.warning("cellSpursEnableExceptionEventHandler(spurs=*0x%x, flag=%d)", spurs, flag); if (!spurs) { @@ -1721,7 +1721,7 @@ s32 cellSpursEnableExceptionEventHandler(vm::ptr spurs, b8 flag) /// Set the global SPU exception event handler s32 cellSpursSetGlobalExceptionEventHandler(vm::ptr spurs, vm::ptr eaHandler, vm::ptr arg) { - cellSpurs.Warning("cellSpursSetGlobalExceptionEventHandler(spurs=*0x%x, eaHandler=*0x%x, arg=*0x%x)", spurs, eaHandler, arg); + cellSpurs.warning("cellSpursSetGlobalExceptionEventHandler(spurs=*0x%x, eaHandler=*0x%x, arg=*0x%x)", spurs, eaHandler, arg); if (!spurs || !eaHandler) { @@ -1753,7 +1753,7 @@ s32 cellSpursSetGlobalExceptionEventHandler(vm::ptr spurs, vm::ptr spurs) { - cellSpurs.Warning("cellSpursUnsetGlobalExceptionEventHandler(spurs=*0x%x)", spurs); + cellSpurs.warning("cellSpursUnsetGlobalExceptionEventHandler(spurs=*0x%x)", spurs); spurs->globalSpuExceptionHandlerArgs = 0; spurs->globalSpuExceptionHandler.exchange(0); @@ -1855,7 +1855,7 @@ s32 _spurs::trace_initialize(PPUThread& ppu, vm::ptr spurs, vm::ptr spurs, vm::ptr buffer, u32 size, u32 mode) { - cellSpurs.Warning("cellSpursTraceInitialize(spurs=*0x%x, buffer=*0x%x, size=0x%x, mode=0x%x)", spurs, buffer, size, mode); + cellSpurs.warning("cellSpursTraceInitialize(spurs=*0x%x, buffer=*0x%x, size=0x%x, mode=0x%x)", spurs, buffer, size, mode); if (_spurs::is_libprof_loaded()) { @@ -1868,7 +1868,7 @@ s32 cellSpursTraceInitialize(PPUThread& ppu, vm::ptr spurs, vm::ptr spurs) { - cellSpurs.Warning("cellSpursTraceFinalize(spurs=*0x%x)", spurs); + cellSpurs.warning("cellSpursTraceFinalize(spurs=*0x%x)", spurs); if (!spurs) { @@ -1923,7 +1923,7 @@ s32 _spurs::trace_start(PPUThread& ppu, vm::ptr spurs, u32 updateStat /// Start SPURS trace s32 cellSpursTraceStart(PPUThread& ppu, vm::ptr spurs) { - cellSpurs.Warning("cellSpursTraceStart(spurs=*0x%x)", spurs); + cellSpurs.warning("cellSpursTraceStart(spurs=*0x%x)", spurs); if (!spurs) { @@ -1967,7 +1967,7 @@ s32 _spurs::trace_stop(PPUThread& ppu, vm::ptr spurs, u32 updateStatu /// Stop SPURS trace s32 cellSpursTraceStop(PPUThread& ppu, vm::ptr spurs) { - cellSpurs.Warning("cellSpursTraceStop(spurs=*0x%x)", spurs); + cellSpurs.warning("cellSpursTraceStop(spurs=*0x%x)", spurs); if (!spurs) { @@ -1989,7 +1989,7 @@ s32 cellSpursTraceStop(PPUThread& ppu, vm::ptr spurs) /// Initialize attributes of a workload s32 _cellSpursWorkloadAttributeInitialize(vm::ptr attr, u32 revision, u32 sdkVersion, vm::cptr pm, u32 size, u64 data, vm::cptr priority, u32 minCnt, u32 maxCnt) { - cellSpurs.Warning("_cellSpursWorkloadAttributeInitialize(attr=*0x%x, revision=%d, sdkVersion=0x%x, pm=*0x%x, size=0x%x, data=0x%llx, priority=*0x%x, minCnt=0x%x, maxCnt=0x%x)", + cellSpurs.warning("_cellSpursWorkloadAttributeInitialize(attr=*0x%x, revision=%d, sdkVersion=0x%x, pm=*0x%x, size=0x%x, data=0x%llx, priority=*0x%x, minCnt=0x%x, maxCnt=0x%x)", attr, revision, sdkVersion, pm, size, data, priority, minCnt, maxCnt); if (!attr) @@ -2032,7 +2032,7 @@ s32 _cellSpursWorkloadAttributeInitialize(vm::ptr at /// Set the name of a workload s32 cellSpursWorkloadAttributeSetName(vm::ptr attr, vm::cptr nameClass, vm::cptr nameInstance) { - cellSpurs.Warning("cellSpursWorkloadAttributeSetName(attr=*0x%x, nameClass=*0x%x, nameInstance=*0x%x)", attr, nameClass, nameInstance); + cellSpurs.warning("cellSpursWorkloadAttributeSetName(attr=*0x%x, nameClass=*0x%x, nameInstance=*0x%x)", attr, nameClass, nameInstance); if (!attr) { @@ -2052,7 +2052,7 @@ s32 cellSpursWorkloadAttributeSetName(vm::ptr attr, /// Set a hook function for shutdown completion event of a workload s32 cellSpursWorkloadAttributeSetShutdownCompletionEventHook(vm::ptr attr, vm::ptr hook, vm::ptr arg) { - cellSpurs.Warning("cellSpursWorkloadAttributeSetShutdownCompletionEventHook(attr=*0x%x, hook=*0x%x, arg=*0x%x)", attr, hook, arg); + cellSpurs.warning("cellSpursWorkloadAttributeSetShutdownCompletionEventHook(attr=*0x%x, hook=*0x%x, arg=*0x%x)", attr, hook, arg); if (!attr || !hook) { @@ -2237,7 +2237,7 @@ s32 _spurs::add_workload(vm::ptr spurs, vm::ptr wid, vm::cptr spurs, vm::ptr wid, vm::cptr pm, u32 size, u64 data, vm::cptr priority, u32 minCnt, u32 maxCnt) { - cellSpurs.Warning("cellSpursAddWorkload(spurs=*0x%x, wid=*0x%x, pm=*0x%x, size=0x%x, data=0x%llx, priority=*0x%x, minCnt=0x%x, maxCnt=0x%x)", + cellSpurs.warning("cellSpursAddWorkload(spurs=*0x%x, wid=*0x%x, pm=*0x%x, size=0x%x, data=0x%llx, priority=*0x%x, minCnt=0x%x, maxCnt=0x%x)", spurs, wid, pm, size, data, priority, minCnt, maxCnt); return _spurs::add_workload(spurs, wid, pm, size, data, *priority, minCnt, maxCnt, vm::null, vm::null, vm::null, vm::null); @@ -2246,7 +2246,7 @@ s32 cellSpursAddWorkload(vm::ptr spurs, vm::ptr wid, vm::cptr spurs, vm::ptr wid, vm::cptr attr) { - cellSpurs.Warning("cellSpursAddWorkloadWithAttribute(spurs=*0x%x, wid=*0x%x, attr=*0x%x)", spurs, wid, attr); + cellSpurs.warning("cellSpursAddWorkloadWithAttribute(spurs=*0x%x, wid=*0x%x, attr=*0x%x)", spurs, wid, attr); if (!attr) { @@ -2289,7 +2289,7 @@ s32 cellSpursRemoveWorkload() s32 cellSpursWakeUp(PPUThread& ppu, vm::ptr spurs) { - cellSpurs.Warning("cellSpursWakeUp(spurs=*0x%x)", spurs); + cellSpurs.warning("cellSpursWakeUp(spurs=*0x%x)", spurs); if (!spurs) { @@ -2319,7 +2319,7 @@ s32 cellSpursWakeUp(PPUThread& ppu, vm::ptr spurs) /// Send a workload signal s32 cellSpursSendWorkloadSignal(vm::ptr spurs, u32 wid) { - cellSpurs.Warning("cellSpursSendWorkloadSignal(spurs=*0x%x, wid=%d)", spurs, wid); + cellSpurs.warning("cellSpursSendWorkloadSignal(spurs=*0x%x, wid=%d)", spurs, wid); if (!spurs) { @@ -2366,7 +2366,7 @@ s32 cellSpursSendWorkloadSignal(vm::ptr spurs, u32 wid) /// Get the address of the workload flag s32 cellSpursGetWorkloadFlag(vm::ptr spurs, vm::pptr flag) { - cellSpurs.Warning("cellSpursGetWorkloadFlag(spurs=*0x%x, flag=**0x%x)", spurs, flag); + cellSpurs.warning("cellSpursGetWorkloadFlag(spurs=*0x%x, flag=**0x%x)", spurs, flag); if (!spurs || !flag) { @@ -2385,7 +2385,7 @@ s32 cellSpursGetWorkloadFlag(vm::ptr spurs, vm::pptr spurs, u32 wid, u32 value) { - cellSpurs.Warning("cellSpursReadyCountStore(spurs=*0x%x, wid=%d, value=0x%x)", spurs, wid, value); + cellSpurs.warning("cellSpursReadyCountStore(spurs=*0x%x, wid=%d, value=0x%x)", spurs, wid, value); if (!spurs) { @@ -2448,7 +2448,7 @@ s32 cellSpursReadyCountAdd() /// Get workload's data to be passed to policy module s32 cellSpursGetWorkloadData(vm::ptr spurs, vm::ptr data, u32 wid) { - cellSpurs.Warning("cellSpursGetWorkloadData(spurs=*0x%x, data=*0x%x, wid=%d)", spurs, data, wid); + cellSpurs.warning("cellSpursGetWorkloadData(spurs=*0x%x, data=*0x%x, wid=%d)", spurs, data, wid); if (!spurs || !data) { @@ -2511,7 +2511,7 @@ s32 cellSpursUnsetExceptionEventHandler() /// Set/unset the recipient of the workload flag s32 _cellSpursWorkloadFlagReceiver(vm::ptr spurs, u32 wid, u32 is_set) { - cellSpurs.Warning("_cellSpursWorkloadFlagReceiver(spurs=*0x%x, wid=%d, is_set=%d)", spurs, wid, is_set); + cellSpurs.warning("_cellSpursWorkloadFlagReceiver(spurs=*0x%x, wid=%d, is_set=%d)", spurs, wid, is_set); if (!spurs) { @@ -2604,7 +2604,7 @@ s32 cellSpursRequestIdleSpu() /// Initialize a SPURS event flag s32 _cellSpursEventFlagInitialize(vm::ptr spurs, vm::ptr taskset, vm::ptr eventFlag, u32 flagClearMode, u32 flagDirection) { - cellSpurs.Warning("_cellSpursEventFlagInitialize(spurs=*0x%x, taskset=*0x%x, eventFlag=*0x%x, flagClearMode=%d, flagDirection=%d)", spurs, taskset, eventFlag, flagClearMode, flagDirection); + cellSpurs.warning("_cellSpursEventFlagInitialize(spurs=*0x%x, taskset=*0x%x, eventFlag=*0x%x, flagClearMode=%d, flagDirection=%d)", spurs, taskset, eventFlag, flagClearMode, flagDirection); if ((!taskset && !spurs) || !eventFlag) { @@ -2647,7 +2647,7 @@ s32 _cellSpursEventFlagInitialize(vm::ptr spurs, vm::ptr eventFlag, u16 bits) { - cellSpurs.Warning("cellSpursEventFlagClear(eventFlag=*0x%x, bits=0x%x)", eventFlag, bits); + cellSpurs.warning("cellSpursEventFlagClear(eventFlag=*0x%x, bits=0x%x)", eventFlag, bits); if (!eventFlag) { @@ -2666,7 +2666,7 @@ s32 cellSpursEventFlagClear(vm::ptr eventFlag, u16 bits) /// Set a SPURS event flag s32 cellSpursEventFlagSet(PPUThread& ppu, vm::ptr eventFlag, u16 bits) { - cellSpurs.Warning("cellSpursEventFlagSet(eventFlag=*0x%x, bits=0x%x)", eventFlag, bits); + cellSpurs.warning("cellSpursEventFlagSet(eventFlag=*0x%x, bits=0x%x)", eventFlag, bits); if (!eventFlag) { @@ -2949,7 +2949,7 @@ s32 _spurs::event_flag_wait(PPUThread& ppu, vm::ptr eventFla /// Wait for SPURS event flag s32 cellSpursEventFlagWait(PPUThread& ppu, vm::ptr eventFlag, vm::ptr mask, u32 mode) { - cellSpurs.Warning("cellSpursEventFlagWait(eventFlag=*0x%x, mask=*0x%x, mode=%d)", eventFlag, mask, mode); + cellSpurs.warning("cellSpursEventFlagWait(eventFlag=*0x%x, mask=*0x%x, mode=%d)", eventFlag, mask, mode); return _spurs::event_flag_wait(ppu, eventFlag, mask, mode, 1); } @@ -2957,7 +2957,7 @@ s32 cellSpursEventFlagWait(PPUThread& ppu, vm::ptr eventFlag /// Check SPURS event flag s32 cellSpursEventFlagTryWait(PPUThread& ppu, vm::ptr eventFlag, vm::ptr mask, u32 mode) { - cellSpurs.Warning("cellSpursEventFlagTryWait(eventFlag=*0x%x, mask=*0x%x, mode=0x%x)", eventFlag, mask, mode); + cellSpurs.warning("cellSpursEventFlagTryWait(eventFlag=*0x%x, mask=*0x%x, mode=0x%x)", eventFlag, mask, mode); return _spurs::event_flag_wait(ppu, eventFlag, mask, mode, 0); } @@ -2965,7 +2965,7 @@ s32 cellSpursEventFlagTryWait(PPUThread& ppu, vm::ptr eventF /// Attach an LV2 event queue to a SPURS event flag s32 cellSpursEventFlagAttachLv2EventQueue(PPUThread& ppu, vm::ptr eventFlag) { - cellSpurs.Warning("cellSpursEventFlagAttachLv2EventQueue(eventFlag=*0x%x)", eventFlag); + cellSpurs.warning("cellSpursEventFlagAttachLv2EventQueue(eventFlag=*0x%x)", eventFlag); if (!eventFlag) { @@ -3049,7 +3049,7 @@ s32 cellSpursEventFlagAttachLv2EventQueue(PPUThread& ppu, vm::ptr eventFlag) { - cellSpurs.Warning("cellSpursEventFlagDetachLv2EventQueue(eventFlag=*0x%x)", eventFlag); + cellSpurs.warning("cellSpursEventFlagDetachLv2EventQueue(eventFlag=*0x%x)", eventFlag); if (!eventFlag) { @@ -3110,7 +3110,7 @@ s32 cellSpursEventFlagDetachLv2EventQueue(vm::ptr eventFlag) /// Get send-receive direction of the SPURS event flag s32 cellSpursEventFlagGetDirection(vm::ptr eventFlag, vm::ptr direction) { - cellSpurs.Warning("cellSpursEventFlagGetDirection(eventFlag=*0x%x, direction=*0x%x)", eventFlag, direction); + cellSpurs.warning("cellSpursEventFlagGetDirection(eventFlag=*0x%x, direction=*0x%x)", eventFlag, direction); if (!eventFlag || !direction) { @@ -3129,7 +3129,7 @@ s32 cellSpursEventFlagGetDirection(vm::ptr eventFlag, vm::pt /// Get clearing mode of SPURS event flag s32 cellSpursEventFlagGetClearMode(vm::ptr eventFlag, vm::ptr clear_mode) { - cellSpurs.Warning("cellSpursEventFlagGetClearMode(eventFlag=*0x%x, clear_mode=*0x%x)", eventFlag, clear_mode); + cellSpurs.warning("cellSpursEventFlagGetClearMode(eventFlag=*0x%x, clear_mode=*0x%x)", eventFlag, clear_mode); if (!eventFlag || !clear_mode) { @@ -3148,7 +3148,7 @@ s32 cellSpursEventFlagGetClearMode(vm::ptr eventFlag, vm::pt /// Get address of taskset to which the SPURS event flag belongs s32 cellSpursEventFlagGetTasksetAddress(vm::ptr eventFlag, vm::pptr taskset) { - cellSpurs.Warning("cellSpursEventFlagGetTasksetAddress(eventFlag=*0x%x, taskset=**0x%x)", eventFlag, taskset); + cellSpurs.warning("cellSpursEventFlagGetTasksetAddress(eventFlag=*0x%x, taskset=**0x%x)", eventFlag, taskset); if (!eventFlag || !taskset) { @@ -3166,7 +3166,7 @@ s32 cellSpursEventFlagGetTasksetAddress(vm::ptr eventFlag, v s32 _cellSpursLFQueueInitialize(vm::ptr pTasksetOrSpurs, vm::ptr pQueue, vm::cptr buffer, u32 size, u32 depth, u32 direction) { - cellSpurs.Todo("_cellSpursLFQueueInitialize(pTasksetOrSpurs=*0x%x, pQueue=*0x%x, buffer=*0x%x, size=0x%x, depth=0x%x, direction=%d)", pTasksetOrSpurs, pQueue, buffer, size, depth, direction); + cellSpurs.todo("_cellSpursLFQueueInitialize(pTasksetOrSpurs=*0x%x, pQueue=*0x%x, buffer=*0x%x, size=0x%x, depth=0x%x, direction=%d)", pTasksetOrSpurs, pQueue, buffer, size, depth, direction); return SyncErrorToSpursError(cellSyncLFQueueInitialize(pQueue, buffer, size, depth, direction, pTasksetOrSpurs)); } @@ -3311,7 +3311,7 @@ s32 _spurs::create_taskset(PPUThread& ppu, vm::ptr spurs, vm::ptr spurs, vm::ptr taskset, vm::ptr attr) { - cellSpurs.Warning("cellSpursCreateTasksetWithAttribute(spurs=*0x%x, taskset=*0x%x, attr=*0x%x)", spurs, taskset, attr); + cellSpurs.warning("cellSpursCreateTasksetWithAttribute(spurs=*0x%x, taskset=*0x%x, attr=*0x%x)", spurs, taskset, attr); if (!attr) { @@ -3340,14 +3340,14 @@ s32 cellSpursCreateTasksetWithAttribute(PPUThread& ppu, vm::ptr spurs s32 cellSpursCreateTaskset(PPUThread& ppu, vm::ptr spurs, vm::ptr taskset, u64 args, vm::cptr priority, u32 maxContention) { - cellSpurs.Warning("cellSpursCreateTaskset(spurs=*0x%x, taskset=*0x%x, args=0x%llx, priority=*0x%x, maxContention=%d)", spurs, taskset, args, priority, maxContention); + cellSpurs.warning("cellSpursCreateTaskset(spurs=*0x%x, taskset=*0x%x, args=0x%llx, priority=*0x%x, maxContention=%d)", spurs, taskset, args, priority, maxContention); return _spurs::create_taskset(ppu, spurs, taskset, args, priority, maxContention, vm::null, sizeof32(CellSpursTaskset), 0); } s32 cellSpursJoinTaskset(vm::ptr taskset) { - cellSpurs.Warning("cellSpursJoinTaskset(taskset=*0x%x)", taskset); + cellSpurs.warning("cellSpursJoinTaskset(taskset=*0x%x)", taskset); UNIMPLEMENTED_FUNC(cellSpurs); return CELL_OK; @@ -3355,7 +3355,7 @@ s32 cellSpursJoinTaskset(vm::ptr taskset) s32 cellSpursGetTasksetId(vm::ptr taskset, vm::ptr wid) { - cellSpurs.Warning("cellSpursGetTasksetId(taskset=*0x%x, wid=*0x%x)", taskset, wid); + cellSpurs.warning("cellSpursGetTasksetId(taskset=*0x%x, wid=*0x%x)", taskset, wid); if (!taskset || !wid) { @@ -3505,7 +3505,7 @@ s32 _spurs::task_start(PPUThread& ppu, vm::ptr taskset, u32 ta s32 cellSpursCreateTask(PPUThread& ppu, vm::ptr taskset, vm::ptr taskId, vm::cptr elf, vm::cptr context, u32 size, vm::ptr lsPattern, vm::ptr argument) { - cellSpurs.Warning("cellSpursCreateTask(taskset=*0x%x, taskID=*0x%x, elf=*0x%x, context=*0x%x, size=0x%x, lsPattern=*0x%x, argument=*0x%x)", taskset, taskId, elf, context, size, lsPattern, argument); + cellSpurs.warning("cellSpursCreateTask(taskset=*0x%x, taskID=*0x%x, elf=*0x%x, context=*0x%x, size=0x%x, lsPattern=*0x%x, argument=*0x%x)", taskset, taskId, elf, context, size, lsPattern, argument); if (!taskset) { @@ -3586,7 +3586,7 @@ s32 cellSpursCreateTaskWithAttribute() s32 cellSpursTasksetAttributeSetName(vm::ptr attr, vm::cptr name) { - cellSpurs.Warning("cellSpursTasksetAttributeSetName(attr=*0x%x, name=*0x%x)", attr, name); + cellSpurs.warning("cellSpursTasksetAttributeSetName(attr=*0x%x, name=*0x%x)", attr, name); if (!attr || !name) { @@ -3604,7 +3604,7 @@ s32 cellSpursTasksetAttributeSetName(vm::ptr attr, vm s32 cellSpursTasksetAttributeSetTasksetSize(vm::ptr attr, u32 size) { - cellSpurs.Warning("cellSpursTasksetAttributeSetTasksetSize(attr=*0x%x, size=0x%x)", attr, size); + cellSpurs.warning("cellSpursTasksetAttributeSetTasksetSize(attr=*0x%x, size=0x%x)", attr, size); if (!attr) { @@ -3627,7 +3627,7 @@ s32 cellSpursTasksetAttributeSetTasksetSize(vm::ptr a s32 cellSpursTasksetAttributeEnableClearLS(vm::ptr attr, s32 enable) { - cellSpurs.Warning("cellSpursTasksetAttributeEnableClearLS(attr=*0x%x, enable=%d)", attr, enable); + cellSpurs.warning("cellSpursTasksetAttributeEnableClearLS(attr=*0x%x, enable=%d)", attr, enable); if (!attr) { @@ -3645,7 +3645,7 @@ s32 cellSpursTasksetAttributeEnableClearLS(vm::ptr at s32 _cellSpursTasksetAttribute2Initialize(vm::ptr attribute, u32 revision) { - cellSpurs.Warning("_cellSpursTasksetAttribute2Initialize(attribute=*0x%x, revision=%d)", attribute, revision); + cellSpurs.warning("_cellSpursTasksetAttribute2Initialize(attribute=*0x%x, revision=%d)", attribute, revision); memset(attribute.get_ptr(), 0, sizeof(CellSpursTasksetAttribute2)); attribute->revision = revision; @@ -3713,7 +3713,7 @@ s32 cellSpursTaskAttributeSetExitCodeContainer() s32 _cellSpursTaskAttribute2Initialize(vm::ptr attribute, u32 revision) { - cellSpurs.Warning("_cellSpursTaskAttribute2Initialize(attribute=*0x%x, revision=%d)", attribute, revision); + cellSpurs.warning("_cellSpursTaskAttribute2Initialize(attribute=*0x%x, revision=%d)", attribute, revision); attribute->revision = revision; attribute->sizeContext = 0; @@ -3737,7 +3737,7 @@ s32 cellSpursTaskGetContextSaveAreaSize() s32 cellSpursCreateTaskset2(PPUThread& ppu, vm::ptr spurs, vm::ptr taskset, vm::ptr attr) { - cellSpurs.Warning("cellSpursCreateTaskset2(spurs=*0x%x, taskset=*0x%x, attr=*0x%x)", spurs, taskset, attr); + cellSpurs.warning("cellSpursCreateTaskset2(spurs=*0x%x, taskset=*0x%x, attr=*0x%x)", spurs, taskset, attr); vm::var tmp_attr; @@ -3793,7 +3793,7 @@ s32 cellSpursCreateTask2WithBinInfo() s32 cellSpursTasksetSetExceptionEventHandler(vm::ptr taskset, vm::ptr handler, vm::ptr arg) { - cellSpurs.Warning("cellSpursTasksetSetExceptionEventHandler(taskset=*0x%x, handler=*0x%x, arg=*0x%x)", taskset, handler, arg); + cellSpurs.warning("cellSpursTasksetSetExceptionEventHandler(taskset=*0x%x, handler=*0x%x, arg=*0x%x)", taskset, handler, arg); if (!taskset || !handler) { @@ -3822,7 +3822,7 @@ s32 cellSpursTasksetSetExceptionEventHandler(vm::ptr taskset, s32 cellSpursTasksetUnsetExceptionEventHandler(vm::ptr taskset) { - cellSpurs.Warning("cellSpursTasksetUnsetExceptionEventHandler(taskset=*0x%x)", taskset); + cellSpurs.warning("cellSpursTasksetUnsetExceptionEventHandler(taskset=*0x%x)", taskset); if (!taskset) { @@ -3846,7 +3846,7 @@ s32 cellSpursTasksetUnsetExceptionEventHandler(vm::ptr taskset s32 cellSpursLookUpTasksetAddress(PPUThread& ppu, vm::ptr spurs, vm::pptr taskset, u32 id) { - cellSpurs.Warning("cellSpursLookUpTasksetAddress(spurs=*0x%x, taskset=**0x%x, id=0x%x)", spurs, taskset, id); + cellSpurs.warning("cellSpursLookUpTasksetAddress(spurs=*0x%x, taskset=**0x%x, id=0x%x)", spurs, taskset, id); if (!taskset) { @@ -3866,7 +3866,7 @@ s32 cellSpursLookUpTasksetAddress(PPUThread& ppu, vm::ptr spurs, vm:: s32 cellSpursTasksetGetSpursAddress(vm::cptr taskset, vm::ptr spurs) { - cellSpurs.Warning("cellSpursTasksetGetSpursAddress(taskset=*0x%x, spurs=**0x%x)", taskset, spurs); + cellSpurs.warning("cellSpursTasksetGetSpursAddress(taskset=*0x%x, spurs=**0x%x)", taskset, spurs); if (!taskset || !spurs) { @@ -3895,7 +3895,7 @@ s32 cellSpursGetTasksetInfo() s32 _cellSpursTasksetAttributeInitialize(vm::ptr attribute, u32 revision, u32 sdk_version, u64 args, vm::cptr priority, u32 max_contention) { - cellSpurs.Warning("_cellSpursTasksetAttributeInitialize(attribute=*0x%x, revision=%d, skd_version=0x%x, args=0x%llx, priority=*0x%x, max_contention=%d)", + cellSpurs.warning("_cellSpursTasksetAttributeInitialize(attribute=*0x%x, revision=%d, skd_version=0x%x, args=0x%llx, priority=*0x%x, max_contention=%d)", attribute, revision, sdk_version, args, priority, max_contention); if (!attribute) diff --git a/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp b/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp index a3ad66d2f7..230adbc86f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp @@ -20,7 +20,7 @@ s32 cellSubDisplayEnd() s32 cellSubDisplayGetRequiredMemory(vm::ptr pParam) { - cellSubdisplay.Warning("cellSubDisplayGetRequiredMemory(pParam=*0x%x)", pParam); + cellSubdisplay.warning("cellSubDisplayGetRequiredMemory(pParam=*0x%x)", pParam); if (pParam->version == CELL_SUBDISPLAY_VERSION_0002) { diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp index 5d912cb7b7..c01f8d4ddf 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp @@ -13,7 +13,7 @@ extern Module<> cellSync; s32 cellSyncMutexInitialize(vm::ptr mutex) { - cellSync.Log("cellSyncMutexInitialize(mutex=*0x%x)", mutex); + cellSync.trace("cellSyncMutexInitialize(mutex=*0x%x)", mutex); if (!mutex) { @@ -32,7 +32,7 @@ s32 cellSyncMutexInitialize(vm::ptr mutex) s32 cellSyncMutexLock(PPUThread& ppu, vm::ptr mutex) { - cellSync.Log("cellSyncMutexLock(mutex=*0x%x)", mutex); + cellSync.trace("cellSyncMutexLock(mutex=*0x%x)", mutex); if (!mutex) { @@ -57,7 +57,7 @@ s32 cellSyncMutexLock(PPUThread& ppu, vm::ptr mutex) s32 cellSyncMutexTryLock(vm::ptr mutex) { - cellSync.Log("cellSyncMutexTryLock(mutex=*0x%x)", mutex); + cellSync.trace("cellSyncMutexTryLock(mutex=*0x%x)", mutex); if (!mutex) { @@ -79,7 +79,7 @@ s32 cellSyncMutexTryLock(vm::ptr mutex) s32 cellSyncMutexUnlock(vm::ptr mutex) { - cellSync.Log("cellSyncMutexUnlock(mutex=*0x%x)", mutex); + cellSync.trace("cellSyncMutexUnlock(mutex=*0x%x)", mutex); if (!mutex) { @@ -100,7 +100,7 @@ s32 cellSyncMutexUnlock(vm::ptr mutex) s32 cellSyncBarrierInitialize(vm::ptr barrier, u16 total_count) { - cellSync.Log("cellSyncBarrierInitialize(barrier=*0x%x, total_count=%d)", barrier, total_count); + cellSync.trace("cellSyncBarrierInitialize(barrier=*0x%x, total_count=%d)", barrier, total_count); if (!barrier) { @@ -125,7 +125,7 @@ s32 cellSyncBarrierInitialize(vm::ptr barrier, u16 total_count) s32 cellSyncBarrierNotify(PPUThread& ppu, vm::ptr barrier) { - cellSync.Log("cellSyncBarrierNotify(barrier=*0x%x)", barrier); + cellSync.trace("cellSyncBarrierNotify(barrier=*0x%x)", barrier); if (!barrier) { @@ -146,7 +146,7 @@ s32 cellSyncBarrierNotify(PPUThread& ppu, vm::ptr barrier) s32 cellSyncBarrierTryNotify(vm::ptr barrier) { - cellSync.Log("cellSyncBarrierTryNotify(barrier=*0x%x)", barrier); + cellSync.trace("cellSyncBarrierTryNotify(barrier=*0x%x)", barrier); if (!barrier) { @@ -172,7 +172,7 @@ s32 cellSyncBarrierTryNotify(vm::ptr barrier) s32 cellSyncBarrierWait(PPUThread& ppu, vm::ptr barrier) { - cellSync.Log("cellSyncBarrierWait(barrier=*0x%x)", barrier); + cellSync.trace("cellSyncBarrierWait(barrier=*0x%x)", barrier); if (!barrier) { @@ -195,7 +195,7 @@ s32 cellSyncBarrierWait(PPUThread& ppu, vm::ptr barrier) s32 cellSyncBarrierTryWait(vm::ptr barrier) { - cellSync.Log("cellSyncBarrierTryWait(barrier=*0x%x)", barrier); + cellSync.trace("cellSyncBarrierTryWait(barrier=*0x%x)", barrier); if (!barrier) { @@ -221,7 +221,7 @@ s32 cellSyncBarrierTryWait(vm::ptr barrier) s32 cellSyncRwmInitialize(vm::ptr rwm, vm::ptr buffer, u32 buffer_size) { - cellSync.Log("cellSyncRwmInitialize(rwm=*0x%x, buffer=*0x%x, buffer_size=0x%x)", rwm, buffer, buffer_size); + cellSync.trace("cellSyncRwmInitialize(rwm=*0x%x, buffer=*0x%x, buffer_size=0x%x)", rwm, buffer, buffer_size); if (!rwm || !buffer) { @@ -250,7 +250,7 @@ s32 cellSyncRwmInitialize(vm::ptr rwm, vm::ptr buffer, u32 bu s32 cellSyncRwmRead(PPUThread& ppu, vm::ptr rwm, vm::ptr buffer) { - cellSync.Log("cellSyncRwmRead(rwm=*0x%x, buffer=*0x%x)", rwm, buffer); + cellSync.trace("cellSyncRwmRead(rwm=*0x%x, buffer=*0x%x)", rwm, buffer); if (!rwm || !buffer) { @@ -281,7 +281,7 @@ s32 cellSyncRwmRead(PPUThread& ppu, vm::ptr rwm, vm::ptr buff s32 cellSyncRwmTryRead(vm::ptr rwm, vm::ptr buffer) { - cellSync.Log("cellSyncRwmTryRead(rwm=*0x%x, buffer=*0x%x)", rwm, buffer); + cellSync.trace("cellSyncRwmTryRead(rwm=*0x%x, buffer=*0x%x)", rwm, buffer); if (!rwm || !buffer) { @@ -315,7 +315,7 @@ s32 cellSyncRwmTryRead(vm::ptr rwm, vm::ptr buffer) s32 cellSyncRwmWrite(PPUThread& ppu, vm::ptr rwm, vm::cptr buffer) { - cellSync.Log("cellSyncRwmWrite(rwm=*0x%x, buffer=*0x%x)", rwm, buffer); + cellSync.trace("cellSyncRwmWrite(rwm=*0x%x, buffer=*0x%x)", rwm, buffer); if (!rwm || !buffer) { @@ -346,7 +346,7 @@ s32 cellSyncRwmWrite(PPUThread& ppu, vm::ptr rwm, vm::cptr bu s32 cellSyncRwmTryWrite(vm::ptr rwm, vm::cptr buffer) { - cellSync.Log("cellSyncRwmTryWrite(rwm=*0x%x, buffer=*0x%x)", rwm, buffer); + cellSync.trace("cellSyncRwmTryWrite(rwm=*0x%x, buffer=*0x%x)", rwm, buffer); if (!rwm || !buffer) { @@ -377,7 +377,7 @@ s32 cellSyncRwmTryWrite(vm::ptr rwm, vm::cptr buffer) s32 cellSyncQueueInitialize(vm::ptr queue, vm::ptr buffer, u32 size, u32 depth) { - cellSync.Log("cellSyncQueueInitialize(queue=*0x%x, buffer=*0x%x, size=0x%x, depth=0x%x)", queue, buffer, size, depth); + cellSync.trace("cellSyncQueueInitialize(queue=*0x%x, buffer=*0x%x, size=0x%x, depth=0x%x)", queue, buffer, size, depth); if (!queue) { @@ -412,7 +412,7 @@ s32 cellSyncQueueInitialize(vm::ptr queue, vm::ptr buffer, u3 s32 cellSyncQueuePush(PPUThread& ppu, vm::ptr queue, vm::cptr buffer) { - cellSync.Log("cellSyncQueuePush(queue=*0x%x, buffer=*0x%x)", queue, buffer); + cellSync.trace("cellSyncQueuePush(queue=*0x%x, buffer=*0x%x)", queue, buffer); if (!queue || !buffer) { @@ -443,7 +443,7 @@ s32 cellSyncQueuePush(PPUThread& ppu, vm::ptr queue, vm::cptr queue, vm::cptr buffer) { - cellSync.Log("cellSyncQueueTryPush(queue=*0x%x, buffer=*0x%x)", queue, buffer); + cellSync.trace("cellSyncQueueTryPush(queue=*0x%x, buffer=*0x%x)", queue, buffer); if (!queue || !buffer) { @@ -477,7 +477,7 @@ s32 cellSyncQueueTryPush(vm::ptr queue, vm::cptr buffer) s32 cellSyncQueuePop(PPUThread& ppu, vm::ptr queue, vm::ptr buffer) { - cellSync.Log("cellSyncQueuePop(queue=*0x%x, buffer=*0x%x)", queue, buffer); + cellSync.trace("cellSyncQueuePop(queue=*0x%x, buffer=*0x%x)", queue, buffer); if (!queue || !buffer) { @@ -508,7 +508,7 @@ s32 cellSyncQueuePop(PPUThread& ppu, vm::ptr queue, vm::ptr s32 cellSyncQueueTryPop(vm::ptr queue, vm::ptr buffer) { - cellSync.Log("cellSyncQueueTryPop(queue=*0x%x, buffer=*0x%x)", queue, buffer); + cellSync.trace("cellSyncQueueTryPop(queue=*0x%x, buffer=*0x%x)", queue, buffer); if (!queue || !buffer) { @@ -542,7 +542,7 @@ s32 cellSyncQueueTryPop(vm::ptr queue, vm::ptr buffer) s32 cellSyncQueuePeek(PPUThread& ppu, vm::ptr queue, vm::ptr buffer) { - cellSync.Log("cellSyncQueuePeek(queue=*0x%x, buffer=*0x%x)", queue, buffer); + cellSync.trace("cellSyncQueuePeek(queue=*0x%x, buffer=*0x%x)", queue, buffer); if (!queue || !buffer) { @@ -573,7 +573,7 @@ s32 cellSyncQueuePeek(PPUThread& ppu, vm::ptr queue, vm::ptr queue, vm::ptr buffer) { - cellSync.Log("cellSyncQueueTryPeek(queue=*0x%x, buffer=*0x%x)", queue, buffer); + cellSync.trace("cellSyncQueueTryPeek(queue=*0x%x, buffer=*0x%x)", queue, buffer); if (!queue || !buffer) { @@ -607,7 +607,7 @@ s32 cellSyncQueueTryPeek(vm::ptr queue, vm::ptr buffer) s32 cellSyncQueueSize(vm::ptr queue) { - cellSync.Log("cellSyncQueueSize(queue=*0x%x)", queue); + cellSync.trace("cellSyncQueueSize(queue=*0x%x)", queue); if (!queue) { @@ -626,7 +626,7 @@ s32 cellSyncQueueSize(vm::ptr queue) s32 cellSyncQueueClear(PPUThread& ppu, vm::ptr queue) { - cellSync.Log("cellSyncQueueClear(queue=*0x%x)", queue); + cellSync.trace("cellSyncQueueClear(queue=*0x%x)", queue); if (!queue) { @@ -694,7 +694,7 @@ void syncLFQueueInitialize(vm::ptr queue, vm::cptr buffer s32 cellSyncLFQueueInitialize(vm::ptr queue, vm::cptr buffer, u32 size, u32 depth, u32 direction, vm::ptr eaSignal) { - cellSync.Warning("cellSyncLFQueueInitialize(queue=*0x%x, buffer=*0x%x, size=0x%x, depth=0x%x, direction=%d, eaSignal=*0x%x)", queue, buffer, size, depth, direction, eaSignal); + cellSync.warning("cellSyncLFQueueInitialize(queue=*0x%x, buffer=*0x%x, size=0x%x, depth=0x%x, direction=%d, eaSignal=*0x%x)", queue, buffer, size, depth, direction, eaSignal); if (!queue) { @@ -803,7 +803,7 @@ s32 cellSyncLFQueueInitialize(vm::ptr queue, vm::cptr buf s32 _cellSyncLFQueueGetPushPointer(PPUThread& ppu, vm::ptr queue, vm::ptr pointer, u32 isBlocking, u32 useEventQueue) { - cellSync.Warning("_cellSyncLFQueueGetPushPointer(queue=*0x%x, pointer=*0x%x, isBlocking=%d, useEventQueue=%d)", queue, pointer, isBlocking, useEventQueue); + cellSync.warning("_cellSyncLFQueueGetPushPointer(queue=*0x%x, pointer=*0x%x, isBlocking=%d, useEventQueue=%d)", queue, pointer, isBlocking, useEventQueue); if (queue->m_direction != CELL_SYNC_QUEUE_PPU2SPU) { @@ -900,14 +900,14 @@ s32 _cellSyncLFQueueGetPushPointer(PPUThread& ppu, vm::ptr queu s32 _cellSyncLFQueueGetPushPointer2(PPUThread& ppu, vm::ptr queue, vm::ptr pointer, u32 isBlocking, u32 useEventQueue) { // arguments copied from _cellSyncLFQueueGetPushPointer - cellSync.Todo("_cellSyncLFQueueGetPushPointer2(queue=*0x%x, pointer=*0x%x, isBlocking=%d, useEventQueue=%d)", queue, pointer, isBlocking, useEventQueue); + cellSync.todo("_cellSyncLFQueueGetPushPointer2(queue=*0x%x, pointer=*0x%x, isBlocking=%d, useEventQueue=%d)", queue, pointer, isBlocking, useEventQueue); throw EXCEPTION(""); } s32 _cellSyncLFQueueCompletePushPointer(PPUThread& ppu, vm::ptr queue, s32 pointer, vm::ptr fpSendSignal) { - cellSync.Warning("_cellSyncLFQueueCompletePushPointer(queue=*0x%x, pointer=%d, fpSendSignal=*0x%x)", queue, pointer, fpSendSignal); + cellSync.warning("_cellSyncLFQueueCompletePushPointer(queue=*0x%x, pointer=%d, fpSendSignal=*0x%x)", queue, pointer, fpSendSignal); if (queue->m_direction != CELL_SYNC_QUEUE_PPU2SPU) { @@ -1044,7 +1044,7 @@ s32 _cellSyncLFQueueCompletePushPointer(PPUThread& ppu, vm::ptr s32 _cellSyncLFQueueCompletePushPointer2(PPUThread& ppu, vm::ptr queue, s32 pointer, vm::ptr fpSendSignal) { // arguments copied from _cellSyncLFQueueCompletePushPointer - cellSync.Todo("_cellSyncLFQueueCompletePushPointer2(queue=*0x%x, pointer=%d, fpSendSignal=*0x%x)", queue, pointer, fpSendSignal); + cellSync.todo("_cellSyncLFQueueCompletePushPointer2(queue=*0x%x, pointer=%d, fpSendSignal=*0x%x)", queue, pointer, fpSendSignal); throw EXCEPTION(""); } @@ -1052,7 +1052,7 @@ s32 _cellSyncLFQueueCompletePushPointer2(PPUThread& ppu, vm::ptr queue, vm::cptr buffer, u32 isBlocking) { // cellSyncLFQueuePush has 1 in isBlocking param, cellSyncLFQueueTryPush has 0 - cellSync.Warning("_cellSyncLFQueuePushBody(queue=*0x%x, buffer=*0x%x, isBlocking=%d)", queue, buffer, isBlocking); + cellSync.warning("_cellSyncLFQueuePushBody(queue=*0x%x, buffer=*0x%x, isBlocking=%d)", queue, buffer, isBlocking); if (!queue || !buffer) { @@ -1109,7 +1109,7 @@ s32 _cellSyncLFQueuePushBody(PPUThread& ppu, vm::ptr queue, vm: s32 _cellSyncLFQueueGetPopPointer(PPUThread& ppu, vm::ptr queue, vm::ptr pointer, u32 isBlocking, u32 arg4, u32 useEventQueue) { - cellSync.Warning("_cellSyncLFQueueGetPopPointer(queue=*0x%x, pointer=*0x%x, isBlocking=%d, arg4=%d, useEventQueue=%d)", queue, pointer, isBlocking, arg4, useEventQueue); + cellSync.warning("_cellSyncLFQueueGetPopPointer(queue=*0x%x, pointer=*0x%x, isBlocking=%d, arg4=%d, useEventQueue=%d)", queue, pointer, isBlocking, arg4, useEventQueue); if (queue->m_direction != CELL_SYNC_QUEUE_SPU2PPU) { @@ -1206,7 +1206,7 @@ s32 _cellSyncLFQueueGetPopPointer(PPUThread& ppu, vm::ptr queue s32 _cellSyncLFQueueGetPopPointer2(PPUThread& ppu, vm::ptr queue, vm::ptr pointer, u32 isBlocking, u32 useEventQueue) { // arguments copied from _cellSyncLFQueueGetPopPointer - cellSync.Todo("_cellSyncLFQueueGetPopPointer2(queue=*0x%x, pointer=*0x%x, isBlocking=%d, useEventQueue=%d)", queue, pointer, isBlocking, useEventQueue); + cellSync.todo("_cellSyncLFQueueGetPopPointer2(queue=*0x%x, pointer=*0x%x, isBlocking=%d, useEventQueue=%d)", queue, pointer, isBlocking, useEventQueue); throw EXCEPTION(""); } @@ -1214,7 +1214,7 @@ s32 _cellSyncLFQueueGetPopPointer2(PPUThread& ppu, vm::ptr queu s32 _cellSyncLFQueueCompletePopPointer(PPUThread& ppu, vm::ptr queue, s32 pointer, vm::ptr fpSendSignal, u32 noQueueFull) { // arguments copied from _cellSyncLFQueueCompletePushPointer + unknown argument (noQueueFull taken from LFQueue2CompletePopPointer) - cellSync.Warning("_cellSyncLFQueueCompletePopPointer(queue=*0x%x, pointer=%d, fpSendSignal=*0x%x, noQueueFull=%d)", queue, pointer, fpSendSignal, noQueueFull); + cellSync.warning("_cellSyncLFQueueCompletePopPointer(queue=*0x%x, pointer=%d, fpSendSignal=*0x%x, noQueueFull=%d)", queue, pointer, fpSendSignal, noQueueFull); if (queue->m_direction != CELL_SYNC_QUEUE_SPU2PPU) { @@ -1350,7 +1350,7 @@ s32 _cellSyncLFQueueCompletePopPointer(PPUThread& ppu, vm::ptr s32 _cellSyncLFQueueCompletePopPointer2(PPUThread& ppu, vm::ptr queue, s32 pointer, vm::ptr fpSendSignal, u32 noQueueFull) { // arguments copied from _cellSyncLFQueueCompletePopPointer - cellSync.Todo("_cellSyncLFQueueCompletePopPointer2(queue=*0x%x, pointer=%d, fpSendSignal=*0x%x, noQueueFull=%d)", queue, pointer, fpSendSignal, noQueueFull); + cellSync.todo("_cellSyncLFQueueCompletePopPointer2(queue=*0x%x, pointer=%d, fpSendSignal=*0x%x, noQueueFull=%d)", queue, pointer, fpSendSignal, noQueueFull); throw EXCEPTION(""); } @@ -1358,7 +1358,7 @@ s32 _cellSyncLFQueueCompletePopPointer2(PPUThread& ppu, vm::ptr s32 _cellSyncLFQueuePopBody(PPUThread& ppu, vm::ptr queue, vm::ptr buffer, u32 isBlocking) { // cellSyncLFQueuePop has 1 in isBlocking param, cellSyncLFQueueTryPop has 0 - cellSync.Warning("_cellSyncLFQueuePopBody(queue=*0x%x, buffer=*0x%x, isBlocking=%d)", queue, buffer, isBlocking); + cellSync.warning("_cellSyncLFQueuePopBody(queue=*0x%x, buffer=*0x%x, isBlocking=%d)", queue, buffer, isBlocking); if (!queue || !buffer) { @@ -1415,7 +1415,7 @@ s32 _cellSyncLFQueuePopBody(PPUThread& ppu, vm::ptr queue, vm:: s32 cellSyncLFQueueClear(vm::ptr queue) { - cellSync.Warning("cellSyncLFQueueClear(queue=*0x%x)", queue); + cellSync.warning("cellSyncLFQueueClear(queue=*0x%x)", queue); if (!queue) { @@ -1466,7 +1466,7 @@ s32 cellSyncLFQueueClear(vm::ptr queue) s32 cellSyncLFQueueSize(vm::ptr queue, vm::ptr size) { - cellSync.Warning("cellSyncLFQueueSize(queue=*0x%x, size=*0x%x)", queue, size); + cellSync.warning("cellSyncLFQueueSize(queue=*0x%x, size=*0x%x)", queue, size); if (!queue || !size) { @@ -1503,7 +1503,7 @@ s32 cellSyncLFQueueSize(vm::ptr queue, vm::ptr size) s32 cellSyncLFQueueDepth(vm::ptr queue, vm::ptr depth) { - cellSync.Log("cellSyncLFQueueDepth(queue=*0x%x, depth=*0x%x)", queue, depth); + cellSync.trace("cellSyncLFQueueDepth(queue=*0x%x, depth=*0x%x)", queue, depth); if (!queue || !depth) { @@ -1522,7 +1522,7 @@ s32 cellSyncLFQueueDepth(vm::ptr queue, vm::ptr depth) s32 _cellSyncLFQueueGetSignalAddress(vm::cptr queue, vm::pptr ppSignal) { - cellSync.Log("_cellSyncLFQueueGetSignalAddress(queue=*0x%x, ppSignal=**0x%x)", queue, ppSignal); + cellSync.trace("_cellSyncLFQueueGetSignalAddress(queue=*0x%x, ppSignal=**0x%x)", queue, ppSignal); if (!queue || !ppSignal) { @@ -1541,7 +1541,7 @@ s32 _cellSyncLFQueueGetSignalAddress(vm::cptr queue, vm::pptr queue, vm::ptr direction) { - cellSync.Log("cellSyncLFQueueGetDirection(queue=*0x%x, direction=*0x%x)", queue, direction); + cellSync.trace("cellSyncLFQueueGetDirection(queue=*0x%x, direction=*0x%x)", queue, direction); if (!queue || !direction) { @@ -1560,7 +1560,7 @@ s32 cellSyncLFQueueGetDirection(vm::cptr queue, vm::ptr di s32 cellSyncLFQueueGetEntrySize(vm::cptr queue, vm::ptr entry_size) { - cellSync.Log("cellSyncLFQueueGetEntrySize(queue=*0x%x, entry_size=*0x%x)", queue, entry_size); + cellSync.trace("cellSyncLFQueueGetEntrySize(queue=*0x%x, entry_size=*0x%x)", queue, entry_size); if (!queue || !entry_size) { @@ -1579,14 +1579,14 @@ s32 cellSyncLFQueueGetEntrySize(vm::cptr queue, vm::ptr en s32 _cellSyncLFQueueAttachLv2EventQueue(vm::ptr spus, u32 num, vm::ptr queue) { - cellSync.Todo("_cellSyncLFQueueAttachLv2EventQueue(spus=*0x%x, num=%d, queue=*0x%x)", spus, num, queue); + cellSync.todo("_cellSyncLFQueueAttachLv2EventQueue(spus=*0x%x, num=%d, queue=*0x%x)", spus, num, queue); throw EXCEPTION(""); } s32 _cellSyncLFQueueDetachLv2EventQueue(vm::ptr spus, u32 num, vm::ptr queue) { - cellSync.Todo("_cellSyncLFQueueDetachLv2EventQueue(spus=*0x%x, num=%d, queue=*0x%x)", spus, num, queue); + cellSync.todo("_cellSyncLFQueueDetachLv2EventQueue(spus=*0x%x, num=%d, queue=*0x%x)", spus, num, queue); throw EXCEPTION(""); } @@ -1624,7 +1624,7 @@ Module<> cellSync("cellSync", []() // analyse error code if (u32 code = (value & 0xffffff00) == 0x80410100 ? static_cast(value) : 0) { - cellSync.Error("%s() -> %s (0x%x)", func->name, get_error(code), code); + cellSync.error("%s() -> %s (0x%x)", func->name, get_error(code), code); } }; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp index 4f5f4efeeb..b875e2f7ec 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp @@ -19,7 +19,7 @@ extern Module cellSync2; s32 _cellSync2MutexAttributeInitialize(vm::ptr attr, u32 sdkVersion) { - cellSync2.Warning("_cellSync2MutexAttributeInitialize(attr=*0x%x, sdkVersion=0x%x)", attr, sdkVersion); + cellSync2.warning("_cellSync2MutexAttributeInitialize(attr=*0x%x, sdkVersion=0x%x)", attr, sdkVersion); attr->sdkVersion = sdkVersion; attr->threadTypes = CELL_SYNC2_THREAD_TYPE_PPU_THREAD | CELL_SYNC2_THREAD_TYPE_PPU_FIBER | @@ -34,7 +34,7 @@ s32 _cellSync2MutexAttributeInitialize(vm::ptr attr, u3 s32 cellSync2MutexEstimateBufferSize(vm::cptr attr, vm::ptr bufferSize) { - cellSync2.Todo("cellSync2MutexEstimateBufferSize(attr=*0x%x, bufferSize=*0x%x)", attr, bufferSize); + cellSync2.todo("cellSync2MutexEstimateBufferSize(attr=*0x%x, bufferSize=*0x%x)", attr, bufferSize); if (attr->maxWaiters > 32768) return CELL_SYNC2_ERROR_INVAL; @@ -74,7 +74,7 @@ s32 cellSync2MutexUnlock() s32 _cellSync2CondAttributeInitialize(vm::ptr attr, u32 sdkVersion) { - cellSync2.Warning("_cellSync2CondAttributeInitialize(attr=*0x%x, sdkVersion=0x%x)", attr, sdkVersion); + cellSync2.warning("_cellSync2CondAttributeInitialize(attr=*0x%x, sdkVersion=0x%x)", attr, sdkVersion); attr->sdkVersion = sdkVersion; attr->maxWaiters = 15; @@ -85,7 +85,7 @@ s32 _cellSync2CondAttributeInitialize(vm::ptr attr, u32 s32 cellSync2CondEstimateBufferSize(vm::cptr attr, vm::ptr bufferSize) { - cellSync2.Todo("cellSync2CondEstimateBufferSize(attr=*0x%x, bufferSize=*0x%x)", attr, bufferSize); + cellSync2.todo("cellSync2CondEstimateBufferSize(attr=*0x%x, bufferSize=*0x%x)", attr, bufferSize); if (attr->maxWaiters == 0 || attr->maxWaiters > 32768) return CELL_SYNC2_ERROR_INVAL; @@ -125,7 +125,7 @@ s32 cellSync2CondSignalAll() s32 _cellSync2SemaphoreAttributeInitialize(vm::ptr attr, u32 sdkVersion) { - cellSync2.Warning("_cellSync2SemaphoreAttributeInitialize(attr=*0x%x, sdkVersion=0x%x)", attr, sdkVersion); + cellSync2.warning("_cellSync2SemaphoreAttributeInitialize(attr=*0x%x, sdkVersion=0x%x)", attr, sdkVersion); attr->sdkVersion = sdkVersion; attr->threadTypes = CELL_SYNC2_THREAD_TYPE_PPU_THREAD | CELL_SYNC2_THREAD_TYPE_PPU_FIBER | @@ -139,7 +139,7 @@ s32 _cellSync2SemaphoreAttributeInitialize(vm::ptr s32 cellSync2SemaphoreEstimateBufferSize(vm::cptr attr, vm::ptr bufferSize) { - cellSync2.Todo("cellSync2SemaphoreEstimateBufferSize(attr=*0x%x, bufferSize=*0x%x)", attr, bufferSize); + cellSync2.todo("cellSync2SemaphoreEstimateBufferSize(attr=*0x%x, bufferSize=*0x%x)", attr, bufferSize); if (attr->maxWaiters == 0 || attr->maxWaiters > 32768) return CELL_SYNC2_ERROR_INVAL; @@ -185,7 +185,7 @@ s32 cellSync2SemaphoreGetCount() s32 _cellSync2QueueAttributeInitialize(vm::ptr attr, u32 sdkVersion) { - cellSync2.Warning("_cellSync2QueueAttributeInitialize(attr=*0x%x, sdkVersion=0x%x)", attr, sdkVersion); + cellSync2.warning("_cellSync2QueueAttributeInitialize(attr=*0x%x, sdkVersion=0x%x)", attr, sdkVersion); attr->sdkVersion = sdkVersion; attr->threadTypes = CELL_SYNC2_THREAD_TYPE_PPU_THREAD | CELL_SYNC2_THREAD_TYPE_PPU_FIBER | @@ -202,7 +202,7 @@ s32 _cellSync2QueueAttributeInitialize(vm::ptr attr, u3 s32 cellSync2QueueEstimateBufferSize(vm::cptr attr, vm::ptr bufferSize) { - cellSync2.Todo("cellSync2QueueEstimateBufferSize(attr=*0x%x, bufferSize=*0x%x)", attr, bufferSize); + cellSync2.todo("cellSync2QueueEstimateBufferSize(attr=*0x%x, bufferSize=*0x%x)", attr, bufferSize); if (attr->elementSize == 0 || attr->elementSize > 16384 || attr->elementSize % 16 || attr->depth == 0 || attr->depth > 4294967292 || attr->maxPushWaiters > 32768 || attr->maxPopWaiters > 32768) diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp index 413616848b..f5fe1b2230 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp @@ -131,25 +131,25 @@ const char* get_module_id(u16 id) s32 cellSysmoduleInitialize() { - cellSysmodule.Warning("cellSysmoduleInitialize()"); + cellSysmodule.warning("cellSysmoduleInitialize()"); return CELL_OK; } s32 cellSysmoduleFinalize() { - cellSysmodule.Warning("cellSysmoduleFinalize()"); + cellSysmodule.warning("cellSysmoduleFinalize()"); return CELL_OK; } s32 cellSysmoduleSetMemcontainer(u32 ct_id) { - cellSysmodule.Todo("cellSysmoduleSetMemcontainer(ct_id=0x%x)", ct_id); + cellSysmodule.todo("cellSysmoduleSetMemcontainer(ct_id=0x%x)", ct_id); return CELL_OK; } s32 cellSysmoduleLoadModule(u16 id) { - cellSysmodule.Warning("cellSysmoduleLoadModule(id=0x%04x: %s)", id, get_module_id(id)); + cellSysmodule.warning("cellSysmoduleLoadModule(id=0x%04x: %s)", id, get_module_id(id)); if (!Emu.GetModuleManager().CheckModuleId(id)) { @@ -167,7 +167,7 @@ s32 cellSysmoduleLoadModule(u16 id) s32 cellSysmoduleUnloadModule(u16 id) { - cellSysmodule.Warning("cellSysmoduleUnloadModule(id=0x%04x: %s)", id, get_module_id(id)); + cellSysmodule.warning("cellSysmoduleUnloadModule(id=0x%04x: %s)", id, get_module_id(id)); if (!Emu.GetModuleManager().CheckModuleId(id)) { @@ -178,7 +178,7 @@ s32 cellSysmoduleUnloadModule(u16 id) { if (!m->IsLoaded()) { - cellSysmodule.Error("cellSysmoduleUnloadModule() failed: module not loaded (id=0x%04x)", id); + cellSysmodule.error("cellSysmoduleUnloadModule() failed: module not loaded (id=0x%04x)", id); return CELL_SYSMODULE_ERROR_FATAL; } @@ -190,11 +190,11 @@ s32 cellSysmoduleUnloadModule(u16 id) s32 cellSysmoduleIsLoaded(u16 id) { - cellSysmodule.Warning("cellSysmoduleIsLoaded(id=0x%04x: %s)", id, get_module_id(id)); + cellSysmodule.warning("cellSysmoduleIsLoaded(id=0x%04x: %s)", id, get_module_id(id)); if (!Emu.GetModuleManager().CheckModuleId(id)) { - cellSysmodule.Error("cellSysmoduleIsLoaded(): unknown module (id=0x%04x)", id); + cellSysmodule.error("cellSysmoduleIsLoaded(): unknown module (id=0x%04x)", id); return CELL_SYSMODULE_ERROR_UNKNOWN; } @@ -202,7 +202,7 @@ s32 cellSysmoduleIsLoaded(u16 id) { if (!m->IsLoaded()) { - cellSysmodule.Warning("cellSysmoduleIsLoaded(): module not loaded (id=0x%04x)", id); + cellSysmodule.warning("cellSysmoduleIsLoaded(): module not loaded (id=0x%04x)", id); return CELL_SYSMODULE_ERROR_UNLOADED; } } diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp index 28248da4f0..048dd4625c 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp @@ -39,7 +39,7 @@ const char* get_systemparam_id_name(s32 id) s32 cellSysutilGetSystemParamInt(s32 id, vm::ptr value) { - cellSysutil.Warning("cellSysutilGetSystemParamInt(id=0x%x(%s), value=*0x%x)", id, get_systemparam_id_name(id), value); + cellSysutil.warning("cellSysutilGetSystemParamInt(id=0x%x(%s), value=*0x%x)", id, get_systemparam_id_name(id), value); switch(id) { @@ -112,7 +112,7 @@ s32 cellSysutilGetSystemParamInt(s32 id, vm::ptr value) s32 cellSysutilGetSystemParamString(s32 id, vm::ptr buf, u32 bufsize) { - cellSysutil.Log("cellSysutilGetSystemParamString(id=0x%x(%s), buf=*0x%x, bufsize=%d)", id, get_systemparam_id_name(id), buf, bufsize); + cellSysutil.trace("cellSysutilGetSystemParamString(id=0x%x(%s), buf=*0x%x, bufsize=%d)", id, get_systemparam_id_name(id), buf, bufsize); memset(buf.get_ptr(), 0, bufsize); @@ -158,7 +158,7 @@ void sysutilSendSystemCommand(u64 status, u64 param) s32 cellSysutilCheckCallback(PPUThread& CPU) { - cellSysutil.Log("cellSysutilCheckCallback()"); + cellSysutil.trace("cellSysutilCheckCallback()"); while (auto func = Emu.GetCallbackManager().Check()) { @@ -175,7 +175,7 @@ s32 cellSysutilCheckCallback(PPUThread& CPU) s32 cellSysutilRegisterCallback(s32 slot, vm::ptr func, vm::ptr userdata) { - cellSysutil.Warning("cellSysutilRegisterCallback(slot=%d, func=*0x%x, userdata=*0x%x)", slot, func, userdata); + cellSysutil.warning("cellSysutilRegisterCallback(slot=%d, func=*0x%x, userdata=*0x%x)", slot, func, userdata); if ((u32)slot > 3) { @@ -189,7 +189,7 @@ s32 cellSysutilRegisterCallback(s32 slot, vm::ptr func, vm: s32 cellSysutilUnregisterCallback(s32 slot) { - cellSysutil.Warning("cellSysutilUnregisterCallback(slot=%d)", slot); + cellSysutil.warning("cellSysutilUnregisterCallback(slot=%d)", slot); if ((u32)slot > 3) { @@ -203,7 +203,7 @@ s32 cellSysutilUnregisterCallback(s32 slot) s32 cellSysCacheClear(void) { - cellSysutil.Todo("cellSysCacheClear()"); + cellSysutil.todo("cellSysCacheClear()"); if (!g_sysutil->cacheMounted) { @@ -220,7 +220,7 @@ s32 cellSysCacheClear(void) s32 cellSysCacheMount(vm::ptr param) { - cellSysutil.Warning("cellSysCacheMount(param=*0x%x)", param); + cellSysutil.warning("cellSysCacheMount(param=*0x%x)", param); // TODO: implement char id[CELL_SYSCACHE_ID_SIZE] = { '\0' }; @@ -237,7 +237,7 @@ bool g_bgm_playback_enabled = true; s32 cellSysutilEnableBgmPlayback() { - cellSysutil.Warning("cellSysutilEnableBgmPlayback()"); + cellSysutil.warning("cellSysutilEnableBgmPlayback()"); // TODO g_bgm_playback_enabled = true; @@ -247,7 +247,7 @@ s32 cellSysutilEnableBgmPlayback() s32 cellSysutilEnableBgmPlaybackEx(vm::ptr param) { - cellSysutil.Warning("cellSysutilEnableBgmPlaybackEx(param=*0x%x)", param); + cellSysutil.warning("cellSysutilEnableBgmPlaybackEx(param=*0x%x)", param); // TODO g_bgm_playback_enabled = true; @@ -257,7 +257,7 @@ s32 cellSysutilEnableBgmPlaybackEx(vm::ptr par s32 cellSysutilDisableBgmPlayback() { - cellSysutil.Warning("cellSysutilDisableBgmPlayback()"); + cellSysutil.warning("cellSysutilDisableBgmPlayback()"); // TODO g_bgm_playback_enabled = false; @@ -267,7 +267,7 @@ s32 cellSysutilDisableBgmPlayback() s32 cellSysutilDisableBgmPlaybackEx(vm::ptr param) { - cellSysutil.Warning("cellSysutilDisableBgmPlaybackEx(param=*0x%x)", param); + cellSysutil.warning("cellSysutilDisableBgmPlaybackEx(param=*0x%x)", param); // TODO g_bgm_playback_enabled = false; @@ -277,7 +277,7 @@ s32 cellSysutilDisableBgmPlaybackEx(vm::ptr pa s32 cellSysutilGetBgmPlaybackStatus(vm::ptr status) { - cellSysutil.Warning("cellSysutilGetBgmPlaybackStatus(status=*0x%x)", status); + cellSysutil.warning("cellSysutilGetBgmPlaybackStatus(status=*0x%x)", status); // TODO status->playerState = CELL_SYSUTIL_BGMPLAYBACK_STATUS_STOP; @@ -291,7 +291,7 @@ s32 cellSysutilGetBgmPlaybackStatus(vm::ptr status s32 cellSysutilGetBgmPlaybackStatus2(vm::ptr status2) { - cellSysutil.Warning("cellSysutilGetBgmPlaybackStatus2(status2=*0x%x)", status2); + cellSysutil.warning("cellSysutilGetBgmPlaybackStatus2(status2=*0x%x)", status2); // TODO status2->playerState = CELL_SYSUTIL_BGMPLAYBACK_STATUS_STOP; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp index bf1db48272..b2d3947b8d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp @@ -19,7 +19,7 @@ enum s32 cellSysutilApGetRequiredMemSize() { - cellSysutilAp.Log("cellSysutilApGetRequiredMemSize()"); + cellSysutilAp.trace("cellSysutilApGetRequiredMemSize()"); return 1024*1024; // Return 1 MB as required size } diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutilAvc2.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutilAvc2.cpp index 2e65a7f75d..97cfb7cb29 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutilAvc2.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutilAvc2.cpp @@ -131,7 +131,7 @@ s32 cellSysutilAvc2GetSpeakerVolumeLevel() s32 cellSysutilAvc2IsCameraAttached(vm::ptr status) { - cellSysutilAvc2.Todo("cellSysutilAvc2IsCameraAttached()"); + cellSysutilAvc2.todo("cellSysutilAvc2IsCameraAttached()"); if (rpcs3::config.io.camera.value() == io_camera_state::null) { @@ -178,7 +178,7 @@ s32 cellSysutilAvc2GetWindowShowStatus() s32 cellSysutilAvc2InitParam(u16 version, vm::ptr option) { - cellSysutilAvc2.Warning("cellSysutilAvc2InitParam(version=%d, option=*0x%x)", version, option); + cellSysutilAvc2.warning("cellSysutilAvc2InitParam(version=%d, option=*0x%x)", version, option); if (version >= 110) { @@ -186,7 +186,7 @@ s32 cellSysutilAvc2InitParam(u16 version, vm::ptr opti // Other versions shouldn't differ by too much, if at all - they most likely differ in other functions. if (version != 140) { - cellSysutilAvc2.Todo("cellSysutilAvc2InitParam(): Older/newer version %d used, might cause problems.", version); + cellSysutilAvc2.todo("cellSysutilAvc2InitParam(): Older/newer version %d used, might cause problems.", version); } option->avc_init_param_version = version; @@ -207,17 +207,17 @@ s32 cellSysutilAvc2InitParam(u16 version, vm::ptr opti } else { - cellSysutilAvc2.Error("Unknown frame mode 0x%x", option->video_param.frame_mode); + cellSysutilAvc2.error("Unknown frame mode 0x%x", option->video_param.frame_mode); } } else { - cellSysutilAvc2.Error("Unknown media type 0x%x", option->media_type); + cellSysutilAvc2.error("Unknown media type 0x%x", option->media_type); } } else { - cellSysutilAvc2.Error("cellSysutilAvc2InitParam(): Unknown version %d used, please report this to a developer.", version); + cellSysutilAvc2.error("cellSysutilAvc2InitParam(): Unknown version %d used, please report this to a developer.", version); } return CELL_OK; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutilMisc.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutilMisc.cpp index fead88412d..d93bba7751 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutilMisc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutilMisc.cpp @@ -19,7 +19,7 @@ enum s32 cellSysutilGetLicenseArea() { - cellSysutilMisc.Warning("cellSysutilGetLicenseArea()"); + cellSysutilMisc.warning("cellSysutilGetLicenseArea()"); switch (const char region = Emu.GetTitleID().at(2)) { @@ -29,7 +29,7 @@ s32 cellSysutilGetLicenseArea() case 'H': return CELL_SYSUTIL_LICENSE_AREA_H; case 'K': return CELL_SYSUTIL_LICENSE_AREA_K; case 'A': return CELL_SYSUTIL_LICENSE_AREA_C; - default: cellSysutilMisc.Todo("Unknown license area: %s", Emu.GetTitleID().c_str()); return CELL_SYSUTIL_LICENSE_AREA_OTHER; + default: cellSysutilMisc.todo("Unknown license area: %s", Emu.GetTitleID().c_str()); return CELL_SYSUTIL_LICENSE_AREA_OTHER; } } diff --git a/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp b/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp index 11b2226ee6..bcd3476fc4 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp @@ -8,14 +8,14 @@ extern Module<> cellUsbd; s32 cellUsbdInit() { - cellUsbd.Warning("cellUsbdInit()"); + cellUsbd.warning("cellUsbdInit()"); return CELL_OK; } s32 cellUsbdEnd() { - cellUsbd.Warning("cellUsbdEnd()"); + cellUsbd.warning("cellUsbdEnd()"); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp b/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp index fd174304ae..a868720f4e 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp @@ -11,7 +11,7 @@ extern Module<> cellUserInfo; s32 cellUserInfoGetStat(u32 id, vm::ptr stat) { - cellUserInfo.Warning("cellUserInfoGetStat(id=%d, stat=*0x%x)", id, stat); + cellUserInfo.warning("cellUserInfoGetStat(id=%d, stat=*0x%x)", id, stat); if (id > CELL_SYSUTIL_USERID_MAX) return CELL_USERINFO_ERROR_NOUSER; @@ -63,7 +63,7 @@ s32 cellUserInfoEnableOverlay() s32 cellUserInfoGetList(vm::ptr listNum, vm::ptr listBuf, vm::ptr currentUserId) { - cellUserInfo.Warning("cellUserInfoGetList(listNum=*0x%x, listBuf=*0x%x, currentUserId=*0x%x)", listNum, listBuf, currentUserId); + cellUserInfo.warning("cellUserInfoGetList(listNum=*0x%x, listBuf=*0x%x, currentUserId=*0x%x)", listNum, listBuf, currentUserId); // If only listNum is NULL, an error will be returned if (listBuf && !listNum) diff --git a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp index 999b3c8596..5332ae7cd1 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp @@ -123,7 +123,7 @@ next: VdecTask task; if (!vdec.job.peek(task, 0, &vdec.is_closed)) { - if (Emu.IsStopped()) cellVdec.Warning("vdecRead() aborted"); + if (Emu.IsStopped()) cellVdec.warning("vdecRead() aborted"); return 0; } @@ -156,7 +156,7 @@ next: default: { - cellVdec.Error("vdecRead(): unknown task (%d)", task.type); + cellVdec.error("vdecRead(): unknown task (%d)", task.type); Emu.Pause(); return -1; } @@ -188,9 +188,9 @@ u32 vdecQueryAttr(s32 type, u32 profile, u32 spec_addr /* may be 0 */, vm::ptr type, vm::ptr attr) { - cellVdec.Warning("cellVdecQueryAttr(type=*0x%x, attr=*0x%x)", type, attr); + cellVdec.warning("cellVdecQueryAttr(type=*0x%x, attr=*0x%x)", type, attr); return vdecQueryAttr(type->codecType, type->profileLevel, 0, attr); } s32 cellVdecQueryAttrEx(vm::cptr type, vm::ptr attr) { - cellVdec.Warning("cellVdecQueryAttrEx(type=*0x%x, attr=*0x%x)", type, attr); + cellVdec.warning("cellVdecQueryAttrEx(type=*0x%x, attr=*0x%x)", type, attr); return vdecQueryAttr(type->codecType, type->profileLevel, type->codecSpecificInfo_addr, attr); } s32 cellVdecOpen(vm::cptr type, vm::cptr res, vm::cptr cb, vm::ptr handle) { - cellVdec.Warning("cellVdecOpen(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); + cellVdec.warning("cellVdecOpen(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); vdecOpen(*handle = idm::make(type->codecType, type->profileLevel, res->memAddr, res->memSize, cb->cbFunc, cb->cbArg)); @@ -567,7 +567,7 @@ s32 cellVdecOpen(vm::cptr type, vm::cptr res, vm s32 cellVdecOpenEx(vm::cptr type, vm::cptr res, vm::cptr cb, vm::ptr handle) { - cellVdec.Warning("cellVdecOpenEx(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); + cellVdec.warning("cellVdecOpenEx(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); vdecOpen(*handle = idm::make(type->codecType, type->profileLevel, res->memAddr, res->memSize, cb->cbFunc, cb->cbArg)); @@ -576,7 +576,7 @@ s32 cellVdecOpenEx(vm::cptr type, vm::cptr r s32 cellVdecClose(u32 handle) { - cellVdec.Warning("cellVdecClose(handle=0x%x)", handle); + cellVdec.warning("cellVdecClose(handle=0x%x)", handle); const auto vdec = idm::get(handle); @@ -602,7 +602,7 @@ s32 cellVdecClose(u32 handle) s32 cellVdecStartSeq(u32 handle) { - cellVdec.Log("cellVdecStartSeq(handle=0x%x)", handle); + cellVdec.trace("cellVdecStartSeq(handle=0x%x)", handle); const auto vdec = idm::get(handle); @@ -617,7 +617,7 @@ s32 cellVdecStartSeq(u32 handle) s32 cellVdecEndSeq(u32 handle) { - cellVdec.Warning("cellVdecEndSeq(handle=0x%x)", handle); + cellVdec.warning("cellVdecEndSeq(handle=0x%x)", handle); const auto vdec = idm::get(handle); @@ -632,7 +632,7 @@ s32 cellVdecEndSeq(u32 handle) s32 cellVdecDecodeAu(u32 handle, CellVdecDecodeMode mode, vm::cptr auInfo) { - cellVdec.Log("cellVdecDecodeAu(handle=0x%x, mode=%d, auInfo=*0x%x)", handle, mode, auInfo); + cellVdec.trace("cellVdecDecodeAu(handle=0x%x, mode=%d, auInfo=*0x%x)", handle, mode, auInfo); const auto vdec = idm::get(handle); @@ -662,7 +662,7 @@ s32 cellVdecDecodeAu(u32 handle, CellVdecDecodeMode mode, vm::cptr format, vm::ptr outBuff) { - cellVdec.Log("cellVdecGetPicture(handle=0x%x, format=*0x%x, outBuff=*0x%x)", handle, format, outBuff); + cellVdec.trace("cellVdecGetPicture(handle=0x%x, format=*0x%x, outBuff=*0x%x)", handle, format, outBuff); const auto vdec = idm::get(handle); @@ -769,7 +769,7 @@ s32 cellVdecGetPicture(u32 handle, vm::cptr format, vm::ptr format2, vm::ptr outBuff, u32 arg4) { - cellVdec.Warning("cellVdecGetPictureExt(handle=0x%x, format2=*0x%x, outBuff=*0x%x, arg4=*0x%x)", handle, format2, outBuff, arg4); + cellVdec.warning("cellVdecGetPictureExt(handle=0x%x, format2=*0x%x, outBuff=*0x%x, arg4=*0x%x)", handle, format2, outBuff, arg4); if (arg4 || format2->unk0 || format2->unk1) { @@ -786,7 +786,7 @@ s32 cellVdecGetPictureExt(u32 handle, vm::cptr format2, vm:: s32 cellVdecGetPicItem(u32 handle, vm::pptr picItem) { - cellVdec.Log("cellVdecGetPicItem(handle=0x%x, picItem=**0x%x)", handle, picItem); + cellVdec.trace("cellVdecGetPicItem(handle=0x%x, picItem=**0x%x)", handle, picItem); const auto vdec = idm::get(handle); @@ -841,7 +841,7 @@ s32 cellVdecGetPicItem(u32 handle, vm::pptr picItem) case AV_PICTURE_TYPE_I: avc->pictureType[0] = CELL_VDEC_AVC_PCT_I; break; case AV_PICTURE_TYPE_P: avc->pictureType[0] = CELL_VDEC_AVC_PCT_P; break; case AV_PICTURE_TYPE_B: avc->pictureType[0] = CELL_VDEC_AVC_PCT_B; break; - default: cellVdec.Error("cellVdecGetPicItem(AVC): unknown pict_type value (0x%x)", frame.pict_type); + default: cellVdec.error("cellVdecGetPicItem(AVC): unknown pict_type value (0x%x)", frame.pict_type); } avc->pictureType[1] = CELL_VDEC_AVC_PCT_UNKNOWN; // ??? avc->idrPictureFlag = false; // ??? @@ -872,7 +872,7 @@ s32 cellVdecGetPicItem(u32 handle, vm::pptr picItem) case CELL_VDEC_FRC_50: avc->frameRateCode = CELL_VDEC_AVC_FRC_50; break; case CELL_VDEC_FRC_60000DIV1001: avc->frameRateCode = CELL_VDEC_AVC_FRC_60000DIV1001; break; case CELL_VDEC_FRC_60: avc->frameRateCode = CELL_VDEC_AVC_FRC_60; break; - default: cellVdec.Error("cellVdecGetPicItem(AVC): unknown frc value (0x%x)", vf.frc); + default: cellVdec.error("cellVdecGetPicItem(AVC): unknown frc value (0x%x)", vf.frc); } avc->fixed_frame_rate_flag = true; @@ -893,7 +893,7 @@ s32 cellVdecGetPicItem(u32 handle, vm::pptr picItem) case AV_PICTURE_TYPE_I: dvx->pictureType = CELL_VDEC_DIVX_VCT_I; break; case AV_PICTURE_TYPE_P: dvx->pictureType = CELL_VDEC_DIVX_VCT_P; break; case AV_PICTURE_TYPE_B: dvx->pictureType = CELL_VDEC_DIVX_VCT_B; break; - default: cellVdec.Error("cellVdecGetPicItem(DivX): unknown pict_type value (0x%x)", frame.pict_type); + default: cellVdec.error("cellVdecGetPicItem(DivX): unknown pict_type value (0x%x)", frame.pict_type); } dvx->horizontalSize = frame.width; dvx->verticalSize = frame.height; @@ -915,7 +915,7 @@ s32 cellVdecGetPicItem(u32 handle, vm::pptr picItem) case CELL_VDEC_FRC_50: dvx->frameRateCode = CELL_VDEC_DIVX_FRC_50; break; case CELL_VDEC_FRC_60000DIV1001: dvx->frameRateCode = CELL_VDEC_DIVX_FRC_60000DIV1001; break; case CELL_VDEC_FRC_60: dvx->frameRateCode = CELL_VDEC_DIVX_FRC_60; break; - default: cellVdec.Error("cellVdecGetPicItem(DivX): unknown frc value (0x%x)", vf.frc); + default: cellVdec.error("cellVdecGetPicItem(DivX): unknown frc value (0x%x)", vf.frc); } } else if (vdec->type == CELL_VDEC_CODEC_TYPE_MPEG2) @@ -931,7 +931,7 @@ s32 cellVdecGetPicItem(u32 handle, vm::pptr picItem) s32 cellVdecSetFrameRate(u32 handle, CellVdecFrameRate frc) { - cellVdec.Log("cellVdecSetFrameRate(handle=0x%x, frc=0x%x)", handle, frc); + cellVdec.trace("cellVdecSetFrameRate(handle=0x%x, frc=0x%x)", handle, frc); const auto vdec = idm::get(handle); diff --git a/rpcs3/Emu/SysCalls/Modules/cellVideoOut.cpp b/rpcs3/Emu/SysCalls/Modules/cellVideoOut.cpp index 990e8f356a..4649a164b7 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVideoOut.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVideoOut.cpp @@ -11,7 +11,7 @@ extern Module<> cellSysutil; s32 cellVideoOutGetState(u32 videoOut, u32 deviceIndex, vm::ptr state) { - cellSysutil.Log("cellVideoOutGetState(videoOut=%d, deviceIndex=%d, state=*0x%x)", videoOut, deviceIndex, state); + cellSysutil.trace("cellVideoOutGetState(videoOut=%d, deviceIndex=%d, state=*0x%x)", videoOut, deviceIndex, state); if (deviceIndex) return CELL_VIDEO_OUT_ERROR_DEVICE_NOT_FOUND; @@ -37,7 +37,7 @@ s32 cellVideoOutGetState(u32 videoOut, u32 deviceIndex, vm::ptr resolution) { - cellSysutil.Log("cellVideoOutGetResolution(resolutionId=%d, resolution=*0x%x)", resolutionId, resolution); + cellSysutil.trace("cellVideoOutGetResolution(resolutionId=%d, resolution=*0x%x)", resolutionId, resolution); u32 num = ResolutionIdToNum(resolutionId); if (!num) @@ -51,7 +51,7 @@ s32 cellVideoOutGetResolution(u32 resolutionId, vm::ptr s32 cellVideoOutConfigure(u32 videoOut, vm::ptr config, vm::ptr option, u32 waitForEvent) { - cellSysutil.Warning("cellVideoOutConfigure(videoOut=%d, config=*0x%x, option=*0x%x, waitForEvent=%d)", videoOut, config, option, waitForEvent); + cellSysutil.warning("cellVideoOutConfigure(videoOut=%d, config=*0x%x, option=*0x%x, waitForEvent=%d)", videoOut, config, option, waitForEvent); switch (videoOut) { @@ -84,7 +84,7 @@ s32 cellVideoOutConfigure(u32 videoOut, vm::ptr confi s32 cellVideoOutGetConfiguration(u32 videoOut, vm::ptr config, vm::ptr option) { - cellSysutil.Warning("cellVideoOutGetConfiguration(videoOut=%d, config=*0x%x, option=*0x%x)", videoOut, config, option); + cellSysutil.warning("cellVideoOutGetConfiguration(videoOut=%d, config=*0x%x, option=*0x%x)", videoOut, config, option); if (option) *option = {}; *config = {}; @@ -109,7 +109,7 @@ s32 cellVideoOutGetConfiguration(u32 videoOut, vm::ptr info) { - cellSysutil.Warning("cellVideoOutGetDeviceInfo(videoOut=%d, deviceIndex=%d, info=*0x%x)", videoOut, deviceIndex, info); + cellSysutil.warning("cellVideoOutGetDeviceInfo(videoOut=%d, deviceIndex=%d, info=*0x%x)", videoOut, deviceIndex, info); if (deviceIndex) return CELL_VIDEO_OUT_ERROR_DEVICE_NOT_FOUND; @@ -140,7 +140,7 @@ s32 cellVideoOutGetDeviceInfo(u32 videoOut, u32 deviceIndex, vm::ptr cellVpost; s32 cellVpostQueryAttr(vm::cptr cfgParam, vm::ptr attr) { - cellVpost.Warning("cellVpostQueryAttr(cfgParam=*0x%x, attr=*0x%x)", cfgParam, attr); + cellVpost.warning("cellVpostQueryAttr(cfgParam=*0x%x, attr=*0x%x)", cfgParam, attr); // TODO: check cfgParam and output values @@ -29,7 +29,7 @@ s32 cellVpostQueryAttr(vm::cptr cfgParam, vm::ptr cfgParam, vm::cptr resource, vm::ptr handle) { - cellVpost.Warning("cellVpostOpen(cfgParam=*0x%x, resource=*0x%x, handle=*0x%x)", cfgParam, resource, handle); + cellVpost.warning("cellVpostOpen(cfgParam=*0x%x, resource=*0x%x, handle=*0x%x)", cfgParam, resource, handle); // TODO: check values *handle = idm::make(cfgParam->outPicFmt == CELL_VPOST_PIC_FMT_OUT_RGBA_ILV); @@ -38,7 +38,7 @@ s32 cellVpostOpen(vm::cptr cfgParam, vm::cptr cfgParam, vm::cptr resource, vm::ptr handle) { - cellVpost.Warning("cellVpostOpenEx(cfgParam=*0x%x, resource=*0x%x, handle=*0x%x)", cfgParam, resource, handle); + cellVpost.warning("cellVpostOpenEx(cfgParam=*0x%x, resource=*0x%x, handle=*0x%x)", cfgParam, resource, handle); // TODO: check values *handle = idm::make(cfgParam->outPicFmt == CELL_VPOST_PIC_FMT_OUT_RGBA_ILV); @@ -47,7 +47,7 @@ s32 cellVpostOpenEx(vm::cptr cfgParam, vm::cptr(handle); @@ -62,7 +62,7 @@ s32 cellVpostClose(u32 handle) s32 cellVpostExec(u32 handle, vm::cptr inPicBuff, vm::cptr ctrlParam, vm::ptr outPicBuff, vm::ptr picInfo) { - cellVpost.Log("cellVpostExec(handle=0x%x, inPicBuff=*0x%x, ctrlParam=*0x%x, outPicBuff=*0x%x, picInfo=*0x%x)", handle, inPicBuff, ctrlParam, outPicBuff, picInfo); + cellVpost.trace("cellVpostExec(handle=0x%x, inPicBuff=*0x%x, ctrlParam=*0x%x, outPicBuff=*0x%x, picInfo=*0x%x)", handle, inPicBuff, ctrlParam, outPicBuff, picInfo); const auto vpost = idm::get(handle); @@ -77,15 +77,15 @@ s32 cellVpostExec(u32 handle, vm::cptr inPicBuff, vm::cptroutHeight; //ctrlParam->inWindow; // ignored - if (ctrlParam->inWindow.x) cellVpost.Notice("*** inWindow.x = %d", (u32)ctrlParam->inWindow.x); - if (ctrlParam->inWindow.y) cellVpost.Notice("*** inWindow.y = %d", (u32)ctrlParam->inWindow.y); - if (ctrlParam->inWindow.width != w) cellVpost.Notice("*** inWindow.width = %d", (u32)ctrlParam->inWindow.width); - if (ctrlParam->inWindow.height != h) cellVpost.Notice("*** inWindow.height = %d", (u32)ctrlParam->inWindow.height); + if (ctrlParam->inWindow.x) cellVpost.notice("*** inWindow.x = %d", (u32)ctrlParam->inWindow.x); + if (ctrlParam->inWindow.y) cellVpost.notice("*** inWindow.y = %d", (u32)ctrlParam->inWindow.y); + if (ctrlParam->inWindow.width != w) cellVpost.notice("*** inWindow.width = %d", (u32)ctrlParam->inWindow.width); + if (ctrlParam->inWindow.height != h) cellVpost.notice("*** inWindow.height = %d", (u32)ctrlParam->inWindow.height); //ctrlParam->outWindow; // ignored - if (ctrlParam->outWindow.x) cellVpost.Notice("*** outWindow.x = %d", (u32)ctrlParam->outWindow.x); - if (ctrlParam->outWindow.y) cellVpost.Notice("*** outWindow.y = %d", (u32)ctrlParam->outWindow.y); - if (ctrlParam->outWindow.width != ow) cellVpost.Notice("*** outWindow.width = %d", (u32)ctrlParam->outWindow.width); - if (ctrlParam->outWindow.height != oh) cellVpost.Notice("*** outWindow.height = %d", (u32)ctrlParam->outWindow.height); + if (ctrlParam->outWindow.x) cellVpost.notice("*** outWindow.x = %d", (u32)ctrlParam->outWindow.x); + if (ctrlParam->outWindow.y) cellVpost.notice("*** outWindow.y = %d", (u32)ctrlParam->outWindow.y); + if (ctrlParam->outWindow.width != ow) cellVpost.notice("*** outWindow.width = %d", (u32)ctrlParam->outWindow.width); + if (ctrlParam->outWindow.height != oh) cellVpost.notice("*** outWindow.height = %d", (u32)ctrlParam->outWindow.height); //ctrlParam->execType; // ignored //ctrlParam->scalerType; // ignored //ctrlParam->ipcType; // ignored diff --git a/rpcs3/Emu/SysCalls/Modules/cellWebBrowser.cpp b/rpcs3/Emu/SysCalls/Modules/cellWebBrowser.cpp index 04cfebfa8c..1929045f4a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellWebBrowser.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellWebBrowser.cpp @@ -183,7 +183,7 @@ s32 cellWebBrowserEstimate() s32 cellWebBrowserEstimate2(vm::cptr config, vm::ptr memSize) { - cellSysutil.Warning("cellWebBrowserEstimate2(config=*0x%x, memSize=*0x%x)", config, memSize); + cellSysutil.warning("cellWebBrowserEstimate2(config=*0x%x, memSize=*0x%x)", config, memSize); // TODO: When cellWebBrowser stuff is implemented, change this to some real // needed memory buffer size. diff --git a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp index 3852ec87c2..47e482aff5 100644 --- a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp +++ b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp @@ -16,7 +16,7 @@ std::vector g_ssp; s32 cellAANAddData(u32 aan_handle, u32 aan_port, u32 offset, vm::ptr addr, u32 samples) { - libmixer.Log("cellAANAddData(aan_handle=0x%x, aan_port=0x%x, offset=0x%x, addr=*0x%x, samples=%d)", aan_handle, aan_port, offset, addr, samples); + libmixer.trace("cellAANAddData(aan_handle=0x%x, aan_port=0x%x, offset=0x%x, addr=*0x%x, samples=%d)", aan_handle, aan_port, offset, addr, samples); u32 type = aan_port >> 16; u32 port = aan_port & 0xffff; @@ -37,7 +37,7 @@ s32 cellAANAddData(u32 aan_handle, u32 aan_port, u32 offset, vm::ptr addr if (aan_handle != 0x11111111 || samples != 256 || !type || offset != 0) { - libmixer.Error("cellAANAddData(aan_handle=0x%x, aan_port=0x%x, offset=0x%x, addr=*0x%x, samples=%d): invalid parameters", aan_handle, aan_port, offset, addr, samples); + libmixer.error("cellAANAddData(aan_handle=0x%x, aan_port=0x%x, offset=0x%x, addr=*0x%x, samples=%d): invalid parameters", aan_handle, aan_port, offset, addr, samples); return CELL_LIBMIXER_ERROR_INVALID_PARAMATER; } @@ -97,14 +97,14 @@ s32 cellAANAddData(u32 aan_handle, u32 aan_port, u32 offset, vm::ptr addr s32 cellAANConnect(u32 receive, u32 receivePortNo, u32 source, u32 sourcePortNo) { - libmixer.Warning("cellAANConnect(receive=0x%x, receivePortNo=0x%x, source=0x%x, sourcePortNo=0x%x)", + libmixer.warning("cellAANConnect(receive=0x%x, receivePortNo=0x%x, source=0x%x, sourcePortNo=0x%x)", receive, receivePortNo, source, sourcePortNo); std::lock_guard lock(g_surmx.mutex); if (source >= g_ssp.size() || !g_ssp[source].m_created) { - libmixer.Error("cellAANConnect(): invalid source (%d)", source); + libmixer.error("cellAANConnect(): invalid source (%d)", source); return CELL_LIBMIXER_ERROR_INVALID_PARAMATER; } @@ -115,14 +115,14 @@ s32 cellAANConnect(u32 receive, u32 receivePortNo, u32 source, u32 sourcePortNo) s32 cellAANDisconnect(u32 receive, u32 receivePortNo, u32 source, u32 sourcePortNo) { - libmixer.Warning("cellAANDisconnect(receive=0x%x, receivePortNo=0x%x, source=0x%x, sourcePortNo=0x%x)", + libmixer.warning("cellAANDisconnect(receive=0x%x, receivePortNo=0x%x, source=0x%x, sourcePortNo=0x%x)", receive, receivePortNo, source, sourcePortNo); std::lock_guard lock(g_surmx.mutex); if (source >= g_ssp.size() || !g_ssp[source].m_created) { - libmixer.Error("cellAANDisconnect(): invalid source (%d)", source); + libmixer.error("cellAANDisconnect(): invalid source (%d)", source); return CELL_LIBMIXER_ERROR_INVALID_PARAMATER; } @@ -133,11 +133,11 @@ s32 cellAANDisconnect(u32 receive, u32 receivePortNo, u32 source, u32 sourcePort s32 cellSSPlayerCreate(vm::ptr handle, vm::ptr config) { - libmixer.Warning("cellSSPlayerCreate(handle=*0x%x, config=*0x%x)", handle, config); + libmixer.warning("cellSSPlayerCreate(handle=*0x%x, config=*0x%x)", handle, config); if (config->outputMode != 0 || config->channels - 1 >= 2) { - libmixer.Error("cellSSPlayerCreate(config.outputMode=%d, config.channels=%d): invalid parameters", config->outputMode, config->channels); + libmixer.error("cellSSPlayerCreate(config.outputMode=%d, config.channels=%d): invalid parameters", config->outputMode, config->channels); return CELL_LIBMIXER_ERROR_INVALID_PARAMATER; } @@ -156,13 +156,13 @@ s32 cellSSPlayerCreate(vm::ptr handle, vm::ptr config) s32 cellSSPlayerRemove(u32 handle) { - libmixer.Warning("cellSSPlayerRemove(handle=0x%x)", handle); + libmixer.warning("cellSSPlayerRemove(handle=0x%x)", handle); std::lock_guard lock(g_surmx.mutex); if (handle >= g_ssp.size() || !g_ssp[handle].m_created) { - libmixer.Error("cellSSPlayerRemove(): SSPlayer not found (%d)", handle); + libmixer.error("cellSSPlayerRemove(): SSPlayer not found (%d)", handle); return CELL_LIBMIXER_ERROR_INVALID_PARAMATER; } @@ -175,13 +175,13 @@ s32 cellSSPlayerRemove(u32 handle) s32 cellSSPlayerSetWave(u32 handle, vm::ptr waveInfo, vm::ptr commonInfo) { - libmixer.Warning("cellSSPlayerSetWave(handle=0x%x, waveInfo=*0x%x, commonInfo=*0x%x)", handle, waveInfo, commonInfo); + libmixer.warning("cellSSPlayerSetWave(handle=0x%x, waveInfo=*0x%x, commonInfo=*0x%x)", handle, waveInfo, commonInfo); std::lock_guard lock(g_surmx.mutex); if (handle >= g_ssp.size() || !g_ssp[handle].m_created) { - libmixer.Error("cellSSPlayerSetWave(): SSPlayer not found (%d)", handle); + libmixer.error("cellSSPlayerSetWave(): SSPlayer not found (%d)", handle); return CELL_LIBMIXER_ERROR_INVALID_PARAMATER; } @@ -198,13 +198,13 @@ s32 cellSSPlayerSetWave(u32 handle, vm::ptr waveInfo, vm: s32 cellSSPlayerPlay(u32 handle, vm::ptr info) { - libmixer.Warning("cellSSPlayerPlay(handle=0x%x, info=*0x%x)", handle, info); + libmixer.warning("cellSSPlayerPlay(handle=0x%x, info=*0x%x)", handle, info); std::lock_guard lock(g_surmx.mutex); if (handle >= g_ssp.size() || !g_ssp[handle].m_created) { - libmixer.Error("cellSSPlayerPlay(): SSPlayer not found (%d)", handle); + libmixer.error("cellSSPlayerPlay(): SSPlayer not found (%d)", handle); return CELL_LIBMIXER_ERROR_INVALID_PARAMATER; } @@ -222,13 +222,13 @@ s32 cellSSPlayerPlay(u32 handle, vm::ptr info) s32 cellSSPlayerStop(u32 handle, u32 mode) { - libmixer.Warning("cellSSPlayerStop(handle=0x%x, mode=0x%x)", handle, mode); + libmixer.warning("cellSSPlayerStop(handle=0x%x, mode=0x%x)", handle, mode); std::lock_guard lock(g_surmx.mutex); if (handle >= g_ssp.size() || !g_ssp[handle].m_created) { - libmixer.Error("cellSSPlayerStop(): SSPlayer not found (%d)", handle); + libmixer.error("cellSSPlayerStop(): SSPlayer not found (%d)", handle); return CELL_LIBMIXER_ERROR_INVALID_PARAMATER; } @@ -241,13 +241,13 @@ s32 cellSSPlayerStop(u32 handle, u32 mode) s32 cellSSPlayerSetParam(u32 handle, vm::ptr info) { - libmixer.Warning("cellSSPlayerSetParam(handle=0x%x, info=*0x%x)", handle, info); + libmixer.warning("cellSSPlayerSetParam(handle=0x%x, info=*0x%x)", handle, info); std::lock_guard lock(g_surmx.mutex); if (handle >= g_ssp.size() || !g_ssp[handle].m_created) { - libmixer.Error("cellSSPlayerSetParam(): SSPlayer not found (%d)", handle); + libmixer.error("cellSSPlayerSetParam(): SSPlayer not found (%d)", handle); return CELL_LIBMIXER_ERROR_INVALID_PARAMATER; } @@ -264,13 +264,13 @@ s32 cellSSPlayerSetParam(u32 handle, vm::ptr info) s32 cellSSPlayerGetState(u32 handle) { - libmixer.Warning("cellSSPlayerGetState(handle=0x%x)", handle); + libmixer.warning("cellSSPlayerGetState(handle=0x%x)", handle); std::lock_guard lock(g_surmx.mutex); if (handle >= g_ssp.size() || !g_ssp[handle].m_created) { - libmixer.Warning("cellSSPlayerGetState(): SSPlayer not found (%d)", handle); + libmixer.warning("cellSSPlayerGetState(): SSPlayer not found (%d)", handle); return CELL_SSPLAYER_STATE_ERROR; } @@ -284,7 +284,7 @@ s32 cellSSPlayerGetState(u32 handle) s32 cellSurMixerCreate(vm::cptr config) { - libmixer.Warning("cellSurMixerCreate(config=*0x%x)", config); + libmixer.warning("cellSurMixerCreate(config=*0x%x)", config); g_surmx.audio_port = g_audio.open_port(); @@ -311,14 +311,14 @@ s32 cellSurMixerCreate(vm::cptr config) port.level = 1.0f; port.level_set.store({ 1.0f, 0.0f }); - libmixer.Warning("*** audio port opened (port=%d)", g_surmx.audio_port); + libmixer.warning("*** audio port opened (port=%d)", g_surmx.audio_port); g_surmx.mixcount = 0; g_surmx.cb = vm::null; g_ssp.clear(); - libmixer.Warning("*** surMixer created (ch1=%d, ch2=%d, ch6=%d, ch8=%d)", config->chStrips1, config->chStrips2, config->chStrips6, config->chStrips8); + libmixer.warning("*** surMixer created (ch1=%d, ch2=%d, ch6=%d, ch8=%d)", config->chStrips1, config->chStrips2, config->chStrips6, config->chStrips8); const auto ppu = idm::make_ptr("Surmixer Thread"); ppu->prio = 1001; @@ -455,21 +455,21 @@ s32 cellSurMixerCreate(vm::cptr config) s32 cellSurMixerGetAANHandle(vm::ptr handle) { - libmixer.Warning("cellSurMixerGetAANHandle(handle=*0x%x) -> %d", handle, 0x11111111); + libmixer.warning("cellSurMixerGetAANHandle(handle=*0x%x) -> %d", handle, 0x11111111); *handle = 0x11111111; return CELL_OK; } s32 cellSurMixerChStripGetAANPortNo(vm::ptr port, u32 type, u32 index) { - libmixer.Warning("cellSurMixerChStripGetAANPortNo(port=*0x%x, type=0x%x, index=0x%x) -> 0x%x", port, type, index, (type << 16) | index); + libmixer.warning("cellSurMixerChStripGetAANPortNo(port=*0x%x, type=0x%x, index=0x%x) -> 0x%x", port, type, index, (type << 16) | index); *port = (type << 16) | index; return CELL_OK; } s32 cellSurMixerSetNotifyCallback(vm::ptr func, vm::ptr arg) { - libmixer.Warning("cellSurMixerSetNotifyCallback(func=*0x%x, arg=*0x%x)", func, arg); + libmixer.warning("cellSurMixerSetNotifyCallback(func=*0x%x, arg=*0x%x)", func, arg); if (g_surmx.cb) { @@ -484,7 +484,7 @@ s32 cellSurMixerSetNotifyCallback(vm::ptr fu s32 cellSurMixerRemoveNotifyCallback(vm::ptr func) { - libmixer.Warning("cellSurMixerRemoveNotifyCallback(func=*0x%x)", func); + libmixer.warning("cellSurMixerRemoveNotifyCallback(func=*0x%x)", func); if (g_surmx.cb != func) { @@ -498,7 +498,7 @@ s32 cellSurMixerRemoveNotifyCallback(vm::ptr s32 cellSurMixerStart() { - libmixer.Warning("cellSurMixerStart()"); + libmixer.warning("cellSurMixerStart()"); if (g_surmx.audio_port >= AUDIO_PORT_COUNT) { @@ -512,13 +512,13 @@ s32 cellSurMixerStart() s32 cellSurMixerSetParameter(u32 param, float value) { - libmixer.Todo("cellSurMixerSetParameter(param=0x%x, value=%f)", param, value); + libmixer.todo("cellSurMixerSetParameter(param=0x%x, value=%f)", param, value); return CELL_OK; } s32 cellSurMixerFinalize() { - libmixer.Warning("cellSurMixerFinalize()"); + libmixer.warning("cellSurMixerFinalize()"); if (g_surmx.audio_port >= AUDIO_PORT_COUNT) { @@ -534,11 +534,11 @@ s32 cellSurMixerSurBusAddData(u32 busNo, u32 offset, vm::ptr addr, u32 sa { if (busNo < 8 && samples == 256 && offset == 0) { - libmixer.Log("cellSurMixerSurBusAddData(busNo=%d, offset=0x%x, addr=0x%x, samples=%d)", busNo, offset, addr, samples); + libmixer.trace("cellSurMixerSurBusAddData(busNo=%d, offset=0x%x, addr=0x%x, samples=%d)", busNo, offset, addr, samples); } else { - libmixer.Todo("cellSurMixerSurBusAddData(busNo=%d, offset=0x%x, addr=0x%x, samples=%d)", busNo, offset, addr, samples); + libmixer.todo("cellSurMixerSurBusAddData(busNo=%d, offset=0x%x, addr=0x%x, samples=%d)", busNo, offset, addr, samples); return CELL_OK; } @@ -555,13 +555,13 @@ s32 cellSurMixerSurBusAddData(u32 busNo, u32 offset, vm::ptr addr, u32 sa s32 cellSurMixerChStripSetParameter(u32 type, u32 index, vm::ptr param) { - libmixer.Todo("cellSurMixerChStripSetParameter(type=%d, index=%d, param=*0x%x)", type, index, param); + libmixer.todo("cellSurMixerChStripSetParameter(type=%d, index=%d, param=*0x%x)", type, index, param); return CELL_OK; } s32 cellSurMixerPause(u32 type) { - libmixer.Warning("cellSurMixerPause(type=%d)", type); + libmixer.warning("cellSurMixerPause(type=%d)", type); if (g_surmx.audio_port >= AUDIO_PORT_COUNT) { @@ -575,7 +575,7 @@ s32 cellSurMixerPause(u32 type) s32 cellSurMixerGetCurrentBlockTag(vm::ptr tag) { - libmixer.Log("cellSurMixerGetCurrentBlockTag(tag=*0x%x)", tag); + libmixer.trace("cellSurMixerGetCurrentBlockTag(tag=*0x%x)", tag); *tag = g_surmx.mixcount; return CELL_OK; @@ -583,7 +583,7 @@ s32 cellSurMixerGetCurrentBlockTag(vm::ptr tag) s32 cellSurMixerGetTimestamp(u64 tag, vm::ptr stamp) { - libmixer.Log("cellSurMixerGetTimestamp(tag=0x%llx, stamp=*0x%x)", tag, stamp); + libmixer.trace("cellSurMixerGetTimestamp(tag=0x%llx, stamp=*0x%x)", tag, stamp); *stamp = g_audio.start_time + (tag) * 256000000 / 48000; // ??? return CELL_OK; @@ -591,25 +591,25 @@ s32 cellSurMixerGetTimestamp(u64 tag, vm::ptr stamp) void cellSurMixerBeep(u32 arg) { - libmixer.Todo("cellSurMixerBeep(arg=%d)", arg); + libmixer.todo("cellSurMixerBeep(arg=%d)", arg); return; } float cellSurMixerUtilGetLevelFromDB(float dB) { - libmixer.Todo("cellSurMixerUtilGetLevelFromDB(dB=%f)", dB); + libmixer.todo("cellSurMixerUtilGetLevelFromDB(dB=%f)", dB); throw EXCEPTION(""); } float cellSurMixerUtilGetLevelFromDBIndex(s32 index) { - libmixer.Todo("cellSurMixerUtilGetLevelFromDBIndex(index=%d)", index); + libmixer.todo("cellSurMixerUtilGetLevelFromDBIndex(index=%d)", index); throw EXCEPTION(""); } float cellSurMixerUtilNoteToRatio(u8 refNote, u8 note) { - libmixer.Todo("cellSurMixerUtilNoteToRatio(refNote=%d, note=%d)", refNote, note); + libmixer.todo("cellSurMixerUtilNoteToRatio(refNote=%d, note=%d)", refNote, note); throw EXCEPTION(""); } diff --git a/rpcs3/Emu/SysCalls/Modules/libsynth2.cpp b/rpcs3/Emu/SysCalls/Modules/libsynth2.cpp index 4e3b651588..ad341c25c9 100644 --- a/rpcs3/Emu/SysCalls/Modules/libsynth2.cpp +++ b/rpcs3/Emu/SysCalls/Modules/libsynth2.cpp @@ -6,100 +6,100 @@ s32 cellSoundSynth2Config(s16 param, s32 value) { - libsynth2.Todo("cellSoundSynth2Config(param=%d, value=%d)", param, value); + libsynth2.todo("cellSoundSynth2Config(param=%d, value=%d)", param, value); return CELL_OK; } s32 cellSoundSynth2Init(s16 flag) { - libsynth2.Todo("cellSoundSynth2Init(flag=%d)", flag); + libsynth2.todo("cellSoundSynth2Init(flag=%d)", flag); return CELL_OK; } s32 cellSoundSynth2Exit() { - libsynth2.Todo("cellSoundSynth2Exit()"); + libsynth2.todo("cellSoundSynth2Exit()"); return CELL_OK; } void cellSoundSynth2SetParam(u16 reg, u16 value) { - libsynth2.Todo("cellSoundSynth2SetParam(register=0x%x, value=0x%x)", reg, value); + libsynth2.todo("cellSoundSynth2SetParam(register=0x%x, value=0x%x)", reg, value); } u16 cellSoundSynth2GetParam(u16 reg) { - libsynth2.Todo("cellSoundSynth2GetParam(register=0x%x)", reg); + libsynth2.todo("cellSoundSynth2GetParam(register=0x%x)", reg); throw EXCEPTION(""); } void cellSoundSynth2SetSwitch(u16 reg, u32 value) { - libsynth2.Todo("cellSoundSynth2SetSwitch(register=0x%x, value=0x%x)", reg, value); + libsynth2.todo("cellSoundSynth2SetSwitch(register=0x%x, value=0x%x)", reg, value); } u32 cellSoundSynth2GetSwitch(u16 reg) { - libsynth2.Todo("cellSoundSynth2GetSwitch(register=0x%x)", reg); + libsynth2.todo("cellSoundSynth2GetSwitch(register=0x%x)", reg); throw EXCEPTION(""); } s32 cellSoundSynth2SetAddr(u16 reg, u32 value) { - libsynth2.Todo("cellSoundSynth2SetAddr(register=0x%x, value=0x%x)", reg, value); + libsynth2.todo("cellSoundSynth2SetAddr(register=0x%x, value=0x%x)", reg, value); return CELL_OK; } u32 cellSoundSynth2GetAddr(u16 reg) { - libsynth2.Todo("cellSoundSynth2GetAddr(register=0x%x)", reg); + libsynth2.todo("cellSoundSynth2GetAddr(register=0x%x)", reg); throw EXCEPTION(""); } s32 cellSoundSynth2SetEffectAttr(s16 bus, vm::ptr attr) { - libsynth2.Todo("cellSoundSynth2SetEffectAttr(bus=%d, attr=*0x%x)", bus, attr); + libsynth2.todo("cellSoundSynth2SetEffectAttr(bus=%d, attr=*0x%x)", bus, attr); return CELL_OK; } s32 cellSoundSynth2SetEffectMode(s16 bus, vm::ptr attr) { - libsynth2.Todo("cellSoundSynth2SetEffectMode(bus=%d, attr=*0x%x)", bus, attr); + libsynth2.todo("cellSoundSynth2SetEffectMode(bus=%d, attr=*0x%x)", bus, attr); return CELL_OK; } void cellSoundSynth2SetCoreAttr(u16 entry, u16 value) { - libsynth2.Todo("cellSoundSynth2SetCoreAttr(entry=0x%x, value=0x%x)", entry, value); + libsynth2.todo("cellSoundSynth2SetCoreAttr(entry=0x%x, value=0x%x)", entry, value); } s32 cellSoundSynth2Generate(u16 samples, vm::ptr Lout, vm::ptr Rout, vm::ptr Ls, vm::ptr Rs) { - libsynth2.Todo("cellSoundSynth2Generate(samples=0x%x, Lout=*0x%x, Rout=*0x%x, Ls=*0x%x, Rs=*0x%x)", samples, Lout, Rout, Ls, Rs); + libsynth2.todo("cellSoundSynth2Generate(samples=0x%x, Lout=*0x%x, Rout=*0x%x, Ls=*0x%x, Rs=*0x%x)", samples, Lout, Rout, Ls, Rs); return CELL_OK; } s32 cellSoundSynth2VoiceTrans(s16 channel, u16 mode, vm::ptr m_addr, u32 s_addr, u32 size) { - libsynth2.Todo("cellSoundSynth2VoiceTrans(channel=%d, mode=0x%x, m_addr=*0x%x, s_addr=0x%x, size=0x%x)", channel, mode, m_addr, s_addr, size); + libsynth2.todo("cellSoundSynth2VoiceTrans(channel=%d, mode=0x%x, m_addr=*0x%x, s_addr=0x%x, size=0x%x)", channel, mode, m_addr, s_addr, size); return CELL_OK; } s32 cellSoundSynth2VoiceTransStatus(s16 channel, s16 flag) { - libsynth2.Todo("cellSoundSynth2VoiceTransStatus(channel=%d, flag=%d)", channel, flag); + libsynth2.todo("cellSoundSynth2VoiceTransStatus(channel=%d, flag=%d)", channel, flag); return CELL_OK; } 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); + libsynth2.todo("cellSoundSynth2Note2Pitch(center_note=0x%x, center_fine=0x%x, note=0x%x, fine=%d)", center_note, center_fine, note, fine); throw EXCEPTION(""); } 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); + libsynth2.todo("cellSoundSynth2Pitch2Note(center_note=0x%x, center_fine=0x%x, pitch=0x%x)", center_note, center_fine, pitch); throw EXCEPTION(""); } diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp index 15031e1275..44fd5d9f00 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp @@ -14,7 +14,7 @@ extern Module<> sceNp; s32 sceNpInit(u32 poolsize, vm::ptr poolptr) { - sceNp.Warning("sceNpInit(poolsize=0x%x, poolptr=*0x%x)", poolsize, poolptr); + sceNp.warning("sceNpInit(poolsize=0x%x, poolptr=*0x%x)", poolsize, poolptr); if (poolsize == 0) { @@ -35,7 +35,7 @@ s32 sceNpInit(u32 poolsize, vm::ptr poolptr) s32 sceNpTerm() { - sceNp.Warning("sceNpTerm()"); + sceNp.warning("sceNpTerm()"); return CELL_OK; } @@ -44,7 +44,7 @@ s32 npDrmIsAvailable(u32 k_licensee_addr, vm::cptr drm_path) { if (!Emu.GetVFS().ExistsFile(drm_path.get_ptr())) { - sceNp.Warning("npDrmIsAvailable(): '%s' not found", drm_path.get_ptr()); + sceNp.warning("npDrmIsAvailable(): '%s' not found", drm_path.get_ptr()); return CELL_ENOENT; } @@ -60,8 +60,8 @@ s32 npDrmIsAvailable(u32 k_licensee_addr, vm::cptr drm_path) } } - sceNp.Warning("npDrmIsAvailable(): Found DRM license file at %s", drm_path.get_ptr()); - sceNp.Warning("npDrmIsAvailable(): Using k_licensee 0x%s", k_licensee_str.c_str()); + sceNp.warning("npDrmIsAvailable(): Found DRM license file at %s", drm_path.get_ptr()); + sceNp.warning("npDrmIsAvailable(): Using k_licensee 0x%s", k_licensee_str.c_str()); // Set the necessary file paths. std::string drm_file_name = fmt::AfterLast(drm_path.get_ptr(), '/'); @@ -87,7 +87,7 @@ s32 npDrmIsAvailable(u32 k_licensee_addr, vm::cptr drm_path) if (rap_path.back() == '/') { - sceNp.Warning("npDrmIsAvailable(): Can't find RAP file for '%s' (titleID='%s')", drm_path.get_ptr(), titleID); + sceNp.warning("npDrmIsAvailable(): Can't find RAP file for '%s' (titleID='%s')", drm_path.get_ptr(), titleID); } // Decrypt this EDAT using the supplied k_licensee and matching RAP file. @@ -108,28 +108,28 @@ s32 npDrmIsAvailable(u32 k_licensee_addr, vm::cptr drm_path) s32 sceNpDrmIsAvailable(u32 k_licensee_addr, vm::cptr drm_path) { - sceNp.Warning("sceNpDrmIsAvailable(k_licensee=*0x%x, drm_path=*0x%x)", k_licensee_addr, drm_path); + sceNp.warning("sceNpDrmIsAvailable(k_licensee=*0x%x, drm_path=*0x%x)", k_licensee_addr, drm_path); return npDrmIsAvailable(k_licensee_addr, drm_path); } s32 sceNpDrmIsAvailable2(u32 k_licensee_addr, vm::cptr drm_path) { - sceNp.Warning("sceNpDrmIsAvailable2(k_licensee=*0x%x, drm_path=*0x%x)", k_licensee_addr, drm_path); + sceNp.warning("sceNpDrmIsAvailable2(k_licensee=*0x%x, drm_path=*0x%x)", k_licensee_addr, drm_path); return npDrmIsAvailable(k_licensee_addr, drm_path); } s32 sceNpDrmVerifyUpgradeLicense(vm::cptr content_id) { - sceNp.Todo("sceNpDrmVerifyUpgradeLicense(content_id=*0x%x)", content_id); + sceNp.todo("sceNpDrmVerifyUpgradeLicense(content_id=*0x%x)", content_id); return CELL_OK; } s32 sceNpDrmVerifyUpgradeLicense2(vm::cptr content_id) { - sceNp.Todo("sceNpDrmVerifyUpgradeLicense2(content_id=*0x%x)", content_id); + sceNp.todo("sceNpDrmVerifyUpgradeLicense2(content_id=*0x%x)", content_id); return CELL_OK; } @@ -142,7 +142,7 @@ s32 sceNpDrmExecuteGamePurchase() s32 sceNpDrmGetTimelimit(vm::ptr path, vm::ptr time_remain) { - sceNp.Warning("sceNpDrmGetTimelimit(path=*0x%x, time_remain=*0x%x)", path, time_remain); + sceNp.warning("sceNpDrmGetTimelimit(path=*0x%x, time_remain=*0x%x)", path, time_remain); *time_remain = 0x7FFFFFFFFFFFFFFFULL; @@ -151,7 +151,7 @@ s32 sceNpDrmGetTimelimit(vm::ptr path, vm::ptr time_remain) s32 sceNpDrmProcessExitSpawn(vm::cptr path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags) { - sceNp.Warning("sceNpDrmProcessExitSpawn() -> sys_game_process_exitspawn"); + sceNp.warning("sceNpDrmProcessExitSpawn() -> sys_game_process_exitspawn"); sys_game_process_exitspawn(path, argv_addr, envp_addr, data_addr, data_size, prio, flags); @@ -160,7 +160,7 @@ s32 sceNpDrmProcessExitSpawn(vm::cptr path, u32 argv_addr, u32 envp_addr, s32 sceNpDrmProcessExitSpawn2(vm::cptr path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags) { - sceNp.Warning("sceNpDrmProcessExitSpawn2() -> sys_game_process_exitspawn2"); + sceNp.warning("sceNpDrmProcessExitSpawn2() -> sys_game_process_exitspawn2"); sys_game_process_exitspawn2(path, argv_addr, envp_addr, data_addr, data_size, prio, flags); @@ -259,7 +259,7 @@ s32 sceNpBasicAddFriend() s32 sceNpBasicGetFriendListEntryCount(vm::ptr count) { - sceNp.Warning("sceNpBasicGetFriendListEntryCount(count=*0x%x)", count); + sceNp.warning("sceNpBasicGetFriendListEntryCount(count=*0x%x)", count); // TODO: Check if there are any friends *count = 0; @@ -311,7 +311,7 @@ s32 sceNpBasicAddPlayersHistoryAsync() s32 sceNpBasicGetPlayersHistoryEntryCount(u32 options, vm::ptr count) { - sceNp.Todo("sceNpBasicGetPlayersHistoryEntryCount(options=%d, count=*0x%x)", options, count); + sceNp.todo("sceNpBasicGetPlayersHistoryEntryCount(options=%d, count=*0x%x)", options, count); return CELL_OK; } @@ -330,7 +330,7 @@ s32 sceNpBasicAddBlockListEntry() s32 sceNpBasicGetBlockListEntryCount(u32 count) { - sceNp.Todo("sceNpBasicGetBlockListEntryCount(count=%d)", count); + sceNp.todo("sceNpBasicGetBlockListEntryCount(count=%d)", count); return CELL_OK; } @@ -343,14 +343,14 @@ s32 sceNpBasicGetBlockListEntry() s32 sceNpBasicGetMessageAttachmentEntryCount(vm::ptr count) { - sceNp.Todo("sceNpBasicGetMessageAttachmentEntryCount(count=*0x%x)", count); + sceNp.todo("sceNpBasicGetMessageAttachmentEntryCount(count=*0x%x)", count); return CELL_OK; } s32 sceNpBasicGetMessageAttachmentEntry(u32 index, vm::ptr from) { - sceNp.Todo("sceNpBasicGetMessageAttachmentEntry(index=%d, from=*0x%x)", index, from); + sceNp.todo("sceNpBasicGetMessageAttachmentEntry(index=%d, from=*0x%x)", index, from); return CELL_OK; } @@ -369,35 +369,35 @@ s32 sceNpBasicGetCustomInvitationEntry() s32 sceNpBasicGetMatchingInvitationEntryCount(vm::ptr count) { - sceNp.Todo("sceNpBasicGetMatchingInvitationEntryCount(count=*0x%x)", count); + sceNp.todo("sceNpBasicGetMatchingInvitationEntryCount(count=*0x%x)", count); return CELL_OK; } s32 sceNpBasicGetMatchingInvitationEntry(u32 index, vm::ptr from) { - sceNp.Todo("sceNpBasicGetMatchingInvitationEntry(index=%d, from=*0x%x)", index, from); + sceNp.todo("sceNpBasicGetMatchingInvitationEntry(index=%d, from=*0x%x)", index, from); return CELL_OK; } s32 sceNpBasicGetClanMessageEntryCount(vm::ptr count) { - sceNp.Todo("sceNpBasicGetClanMessageEntryCount(count=*0x%x)", count); + sceNp.todo("sceNpBasicGetClanMessageEntryCount(count=*0x%x)", count); return CELL_OK; } s32 sceNpBasicGetClanMessageEntry(u32 index, vm::ptr from) { - sceNp.Todo("sceNpBasicGetClanMessageEntry(index=%d, from=*0x%x)", index, from); + sceNp.todo("sceNpBasicGetClanMessageEntry(index=%d, from=*0x%x)", index, from); return CELL_OK; } s32 sceNpBasicGetMessageEntryCount(u32 type, vm::ptr count) { - sceNp.Warning("sceNpBasicGetMessageEntryCount(type=%d, count=*0x%x)", type, count); + sceNp.warning("sceNpBasicGetMessageEntryCount(type=%d, count=*0x%x)", type, count); // TODO: Check if there are messages *count = 0; @@ -407,14 +407,14 @@ s32 sceNpBasicGetMessageEntryCount(u32 type, vm::ptr count) s32 sceNpBasicGetMessageEntry(u32 type, u32 index, vm::ptr from) { - sceNp.Todo("sceNpBasicGetMessageEntry(type=%d, index=%d, from=*0x%x)", type, index, from); + sceNp.todo("sceNpBasicGetMessageEntry(type=%d, index=%d, from=*0x%x)", type, index, from); return CELL_OK; } s32 sceNpBasicGetEvent(vm::ptr event, vm::ptr from, vm::ptr data, vm::ptr size) { - sceNp.Warning("sceNpBasicGetEvent(event=*0x%x, from=*0x%x, data=*0x%x, size=*0x%x)", event, from, data, size); + sceNp.warning("sceNpBasicGetEvent(event=*0x%x, from=*0x%x, data=*0x%x, size=*0x%x)", event, from, data, size); // TODO: Check for other error and pass other events *event = SCE_NP_BASIC_EVENT_OFFLINE; @@ -676,14 +676,14 @@ s32 sceNpFriendlistAbortGui() s32 sceNpLookupInit() { - sceNp.Warning("sceNpLookupInit()"); + sceNp.warning("sceNpLookupInit()"); return CELL_OK; } s32 sceNpLookupTerm() { - sceNp.Warning("sceNpLookupTerm()"); + sceNp.warning("sceNpLookupTerm()"); return CELL_OK; } @@ -823,7 +823,7 @@ s32 sceNpManagerUnregisterCallback() s32 sceNpManagerGetStatus(vm::ptr status) { - sceNp.Warning("sceNpManagerGetStatus(status=*0x%x)", status); + sceNp.warning("sceNpManagerGetStatus(status=*0x%x)", status); // TODO: Support different statuses *status = SCE_NP_MANAGER_STATUS_OFFLINE; @@ -881,7 +881,7 @@ s32 sceNpManagerGetAccountAge() s32 sceNpManagerGetContentRatingFlag(vm::ptr isRestricted, vm::ptr age) { - sceNp.Warning("sceNpManagerGetContentRatingFlag(isRestricted=*0x%x, age=*0x%x)", isRestricted, age); + sceNp.warning("sceNpManagerGetContentRatingFlag(isRestricted=*0x%x, age=*0x%x)", isRestricted, age); // TODO: read user's parental control information *isRestricted = 0; @@ -1108,14 +1108,14 @@ s32 sceNpProfileAbortGui() s32 sceNpScoreInit() { - sceNp.Warning("sceNpScoreInit()"); + sceNp.warning("sceNpScoreInit()"); return CELL_OK; } s32 sceNpScoreTerm() { - sceNp.Warning("sceNpScoreTerm()"); + sceNp.warning("sceNpScoreTerm()"); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp2.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp2.cpp index 197bde3c1b..0c6cf5260b 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNp2.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNp2.cpp @@ -9,7 +9,7 @@ extern Module<> sceNp2; s32 sceNp2Init(u32 poolsize, vm::ptr poolptr) { - sceNp2.Warning("sceNp2Init(poolsize=0x%x, poolptr=*0x%x)", poolsize, poolptr); + sceNp2.warning("sceNp2Init(poolsize=0x%x, poolptr=*0x%x)", poolsize, poolptr); if (poolsize == 0) { @@ -30,14 +30,14 @@ s32 sceNp2Init(u32 poolsize, vm::ptr poolptr) s32 sceNpMatching2Init(u32 poolsize, s32 priority) { - sceNp2.Todo("sceNpMatching2Init(poolsize=0x%x, priority=%d)", poolsize, priority); + sceNp2.todo("sceNpMatching2Init(poolsize=0x%x, priority=%d)", poolsize, priority); return CELL_OK; } s32 sceNpMatching2Init2(u32 poolsize, s32 priority, vm::ptr param) { - sceNp2.Todo("sceNpMatching2Init2(poolsize=0x%x, priority=%d, param=*0x%x)", poolsize, priority, param); + sceNp2.todo("sceNpMatching2Init2(poolsize=0x%x, priority=%d, param=*0x%x)", poolsize, priority, param); // TODO: // 1. Create an internal thread @@ -49,21 +49,21 @@ s32 sceNpMatching2Init2(u32 poolsize, s32 priority, vm::ptr sceNpClans; s32 sceNpClansInit(vm::ptr commId, vm::ptr passphrase, vm::ptr pool, vm::ptr poolSize, u32 flags) { - sceNpClans.Warning("sceNpClansInit(commId=*0x%x, passphrase=*0x%x, pool=*0x%x, poolSize=*0x%x, flags=0x%x)", commId, passphrase, pool, poolSize, flags); + sceNpClans.warning("sceNpClansInit(commId=*0x%x, passphrase=*0x%x, pool=*0x%x, poolSize=*0x%x, flags=0x%x)", commId, passphrase, pool, poolSize, flags); if (flags != 0) { @@ -22,14 +22,14 @@ s32 sceNpClansInit(vm::ptr commId, vm::ptr handle, u64 flags) { - sceNpClans.Todo("sceNpClansCreateRequest(handle=*0x%x, flags=0x%llx)", handle, flags); + sceNpClans.todo("sceNpClansCreateRequest(handle=*0x%x, flags=0x%llx)", handle, flags); if (flags != 0) { diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.cpp index 0ae6ecf839..c1bdbf23d9 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.cpp @@ -20,14 +20,14 @@ s32 sceNpCommerce2GetStoreBrowseUserdata() s32 sceNpCommerce2Init() { - sceNpCommerce2.Warning("sceNpCommerce2Init()"); + sceNpCommerce2.warning("sceNpCommerce2Init()"); return CELL_OK; } s32 sceNpCommerce2Term() { - sceNpCommerce2.Warning("sceNpCommerce2Term()"); + sceNpCommerce2.warning("sceNpCommerce2Term()"); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpSns.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpSns.cpp index 5ebfbbc0b7..26b61aed15 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpSns.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpSns.cpp @@ -7,7 +7,7 @@ extern Module<> sceNpSns; s32 sceNpSnsFbInit(vm::ptr params) { - sceNpSns.Todo("sceNpSnsFbInit(params=*0x%x)", params); + sceNpSns.todo("sceNpSnsFbInit(params=*0x%x)", params); // TODO: Use the initialization parameters somewhere @@ -16,7 +16,7 @@ s32 sceNpSnsFbInit(vm::ptr params) s32 sceNpSnsFbTerm() { - sceNpSns.Warning("sceNpSnsFbTerm()"); + sceNpSns.warning("sceNpSnsFbTerm()"); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp index 9e2d66c37e..98756e976c 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp @@ -33,21 +33,21 @@ struct trophy_handle_t // Functions s32 sceNpTrophyInit(vm::ptr pool, u32 poolSize, u32 containerId, u64 options) { - sceNpTrophy.Warning("sceNpTrophyInit(pool=*0x%x, poolSize=0x%x, containerId=0x%x, options=0x%llx)", pool, poolSize, containerId, options); + sceNpTrophy.warning("sceNpTrophyInit(pool=*0x%x, poolSize=0x%x, containerId=0x%x, options=0x%llx)", pool, poolSize, containerId, options); return CELL_OK; } s32 sceNpTrophyTerm() { - sceNpTrophy.Warning("sceNpTrophyTerm()"); + sceNpTrophy.warning("sceNpTrophyTerm()"); return CELL_OK; } s32 sceNpTrophyCreateHandle(vm::ptr handle) { - sceNpTrophy.Warning("sceNpTrophyCreateHandle(handle=*0x%x)", handle); + sceNpTrophy.warning("sceNpTrophyCreateHandle(handle=*0x%x)", handle); if (!handle) { @@ -61,7 +61,7 @@ s32 sceNpTrophyCreateHandle(vm::ptr handle) s32 sceNpTrophyDestroyHandle(u32 handle) { - sceNpTrophy.Warning("sceNpTrophyDestroyHandle(handle=0x%x)", handle); + sceNpTrophy.warning("sceNpTrophyDestroyHandle(handle=0x%x)", handle); const auto hndl = idm::get(handle); @@ -77,7 +77,7 @@ s32 sceNpTrophyDestroyHandle(u32 handle) s32 sceNpTrophyAbortHandle(u32 handle) { - sceNpTrophy.Todo("sceNpTrophyAbortHandle(handle=0x%x)", handle); + sceNpTrophy.todo("sceNpTrophyAbortHandle(handle=0x%x)", handle); const auto hndl = idm::get(handle); @@ -91,7 +91,7 @@ s32 sceNpTrophyAbortHandle(u32 handle) s32 sceNpTrophyCreateContext(vm::ptr context, vm::cptr commId, vm::cptr commSign, u64 options) { - sceNpTrophy.Warning("sceNpTrophyCreateContext(context=*0x%x, commId=*0x%x, commSign=*0x%x, options=0x%llx)", context, commId, commSign, options); + sceNpTrophy.warning("sceNpTrophyCreateContext(context=*0x%x, commId=*0x%x, commSign=*0x%x, options=0x%llx)", context, commId, commSign, options); // rough checks for further fmt::format call if (commId->term || commId->num > 99) @@ -124,7 +124,7 @@ s32 sceNpTrophyCreateContext(vm::ptr context, vm::cptr(context); @@ -140,13 +140,13 @@ s32 sceNpTrophyDestroyContext(u32 context) s32 sceNpTrophyRegisterContext(PPUThread& CPU, u32 context, u32 handle, vm::ptr statusCb, vm::ptr arg, u64 options) { - sceNpTrophy.Error("sceNpTrophyRegisterContext(context=0x%x, handle=0x%x, statusCb=*0x%x, arg=*0x%x, options=0x%llx)", context, handle, statusCb, arg, options); + sceNpTrophy.error("sceNpTrophyRegisterContext(context=0x%x, handle=0x%x, statusCb=*0x%x, arg=*0x%x, options=0x%llx)", context, handle, statusCb, arg, options); const auto ctxt = idm::get(context); if (!ctxt) { - sceNpTrophy.Error("sceNpTrophyRegisterContext(): SCE_NP_TROPHY_ERROR_UNKNOWN_CONTEXT"); + sceNpTrophy.error("sceNpTrophyRegisterContext(): SCE_NP_TROPHY_ERROR_UNKNOWN_CONTEXT"); return SCE_NP_TROPHY_ERROR_UNKNOWN_CONTEXT; } @@ -154,14 +154,14 @@ s32 sceNpTrophyRegisterContext(PPUThread& CPU, u32 context, u32 handle, vm::ptr< if (!hndl) { - sceNpTrophy.Error("sceNpTrophyRegisterContext(): SCE_NP_TROPHY_ERROR_UNKNOWN_HANDLE"); + sceNpTrophy.error("sceNpTrophyRegisterContext(): SCE_NP_TROPHY_ERROR_UNKNOWN_HANDLE"); return SCE_NP_TROPHY_ERROR_UNKNOWN_HANDLE; } TRPLoader trp(*ctxt->trp_stream); if (!trp.LoadHeader()) { - sceNpTrophy.Error("sceNpTrophyRegisterContext(): SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE"); + sceNpTrophy.error("sceNpTrophyRegisterContext(): SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE"); return SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE; } @@ -201,7 +201,7 @@ s32 sceNpTrophyRegisterContext(PPUThread& CPU, u32 context, u32 handle, vm::ptr< std::string trophyPath = "/dev_hdd0/home/00000001/trophy/" + ctxt->trp_name; if (!trp.Install(trophyPath)) { - sceNpTrophy.Error("sceNpTrophyRegisterContext(): SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE"); + sceNpTrophy.error("sceNpTrophyRegisterContext(): SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE"); return SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE; } @@ -220,7 +220,7 @@ s32 sceNpTrophyRegisterContext(PPUThread& CPU, u32 context, u32 handle, vm::ptr< s32 sceNpTrophyGetRequiredDiskSpace(u32 context, u32 handle, vm::ptr reqspace, u64 options) { - sceNpTrophy.Todo("sceNpTrophyGetRequiredDiskSpace(context=0x%x, handle=0x%x, reqspace=*0x%x, options=0x%llx)", context, handle, reqspace, options); + sceNpTrophy.todo("sceNpTrophyGetRequiredDiskSpace(context=0x%x, handle=0x%x, reqspace=*0x%x, options=0x%llx)", context, handle, reqspace, options); const auto ctxt = idm::get(context); @@ -244,14 +244,14 @@ s32 sceNpTrophyGetRequiredDiskSpace(u32 context, u32 handle, vm::ptr reqspa s32 sceNpTrophySetSoundLevel(u32 context, u32 handle, u32 level, u64 options) { - sceNpTrophy.Todo("sceNpTrophySetSoundLevel(context=0x%x, handle=0x%x, level=%d, options=0x%llx)", context, handle, level, options); + sceNpTrophy.todo("sceNpTrophySetSoundLevel(context=0x%x, handle=0x%x, level=%d, options=0x%llx)", context, handle, level, options); return CELL_OK; } s32 sceNpTrophyGetGameInfo(u32 context, u32 handle, vm::ptr details, vm::ptr data) { - sceNpTrophy.Error("sceNpTrophyGetGameInfo(context=0x%x, handle=0x%x, details=*0x%x, data=*0x%x)", context, handle, details, data); + sceNpTrophy.error("sceNpTrophyGetGameInfo(context=0x%x, handle=0x%x, details=*0x%x, data=*0x%x)", context, handle, details, data); const auto ctxt = idm::get(context); @@ -312,7 +312,7 @@ s32 sceNpTrophyGetGameInfo(u32 context, u32 handle, vm::ptr platinumId) { - sceNpTrophy.Error("sceNpTrophyUnlockTrophy(context=0x%x, handle=0x%x, trophyId=%d, platinumId=*0x%x)", context, handle, trophyId, platinumId); + sceNpTrophy.error("sceNpTrophyUnlockTrophy(context=0x%x, handle=0x%x, trophyId=%d, platinumId=*0x%x)", context, handle, trophyId, platinumId); const auto ctxt = idm::get(context); @@ -343,7 +343,7 @@ s32 sceNpTrophyUnlockTrophy(u32 context, u32 handle, s32 trophyId, vm::ptr s32 sceNpTrophyGetTrophyUnlockState(u32 context, u32 handle, vm::ptr flags, vm::ptr count) { - sceNpTrophy.Error("sceNpTrophyGetTrophyUnlockState(context=0x%x, handle=0x%x, flags=*0x%x, count=*0x%x)", context, handle, flags, count); + sceNpTrophy.error("sceNpTrophyGetTrophyUnlockState(context=0x%x, handle=0x%x, flags=*0x%x, count=*0x%x)", context, handle, flags, count); const auto ctxt = idm::get(context); @@ -362,7 +362,7 @@ s32 sceNpTrophyGetTrophyUnlockState(u32 context, u32 handle, vm::ptrtropusr->GetTrophiesCount(); *count = count_; if (count_ > 128) - sceNpTrophy.Error("sceNpTrophyGetTrophyUnlockState: More than 128 trophies detected!"); + sceNpTrophy.error("sceNpTrophyGetTrophyUnlockState: More than 128 trophies detected!"); // Pack up to 128 bools in u32 flag_bits[4] for (u32 id = 0; id < count_; id++) @@ -378,7 +378,7 @@ s32 sceNpTrophyGetTrophyUnlockState(u32 context, u32 handle, vm::ptr details, vm::ptr data) { - sceNpTrophy.Warning("sceNpTrophyGetTrophyInfo(context=0x%x, handle=0x%x, trophyId=%d, details=*0x%x, data=*0x%x)", context, handle, trophyId, details, data); + sceNpTrophy.warning("sceNpTrophyGetTrophyInfo(context=0x%x, handle=0x%x, trophyId=%d, details=*0x%x, data=*0x%x)", context, handle, trophyId, details, data); const auto ctxt = idm::get(context); @@ -435,21 +435,21 @@ s32 sceNpTrophyGetTrophyInfo(u32 context, u32 handle, s32 trophyId, vm::ptr percentage) { - sceNpTrophy.Todo("sceNpTrophyGetGameProgress(context=0x%x, handle=0x%x, percentage=*0x%x)", context, handle, percentage); + sceNpTrophy.todo("sceNpTrophyGetGameProgress(context=0x%x, handle=0x%x, percentage=*0x%x)", context, handle, percentage); return CELL_OK; } s32 sceNpTrophyGetGameIcon(u32 context, u32 handle, vm::ptr buffer, vm::ptr size) { - sceNpTrophy.Todo("sceNpTrophyGetGameIcon(context=0x%x, handle=0x%x, buffer=*0x%x, size=*0x%x)", context, handle, buffer, size); + sceNpTrophy.todo("sceNpTrophyGetGameIcon(context=0x%x, handle=0x%x, buffer=*0x%x, size=*0x%x)", context, handle, buffer, size); return CELL_OK; } s32 sceNpTrophyGetTrophyIcon(u32 context, u32 handle, s32 trophyId, vm::ptr buffer, vm::ptr size) { - sceNpTrophy.Todo("sceNpTrophyGetTrophyIcon(context=0x%x, handle=0x%x, trophyId=%d, buffer=*0x%x, size=*0x%x)", context, handle, trophyId, buffer, size); + sceNpTrophy.todo("sceNpTrophyGetTrophyIcon(context=0x%x, handle=0x%x, trophyId=%d, buffer=*0x%x, size=*0x%x)", context, handle, trophyId, buffer, size); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTus.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpTus.cpp index 6bd4f62ac0..4eb33b0cee 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpTus.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpTus.cpp @@ -9,14 +9,14 @@ extern Module<> sceNpTus; s32 sceNpTusInit() { - sceNpTus.Warning("sceNpTusInit()"); + sceNpTus.warning("sceNpTusInit()"); return CELL_OK; } s32 sceNpTusTerm() { - sceNpTus.Warning("sceNpTusTerm()"); + sceNpTus.warning("sceNpTusTerm()"); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp index b038aee743..ca24e0bd8a 100644 --- a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp @@ -21,7 +21,7 @@ std::array, TLS_MAX> g_tls_owners; void sys_initialize_tls() { - sysPrxForUser.Log("sys_initialize_tls()"); + sysPrxForUser.trace("sys_initialize_tls()"); } u32 ppu_get_tls(u32 thread) @@ -79,33 +79,33 @@ void ppu_free_tls(u32 thread) s64 sys_time_get_system_time() { - sysPrxForUser.Log("sys_time_get_system_time()"); + sysPrxForUser.trace("sys_time_get_system_time()"); return get_system_time(); } s64 _sys_process_atexitspawn() { - sysPrxForUser.Log("_sys_process_atexitspawn()"); + sysPrxForUser.trace("_sys_process_atexitspawn()"); return CELL_OK; } s64 _sys_process_at_Exitspawn() { - sysPrxForUser.Log("_sys_process_at_Exitspawn"); + sysPrxForUser.trace("_sys_process_at_Exitspawn"); return CELL_OK; } s32 sys_interrupt_thread_disestablish(PPUThread& ppu, u32 ih) { - sysPrxForUser.Todo("sys_interrupt_thread_disestablish(ih=0x%x)", ih); + sysPrxForUser.todo("sys_interrupt_thread_disestablish(ih=0x%x)", ih); return _sys_interrupt_thread_disestablish(ppu, ih, vm::var{}); } s32 sys_process_is_stack(u32 p) { - sysPrxForUser.Log("sys_process_is_stack(p=0x%x)", p); + sysPrxForUser.trace("sys_process_is_stack(p=0x%x)", p); // prx: compare high 4 bits with "0xD" return (p >> 28) == 0xD; @@ -113,7 +113,7 @@ s32 sys_process_is_stack(u32 p) s32 sys_process_get_paramsfo(vm::ptr buffer) { - sysPrxForUser.Warning("sys_process_get_paramsfo(buffer=*0x%x)", buffer); + sysPrxForUser.warning("sys_process_get_paramsfo(buffer=*0x%x)", buffer); // prx: load some data (0x40 bytes) previously set by _sys_process_get_paramsfo syscall return _sys_process_get_paramsfo(buffer); @@ -121,7 +121,7 @@ s32 sys_process_get_paramsfo(vm::ptr buffer) s32 sys_get_random_number(vm::ptr addr, u64 size) { - sysPrxForUser.Warning("sys_get_random_number(addr=*0x%x, size=%d)", addr, size); + sysPrxForUser.warning("sys_get_random_number(addr=*0x%x, size=%d)", addr, size); if (size > 4096) size = 4096; @@ -146,9 +146,9 @@ s32 console_putc() s32 console_write(vm::ptr data, u32 len) { - sysPrxForUser.Warning("console_write(data=*0x%x, len=%d)", data, len); + sysPrxForUser.warning("console_write(data=*0x%x, len=%d)", data, len); - LOG_NOTICE(TTY, { data.get_ptr(), len }); + _log::g_tty_file.log({ data.get_ptr(), len }); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/sys_game.cpp b/rpcs3/Emu/SysCalls/Modules/sys_game.cpp index 65f62689c0..413cd98b5c 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_game.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_game.cpp @@ -20,14 +20,14 @@ void sys_game_process_exitspawn(vm::cptr path, u32 argv_addr, u32 envp_add start_pos += to.length(); } - sysPrxForUser.Todo("sys_game_process_exitspawn()"); - sysPrxForUser.Warning("path: %s", _path.c_str()); - sysPrxForUser.Warning("argv: 0x%x", argv_addr); - sysPrxForUser.Warning("envp: 0x%x", envp_addr); - sysPrxForUser.Warning("data: 0x%x", data_addr); - sysPrxForUser.Warning("data_size: 0x%x", data_size); - sysPrxForUser.Warning("prio: %d", prio); - sysPrxForUser.Warning("flags: %d", flags); + sysPrxForUser.todo("sys_game_process_exitspawn()"); + sysPrxForUser.warning("path: %s", _path.c_str()); + sysPrxForUser.warning("argv: 0x%x", argv_addr); + sysPrxForUser.warning("envp: 0x%x", envp_addr); + sysPrxForUser.warning("data: 0x%x", data_addr); + sysPrxForUser.warning("data_size: 0x%x", data_size); + sysPrxForUser.warning("prio: %d", prio); + sysPrxForUser.warning("flags: %d", flags); std::vector argv; std::vector env; @@ -43,7 +43,7 @@ void sys_game_process_exitspawn(vm::cptr path, u32 argv_addr, u32 envp_add for (auto &arg : argv) { - sysPrxForUser.Log("argument: %s", arg.c_str()); + sysPrxForUser.trace("argument: %s", arg.c_str()); } } @@ -58,7 +58,7 @@ void sys_game_process_exitspawn(vm::cptr path, u32 argv_addr, u32 envp_add for (auto &en : env) { - sysPrxForUser.Log("env_argument: %s", en.c_str()); + sysPrxForUser.trace("env_argument: %s", en.c_str()); } } @@ -68,7 +68,7 @@ void sys_game_process_exitspawn(vm::cptr path, u32 argv_addr, u32 envp_add // then kill the current process Emu.Pause(); - sysPrxForUser.Success("Process finished"); + sysPrxForUser.success("Process finished"); Emu.CallAfter([=]() { @@ -96,14 +96,14 @@ void sys_game_process_exitspawn2(vm::cptr path, u32 argv_addr, u32 envp_ad start_pos += to.length(); } - sysPrxForUser.Warning("sys_game_process_exitspawn2()"); - sysPrxForUser.Warning("path: %s", _path.c_str()); - sysPrxForUser.Warning("argv: 0x%x", argv_addr); - sysPrxForUser.Warning("envp: 0x%x", envp_addr); - sysPrxForUser.Warning("data: 0x%x", data_addr); - sysPrxForUser.Warning("data_size: 0x%x", data_size); - sysPrxForUser.Warning("prio: %d", prio); - sysPrxForUser.Warning("flags: %d", flags); + sysPrxForUser.warning("sys_game_process_exitspawn2()"); + sysPrxForUser.warning("path: %s", _path.c_str()); + sysPrxForUser.warning("argv: 0x%x", argv_addr); + sysPrxForUser.warning("envp: 0x%x", envp_addr); + sysPrxForUser.warning("data: 0x%x", data_addr); + sysPrxForUser.warning("data_size: 0x%x", data_size); + sysPrxForUser.warning("prio: %d", prio); + sysPrxForUser.warning("flags: %d", flags); std::vector argv; std::vector env; @@ -119,7 +119,7 @@ void sys_game_process_exitspawn2(vm::cptr path, u32 argv_addr, u32 envp_ad for (auto &arg : argv) { - sysPrxForUser.Log("argument: %s", arg.c_str()); + sysPrxForUser.trace("argument: %s", arg.c_str()); } } @@ -134,7 +134,7 @@ void sys_game_process_exitspawn2(vm::cptr path, u32 argv_addr, u32 envp_ad for (auto &en : env) { - sysPrxForUser.Log("env_argument: %s", en.c_str()); + sysPrxForUser.trace("env_argument: %s", en.c_str()); } } @@ -144,7 +144,7 @@ void sys_game_process_exitspawn2(vm::cptr path, u32 argv_addr, u32 envp_ad // then kill the current process Emu.Pause(); - sysPrxForUser.Success("Process finished"); + sysPrxForUser.success("Process finished"); Emu.CallAfter([=]() { diff --git a/rpcs3/Emu/SysCalls/Modules/sys_heap.cpp b/rpcs3/Emu/SysCalls/Modules/sys_heap.cpp index b3e0aafd3a..cec953fdf1 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_heap.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_heap.cpp @@ -20,14 +20,14 @@ struct HeapInfo u32 _sys_heap_create_heap(vm::cptr name, u32 arg2, u32 arg3, u32 arg4) { - sysPrxForUser.Warning("_sys_heap_create_heap(name=*0x%x, arg2=0x%x, arg3=0x%x, arg4=0x%x)", name, arg2, arg3, arg4); + sysPrxForUser.warning("_sys_heap_create_heap(name=*0x%x, arg2=0x%x, arg3=0x%x, arg4=0x%x)", name, arg2, arg3, arg4); return idm::make(name.get_ptr()); } s32 _sys_heap_delete_heap(u32 heap) { - sysPrxForUser.Warning("_sys_heap_delete_heap(heap=0x%x)", heap); + sysPrxForUser.warning("_sys_heap_delete_heap(heap=0x%x)", heap); idm::remove(heap); @@ -36,21 +36,21 @@ s32 _sys_heap_delete_heap(u32 heap) u32 _sys_heap_malloc(u32 heap, u32 size) { - sysPrxForUser.Warning("_sys_heap_malloc(heap=0x%x, size=0x%x)", heap, size); + sysPrxForUser.warning("_sys_heap_malloc(heap=0x%x, size=0x%x)", heap, size); return vm::alloc(size, vm::main); } u32 _sys_heap_memalign(u32 heap, u32 align, u32 size) { - sysPrxForUser.Warning("_sys_heap_memalign(heap=0x%x, align=0x%x, size=0x%x)", heap, align, size); + sysPrxForUser.warning("_sys_heap_memalign(heap=0x%x, align=0x%x, size=0x%x)", heap, align, size); return vm::alloc(size, vm::main, std::max(align, 4096)); } s32 _sys_heap_free(u32 heap, u32 addr) { - sysPrxForUser.Warning("_sys_heap_free(heap=0x%x, addr=0x%x)", heap, addr); + sysPrxForUser.warning("_sys_heap_free(heap=0x%x, addr=0x%x)", heap, addr); vm::dealloc(addr, vm::main); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp b/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp index 5c394b77f2..a7ec31eb24 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp @@ -153,7 +153,7 @@ namespace sys_libc_func { void memcpy(vm::ptr dst, vm::cptr src, u32 size) { - sys_libc.Log("memcpy(dst=*0x%x, src=*0x%x, size=0x%x)", dst, src, size); + sys_libc.trace("memcpy(dst=*0x%x, src=*0x%x, size=0x%x)", dst, src, size); ::memcpy(dst.get_ptr(), src.get_ptr(), size); } @@ -163,7 +163,7 @@ extern Module<> sysPrxForUser; vm::ptr _sys_memset(vm::ptr dst, s32 value, u32 size) { - sysPrxForUser.Log("_sys_memset(dst=*0x%x, value=%d, size=0x%x)", dst, value, size); + sysPrxForUser.trace("_sys_memset(dst=*0x%x, value=%d, size=0x%x)", dst, value, size); memset(dst.get_ptr(), value, size); @@ -172,7 +172,7 @@ vm::ptr _sys_memset(vm::ptr dst, s32 value, u32 size) vm::ptr _sys_memcpy(vm::ptr dst, vm::cptr src, u32 size) { - sysPrxForUser.Log("_sys_memcpy(dst=*0x%x, src=*0x%x, size=0x%x)", dst, src, size); + sysPrxForUser.trace("_sys_memcpy(dst=*0x%x, src=*0x%x, size=0x%x)", dst, src, size); memcpy(dst.get_ptr(), src.get_ptr(), size); @@ -181,7 +181,7 @@ vm::ptr _sys_memcpy(vm::ptr dst, vm::cptr src, u32 size) s32 _sys_memcmp(vm::cptr buf1, vm::cptr buf2, u32 size) { - sysPrxForUser.Log("_sys_memcmp(buf1=*0x%x, buf2=*0x%x, size=%d)", buf1, buf2, size); + sysPrxForUser.trace("_sys_memcmp(buf1=*0x%x, buf2=*0x%x, size=%d)", buf1, buf2, size); return memcmp(buf1.get_ptr(), buf2.get_ptr(), size); } @@ -198,28 +198,28 @@ s32 _sys_memmove() s64 _sys_strlen(vm::cptr str) { - sysPrxForUser.Log("_sys_strlen(str=*0x%x)", str); + sysPrxForUser.trace("_sys_strlen(str=*0x%x)", str); return strlen(str.get_ptr()); } s32 _sys_strcmp(vm::cptr str1, vm::cptr str2) { - sysPrxForUser.Log("_sys_strcmp(str1=*0x%x, str2=*0x%x)", str1, str2); + sysPrxForUser.trace("_sys_strcmp(str1=*0x%x, str2=*0x%x)", str1, str2); return strcmp(str1.get_ptr(), str2.get_ptr()); } s32 _sys_strncmp(vm::cptr str1, vm::cptr str2, s32 max) { - sysPrxForUser.Log("_sys_strncmp(str1=*0x%x, str2=*0x%x, max=%d)", str1, str2, max); + sysPrxForUser.trace("_sys_strncmp(str1=*0x%x, str2=*0x%x, max=%d)", str1, str2, max); return strncmp(str1.get_ptr(), str2.get_ptr(), max); } vm::ptr _sys_strcat(vm::ptr dest, vm::cptr source) { - sysPrxForUser.Log("_sys_strcat(dest=*0x%x, source=*0x%x)", dest, source); + sysPrxForUser.trace("_sys_strcat(dest=*0x%x, source=*0x%x)", dest, source); if (strcat(dest.get_ptr(), source.get_ptr()) != dest.get_ptr()) { @@ -231,14 +231,14 @@ vm::ptr _sys_strcat(vm::ptr dest, vm::cptr source) vm::cptr _sys_strchr(vm::cptr str, s32 ch) { - sysPrxForUser.Log("_sys_strchr(str=*0x%x, ch=0x%x)", str, ch); + sysPrxForUser.trace("_sys_strchr(str=*0x%x, ch=0x%x)", str, ch); return vm::cptr::make(vm::get_addr(strchr(str.get_ptr(), ch))); } vm::ptr _sys_strncat(vm::ptr dest, vm::cptr source, u32 len) { - sysPrxForUser.Log("_sys_strncat(dest=*0x%x, source=*0x%x, len=%d)", dest, source, len); + sysPrxForUser.trace("_sys_strncat(dest=*0x%x, source=*0x%x, len=%d)", dest, source, len); if (strncat(dest.get_ptr(), source.get_ptr(), len) != dest.get_ptr()) { @@ -250,7 +250,7 @@ vm::ptr _sys_strncat(vm::ptr dest, vm::cptr source, u32 len) vm::ptr _sys_strcpy(vm::ptr dest, vm::cptr source) { - sysPrxForUser.Log("_sys_strcpy(dest=*0x%x, source=*0x%x)", dest, source); + sysPrxForUser.trace("_sys_strcpy(dest=*0x%x, source=*0x%x)", dest, source); if (strcpy(dest.get_ptr(), source.get_ptr()) != dest.get_ptr()) { @@ -262,7 +262,7 @@ vm::ptr _sys_strcpy(vm::ptr dest, vm::cptr source) vm::ptr _sys_strncpy(vm::ptr dest, vm::cptr source, u32 len) { - sysPrxForUser.Log("_sys_strncpy(dest=*0x%x, source=*0x%x, len=%d)", dest, source, len); + sysPrxForUser.trace("_sys_strncpy(dest=*0x%x, source=*0x%x, len=%d)", dest, source, len); if (!dest || !source) { @@ -299,21 +299,21 @@ s32 _sys_toupper() u32 _sys_malloc(u32 size) { - sysPrxForUser.Warning("_sys_malloc(size=0x%x)", size); + sysPrxForUser.warning("_sys_malloc(size=0x%x)", size); return vm::alloc(size, vm::main); } u32 _sys_memalign(u32 align, u32 size) { - sysPrxForUser.Warning("_sys_memalign(align=0x%x, size=0x%x)", align, size); + sysPrxForUser.warning("_sys_memalign(align=0x%x, size=0x%x)", align, size); return vm::alloc(size, vm::main, std::max(align, 4096)); } s32 _sys_free(u32 addr) { - sysPrxForUser.Warning("_sys_free(addr=0x%x)", addr); + sysPrxForUser.warning("_sys_free(addr=0x%x)", addr); vm::dealloc(addr, vm::main); @@ -322,11 +322,11 @@ s32 _sys_free(u32 addr) s32 _sys_snprintf(PPUThread& ppu, vm::ptr dst, u32 count, vm::cptr fmt, ppu_va_args_t va_args) { - sysPrxForUser.Warning("_sys_snprintf(dst=*0x%x, count=%d, fmt=*0x%x, ...)", dst, count, fmt); + sysPrxForUser.warning("_sys_snprintf(dst=*0x%x, count=%d, fmt=*0x%x, ...)", dst, count, fmt); std::string result = ps3_fmt(ppu, fmt, va_args.g_count, va_args.f_count, va_args.v_count); - sysPrxForUser.Warning("*** '%s' -> '%s'", fmt.get_ptr(), result); + sysPrxForUser.warning("*** '%s' -> '%s'", fmt.get_ptr(), result); if (!count) { @@ -344,10 +344,9 @@ s32 _sys_snprintf(PPUThread& ppu, vm::ptr dst, u32 count, vm::cptr f s32 _sys_printf(PPUThread& ppu, vm::cptr fmt, ppu_va_args_t va_args) { - sysPrxForUser.Warning("_sys_printf(fmt=*0x%x, ...)", fmt); - std::string result = ps3_fmt(ppu, fmt, va_args.g_count, va_args.f_count, va_args.v_count); + sysPrxForUser.warning("_sys_printf(fmt=*0x%x, ...)", fmt); - LOG_ERROR(TTY, result); + _log::g_tty_file.log(ps3_fmt(ppu, fmt, va_args.g_count, va_args.f_count, va_args.v_count)); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/sys_lwcond_.cpp b/rpcs3/Emu/SysCalls/Modules/sys_lwcond_.cpp index a2ad2c0f55..8f6577dec7 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_lwcond_.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_lwcond_.cpp @@ -13,7 +13,7 @@ extern Module<> sysPrxForUser; s32 sys_lwcond_create(vm::ptr lwcond, vm::ptr lwmutex, vm::ptr attr) { - sysPrxForUser.Warning("sys_lwcond_create(lwcond=*0x%x, lwmutex=*0x%x, attr=*0x%x)", lwcond, lwmutex, attr); + sysPrxForUser.warning("sys_lwcond_create(lwcond=*0x%x, lwmutex=*0x%x, attr=*0x%x)", lwcond, lwmutex, attr); lwcond->lwcond_queue = idm::make(reinterpret_cast(attr->name)); lwcond->lwmutex = lwmutex; @@ -23,7 +23,7 @@ s32 sys_lwcond_create(vm::ptr lwcond, vm::ptr lwmut s32 sys_lwcond_destroy(vm::ptr lwcond) { - sysPrxForUser.Log("sys_lwcond_destroy(lwcond=*0x%x)", lwcond); + sysPrxForUser.trace("sys_lwcond_destroy(lwcond=*0x%x)", lwcond); const s32 res = _sys_lwcond_destroy(lwcond->lwcond_queue); @@ -37,7 +37,7 @@ s32 sys_lwcond_destroy(vm::ptr lwcond) s32 sys_lwcond_signal(PPUThread& ppu, vm::ptr lwcond) { - sysPrxForUser.Log("sys_lwcond_signal(lwcond=*0x%x)", lwcond); + sysPrxForUser.trace("sys_lwcond_signal(lwcond=*0x%x)", lwcond); const vm::ptr lwmutex = lwcond->lwmutex; @@ -95,7 +95,7 @@ s32 sys_lwcond_signal(PPUThread& ppu, vm::ptr lwcond) s32 sys_lwcond_signal_all(PPUThread& ppu, vm::ptr lwcond) { - sysPrxForUser.Log("sys_lwcond_signal_all(lwcond=*0x%x)", lwcond); + sysPrxForUser.trace("sys_lwcond_signal_all(lwcond=*0x%x)", lwcond); const vm::ptr lwmutex = lwcond->lwmutex; @@ -152,7 +152,7 @@ s32 sys_lwcond_signal_all(PPUThread& ppu, vm::ptr lwcond) s32 sys_lwcond_signal_to(PPUThread& ppu, vm::ptr lwcond, u32 ppu_thread_id) { - sysPrxForUser.Log("sys_lwcond_signal_to(lwcond=*0x%x, ppu_thread_id=0x%x)", lwcond, ppu_thread_id); + sysPrxForUser.trace("sys_lwcond_signal_to(lwcond=*0x%x, ppu_thread_id=0x%x)", lwcond, ppu_thread_id); const vm::ptr lwmutex = lwcond->lwmutex; @@ -210,7 +210,7 @@ s32 sys_lwcond_signal_to(PPUThread& ppu, vm::ptr lwcond, u32 ppu_t s32 sys_lwcond_wait(PPUThread& ppu, vm::ptr lwcond, u64 timeout) { - sysPrxForUser.Log("sys_lwcond_wait(lwcond=*0x%x, timeout=0x%llx)", lwcond, timeout); + sysPrxForUser.trace("sys_lwcond_wait(lwcond=*0x%x, timeout=0x%llx)", lwcond, timeout); const be_t tid = ppu.get_id(); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_lwmutex_.cpp b/rpcs3/Emu/SysCalls/Modules/sys_lwmutex_.cpp index 1213c2d761..347c180077 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_lwmutex_.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_lwmutex_.cpp @@ -12,13 +12,13 @@ extern Module<> sysPrxForUser; s32 sys_lwmutex_create(vm::ptr lwmutex, vm::ptr attr) { - sysPrxForUser.Warning("sys_lwmutex_create(lwmutex=*0x%x, attr=*0x%x)", lwmutex, attr); + sysPrxForUser.warning("sys_lwmutex_create(lwmutex=*0x%x, attr=*0x%x)", lwmutex, attr); const bool recursive = attr->recursive == SYS_SYNC_RECURSIVE; if (!recursive && attr->recursive != SYS_SYNC_NOT_RECURSIVE) { - sysPrxForUser.Error("sys_lwmutex_create(): invalid recursive attribute (0x%x)", attr->recursive); + sysPrxForUser.error("sys_lwmutex_create(): invalid recursive attribute (0x%x)", attr->recursive); return CELL_EINVAL; } @@ -29,7 +29,7 @@ s32 sys_lwmutex_create(vm::ptr lwmutex, vm::ptrlock_var.store({ lwmutex_free, 0 }); @@ -42,7 +42,7 @@ s32 sys_lwmutex_create(vm::ptr lwmutex, vm::ptr lwmutex) { - sysPrxForUser.Log("sys_lwmutex_destroy(lwmutex=*0x%x)", lwmutex); + sysPrxForUser.trace("sys_lwmutex_destroy(lwmutex=*0x%x)", lwmutex); // check to prevent recursive locking in the next call if (lwmutex->vars.owner.load() == ppu.get_id()) @@ -73,7 +73,7 @@ s32 sys_lwmutex_destroy(PPUThread& ppu, vm::ptr lwmutex) s32 sys_lwmutex_lock(PPUThread& ppu, vm::ptr lwmutex, u64 timeout) { - sysPrxForUser.Log("sys_lwmutex_lock(lwmutex=*0x%x, timeout=0x%llx)", lwmutex, timeout); + sysPrxForUser.trace("sys_lwmutex_lock(lwmutex=*0x%x, timeout=0x%llx)", lwmutex, timeout); const be_t tid = ppu.get_id(); @@ -167,7 +167,7 @@ s32 sys_lwmutex_lock(PPUThread& ppu, vm::ptr lwmutex, u64 timeout s32 sys_lwmutex_trylock(PPUThread& ppu, vm::ptr lwmutex) { - sysPrxForUser.Log("sys_lwmutex_trylock(lwmutex=*0x%x)", lwmutex); + sysPrxForUser.trace("sys_lwmutex_trylock(lwmutex=*0x%x)", lwmutex); const be_t tid = ppu.get_id(); @@ -234,7 +234,7 @@ s32 sys_lwmutex_trylock(PPUThread& ppu, vm::ptr lwmutex) s32 sys_lwmutex_unlock(PPUThread& ppu, vm::ptr lwmutex) { - sysPrxForUser.Log("sys_lwmutex_unlock(lwmutex=*0x%x)", lwmutex); + sysPrxForUser.trace("sys_lwmutex_unlock(lwmutex=*0x%x)", lwmutex); const be_t tid = ppu.get_id(); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_mempool.cpp b/rpcs3/Emu/SysCalls/Modules/sys_mempool.cpp index 143df2f46b..60851eacb8 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_mempool.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_mempool.cpp @@ -26,7 +26,7 @@ s32 sys_mempool_allocate_block() s32 sys_mempool_create(vm::ptr mempool, vm::ptr chunk, const u64 chunk_size, const u64 block_size, const u64 ralignment) { - sysPrxForUser.Warning("sys_mempool_create(mempool=*0x%x, chunk=*0x%x, chunk_size=%d, block_size=%d, ralignment=%d)", mempool, chunk, chunk_size, block_size, ralignment); + sysPrxForUser.warning("sys_mempool_create(mempool=*0x%x, chunk=*0x%x, chunk_size=%d, block_size=%d, ralignment=%d)", mempool, chunk, chunk_size, block_size, ralignment); if (block_size > chunk_size) { @@ -74,14 +74,14 @@ s32 sys_mempool_create(vm::ptr mempool, vm::ptr chunk, cons void sys_mempool_destroy(sys_mempool_t mempool) { - sysPrxForUser.Warning("sys_mempool_destroy(mempool=%d)", mempool); + sysPrxForUser.warning("sys_mempool_destroy(mempool=%d)", mempool); idm::remove(mempool); } s32 sys_mempool_free_block(sys_mempool_t mempool, vm::ptr block) { - sysPrxForUser.Warning("sys_mempool_free_block(mempool=%d, block=*0x%x)", mempool, block); + sysPrxForUser.warning("sys_mempool_free_block(mempool=%d, block=*0x%x)", mempool, block); auto memory_pool = idm::get(mempool); if (!memory_pool) @@ -100,7 +100,7 @@ s32 sys_mempool_free_block(sys_mempool_t mempool, vm::ptr block) u64 sys_mempool_get_count(sys_mempool_t mempool) { - sysPrxForUser.Warning("sys_mempool_get_count(mempool=%d)", mempool); + sysPrxForUser.warning("sys_mempool_get_count(mempool=%d)", mempool); auto memory_pool = idm::get(mempool); if (!memory_pool) @@ -113,7 +113,7 @@ u64 sys_mempool_get_count(sys_mempool_t mempool) vm::ptr sys_mempool_try_allocate_block(sys_mempool_t mempool) { - sysPrxForUser.Warning("sys_mempool_try_allocate_block(mempool=%d)", mempool); + sysPrxForUser.warning("sys_mempool_try_allocate_block(mempool=%d)", mempool); auto memory_pool = idm::get(mempool); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_net.cpp b/rpcs3/Emu/SysCalls/Modules/sys_net.cpp index 238a53492b..40f751cf43 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_net.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_net.cpp @@ -104,7 +104,7 @@ void copy_fdset(fd_set* set, vm::ptr src) if (src->fds_bits[i] & (1 << bit)) { u32 sock = (i << 5) | bit; - //libnet.Error("setting: fd %d", sock); + //libnet.error("setting: fd %d", sock); FD_SET(g_socketMap[sock], set); } } @@ -154,7 +154,7 @@ namespace sys_net // Functions s32 accept(s32 s, vm::ptr addr, vm::ptr paddrlen) { - libnet.Warning("accept(s=%d, family=*0x%x, paddrlen=*0x%x)", s, addr, paddrlen); + libnet.warning("accept(s=%d, family=*0x%x, paddrlen=*0x%x)", s, addr, paddrlen); s = g_socketMap[s]; if (!addr) { @@ -176,14 +176,14 @@ namespace sys_net s32 bind(s32 s, vm::cptr addr, u32 addrlen) { - libnet.Warning("bind(s=%d, family=*0x%x, addrlen=%d)", s, addr, addrlen); + libnet.warning("bind(s=%d, family=*0x%x, addrlen=%d)", s, addr, addrlen); s = g_socketMap[s]; ::sockaddr_in saddr; memcpy(&saddr, addr.get_ptr(), sizeof(::sockaddr_in)); saddr.sin_family = addr->sa_family; const char *ipaddr = ::inet_ntoa(saddr.sin_addr); - libnet.Warning("binding on %s to port %d", ipaddr, ntohs(saddr.sin_port)); + libnet.warning("binding on %s to port %d", ipaddr, ntohs(saddr.sin_port)); s32 ret = ::bind(s, (const ::sockaddr*)&saddr, addrlen); get_errno() = getLastError(); @@ -192,14 +192,14 @@ namespace sys_net s32 connect(s32 s, vm::ptr addr, u32 addrlen) { - libnet.Warning("connect(s=%d, family=*0x%x, addrlen=%d)", s, addr, addrlen); + libnet.warning("connect(s=%d, family=*0x%x, addrlen=%d)", s, addr, addrlen); s = g_socketMap[s]; ::sockaddr_in saddr; memcpy(&saddr, addr.get_ptr(), sizeof(::sockaddr_in)); saddr.sin_family = addr->sa_family; const char *ipaddr = ::inet_ntoa(saddr.sin_addr); - libnet.Warning("connecting on %s to port %d", ipaddr, ntohs(saddr.sin_port)); + libnet.warning("connecting on %s to port %d", ipaddr, ntohs(saddr.sin_port)); s32 ret = ::connect(s, (const ::sockaddr*)&saddr, addrlen); get_errno() = getLastError(); @@ -238,7 +238,7 @@ namespace sys_net u32 inet_addr(vm::cptr cp) { - libnet.Warning("inet_addr(cp=*0x%x)", cp); + libnet.warning("inet_addr(cp=*0x%x)", cp); return htonl(::inet_addr(cp.get_ptr())); // return a big-endian IP address (WTF? function should return LITTLE-ENDIAN value) } @@ -280,7 +280,7 @@ namespace sys_net vm::cptr inet_ntop(s32 af, vm::ptr src, vm::ptr dst, u32 size) { - libnet.Warning("inet_ntop(af=%d, src=*0x%x, dst=*0x%x, size=%d)", af, src, dst, size); + libnet.warning("inet_ntop(af=%d, src=*0x%x, dst=*0x%x, size=%d)", af, src, dst, size); const char* result = ::inet_ntop(af, src.get_ptr(), dst.get_ptr(), size); if (result == nullptr) @@ -293,13 +293,13 @@ namespace sys_net s32 inet_pton(s32 af, vm::cptr src, vm::ptr dst) { - libnet.Warning("inet_pton(af=%d, src=*0x%x, dst=*0x%x)", af, src, dst); + libnet.warning("inet_pton(af=%d, src=*0x%x, dst=*0x%x)", af, src, dst); return ::inet_pton(af, src.get_ptr(), dst.get_ptr()); } s32 listen(s32 s, s32 backlog) { - libnet.Warning("listen(s=%d, backlog=%d)", s, backlog); + libnet.warning("listen(s=%d, backlog=%d)", s, backlog); s = g_socketMap[s]; s32 ret = ::listen(s, backlog); get_errno() = getLastError(); @@ -309,7 +309,7 @@ namespace sys_net s32 recv(s32 s, vm::ptr buf, u32 len, s32 flags) { - libnet.Warning("recv(s=%d, buf=*0x%x, len=%d, flags=0x%x)", s, buf, len, flags); + libnet.warning("recv(s=%d, buf=*0x%x, len=%d, flags=0x%x)", s, buf, len, flags); s = g_socketMap[s]; s32 ret = ::recv(s, buf.get_ptr(), len, flags); @@ -320,7 +320,7 @@ namespace sys_net s32 recvfrom(s32 s, vm::ptr buf, u32 len, s32 flags, vm::ptr addr, vm::ptr paddrlen) { - libnet.Warning("recvfrom(s=%d, buf=*0x%x, len=%d, flags=0x%x, addr=*0x%x, paddrlen=*0x%x)", s, buf, len, flags, addr, paddrlen); + libnet.warning("recvfrom(s=%d, buf=*0x%x, len=%d, flags=0x%x, addr=*0x%x, paddrlen=*0x%x)", s, buf, len, flags, addr, paddrlen); s = g_socketMap[s]; ::sockaddr _addr; @@ -342,7 +342,7 @@ namespace sys_net s32 send(s32 s, vm::cptr buf, u32 len, s32 flags) { - libnet.Warning("send(s=%d, buf=*0x%x, len=%d, flags=0x%x)", s, buf, len, flags); + libnet.warning("send(s=%d, buf=*0x%x, len=%d, flags=0x%x)", s, buf, len, flags); s = g_socketMap[s]; s32 ret = ::send(s, buf.get_ptr(), len, flags); @@ -359,7 +359,7 @@ namespace sys_net s32 sendto(s32 s, vm::cptr buf, u32 len, s32 flags, vm::ptr addr, u32 addrlen) { - libnet.Warning("sendto(s=%d, buf=*0x%x, len=%d, flags=0x%x, addr=*0x%x, addrlen=%d)", s, buf, len, flags, addr, addrlen); + libnet.warning("sendto(s=%d, buf=*0x%x, len=%d, flags=0x%x, addr=*0x%x, addrlen=%d)", s, buf, len, flags, addr, addrlen); s = g_socketMap[s]; ::sockaddr _addr; @@ -373,7 +373,7 @@ namespace sys_net s32 setsockopt(s32 s, s32 level, s32 optname, vm::cptr optval, u32 optlen) { - libnet.Warning("socket(s=%d, level=%d, optname=%d, optval=*0x%x, optlen=%d)", s, level, optname, optval, optlen); + libnet.warning("socket(s=%d, level=%d, optname=%d, optval=*0x%x, optlen=%d)", s, level, optname, optval, optlen); s = g_socketMap[s]; s32 ret = ::setsockopt(s, level, optname, optval.get_ptr(), optlen); @@ -384,7 +384,7 @@ namespace sys_net s32 shutdown(s32 s, s32 how) { - libnet.Warning("shutdown(s=%d, how=%d)", s, how); + libnet.warning("shutdown(s=%d, how=%d)", s, how); s = g_socketMap[s]; s32 ret = ::shutdown(s, how); @@ -395,7 +395,7 @@ namespace sys_net s32 socket(s32 family, s32 type, s32 protocol) { - libnet.Warning("socket(family=%d, type=%d, protocol=%d)", family, type, protocol); + libnet.warning("socket(family=%d, type=%d, protocol=%d)", family, type, protocol); s32 sock = ::socket(family, type, protocol); get_errno() = getLastError(); @@ -406,7 +406,7 @@ namespace sys_net s32 socketclose(s32 s) { - libnet.Warning("socket(s=%d)", s); + libnet.warning("socket(s=%d)", s); s = g_socketMap[s]; #ifdef _WIN32 @@ -426,7 +426,7 @@ namespace sys_net s32 socketselect(s32 nfds, vm::ptr readfds, vm::ptr writefds, vm::ptr exceptfds, vm::ptr timeout) { - libnet.Warning("socketselect(nfds=%d, readfds=*0x%x, writefds=*0x%x, exceptfds=*0x%x, timeout=*0x%x)", nfds, readfds, writefds, exceptfds, timeout); + libnet.warning("socketselect(nfds=%d, readfds=*0x%x, writefds=*0x%x, exceptfds=*0x%x, timeout=*0x%x)", nfds, readfds, writefds, exceptfds, timeout); ::timeval _timeout; @@ -436,7 +436,7 @@ namespace sys_net _timeout.tv_usec = timeout->tv_usec; } - //libnet.Error("timeval: %d . %d", _timeout.tv_sec, _timeout.tv_usec); + //libnet.error("timeval: %d . %d", _timeout.tv_sec, _timeout.tv_usec); ::fd_set _readfds; ::fd_set _writefds; @@ -452,7 +452,7 @@ namespace sys_net if (getLastError() >= 0) { - libnet.Error("socketselect(): error %d", getLastError()); + libnet.error("socketselect(): error %d", getLastError()); } //return ret; @@ -461,7 +461,7 @@ namespace sys_net s32 sys_net_initialize_network_ex(vm::ptr param) { - libnet.Warning("sys_net_initialize_network_ex(param=*0x%x)", param); + libnet.warning("sys_net_initialize_network_ex(param=*0x%x)", param); #ifdef _WIN32 WSADATA wsaData; @@ -527,7 +527,7 @@ namespace sys_net vm::ptr _sys_net_errno_loc() { - libnet.Warning("_sys_net_errno_loc()"); + libnet.warning("_sys_net_errno_loc()"); return get_errno().ptr(); } @@ -594,7 +594,7 @@ namespace sys_net s32 sys_net_finalize_network() { - libnet.Warning("sys_net_initialize_network_ex()"); + libnet.warning("sys_net_initialize_network_ex()"); #ifdef _WIN32 WSACleanup(); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_ppu_thread_.cpp b/rpcs3/Emu/SysCalls/Modules/sys_ppu_thread_.cpp index 4c29cac68f..a22edcc521 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_ppu_thread_.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_ppu_thread_.cpp @@ -10,7 +10,7 @@ extern Module<> sysPrxForUser; s32 sys_ppu_thread_create(vm::ptr thread_id, u32 entry, u64 arg, s32 prio, u32 stacksize, u64 flags, vm::cptr threadname) { - sysPrxForUser.Warning("sys_ppu_thread_create(thread_id=*0x%x, entry=0x%x, arg=0x%llx, prio=%d, stacksize=0x%x, flags=0x%llx, threadname=*0x%x)", thread_id, entry, arg, prio, stacksize, flags, threadname); + sysPrxForUser.warning("sys_ppu_thread_create(thread_id=*0x%x, entry=0x%x, arg=0x%llx, prio=%d, stacksize=0x%x, flags=0x%llx, threadname=*0x%x)", thread_id, entry, arg, prio, stacksize, flags, threadname); // (allocate TLS) // (return CELL_ENOMEM if failed) @@ -28,7 +28,7 @@ s32 sys_ppu_thread_create(vm::ptr thread_id, u32 entry, u64 arg, s32 prio, s32 sys_ppu_thread_get_id(PPUThread& ppu, vm::ptr thread_id) { - sysPrxForUser.Log("sys_ppu_thread_get_id(thread_id=*0x%x)", thread_id); + sysPrxForUser.trace("sys_ppu_thread_get_id(thread_id=*0x%x)", thread_id); *thread_id = ppu.get_id(); @@ -37,7 +37,7 @@ s32 sys_ppu_thread_get_id(PPUThread& ppu, vm::ptr thread_id) void sys_ppu_thread_exit(PPUThread& ppu, u64 val) { - sysPrxForUser.Log("sys_ppu_thread_exit(val=0x%llx)", val); + sysPrxForUser.trace("sys_ppu_thread_exit(val=0x%llx)", val); // (call registered atexit functions) // (deallocate TLS) @@ -57,7 +57,7 @@ std::mutex g_once_mutex; void sys_ppu_thread_once(PPUThread& ppu, vm::ptr> once_ctrl, vm::ptr init) { - sysPrxForUser.Warning("sys_ppu_thread_once(once_ctrl=*0x%x, init=*0x%x)", once_ctrl, init); + sysPrxForUser.warning("sys_ppu_thread_once(once_ctrl=*0x%x, init=*0x%x)", once_ctrl, init); std::lock_guard lock(g_once_mutex); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_prx_.cpp b/rpcs3/Emu/SysCalls/Modules/sys_prx_.cpp index 28b0ea046e..0ad64dc4ad 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_prx_.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_prx_.cpp @@ -10,7 +10,7 @@ extern Module<> sysPrxForUser; s64 sys_prx_exitspawn_with_level() { - sysPrxForUser.Log("sys_prx_exitspawn_with_level()"); + sysPrxForUser.trace("sys_prx_exitspawn_with_level()"); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/sys_spinlock.cpp b/rpcs3/Emu/SysCalls/Modules/sys_spinlock.cpp index e1744e31bb..50bc095695 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_spinlock.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_spinlock.cpp @@ -9,14 +9,14 @@ extern Module<> sysPrxForUser; void sys_spinlock_initialize(vm::ptr> lock) { - sysPrxForUser.Log("sys_spinlock_initialize(lock=*0x%x)", lock); + sysPrxForUser.trace("sys_spinlock_initialize(lock=*0x%x)", lock); lock->exchange(0); } void sys_spinlock_lock(PPUThread& ppu, vm::ptr> lock) { - sysPrxForUser.Log("sys_spinlock_lock(lock=*0x%x)", lock); + sysPrxForUser.trace("sys_spinlock_lock(lock=*0x%x)", lock); // prx: exchange with 0xabadcafe, repeat until exchanged with 0 vm::wait_op(ppu, lock.addr(), 4, WRAP_EXPR(!lock->exchange(0xabadcafe))); @@ -24,7 +24,7 @@ void sys_spinlock_lock(PPUThread& ppu, vm::ptr> lock) s32 sys_spinlock_trylock(vm::ptr> lock) { - sysPrxForUser.Log("sys_spinlock_trylock(lock=*0x%x)", lock); + sysPrxForUser.trace("sys_spinlock_trylock(lock=*0x%x)", lock); if (lock->exchange(0xabadcafe)) { @@ -36,7 +36,7 @@ s32 sys_spinlock_trylock(vm::ptr> lock) void sys_spinlock_unlock(vm::ptr> lock) { - sysPrxForUser.Log("sys_spinlock_unlock(lock=*0x%x)", lock); + sysPrxForUser.trace("sys_spinlock_unlock(lock=*0x%x)", lock); lock->exchange(0); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_spu_.cpp b/rpcs3/Emu/SysCalls/Modules/sys_spu_.cpp index d8e6b2abf5..4d859a9739 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_spu_.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_spu_.cpp @@ -20,39 +20,39 @@ spu_printf_cb_t g_spu_printf_dtcb; s32 sys_spu_elf_get_information(u32 elf_img, vm::ptr entry, vm::ptr nseg) { - sysPrxForUser.Todo("sys_spu_elf_get_information(elf_img=0x%x, entry=*0x%x, nseg=*0x%x)", elf_img, entry, nseg); + sysPrxForUser.todo("sys_spu_elf_get_information(elf_img=0x%x, entry=*0x%x, nseg=*0x%x)", elf_img, entry, nseg); return CELL_OK; } s32 sys_spu_elf_get_segments(u32 elf_img, vm::ptr segments, s32 nseg) { - sysPrxForUser.Todo("sys_spu_elf_get_segments(elf_img=0x%x, segments=*0x%x, nseg=0x%x)", elf_img, segments, nseg); + sysPrxForUser.todo("sys_spu_elf_get_segments(elf_img=0x%x, segments=*0x%x, nseg=0x%x)", elf_img, segments, nseg); return CELL_OK; } s32 sys_spu_image_import(vm::ptr img, u32 src, u32 type) { - sysPrxForUser.Warning("sys_spu_image_import(img=*0x%x, src=0x%x, type=%d)", img, src, type); + sysPrxForUser.warning("sys_spu_image_import(img=*0x%x, src=0x%x, type=%d)", img, src, type); return spu_image_import(*img, src, type); } s32 sys_spu_image_close(vm::ptr img) { - sysPrxForUser.Todo("sys_spu_image_close(img=*0x%x)", img); + sysPrxForUser.todo("sys_spu_image_close(img=*0x%x)", img); return CELL_OK; } s32 sys_raw_spu_load(s32 id, vm::cptr path, vm::ptr entry) { - sysPrxForUser.Warning("sys_raw_spu_load(id=%d, path=*0x%x, entry=*0x%x)", id, path, entry); - sysPrxForUser.Warning("*** path = '%s'", path.get_ptr()); + sysPrxForUser.warning("sys_raw_spu_load(id=%d, path=*0x%x, entry=*0x%x)", id, path, entry); + sysPrxForUser.warning("*** path = '%s'", path.get_ptr()); vfsFile f(path.get_ptr()); if (!f.IsOpened()) { - sysPrxForUser.Error("sys_raw_spu_load error: '%s' not found!", path.get_ptr()); + sysPrxForUser.error("sys_raw_spu_load error: '%s' not found!", path.get_ptr()); return CELL_ENOENT; } @@ -61,7 +61,7 @@ s32 sys_raw_spu_load(s32 id, vm::cptr path, vm::ptr entry) if (hdr.CheckMagic()) { - sysPrxForUser.Error("sys_raw_spu_load error: '%s' is encrypted! Decrypt SELF and try again.", path.get_ptr()); + sysPrxForUser.error("sys_raw_spu_load error: '%s' is encrypted! Decrypt SELF and try again.", path.get_ptr()); Emu.Pause(); return CELL_ENOENT; } @@ -78,7 +78,7 @@ s32 sys_raw_spu_load(s32 id, vm::cptr path, vm::ptr entry) s32 sys_raw_spu_image_load(PPUThread& ppu, s32 id, vm::ptr img) { - sysPrxForUser.Warning("sys_raw_spu_image_load(id=%d, img=*0x%x)", id, img); + sysPrxForUser.warning("sys_raw_spu_image_load(id=%d, img=*0x%x)", id, img); // TODO: use segment info @@ -92,15 +92,15 @@ s32 sys_raw_spu_image_load(PPUThread& ppu, s32 id, vm::ptr img) const auto stamp2 = get_system_time(); - sysPrxForUser.Error("memcpy() latency: %lldus", (stamp1 - stamp0)); - sysPrxForUser.Error("MMIO latency: %lldus", (stamp2 - stamp1)); + sysPrxForUser.error("memcpy() latency: %lldus", (stamp1 - stamp0)); + sysPrxForUser.error("MMIO latency: %lldus", (stamp2 - stamp1)); return CELL_OK; } s32 _sys_spu_printf_initialize(spu_printf_cb_t agcb, spu_printf_cb_t dgcb, spu_printf_cb_t atcb, spu_printf_cb_t dtcb) { - sysPrxForUser.Warning("_sys_spu_printf_initialize(agcb=*0x%x, dgcb=*0x%x, atcb=*0x%x, dtcb=*0x%x)", agcb, dgcb, atcb, dtcb); + sysPrxForUser.warning("_sys_spu_printf_initialize(agcb=*0x%x, dgcb=*0x%x, atcb=*0x%x, dtcb=*0x%x)", agcb, dgcb, atcb, dtcb); // register callbacks g_spu_printf_agcb = agcb; @@ -113,7 +113,7 @@ s32 _sys_spu_printf_initialize(spu_printf_cb_t agcb, spu_printf_cb_t dgcb, spu_p s32 _sys_spu_printf_finalize() { - sysPrxForUser.Warning("_sys_spu_printf_finalize()"); + sysPrxForUser.warning("_sys_spu_printf_finalize()"); g_spu_printf_agcb = vm::null; g_spu_printf_dgcb = vm::null; @@ -125,7 +125,7 @@ s32 _sys_spu_printf_finalize() s32 _sys_spu_printf_attach_group(PPUThread& ppu, u32 group) { - sysPrxForUser.Warning("_sys_spu_printf_attach_group(group=0x%x)", group); + sysPrxForUser.warning("_sys_spu_printf_attach_group(group=0x%x)", group); if (!g_spu_printf_agcb) { @@ -137,7 +137,7 @@ s32 _sys_spu_printf_attach_group(PPUThread& ppu, u32 group) s32 _sys_spu_printf_detach_group(PPUThread& ppu, u32 group) { - sysPrxForUser.Warning("_sys_spu_printf_detach_group(group=0x%x)", group); + sysPrxForUser.warning("_sys_spu_printf_detach_group(group=0x%x)", group); if (!g_spu_printf_dgcb) { @@ -149,7 +149,7 @@ s32 _sys_spu_printf_detach_group(PPUThread& ppu, u32 group) s32 _sys_spu_printf_attach_thread(PPUThread& ppu, u32 thread) { - sysPrxForUser.Warning("_sys_spu_printf_attach_thread(thread=0x%x)", thread); + sysPrxForUser.warning("_sys_spu_printf_attach_thread(thread=0x%x)", thread); if (!g_spu_printf_atcb) { @@ -161,7 +161,7 @@ s32 _sys_spu_printf_attach_thread(PPUThread& ppu, u32 thread) s32 _sys_spu_printf_detach_thread(PPUThread& ppu, u32 thread) { - sysPrxForUser.Warning("_sys_spu_printf_detach_thread(thread=0x%x)", thread); + sysPrxForUser.warning("_sys_spu_printf_detach_thread(thread=0x%x)", thread); if (!g_spu_printf_dtcb) { diff --git a/rpcs3/Emu/SysCalls/SysCalls.cpp b/rpcs3/Emu/SysCalls/SysCalls.cpp index 62cb2fea3f..bb3ebdde99 100644 --- a/rpcs3/Emu/SysCalls/SysCalls.cpp +++ b/rpcs3/Emu/SysCalls/SysCalls.cpp @@ -36,7 +36,7 @@ void null_func(PPUThread& ppu) { const u64 code = ppu.GPR[11]; - LOG_ERROR(HLE, "Unimplemented syscall %lld: %s -> CELL_OK", code, get_ps3_function_name(~code)); + LOG_TODO(HLE, "Unimplemented syscall %lld: %s -> CELL_OK", code, get_ps3_function_name(~code)); ppu.GPR[3] = 0; } @@ -900,17 +900,11 @@ void execute_syscall_by_index(PPUThread& ppu, u64 code) auto last_code = ppu.hle_code; ppu.hle_code = ~code; - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(PPU, "Syscall %lld called: %s", code, get_ps3_function_name(~code)); - } + LOG_TRACE(PPU, "Syscall %lld called: %s", code, get_ps3_function_name(~code)); g_sc_table[code](ppu); - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(PPU, "Syscall %lld finished: %s -> 0x%llx", code, get_ps3_function_name(~code), ppu.GPR[3]); - } + LOG_TRACE(PPU, "Syscall %lld finished: %s -> 0x%llx", code, get_ps3_function_name(~code), ppu.GPR[3]); ppu.hle_code = last_code; } diff --git a/rpcs3/Emu/SysCalls/SysCalls.h b/rpcs3/Emu/SysCalls/SysCalls.h index 95138cfbfa..2415401100 100644 --- a/rpcs3/Emu/SysCalls/SysCalls.h +++ b/rpcs3/Emu/SysCalls/SysCalls.h @@ -1,23 +1,13 @@ #pragma once #include "ErrorCodes.h" -#include "LogBase.h" -class SysCallBase : public LogBase +struct SysCallBase : public _log::channel { -private: - std::string m_module_name; - -public: SysCallBase(const std::string& name) - : m_module_name(name) + : _log::channel(name, _log::level::notice) { } - - virtual const std::string& GetName() const override - { - return m_module_name; - } }; void execute_syscall_by_index(class PPUThread& ppu, u64 code); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp b/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp index e1f08b89a2..ceda3643e2 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp @@ -35,7 +35,7 @@ void lv2_cond_t::notify(lv2_lock_t& lv2_lock, sleep_queue_t::value_type& thread) s32 sys_cond_create(vm::ptr cond_id, u32 mutex_id, vm::ptr attr) { - sys_cond.Warning("sys_cond_create(cond_id=*0x%x, mutex_id=0x%x, attr=*0x%x)", cond_id, mutex_id, attr); + sys_cond.warning("sys_cond_create(cond_id=*0x%x, mutex_id=0x%x, attr=*0x%x)", cond_id, mutex_id, attr); LV2_LOCK; @@ -48,7 +48,7 @@ s32 sys_cond_create(vm::ptr cond_id, u32 mutex_id, vm::ptrpshared != SYS_SYNC_NOT_PROCESS_SHARED || attr->ipc_key || attr->flags) { - sys_cond.Error("sys_cond_create(): unknown attributes (pshared=0x%x, ipc_key=0x%llx, flags=0x%x)", attr->pshared, attr->ipc_key, attr->flags); + sys_cond.error("sys_cond_create(): unknown attributes (pshared=0x%x, ipc_key=0x%llx, flags=0x%x)", attr->pshared, attr->ipc_key, attr->flags); return CELL_EINVAL; } @@ -64,7 +64,7 @@ s32 sys_cond_create(vm::ptr cond_id, u32 mutex_id, vm::ptr equeue_id, vm::ptr attr, u64 event_queue_key, s32 size) { - sys_event.Warning("sys_event_queue_create(equeue_id=*0x%x, attr=*0x%x, event_queue_key=0x%llx, size=%d)", equeue_id, attr, event_queue_key, size); + sys_event.warning("sys_event_queue_create(equeue_id=*0x%x, attr=*0x%x, event_queue_key=0x%llx, size=%d)", equeue_id, attr, event_queue_key, size); if (size <= 0 || size > 127) { @@ -86,7 +86,7 @@ s32 sys_event_queue_create(vm::ptr equeue_id, vm::ptr equeue_id, vm::ptr equeue_id, vm::ptr event_array, s32 size, vm::ptr number) { - sys_event.Log("sys_event_queue_tryreceive(equeue_id=0x%x, event_array=*0x%x, size=%d, number=*0x%x)", equeue_id, event_array, size, number); + sys_event.trace("sys_event_queue_tryreceive(equeue_id=0x%x, event_array=*0x%x, size=%d, number=*0x%x)", equeue_id, event_array, size, number); LV2_LOCK; @@ -200,7 +200,7 @@ s32 sys_event_queue_tryreceive(u32 equeue_id, vm::ptr event_array, s32 sys_event_queue_receive(PPUThread& ppu, u32 equeue_id, vm::ptr dummy_event, u64 timeout) { - sys_event.Log("sys_event_queue_receive(equeue_id=0x%x, *0x%x, timeout=0x%llx)", equeue_id, dummy_event, timeout); + sys_event.trace("sys_event_queue_receive(equeue_id=0x%x, *0x%x, timeout=0x%llx)", equeue_id, dummy_event, timeout); const u64 start_time = get_system_time(); @@ -271,7 +271,7 @@ s32 sys_event_queue_receive(PPUThread& ppu, u32 equeue_id, vm::ptr s32 sys_event_queue_drain(u32 equeue_id) { - sys_event.Log("sys_event_queue_drain(equeue_id=0x%x)", equeue_id); + sys_event.trace("sys_event_queue_drain(equeue_id=0x%x)", equeue_id); LV2_LOCK; @@ -289,11 +289,11 @@ s32 sys_event_queue_drain(u32 equeue_id) s32 sys_event_port_create(vm::ptr eport_id, s32 port_type, u64 name) { - sys_event.Warning("sys_event_port_create(eport_id=*0x%x, port_type=%d, name=0x%llx)", eport_id, port_type, name); + sys_event.warning("sys_event_port_create(eport_id=*0x%x, port_type=%d, name=0x%llx)", eport_id, port_type, name); if (port_type != SYS_EVENT_PORT_LOCAL) { - sys_event.Error("sys_event_port_create(): unknown port type (%d)", port_type); + sys_event.error("sys_event_port_create(): unknown port type (%d)", port_type); return CELL_EINVAL; } @@ -304,7 +304,7 @@ s32 sys_event_port_create(vm::ptr eport_id, s32 port_type, u64 name) s32 sys_event_port_destroy(u32 eport_id) { - sys_event.Warning("sys_event_port_destroy(eport_id=0x%x)", eport_id); + sys_event.warning("sys_event_port_destroy(eport_id=0x%x)", eport_id); LV2_LOCK; @@ -327,7 +327,7 @@ s32 sys_event_port_destroy(u32 eport_id) s32 sys_event_port_connect_local(u32 eport_id, u32 equeue_id) { - sys_event.Warning("sys_event_port_connect_local(eport_id=0x%x, equeue_id=0x%x)", eport_id, equeue_id); + sys_event.warning("sys_event_port_connect_local(eport_id=0x%x, equeue_id=0x%x)", eport_id, equeue_id); LV2_LOCK; @@ -356,7 +356,7 @@ s32 sys_event_port_connect_local(u32 eport_id, u32 equeue_id) s32 sys_event_port_disconnect(u32 eport_id) { - sys_event.Warning("sys_event_port_disconnect(eport_id=0x%x)", eport_id); + sys_event.warning("sys_event_port_disconnect(eport_id=0x%x)", eport_id); LV2_LOCK; @@ -383,7 +383,7 @@ s32 sys_event_port_disconnect(u32 eport_id) s32 sys_event_port_send(u32 eport_id, u64 data1, u64 data2, u64 data3) { - sys_event.Log("sys_event_port_send(eport_id=0x%x, data1=0x%llx, data2=0x%llx, data3=0x%llx)", eport_id, data1, data2, data3); + sys_event.trace("sys_event_port_send(eport_id=0x%x, data1=0x%llx, data2=0x%llx, data3=0x%llx)", eport_id, data1, data2, data3); LV2_LOCK; diff --git a/rpcs3/Emu/SysCalls/lv2/sys_event_flag.cpp b/rpcs3/Emu/SysCalls/lv2/sys_event_flag.cpp index a788aacc3b..da3b58edc2 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_event_flag.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_event_flag.cpp @@ -47,7 +47,7 @@ void lv2_event_flag_t::notify_all(lv2_lock_t& lv2_lock) s32 sys_event_flag_create(vm::ptr id, vm::ptr attr, u64 init) { - sys_event_flag.Warning("sys_event_flag_create(id=*0x%x, attr=*0x%x, init=0x%llx)", id, attr, init); + sys_event_flag.warning("sys_event_flag_create(id=*0x%x, attr=*0x%x, init=0x%llx)", id, attr, init); if (!id || !attr) { @@ -58,13 +58,13 @@ s32 sys_event_flag_create(vm::ptr id, vm::ptr a if (protocol != SYS_SYNC_FIFO && protocol != SYS_SYNC_RETRY && protocol != SYS_SYNC_PRIORITY && protocol != SYS_SYNC_PRIORITY_INHERIT) { - sys_event_flag.Error("sys_event_flag_create(): unknown protocol (0x%x)", protocol); + sys_event_flag.error("sys_event_flag_create(): unknown protocol (0x%x)", protocol); return CELL_EINVAL; } if (attr->pshared != SYS_SYNC_NOT_PROCESS_SHARED || attr->ipc_key || attr->flags) { - sys_event_flag.Error("sys_event_flag_create(): unknown attributes (pshared=0x%x, ipc_key=0x%llx, flags=0x%x)", attr->pshared, attr->ipc_key, attr->flags); + sys_event_flag.error("sys_event_flag_create(): unknown attributes (pshared=0x%x, ipc_key=0x%llx, flags=0x%x)", attr->pshared, attr->ipc_key, attr->flags); return CELL_EINVAL; } @@ -72,7 +72,7 @@ s32 sys_event_flag_create(vm::ptr id, vm::ptr a if (type != SYS_SYNC_WAITER_SINGLE && type != SYS_SYNC_WAITER_MULTIPLE) { - sys_event_flag.Error("sys_event_flag_create(): unknown type (0x%x)", type); + sys_event_flag.error("sys_event_flag_create(): unknown type (0x%x)", type); return CELL_EINVAL; } @@ -83,7 +83,7 @@ s32 sys_event_flag_create(vm::ptr id, vm::ptr a s32 sys_event_flag_destroy(u32 id) { - sys_event_flag.Warning("sys_event_flag_destroy(id=0x%x)", id); + sys_event_flag.warning("sys_event_flag_destroy(id=0x%x)", id); LV2_LOCK; @@ -106,7 +106,7 @@ s32 sys_event_flag_destroy(u32 id) s32 sys_event_flag_wait(PPUThread& ppu, u32 id, u64 bitptn, u32 mode, vm::ptr result, u64 timeout) { - sys_event_flag.Log("sys_event_flag_wait(id=0x%x, bitptn=0x%llx, mode=0x%x, result=*0x%x, timeout=0x%llx)", id, bitptn, mode, result, timeout); + sys_event_flag.trace("sys_event_flag_wait(id=0x%x, bitptn=0x%llx, mode=0x%x, result=*0x%x, timeout=0x%llx)", id, bitptn, mode, result, timeout); const u64 start_time = get_system_time(); @@ -121,7 +121,7 @@ s32 sys_event_flag_wait(PPUThread& ppu, u32 id, u64 bitptn, u32 mode, vm::ptr result) { - sys_event_flag.Log("sys_event_flag_trywait(id=0x%x, bitptn=0x%llx, mode=0x%x, result=*0x%x)", id, bitptn, mode, result); + sys_event_flag.trace("sys_event_flag_trywait(id=0x%x, bitptn=0x%llx, mode=0x%x, result=*0x%x)", id, bitptn, mode, result); LV2_LOCK; @@ -197,7 +197,7 @@ s32 sys_event_flag_trywait(u32 id, u64 bitptn, u32 mode, vm::ptr result) if (!lv2_event_flag_t::check_mode(mode)) { - sys_event_flag.Error("sys_event_flag_trywait(): unknown mode (0x%x)", mode); + sys_event_flag.error("sys_event_flag_trywait(): unknown mode (0x%x)", mode); return CELL_EINVAL; } @@ -222,7 +222,7 @@ s32 sys_event_flag_trywait(u32 id, u64 bitptn, u32 mode, vm::ptr result) s32 sys_event_flag_set(u32 id, u64 bitptn) { - sys_event_flag.Log("sys_event_flag_set(id=0x%x, bitptn=0x%llx)", id, bitptn); + sys_event_flag.trace("sys_event_flag_set(id=0x%x, bitptn=0x%llx)", id, bitptn); LV2_LOCK; @@ -243,7 +243,7 @@ s32 sys_event_flag_set(u32 id, u64 bitptn) s32 sys_event_flag_clear(u32 id, u64 bitptn) { - sys_event_flag.Log("sys_event_flag_clear(id=0x%x, bitptn=0x%llx)", id, bitptn); + sys_event_flag.trace("sys_event_flag_clear(id=0x%x, bitptn=0x%llx)", id, bitptn); LV2_LOCK; @@ -261,7 +261,7 @@ s32 sys_event_flag_clear(u32 id, u64 bitptn) s32 sys_event_flag_cancel(u32 id, vm::ptr num) { - sys_event_flag.Log("sys_event_flag_cancel(id=0x%x, num=*0x%x)", id, num); + sys_event_flag.trace("sys_event_flag_cancel(id=0x%x, num=*0x%x)", id, num); LV2_LOCK; @@ -308,7 +308,7 @@ s32 sys_event_flag_cancel(u32 id, vm::ptr num) s32 sys_event_flag_get(u32 id, vm::ptr flags) { - sys_event_flag.Log("sys_event_flag_get(id=0x%x, flags=*0x%x)", id, flags); + sys_event_flag.trace("sys_event_flag_get(id=0x%x, flags=*0x%x)", id, flags); LV2_LOCK; diff --git a/rpcs3/Emu/SysCalls/lv2/sys_fs.cpp b/rpcs3/Emu/SysCalls/lv2/sys_fs.cpp index 2576ebdf25..9b2fef1ae0 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_fs.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_fs.cpp @@ -15,19 +15,19 @@ SysCallBase sys_fs("sys_fs"); s32 sys_fs_test(u32 arg1, u32 arg2, vm::ptr arg3, u32 arg4, vm::ptr arg5, u32 arg6) { - sys_fs.Todo("sys_fs_test(arg1=0x%x, arg2=0x%x, arg3=*0x%x, arg4=0x%x, arg5=*0x%x, arg6=0x%x) -> CELL_OK", arg1, arg2, arg3, arg4, arg5, arg6); + sys_fs.todo("sys_fs_test(arg1=0x%x, arg2=0x%x, arg3=*0x%x, arg4=0x%x, arg5=*0x%x, arg6=0x%x) -> CELL_OK", arg1, arg2, arg3, arg4, arg5, arg6); return CELL_OK; } s32 sys_fs_open(vm::cptr path, s32 flags, vm::ptr fd, s32 mode, vm::cptr arg, u64 size) { - sys_fs.Warning("sys_fs_open(path=*0x%x, flags=%#o, fd=*0x%x, mode=%#o, arg=*0x%x, size=0x%llx)", path, flags, fd, mode, arg, size); - sys_fs.Warning("*** path = '%s'", path.get_ptr()); + sys_fs.warning("sys_fs_open(path=*0x%x, flags=%#o, fd=*0x%x, mode=%#o, arg=*0x%x, size=0x%llx)", path, flags, fd, mode, arg, size); + sys_fs.warning("*** path = '%s'", path.get_ptr()); if (!path[0]) { - sys_fs.Error("sys_fs_open('%s') failed: path is invalid", path.get_ptr()); + sys_fs.error("sys_fs_open('%s') failed: path is invalid", path.get_ptr()); return CELL_FS_EINVAL; } @@ -37,7 +37,7 @@ s32 sys_fs_open(vm::cptr path, s32 flags, vm::ptr fd, s32 mode, vm::c if (!device) { - sys_fs.Error("sys_fs_open('%s') failed: device not mounted", path.get_ptr()); + sys_fs.error("sys_fs_open('%s') failed: device not mounted", path.get_ptr()); return CELL_FS_ENOTMOUNTED; } @@ -45,7 +45,7 @@ s32 sys_fs_open(vm::cptr path, s32 flags, vm::ptr fd, s32 mode, vm::c if (fs::is_dir(local_path)) { - sys_fs.Error("sys_fs_open('%s') failed: path is a directory", path.get_ptr()); + sys_fs.error("sys_fs_open('%s') failed: path is a directory", path.get_ptr()); return CELL_FS_EISDIR; } @@ -104,7 +104,7 @@ s32 sys_fs_open(vm::cptr path, s32 flags, vm::ptr fd, s32 mode, vm::c if (!file || !file->IsOpened()) { - sys_fs.Error("sys_fs_open('%s'): failed to open file (flags=%#o, mode=%#o)", path.get_ptr(), flags, mode); + sys_fs.error("sys_fs_open('%s'): failed to open file (flags=%#o, mode=%#o)", path.get_ptr(), flags, mode); if (open_mode & fom::excl) { @@ -129,7 +129,7 @@ s32 sys_fs_open(vm::cptr path, s32 flags, vm::ptr fd, s32 mode, vm::c s32 sys_fs_read(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nread) { - sys_fs.Log("sys_fs_read(fd=%d, buf=0x%x, nbytes=0x%llx, nread=0x%x)", fd, buf, nbytes, nread); + sys_fs.trace("sys_fs_read(fd=%d, buf=0x%x, nbytes=0x%llx, nread=0x%x)", fd, buf, nbytes, nread); const auto file = idm::get(fd); @@ -147,7 +147,7 @@ s32 sys_fs_read(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nread) s32 sys_fs_write(u32 fd, vm::cptr buf, u64 nbytes, vm::ptr nwrite) { - sys_fs.Log("sys_fs_write(fd=%d, buf=*0x%x, nbytes=0x%llx, nwrite=*0x%x)", fd, buf, nbytes, nwrite); + sys_fs.trace("sys_fs_write(fd=%d, buf=*0x%x, nbytes=0x%llx, nwrite=*0x%x)", fd, buf, nbytes, nwrite); const auto file = idm::get(fd); @@ -167,7 +167,7 @@ s32 sys_fs_write(u32 fd, vm::cptr buf, u64 nbytes, vm::ptr nwrite) s32 sys_fs_close(u32 fd) { - sys_fs.Log("sys_fs_close(fd=%d)", fd); + sys_fs.trace("sys_fs_close(fd=%d)", fd); const auto file = idm::get(fd); @@ -185,14 +185,14 @@ s32 sys_fs_close(u32 fd) s32 sys_fs_opendir(vm::cptr path, vm::ptr fd) { - sys_fs.Warning("sys_fs_opendir(path=*0x%x, fd=*0x%x)", path, fd); - sys_fs.Warning("*** path = '%s'", path.get_ptr()); + sys_fs.warning("sys_fs_opendir(path=*0x%x, fd=*0x%x)", path, fd); + sys_fs.warning("*** path = '%s'", path.get_ptr()); std::shared_ptr dir(Emu.GetVFS().OpenDir(path.get_ptr())); if (!dir || !dir->IsOpened()) { - sys_fs.Error("sys_fs_opendir('%s'): failed to open directory", path.get_ptr()); + sys_fs.error("sys_fs_opendir('%s'): failed to open directory", path.get_ptr()); return CELL_FS_ENOENT; } @@ -211,7 +211,7 @@ s32 sys_fs_opendir(vm::cptr path, vm::ptr fd) s32 sys_fs_readdir(u32 fd, vm::ptr dir, vm::ptr nread) { - sys_fs.Warning("sys_fs_readdir(fd=%d, dir=*0x%x, nread=*0x%x)", fd, dir, nread); + sys_fs.warning("sys_fs_readdir(fd=%d, dir=*0x%x, nread=*0x%x)", fd, dir, nread); const auto directory = idm::get(fd); @@ -239,7 +239,7 @@ s32 sys_fs_readdir(u32 fd, vm::ptr dir, vm::ptr nread) s32 sys_fs_closedir(u32 fd) { - sys_fs.Log("sys_fs_closedir(fd=%d)", fd); + sys_fs.trace("sys_fs_closedir(fd=%d)", fd); const auto directory = idm::get(fd); @@ -255,14 +255,14 @@ s32 sys_fs_closedir(u32 fd) s32 sys_fs_stat(vm::cptr path, vm::ptr sb) { - sys_fs.Warning("sys_fs_stat(path=*0x%x, sb=*0x%x)", path, sb); - sys_fs.Warning("*** path = '%s'", path.get_ptr()); + sys_fs.warning("sys_fs_stat(path=*0x%x, sb=*0x%x)", path, sb); + sys_fs.warning("*** path = '%s'", path.get_ptr()); std::string local_path; if (!Emu.GetVFS().GetDevice(path.get_ptr(), local_path)) { - sys_fs.Warning("sys_fs_stat('%s') failed: not mounted", path.get_ptr()); + sys_fs.warning("sys_fs_stat('%s') failed: not mounted", path.get_ptr()); return CELL_FS_ENOTMOUNTED; } @@ -270,7 +270,7 @@ s32 sys_fs_stat(vm::cptr path, vm::ptr sb) if (!fs::stat(local_path, info)) { - sys_fs.Error("sys_fs_stat('%s') failed: not found", path.get_ptr()); + sys_fs.error("sys_fs_stat('%s') failed: not found", path.get_ptr()); return CELL_FS_ENOENT; } @@ -288,7 +288,7 @@ s32 sys_fs_stat(vm::cptr path, vm::ptr sb) s32 sys_fs_fstat(u32 fd, vm::ptr sb) { - sys_fs.Warning("sys_fs_fstat(fd=%d, sb=*0x%x)", fd, sb); + sys_fs.warning("sys_fs_fstat(fd=%d, sb=*0x%x)", fd, sb); const auto file = idm::get(fd); @@ -303,7 +303,7 @@ s32 sys_fs_fstat(u32 fd, vm::ptr sb) if (!local_file) { - sys_fs.Error("sys_fs_fstat(fd=0x%x): not a local file"); + sys_fs.error("sys_fs_fstat(fd=0x%x): not a local file"); return CELL_FS_ENOTSUP; } @@ -328,8 +328,8 @@ s32 sys_fs_fstat(u32 fd, vm::ptr sb) s32 sys_fs_mkdir(vm::cptr path, s32 mode) { - sys_fs.Warning("sys_fs_mkdir(path=*0x%x, mode=%#o)", path, mode); - sys_fs.Warning("*** path = '%s'", path.get_ptr()); + sys_fs.warning("sys_fs_mkdir(path=*0x%x, mode=%#o)", path, mode); + sys_fs.warning("*** path = '%s'", path.get_ptr()); std::string ps3_path = path.get_ptr(); @@ -343,29 +343,29 @@ s32 sys_fs_mkdir(vm::cptr path, s32 mode) return CELL_FS_EIO; // ??? } - sys_fs.Notice("sys_fs_mkdir(): directory '%s' created", path.get_ptr()); + sys_fs.notice("sys_fs_mkdir(): directory '%s' created", path.get_ptr()); return CELL_OK; } s32 sys_fs_rename(vm::cptr from, vm::cptr to) { - sys_fs.Warning("sys_fs_rename(from=*0x%x, to=*0x%x)", from, to); - sys_fs.Warning("*** from = '%s'", from.get_ptr()); - sys_fs.Warning("*** to = '%s'", to.get_ptr()); + sys_fs.warning("sys_fs_rename(from=*0x%x, to=*0x%x)", from, to); + sys_fs.warning("*** from = '%s'", from.get_ptr()); + sys_fs.warning("*** to = '%s'", to.get_ptr()); if (!Emu.GetVFS().Rename(from.get_ptr(), to.get_ptr())) { return CELL_FS_ENOENT; // ??? } - sys_fs.Notice("sys_fs_rename(): '%s' renamed to '%s'", from.get_ptr(), to.get_ptr()); + sys_fs.notice("sys_fs_rename(): '%s' renamed to '%s'", from.get_ptr(), to.get_ptr()); return CELL_OK; } s32 sys_fs_rmdir(vm::cptr path) { - sys_fs.Warning("sys_fs_rmdir(path=*0x%x)", path); - sys_fs.Warning("*** path = '%s'", path.get_ptr()); + sys_fs.warning("sys_fs_rmdir(path=*0x%x)", path); + sys_fs.warning("*** path = '%s'", path.get_ptr()); std::string ps3_path = path.get_ptr(); @@ -379,14 +379,14 @@ s32 sys_fs_rmdir(vm::cptr path) return CELL_FS_EIO; // ??? } - sys_fs.Notice("sys_fs_rmdir(): directory '%s' removed", path.get_ptr()); + sys_fs.notice("sys_fs_rmdir(): directory '%s' removed", path.get_ptr()); return CELL_OK; } s32 sys_fs_unlink(vm::cptr path) { - sys_fs.Warning("sys_fs_unlink(path=*0x%x)", path); - sys_fs.Warning("*** path = '%s'", path.get_ptr()); + sys_fs.warning("sys_fs_unlink(path=*0x%x)", path); + sys_fs.warning("*** path = '%s'", path.get_ptr()); std::string ps3_path = path.get_ptr(); @@ -400,24 +400,24 @@ s32 sys_fs_unlink(vm::cptr path) return CELL_FS_EIO; // ??? } - sys_fs.Notice("sys_fs_unlink(): file '%s' deleted", path.get_ptr()); + sys_fs.notice("sys_fs_unlink(): file '%s' deleted", path.get_ptr()); return CELL_OK; } s32 sys_fs_fcntl(u32 fd, s32 flags, u32 addr, u32 arg4, u32 arg5, u32 arg6) { - sys_fs.Todo("sys_fs_fcntl(fd=0x%x, flags=0x%x, addr=*0x%x, arg4=0x%x, arg5=0x%x, arg6=0x%x) -> CELL_OK", fd, flags, addr, arg4, arg5, arg6); + sys_fs.todo("sys_fs_fcntl(fd=0x%x, flags=0x%x, addr=*0x%x, arg4=0x%x, arg5=0x%x, arg6=0x%x) -> CELL_OK", fd, flags, addr, arg4, arg5, arg6); return CELL_OK; } s32 sys_fs_lseek(u32 fd, s64 offset, s32 whence, vm::ptr pos) { - sys_fs.Log("sys_fs_lseek(fd=%d, offset=0x%llx, whence=0x%x, pos=*0x%x)", fd, offset, whence, pos); + sys_fs.trace("sys_fs_lseek(fd=%d, offset=0x%llx, whence=0x%x, pos=*0x%x)", fd, offset, whence, pos); if (whence >= 3) { - sys_fs.Error("sys_fs_lseek(): unknown seek whence (%d)", whence); + sys_fs.error("sys_fs_lseek(): unknown seek whence (%d)", whence); return CELL_FS_EINVAL; } @@ -437,7 +437,7 @@ s32 sys_fs_lseek(u32 fd, s64 offset, s32 whence, vm::ptr pos) s32 sys_fs_fget_block_size(u32 fd, vm::ptr sector_size, vm::ptr block_size, vm::ptr arg4, vm::ptr arg5) { - sys_fs.Todo("sys_fs_fget_block_size(fd=%d, sector_size=*0x%x, block_size=*0x%x, arg4=*0x%x, arg5=*0x%x)", fd, sector_size, block_size, arg4, arg5); + sys_fs.todo("sys_fs_fget_block_size(fd=%d, sector_size=*0x%x, block_size=*0x%x, arg4=*0x%x, arg5=*0x%x)", fd, sector_size, block_size, arg4, arg5); const auto file = idm::get(fd); @@ -454,8 +454,8 @@ s32 sys_fs_fget_block_size(u32 fd, vm::ptr sector_size, vm::ptr block_ s32 sys_fs_get_block_size(vm::cptr path, vm::ptr sector_size, vm::ptr block_size, vm::ptr arg4) { - sys_fs.Todo("sys_fs_get_block_size(path=*0x%x, sector_size=*0x%x, block_size=*0x%x, arg4=*0x%x, arg5=*0x%x)", path, sector_size, block_size, arg4); - sys_fs.Todo("*** path = '%s'", path.get_ptr()); + sys_fs.todo("sys_fs_get_block_size(path=*0x%x, sector_size=*0x%x, block_size=*0x%x, arg4=*0x%x, arg5=*0x%x)", path, sector_size, block_size, arg4); + sys_fs.todo("*** path = '%s'", path.get_ptr()); *sector_size = 4096; // ? *block_size = 4096; // ? @@ -465,8 +465,8 @@ s32 sys_fs_get_block_size(vm::cptr path, vm::ptr sector_size, vm::ptr s32 sys_fs_truncate(vm::cptr path, u64 size) { - sys_fs.Warning("sys_fs_truncate(path=*0x%x, size=0x%llx)", path, size); - sys_fs.Warning("*** path = '%s'", path.get_ptr()); + sys_fs.warning("sys_fs_truncate(path=*0x%x, size=0x%llx)", path, size); + sys_fs.warning("*** path = '%s'", path.get_ptr()); std::string ps3_path = path.get_ptr(); @@ -485,7 +485,7 @@ s32 sys_fs_truncate(vm::cptr path, u64 size) s32 sys_fs_ftruncate(u32 fd, u64 size) { - sys_fs.Warning("sys_fs_ftruncate(fd=%d, size=0x%llx)", fd, size); + sys_fs.warning("sys_fs_ftruncate(fd=%d, size=0x%llx)", fd, size); const auto file = idm::get(fd); @@ -500,7 +500,7 @@ s32 sys_fs_ftruncate(u32 fd, u64 size) if (!local_file) { - sys_fs.Error("sys_fs_ftruncate(fd=0x%x): not a local file"); + sys_fs.error("sys_fs_ftruncate(fd=0x%x): not a local file"); return CELL_FS_ENOTSUP; } @@ -514,8 +514,8 @@ s32 sys_fs_ftruncate(u32 fd, u64 size) s32 sys_fs_chmod(vm::cptr path, s32 mode) { - sys_fs.Todo("sys_fs_chmod(path=*0x%x, mode=%#o) -> CELL_OK", path, mode); - sys_fs.Todo("*** path = '%s'", path.get_ptr()); + sys_fs.todo("sys_fs_chmod(path=*0x%x, mode=%#o) -> CELL_OK", path, mode); + sys_fs.todo("*** path = '%s'", path.get_ptr()); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp b/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp index 24d96e51b2..6251f33d00 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp @@ -44,7 +44,7 @@ void lv2_int_serv_t::join(PPUThread& ppu, lv2_lock_t& lv2_lock) s32 sys_interrupt_tag_destroy(u32 intrtag) { - sys_interrupt.Warning("sys_interrupt_tag_destroy(intrtag=0x%x)", intrtag); + sys_interrupt.warning("sys_interrupt_tag_destroy(intrtag=0x%x)", intrtag); LV2_LOCK; @@ -67,7 +67,7 @@ s32 sys_interrupt_tag_destroy(u32 intrtag) s32 _sys_interrupt_thread_establish(vm::ptr ih, u32 intrtag, u32 intrthread, u64 arg1, u64 arg2) { - sys_interrupt.Warning("_sys_interrupt_thread_establish(ih=*0x%x, intrtag=0x%x, intrthread=0x%x, arg1=0x%llx, arg2=0x%llx)", ih, intrtag, intrthread, arg1, arg2); + sys_interrupt.warning("_sys_interrupt_thread_establish(ih=*0x%x, intrtag=0x%x, intrthread=0x%x, arg1=0x%llx, arg2=0x%llx)", ih, intrtag, intrthread, arg1, arg2); LV2_LOCK; @@ -96,7 +96,7 @@ s32 _sys_interrupt_thread_establish(vm::ptr ih, u32 intrtag, u32 intrthread // It's unclear if multiple handlers can be established on single interrupt tag if (tag->handler) { - sys_interrupt.Error("_sys_interrupt_thread_establish(): handler service already exists (intrtag=0x%x) -> CELL_ESTAT", intrtag); + sys_interrupt.error("_sys_interrupt_thread_establish(): handler service already exists (intrtag=0x%x) -> CELL_ESTAT", intrtag); return CELL_ESTAT; } @@ -149,7 +149,7 @@ s32 _sys_interrupt_thread_establish(vm::ptr ih, u32 intrtag, u32 intrthread s32 _sys_interrupt_thread_disestablish(PPUThread& ppu, u32 ih, vm::ptr r13) { - sys_interrupt.Warning("_sys_interrupt_thread_disestablish(ih=0x%x, r13=*0x%x)", ih, r13); + sys_interrupt.warning("_sys_interrupt_thread_disestablish(ih=0x%x, r13=*0x%x)", ih, r13); LV2_LOCK; @@ -171,7 +171,7 @@ s32 _sys_interrupt_thread_disestablish(PPUThread& ppu, u32 ih, vm::ptr r13) void sys_interrupt_thread_eoi(PPUThread& ppu) { - sys_interrupt.Log("sys_interrupt_thread_eoi()"); + sys_interrupt.trace("sys_interrupt_thread_eoi()"); // TODO: maybe it should actually unwind the stack of PPU thread? diff --git a/rpcs3/Emu/SysCalls/lv2/sys_lwcond.cpp b/rpcs3/Emu/SysCalls/lv2/sys_lwcond.cpp index 5c997c5102..ad843cae93 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_lwcond.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_lwcond.cpp @@ -38,7 +38,7 @@ void lv2_lwcond_t::notify(lv2_lock_t & lv2_lock, sleep_queue_t::value_type& thre s32 _sys_lwcond_create(vm::ptr lwcond_id, u32 lwmutex_id, vm::ptr control, u64 name, u32 arg5) { - sys_lwcond.Warning("_sys_lwcond_create(lwcond_id=*0x%x, lwmutex_id=0x%x, control=*0x%x, name=0x%llx, arg5=0x%x)", lwcond_id, lwmutex_id, control, name, arg5); + sys_lwcond.warning("_sys_lwcond_create(lwcond_id=*0x%x, lwmutex_id=0x%x, control=*0x%x, name=0x%llx, arg5=0x%x)", lwcond_id, lwmutex_id, control, name, arg5); *lwcond_id = idm::make(name); @@ -47,7 +47,7 @@ s32 _sys_lwcond_create(vm::ptr lwcond_id, u32 lwmutex_id, vm::ptr lwmutex_id, u32 protocol, vm::ptr control, u32 arg4, u64 name, u32 arg6) { - sys_lwmutex.Warning("_sys_lwmutex_create(lwmutex_id=*0x%x, protocol=0x%x, control=*0x%x, arg4=0x%x, name=0x%llx, arg6=0x%x)", lwmutex_id, protocol, control, arg4, name, arg6); + sys_lwmutex.warning("_sys_lwmutex_create(lwmutex_id=*0x%x, protocol=0x%x, control=*0x%x, arg4=0x%x, name=0x%llx, arg6=0x%x)", lwmutex_id, protocol, control, arg4, name, arg6); if (protocol != SYS_SYNC_FIFO && protocol != SYS_SYNC_RETRY && protocol != SYS_SYNC_PRIORITY) { - sys_lwmutex.Error("_sys_lwmutex_create(): unknown protocol (0x%x)", protocol); + sys_lwmutex.error("_sys_lwmutex_create(): unknown protocol (0x%x)", protocol); return CELL_EINVAL; } @@ -58,7 +58,7 @@ s32 _sys_lwmutex_create(vm::ptr lwmutex_id, u32 protocol, vm::ptr alloc_addr) { - sys_memory.Warning("sys_memory_allocate(size=0x%x, flags=0x%llx, alloc_addr=*0x%x)", size, flags, alloc_addr); + sys_memory.warning("sys_memory_allocate(size=0x%x, flags=0x%llx, alloc_addr=*0x%x)", size, flags, alloc_addr); LV2_LOCK; @@ -68,7 +68,7 @@ s32 sys_memory_allocate(u32 size, u64 flags, vm::ptr alloc_addr) s32 sys_memory_allocate_from_container(u32 size, u32 cid, u64 flags, vm::ptr alloc_addr) { - sys_memory.Warning("sys_memory_allocate_from_container(size=0x%x, cid=0x%x, flags=0x%llx, alloc_addr=*0x%x)", size, cid, flags, alloc_addr); + sys_memory.warning("sys_memory_allocate_from_container(size=0x%x, cid=0x%x, flags=0x%llx, alloc_addr=*0x%x)", size, cid, flags, alloc_addr); LV2_LOCK; @@ -148,7 +148,7 @@ s32 sys_memory_allocate_from_container(u32 size, u32 cid, u64 flags, vm::ptr attr) { - sys_memory.Error("sys_memory_get_page_attribute(addr=0x%x, attr=*0x%x)", addr, attr); + sys_memory.error("sys_memory_get_page_attribute(addr=0x%x, attr=*0x%x)", addr, attr); LV2_LOCK; @@ -203,7 +203,7 @@ s32 sys_memory_get_page_attribute(u32 addr, vm::ptr attr) s32 sys_memory_get_user_memory_size(vm::ptr mem_info) { - sys_memory.Warning("sys_memory_get_user_memory_size(mem_info=*0x%x)", mem_info); + sys_memory.warning("sys_memory_get_user_memory_size(mem_info=*0x%x)", mem_info); LV2_LOCK; @@ -226,7 +226,7 @@ s32 sys_memory_get_user_memory_size(vm::ptr mem_info) s32 sys_memory_container_create(vm::ptr cid, u32 size) { - sys_memory.Warning("sys_memory_container_create(cid=*0x%x, size=0x%x)", cid, size); + sys_memory.warning("sys_memory_container_create(cid=*0x%x, size=0x%x)", cid, size); LV2_LOCK; @@ -261,7 +261,7 @@ s32 sys_memory_container_create(vm::ptr cid, u32 size) s32 sys_memory_container_destroy(u32 cid) { - sys_memory.Warning("sys_memory_container_destroy(cid=0x%x)", cid); + sys_memory.warning("sys_memory_container_destroy(cid=0x%x)", cid); LV2_LOCK; @@ -285,7 +285,7 @@ s32 sys_memory_container_destroy(u32 cid) s32 sys_memory_container_get_size(vm::ptr mem_info, u32 cid) { - sys_memory.Warning("sys_memory_container_get_size(mem_info=*0x%x, cid=0x%x)", mem_info, cid); + sys_memory.warning("sys_memory_container_get_size(mem_info=*0x%x, cid=0x%x)", mem_info, cid); LV2_LOCK; diff --git a/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp b/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp index abfba68159..5ec9fc02ac 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp @@ -19,7 +19,7 @@ lv2_memory_t::lv2_memory_t(u32 size, u32 align, u64 flags, const std::shared_ptr s32 sys_mmapper_allocate_address(u64 size, u64 flags, u64 alignment, vm::ptr alloc_addr) { - sys_mmapper.Error("sys_mmapper_allocate_address(size=0x%llx, flags=0x%llx, alignment=0x%llx, alloc_addr=*0x%x)", size, flags, alignment, alloc_addr); + sys_mmapper.error("sys_mmapper_allocate_address(size=0x%llx, flags=0x%llx, alignment=0x%llx, alloc_addr=*0x%x)", size, flags, alignment, alloc_addr); LV2_LOCK; @@ -67,7 +67,7 @@ s32 sys_mmapper_allocate_address(u64 size, u64 flags, u64 alignment, vm::ptr mem_id) { - sys_mmapper.Warning("sys_mmapper_allocate_memory(size=0x%llx, flags=0x%llx, mem_id=*0x%x)", size, flags, mem_id); + sys_mmapper.warning("sys_mmapper_allocate_memory(size=0x%llx, flags=0x%llx, mem_id=*0x%x)", size, flags, mem_id); LV2_LOCK; @@ -133,7 +133,7 @@ s32 sys_mmapper_allocate_memory(u64 size, u64 flags, vm::ptr mem_id) s32 sys_mmapper_allocate_memory_from_container(u32 size, u32 cid, u64 flags, vm::ptr mem_id) { - sys_mmapper.Error("sys_mmapper_allocate_memory_from_container(size=0x%x, cid=0x%x, flags=0x%llx, mem_id=*0x%x)", size, cid, flags, mem_id); + sys_mmapper.error("sys_mmapper_allocate_memory_from_container(size=0x%x, cid=0x%x, flags=0x%llx, mem_id=*0x%x)", size, cid, flags, mem_id); LV2_LOCK; @@ -194,14 +194,14 @@ s32 sys_mmapper_allocate_memory_from_container(u32 size, u32 cid, u64 flags, vm: s32 sys_mmapper_change_address_access_right(u32 addr, u64 flags) { - sys_mmapper.Todo("sys_mmapper_change_address_access_right(addr=0x%x, flags=0x%llx)", addr, flags); + sys_mmapper.todo("sys_mmapper_change_address_access_right(addr=0x%x, flags=0x%llx)", addr, flags); return CELL_OK; } s32 sys_mmapper_free_address(u32 addr) { - sys_mmapper.Error("sys_mmapper_free_address(addr=0x%x)", addr); + sys_mmapper.error("sys_mmapper_free_address(addr=0x%x)", addr); LV2_LOCK; @@ -227,7 +227,7 @@ s32 sys_mmapper_free_address(u32 addr) s32 sys_mmapper_free_memory(u32 mem_id) { - sys_mmapper.Warning("sys_mmapper_free_memory(mem_id=0x%x)", mem_id); + sys_mmapper.warning("sys_mmapper_free_memory(mem_id=0x%x)", mem_id); LV2_LOCK; @@ -258,7 +258,7 @@ s32 sys_mmapper_free_memory(u32 mem_id) s32 sys_mmapper_map_memory(u32 addr, u32 mem_id, u64 flags) { - sys_mmapper.Error("sys_mmapper_map_memory(addr=0x%x, mem_id=0x%x, flags=0x%llx)", addr, mem_id, flags); + sys_mmapper.error("sys_mmapper_map_memory(addr=0x%x, mem_id=0x%x, flags=0x%llx)", addr, mem_id, flags); LV2_LOCK; @@ -283,7 +283,7 @@ s32 sys_mmapper_map_memory(u32 addr, u32 mem_id, u64 flags) if (const u32 old_addr = mem->addr) { - sys_mmapper.Warning("sys_mmapper_map_memory: Already mapped (mem_id=0x%x, addr=0x%x)", mem_id, old_addr); + sys_mmapper.warning("sys_mmapper_map_memory: Already mapped (mem_id=0x%x, addr=0x%x)", mem_id, old_addr); return CELL_OK; } @@ -299,7 +299,7 @@ s32 sys_mmapper_map_memory(u32 addr, u32 mem_id, u64 flags) s32 sys_mmapper_search_and_map(u32 start_addr, u32 mem_id, u64 flags, vm::ptr alloc_addr) { - sys_mmapper.Error("sys_mmapper_search_and_map(start_addr=0x%x, mem_id=0x%x, flags=0x%llx, alloc_addr=*0x%x)", start_addr, mem_id, flags, alloc_addr); + sys_mmapper.error("sys_mmapper_search_and_map(start_addr=0x%x, mem_id=0x%x, flags=0x%llx, alloc_addr=*0x%x)", start_addr, mem_id, flags, alloc_addr); LV2_LOCK; @@ -331,7 +331,7 @@ s32 sys_mmapper_search_and_map(u32 start_addr, u32 mem_id, u64 flags, vm::ptr mem_id) { - sys_mmapper.Error("sys_mmapper_unmap_memory(addr=0x%x, mem_id=*0x%x)", addr, mem_id); + sys_mmapper.error("sys_mmapper_unmap_memory(addr=0x%x, mem_id=*0x%x)", addr, mem_id); LV2_LOCK; @@ -364,7 +364,7 @@ s32 sys_mmapper_unmap_memory(u32 addr, vm::ptr mem_id) s32 sys_mmapper_enable_page_fault_notification(u32 addr, u32 eq) { - sys_mmapper.Todo("sys_mmapper_enable_page_fault_notification(addr=0x%x, eq=0x%x)", addr, eq); + sys_mmapper.todo("sys_mmapper_enable_page_fault_notification(addr=0x%x, eq=0x%x)", addr, eq); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp b/rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp index 8d7126285e..f2d50747ee 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp @@ -32,7 +32,7 @@ void lv2_mutex_t::unlock(lv2_lock_t& lv2_lock) s32 sys_mutex_create(vm::ptr mutex_id, vm::ptr attr) { - sys_mutex.Warning("sys_mutex_create(mutex_id=*0x%x, attr=*0x%x)", mutex_id, attr); + sys_mutex.warning("sys_mutex_create(mutex_id=*0x%x, attr=*0x%x)", mutex_id, attr); if (!mutex_id || !attr) { @@ -49,7 +49,7 @@ s32 sys_mutex_create(vm::ptr mutex_id, vm::ptr attr) default: { - sys_mutex.Error("sys_mutex_create(): unknown protocol (0x%x)", protocol); + sys_mutex.error("sys_mutex_create(): unknown protocol (0x%x)", protocol); return CELL_EINVAL; } } @@ -58,7 +58,7 @@ s32 sys_mutex_create(vm::ptr mutex_id, vm::ptr attr) if ((!recursive && attr->recursive != SYS_SYNC_NOT_RECURSIVE) || attr->pshared != SYS_SYNC_NOT_PROCESS_SHARED || attr->adaptive != SYS_SYNC_NOT_ADAPTIVE || attr->ipc_key || attr->flags) { - sys_mutex.Error("sys_mutex_create(): unknown attributes (recursive=0x%x, pshared=0x%x, adaptive=0x%x, ipc_key=0x%llx, flags=0x%x)", attr->recursive, attr->pshared, attr->adaptive, attr->ipc_key, attr->flags); + sys_mutex.error("sys_mutex_create(): unknown attributes (recursive=0x%x, pshared=0x%x, adaptive=0x%x, ipc_key=0x%llx, flags=0x%x)", attr->recursive, attr->pshared, attr->adaptive, attr->ipc_key, attr->flags); return CELL_EINVAL; } @@ -70,7 +70,7 @@ s32 sys_mutex_create(vm::ptr mutex_id, vm::ptr attr) s32 sys_mutex_destroy(u32 mutex_id) { - sys_mutex.Warning("sys_mutex_destroy(mutex_id=0x%x)", mutex_id); + sys_mutex.warning("sys_mutex_destroy(mutex_id=0x%x)", mutex_id); LV2_LOCK; @@ -98,7 +98,7 @@ s32 sys_mutex_destroy(u32 mutex_id) s32 sys_mutex_lock(PPUThread& ppu, u32 mutex_id, u64 timeout) { - sys_mutex.Log("sys_mutex_lock(mutex_id=0x%x, timeout=0x%llx)", mutex_id, timeout); + sys_mutex.trace("sys_mutex_lock(mutex_id=0x%x, timeout=0x%llx)", mutex_id, timeout); const u64 start_time = get_system_time(); @@ -172,7 +172,7 @@ s32 sys_mutex_lock(PPUThread& ppu, u32 mutex_id, u64 timeout) s32 sys_mutex_trylock(PPUThread& ppu, u32 mutex_id) { - sys_mutex.Log("sys_mutex_trylock(mutex_id=0x%x)", mutex_id); + sys_mutex.trace("sys_mutex_trylock(mutex_id=0x%x)", mutex_id); LV2_LOCK; @@ -214,7 +214,7 @@ s32 sys_mutex_trylock(PPUThread& ppu, u32 mutex_id) s32 sys_mutex_unlock(PPUThread& ppu, u32 mutex_id) { - sys_mutex.Log("sys_mutex_unlock(mutex_id=0x%x)", mutex_id); + sys_mutex.trace("sys_mutex_unlock(mutex_id=0x%x)", mutex_id); LV2_LOCK; diff --git a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp index 6c1cc29991..51cff30866 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp @@ -12,7 +12,7 @@ SysCallBase sys_ppu_thread("sys_ppu_thread"); void _sys_ppu_thread_exit(PPUThread& ppu, u64 errorcode) { - sys_ppu_thread.Log("_sys_ppu_thread_exit(errorcode=0x%llx)", errorcode); + sys_ppu_thread.trace("_sys_ppu_thread_exit(errorcode=0x%llx)", errorcode); LV2_LOCK; @@ -44,14 +44,14 @@ void _sys_ppu_thread_exit(PPUThread& ppu, u64 errorcode) void sys_ppu_thread_yield() { - sys_ppu_thread.Log("sys_ppu_thread_yield()"); + sys_ppu_thread.trace("sys_ppu_thread_yield()"); std::this_thread::yield(); } s32 sys_ppu_thread_join(PPUThread& ppu, u32 thread_id, vm::ptr vptr) { - sys_ppu_thread.Warning("sys_ppu_thread_join(thread_id=0x%x, vptr=*0x%x)", thread_id, vptr); + sys_ppu_thread.warning("sys_ppu_thread_join(thread_id=0x%x, vptr=*0x%x)", thread_id, vptr); LV2_LOCK; @@ -94,7 +94,7 @@ s32 sys_ppu_thread_join(PPUThread& ppu, u32 thread_id, vm::ptr vptr) s32 sys_ppu_thread_detach(u32 thread_id) { - sys_ppu_thread.Warning("sys_ppu_thread_detach(thread_id=0x%x)", thread_id); + sys_ppu_thread.warning("sys_ppu_thread_detach(thread_id=0x%x)", thread_id); LV2_LOCK; @@ -123,7 +123,7 @@ s32 sys_ppu_thread_detach(u32 thread_id) void sys_ppu_thread_get_join_state(PPUThread& ppu, vm::ptr isjoinable) { - sys_ppu_thread.Warning("sys_ppu_thread_get_join_state(isjoinable=*0x%x)", isjoinable); + sys_ppu_thread.warning("sys_ppu_thread_get_join_state(isjoinable=*0x%x)", isjoinable); LV2_LOCK; @@ -132,7 +132,7 @@ void sys_ppu_thread_get_join_state(PPUThread& ppu, vm::ptr isjoinable) s32 sys_ppu_thread_set_priority(u32 thread_id, s32 prio) { - sys_ppu_thread.Log("sys_ppu_thread_set_priority(thread_id=0x%x, prio=%d)", thread_id, prio); + sys_ppu_thread.trace("sys_ppu_thread_set_priority(thread_id=0x%x, prio=%d)", thread_id, prio); LV2_LOCK; @@ -155,7 +155,7 @@ s32 sys_ppu_thread_set_priority(u32 thread_id, s32 prio) s32 sys_ppu_thread_get_priority(u32 thread_id, vm::ptr priop) { - sys_ppu_thread.Log("sys_ppu_thread_get_priority(thread_id=0x%x, priop=*0x%x)", thread_id, priop); + sys_ppu_thread.trace("sys_ppu_thread_get_priority(thread_id=0x%x, priop=*0x%x)", thread_id, priop); LV2_LOCK; @@ -173,7 +173,7 @@ s32 sys_ppu_thread_get_priority(u32 thread_id, vm::ptr priop) s32 sys_ppu_thread_get_stack_information(PPUThread& ppu, vm::ptr sp) { - sys_ppu_thread.Log("sys_ppu_thread_get_stack_information(sp=*0x%x)", sp); + sys_ppu_thread.trace("sys_ppu_thread_get_stack_information(sp=*0x%x)", sp); sp->pst_addr = ppu.stack_addr; sp->pst_size = ppu.stack_size; @@ -183,7 +183,7 @@ s32 sys_ppu_thread_get_stack_information(PPUThread& ppu, vm::ptr thread_id, vm::ptr param, u64 arg, u64 unk, s32 prio, u32 stacksize, u64 flags, vm::cptr threadname) { - sys_ppu_thread.Warning("_sys_ppu_thread_create(thread_id=*0x%x, param=*0x%x, arg=0x%llx, unk=0x%llx, prio=%d, stacksize=0x%x, flags=0x%llx, threadname=*0x%x)", + sys_ppu_thread.warning("_sys_ppu_thread_create(thread_id=*0x%x, param=*0x%x, arg=0x%llx, unk=0x%llx, prio=%d, stacksize=0x%x, flags=0x%llx, threadname=*0x%x)", thread_id, param, arg, unk, prio, stacksize, flags, threadname); LV2_LOCK; @@ -284,7 +284,7 @@ s32 _sys_ppu_thread_create(vm::ptr thread_id, vm::ptr p s32 sys_ppu_thread_start(u32 thread_id) { - sys_ppu_thread.Warning("sys_ppu_thread_start(thread_id=0x%x)", thread_id); + sys_ppu_thread.warning("sys_ppu_thread_start(thread_id=0x%x)", thread_id); LV2_LOCK; @@ -302,7 +302,7 @@ s32 sys_ppu_thread_start(u32 thread_id) s32 sys_ppu_thread_rename(u32 thread_id, vm::cptr name) { - sys_ppu_thread.Todo("sys_ppu_thread_rename(thread_id=0x%x, name=*0x%x)", thread_id, name); + sys_ppu_thread.todo("sys_ppu_thread_rename(thread_id=0x%x, name=*0x%x)", thread_id, name); LV2_LOCK; diff --git a/rpcs3/Emu/SysCalls/lv2/sys_process.cpp b/rpcs3/Emu/SysCalls/lv2/sys_process.cpp index 680c4fb20f..9de2ae7dbc 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_process.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_process.cpp @@ -34,25 +34,25 @@ s32 process_getpid() s32 sys_process_getpid() { - sys_process.Log("sys_process_getpid() -> 1"); + sys_process.trace("sys_process_getpid() -> 1"); return process_getpid(); } s32 sys_process_getppid() { - sys_process.Todo("sys_process_getppid() -> 0"); + sys_process.todo("sys_process_getppid() -> 0"); return 0; } s32 sys_process_exit(s32 status) { - sys_process.Warning("sys_process_exit(status=0x%x)", status); + sys_process.warning("sys_process_exit(status=0x%x)", status); LV2_LOCK; CHECK_EMU_STATUS; - sys_process.Success("Process finished"); + sys_process.success("Process finished"); Emu.CallAfter([]() { @@ -71,7 +71,7 @@ s32 sys_process_exit(s32 status) s32 sys_process_get_number_of_object(u32 object, vm::ptr nump) { - sys_process.Error("sys_process_get_number_of_object(object=0x%x, nump=*0x%x)", object, nump); + sys_process.error("sys_process_get_number_of_object(object=0x%x, nump=*0x%x)", object, nump); switch(object) { @@ -105,7 +105,7 @@ s32 sys_process_get_number_of_object(u32 object, vm::ptr nump) s32 sys_process_get_id(u32 object, vm::ptr buffer, u32 size, vm::ptr set_size) { - sys_process.Error("sys_process_get_id(object=0x%x, buffer=*0x%x, size=%d, set_size=*0x%x)", object, buffer, size, set_size); + sys_process.error("sys_process_get_id(object=0x%x, buffer=*0x%x, size=%d, set_size=*0x%x)", object, buffer, size, set_size); std::set objects; @@ -161,14 +161,14 @@ s32 process_is_spu_lock_line_reservation_address(u32 addr, u64 flags) s32 sys_process_is_spu_lock_line_reservation_address(u32 addr, u64 flags) { - sys_process.Warning("sys_process_is_spu_lock_line_reservation_address(addr=0x%x, flags=0x%llx)", addr, flags); + sys_process.warning("sys_process_is_spu_lock_line_reservation_address(addr=0x%x, flags=0x%llx)", addr, flags); return process_is_spu_lock_line_reservation_address(addr, flags); } s32 _sys_process_get_paramsfo(vm::ptr buffer) { - sys_process.Warning("_sys_process_get_paramsfo(buffer=0x%x)", buffer); + sys_process.warning("_sys_process_get_paramsfo(buffer=0x%x)", buffer); if (!Emu.GetTitleID().length()) { @@ -191,7 +191,7 @@ s32 process_get_sdk_version(u32 pid, s32& ver) s32 sys_process_get_sdk_version(u32 pid, vm::ptr version) { - sys_process.Warning("sys_process_get_sdk_version(pid=0x%x, version=*0x%x)", pid, version); + sys_process.warning("sys_process_get_sdk_version(pid=0x%x, version=*0x%x)", pid, version); s32 sdk_ver; s32 ret = process_get_sdk_version(pid, sdk_ver); @@ -208,33 +208,33 @@ s32 sys_process_get_sdk_version(u32 pid, vm::ptr version) s32 sys_process_kill(u32 pid) { - sys_process.Todo("sys_process_kill(pid=0x%x)", pid); + sys_process.todo("sys_process_kill(pid=0x%x)", pid); return CELL_OK; } s32 sys_process_wait_for_child(u32 pid, vm::ptr status, u64 unk) { - sys_process.Todo("sys_process_wait_for_child(pid=0x%x, status=*0x%x, unk=0x%llx", pid, status, unk); + sys_process.todo("sys_process_wait_for_child(pid=0x%x, status=*0x%x, unk=0x%llx", pid, status, unk); return CELL_OK; } s32 sys_process_wait_for_child2(u64 unk1, u64 unk2, u64 unk3, u64 unk4, u64 unk5, u64 unk6) { - sys_process.Todo("sys_process_wait_for_child2(unk1=0x%llx, unk2=0x%llx, unk3=0x%llx, unk4=0x%llx, unk5=0x%llx, unk6=0x%llx)", + sys_process.todo("sys_process_wait_for_child2(unk1=0x%llx, unk2=0x%llx, unk3=0x%llx, unk4=0x%llx, unk5=0x%llx, unk6=0x%llx)", unk1, unk2, unk3, unk4, unk5, unk6); return CELL_OK; } s32 sys_process_get_status(u64 unk) { - sys_process.Todo("sys_process_get_status(unk=0x%llx)", unk); + sys_process.todo("sys_process_get_status(unk=0x%llx)", unk); //vm::write32(CPU.GPR[4], GetPPUThreadStatus(CPU)); return CELL_OK; } s32 sys_process_detach_child(u64 unk) { - sys_process.Todo("sys_process_detach_child(unk=0x%llx)", unk); + sys_process.todo("sys_process_detach_child(unk=0x%llx)", unk); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp b/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp index 06d9843680..4f39c3059f 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp @@ -23,7 +23,7 @@ lv2_prx_t::lv2_prx_t() s32 prx_load_module(std::string path, u64 flags, vm::ptr pOpt) { - sys_prx.Warning("prx_load_module(path='%s', flags=0x%llx, pOpt=*0x%x)", path.c_str(), flags, pOpt); + sys_prx.warning("prx_load_module(path='%s', flags=0x%llx, pOpt=*0x%x)", path.c_str(), flags, pOpt); loader::handlers::elf64 loader; @@ -57,7 +57,7 @@ s32 prx_load_module(std::string path, u64 flags, vm::ptrlle_func && !(func->flags & MFF_FORCED_HLE); - sys_prx.Error("Imported %sfunction '%s' in '%s' module (0x%x)", (is_lle ? "LLE " : ""), get_ps3_function_name(nid), module_.first, addr); + sys_prx.error("Imported %sfunction '%s' in '%s' module (0x%x)", (is_lle ? "LLE " : ""), get_ps3_function_name(nid), module_.first, addr); } if (!patch_ppu_import(addr, index)) { - sys_prx.Error("Failed to inject code at address 0x%x", addr); + sys_prx.error("Failed to inject code at address 0x%x", addr); } } } @@ -135,7 +135,7 @@ s32 prx_load_module(std::string path, u64 flags, vm::ptr path, u64 flags, vm::ptr pOpt) { - sys_prx.Warning("sys_prx_load_module(path=*0x%x, flags=0x%llx, pOpt=*0x%x)", path, flags, pOpt); + sys_prx.warning("sys_prx_load_module(path=*0x%x, flags=0x%llx, pOpt=*0x%x)", path, flags, pOpt); return prx_load_module(path.get_ptr(), flags, pOpt); } s32 sys_prx_load_module_list(s32 count, vm::cpptr path_list, u64 flags, vm::ptr pOpt, vm::ptr id_list) { - sys_prx.Warning("sys_prx_load_module_list(count=%d, path_list=*0x%x, flags=0x%llx, pOpt=*0x%x, id_list=*0x%x)", count, path_list, flags, pOpt, id_list); + sys_prx.warning("sys_prx_load_module_list(count=%d, path_list=*0x%x, flags=0x%llx, pOpt=*0x%x, id_list=*0x%x)", count, path_list, flags, pOpt, id_list); for (s32 i = 0; i < count; ++i) { @@ -170,25 +170,25 @@ s32 sys_prx_load_module_list(s32 count, vm::cpptr path_list, u64 flags, vm s32 sys_prx_load_module_on_memcontainer() { - sys_prx.Todo("sys_prx_load_module_on_memcontainer()"); + sys_prx.todo("sys_prx_load_module_on_memcontainer()"); return CELL_OK; } s32 sys_prx_load_module_by_fd() { - sys_prx.Todo("sys_prx_load_module_by_fd()"); + sys_prx.todo("sys_prx_load_module_by_fd()"); return CELL_OK; } s32 sys_prx_load_module_on_memcontainer_by_fd() { - sys_prx.Todo("sys_prx_load_module_on_memcontainer_by_fd()"); + sys_prx.todo("sys_prx_load_module_on_memcontainer_by_fd()"); return CELL_OK; } s32 sys_prx_start_module(s32 id, u64 flags, vm::ptr pOpt) { - sys_prx.Warning("sys_prx_start_module(id=0x%x, flags=0x%llx, pOpt=*0x%x)", id, flags, pOpt); + sys_prx.warning("sys_prx_start_module(id=0x%x, flags=0x%llx, pOpt=*0x%x)", id, flags, pOpt); const auto prx = idm::get(id); @@ -208,7 +208,7 @@ s32 sys_prx_start_module(s32 id, u64 flags, vm::ptr pOpt) { - sys_prx.Warning("sys_prx_stop_module(id=0x%x, flags=0x%llx, pOpt=*0x%x)", id, flags, pOpt); + sys_prx.warning("sys_prx_stop_module(id=0x%x, flags=0x%llx, pOpt=*0x%x)", id, flags, pOpt); const auto prx = idm::get(id); @@ -228,7 +228,7 @@ s32 sys_prx_stop_module(s32 id, u64 flags, vm::ptr s32 sys_prx_unload_module(s32 id, u64 flags, vm::ptr pOpt) { - sys_prx.Warning("sys_prx_unload_module(id=0x%x, flags=0x%llx, pOpt=*0x%x)", id, flags, pOpt); + sys_prx.warning("sys_prx_unload_module(id=0x%x, flags=0x%llx, pOpt=*0x%x)", id, flags, pOpt); // Get the PRX, free the used memory and delete the object and its ID const auto prx = idm::get(id); @@ -248,26 +248,26 @@ s32 sys_prx_unload_module(s32 id, u64 flags, vm::ptr pInfo) { - sys_prx.Todo("sys_prx_get_module_list(flags=%d, pInfo=*0x%x)", flags, pInfo); + sys_prx.todo("sys_prx_get_module_list(flags=%d, pInfo=*0x%x)", flags, pInfo); return CELL_OK; } s32 sys_prx_get_my_module_id() { - sys_prx.Todo("sys_prx_get_my_module_id()"); + sys_prx.todo("sys_prx_get_my_module_id()"); return CELL_OK; } s32 sys_prx_get_module_id_by_address() { - sys_prx.Todo("sys_prx_get_module_id_by_address()"); + sys_prx.todo("sys_prx_get_module_id_by_address()"); return CELL_OK; } s32 sys_prx_get_module_id_by_name(vm::cptr name, u64 flags, vm::ptr pOpt) { const char *realName = name.get_ptr(); - sys_prx.Todo("sys_prx_get_module_id_by_name(name=%s, flags=%d, pOpt=*0x%x)", realName, flags, pOpt); + sys_prx.todo("sys_prx_get_module_id_by_name(name=%s, flags=%d, pOpt=*0x%x)", realName, flags, pOpt); //if (realName == "?") ... @@ -276,66 +276,66 @@ s32 sys_prx_get_module_id_by_name(vm::cptr name, u64 flags, vm::ptr info) { - sys_prx.Todo("sys_prx_get_module_info(id=%d, flags=%d, info=*0x%x)", id, flags, info); + sys_prx.todo("sys_prx_get_module_info(id=%d, flags=%d, info=*0x%x)", id, flags, info); return CELL_OK; } s32 sys_prx_register_library(vm::ptr library) { - sys_prx.Todo("sys_prx_register_library(library=*0x%x)", library); + sys_prx.todo("sys_prx_register_library(library=*0x%x)", library); return CELL_OK; } s32 sys_prx_unregister_library(vm::ptr library) { - sys_prx.Todo("sys_prx_unregister_library(library=*0x%x)", library); + sys_prx.todo("sys_prx_unregister_library(library=*0x%x)", library); return CELL_OK; } s32 sys_prx_get_ppu_guid() { - sys_prx.Todo("sys_prx_get_ppu_guid()"); + sys_prx.todo("sys_prx_get_ppu_guid()"); return CELL_OK; } s32 sys_prx_register_module() { - sys_prx.Todo("sys_prx_register_module()"); + sys_prx.todo("sys_prx_register_module()"); return CELL_OK; } s32 sys_prx_query_module() { - sys_prx.Todo("sys_prx_query_module()"); + sys_prx.todo("sys_prx_query_module()"); return CELL_OK; } s32 sys_prx_link_library() { - sys_prx.Todo("sys_prx_link_library()"); + sys_prx.todo("sys_prx_link_library()"); return CELL_OK; } s32 sys_prx_unlink_library() { - sys_prx.Todo("sys_prx_unlink_library()"); + sys_prx.todo("sys_prx_unlink_library()"); return CELL_OK; } s32 sys_prx_query_library() { - sys_prx.Todo("sys_prx_query_library()"); + sys_prx.todo("sys_prx_query_library()"); return CELL_OK; } s32 sys_prx_start() { - sys_prx.Todo("sys_prx_start()"); + sys_prx.todo("sys_prx_start()"); return CELL_OK; } s32 sys_prx_stop() { - sys_prx.Todo("sys_prx_stop()"); + sys_prx.todo("sys_prx_stop()"); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/lv2/sys_rsx.cpp b/rpcs3/Emu/SysCalls/lv2/sys_rsx.cpp index a9fedf808d..eb25345942 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_rsx.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_rsx.cpp @@ -9,14 +9,14 @@ SysCallBase sys_rsx("sys_rsx"); s32 sys_rsx_device_open() { - sys_rsx.Todo("sys_rsx_device_open()"); + sys_rsx.todo("sys_rsx_device_open()"); return CELL_OK; } s32 sys_rsx_device_close() { - sys_rsx.Todo("sys_rsx_device_close()"); + sys_rsx.todo("sys_rsx_device_close()"); return CELL_OK; } @@ -33,7 +33,7 @@ s32 sys_rsx_device_close() */ s32 sys_rsx_memory_allocate(vm::ptr mem_handle, vm::ptr mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7) { - sys_rsx.Todo("sys_rsx_memory_allocate(mem_handle=*0x%x, mem_addr=*0x%x, size=0x%x, flags=0x%llx, a5=0x%llx, a6=0x%llx, a7=0x%llx)", mem_handle, mem_addr, size, flags, a5, a6, a7); + sys_rsx.todo("sys_rsx_memory_allocate(mem_handle=*0x%x, mem_addr=*0x%x, size=0x%x, flags=0x%llx, a5=0x%llx, a6=0x%llx, a7=0x%llx)", mem_handle, mem_addr, size, flags, a5, a6, a7); return CELL_OK; } @@ -44,7 +44,7 @@ s32 sys_rsx_memory_allocate(vm::ptr mem_handle, vm::ptr mem_addr, u32 */ s32 sys_rsx_memory_free(u32 mem_handle) { - sys_rsx.Todo("sys_rsx_memory_free(mem_handle=0x%x)", mem_handle); + sys_rsx.todo("sys_rsx_memory_free(mem_handle=0x%x)", mem_handle); return CELL_OK; } @@ -60,7 +60,7 @@ s32 sys_rsx_memory_free(u32 mem_handle) */ s32 sys_rsx_context_allocate(vm::ptr context_id, vm::ptr lpar_dma_control, vm::ptr lpar_driver_info, vm::ptr lpar_reports, u64 mem_ctx, u64 system_mode) { - sys_rsx.Todo("sys_rsx_context_allocate(context_id=*0x%x, lpar_dma_control=*0x%x, lpar_driver_info=*0x%x, lpar_reports=*0x%x, mem_ctx=0x%llx, system_mode=0x%llx)", + sys_rsx.todo("sys_rsx_context_allocate(context_id=*0x%x, lpar_dma_control=*0x%x, lpar_driver_info=*0x%x, lpar_reports=*0x%x, mem_ctx=0x%llx, system_mode=0x%llx)", context_id, lpar_dma_control, lpar_driver_info, lpar_reports, mem_ctx, system_mode); return CELL_OK; @@ -72,7 +72,7 @@ s32 sys_rsx_context_allocate(vm::ptr context_id, vm::ptr lpar_dma_cont */ s32 sys_rsx_context_free(u32 context_id) { - sys_rsx.Todo("sys_rsx_context_free(context_id=0x%x)", context_id); + sys_rsx.todo("sys_rsx_context_free(context_id=0x%x)", context_id); return CELL_OK; } @@ -87,7 +87,7 @@ s32 sys_rsx_context_free(u32 context_id) */ s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags) { - sys_rsx.Todo("sys_rsx_context_iomap(context_id=0x%x, io=0x%x, ea=0x%x, size=0x%x, flags=0x%llx)", context_id, io, ea, size, flags); + sys_rsx.todo("sys_rsx_context_iomap(context_id=0x%x, io=0x%x, ea=0x%x, size=0x%x, flags=0x%llx)", context_id, io, ea, size, flags); return CELL_OK; } @@ -101,7 +101,7 @@ s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags) */ s32 sys_rsx_context_iounmap(u32 context_id, u32 a2, u32 io_addr, u32 size) { - sys_rsx.Todo("sys_rsx_context_iounmap(context_id=0x%x, a2=0x%x, io_addr=0x%x, size=0x%x)", context_id, a2, io_addr, size); + sys_rsx.todo("sys_rsx_context_iounmap(context_id=0x%x, a2=0x%x, io_addr=0x%x, size=0x%x)", context_id, a2, io_addr, size); return CELL_OK; } @@ -117,7 +117,7 @@ s32 sys_rsx_context_iounmap(u32 context_id, u32 a2, u32 io_addr, u32 size) */ s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u64 a5, u64 a6) { - sys_rsx.Todo("sys_rsx_context_attribute(context_id=0x%x, package_id=0x%x, a3=0x%llx, a4=0x%llx, a5=0x%llx, a6=0x%llx)", context_id, package_id, a3, a4, a5, a6); + sys_rsx.todo("sys_rsx_context_attribute(context_id=0x%x, package_id=0x%x, a3=0x%llx, a4=0x%llx, a5=0x%llx, a6=0x%llx)", context_id, package_id, a3, a4, a5, a6); switch(package_id) { @@ -175,7 +175,7 @@ s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u6 */ s32 sys_rsx_device_map(vm::ptr addr, vm::ptr a2, u32 dev_id) { - sys_rsx.Todo("sys_rsx_device_map(addr=*0x%x, a2=0x%x, dev_id=0x%x)", addr, a2, dev_id); + sys_rsx.todo("sys_rsx_device_map(addr=*0x%x, a2=0x%x, dev_id=0x%x)", addr, a2, dev_id); if (dev_id > 15) { // TODO: Throw RSX error @@ -196,14 +196,14 @@ s32 sys_rsx_device_map(vm::ptr addr, vm::ptr a2, u32 dev_id) */ s32 sys_rsx_device_unmap(u32 dev_id) { - sys_rsx.Todo("sys_rsx_device_unmap(dev_id=0x%x)", dev_id); + sys_rsx.todo("sys_rsx_device_unmap(dev_id=0x%x)", dev_id); return CELL_OK; } s32 sys_rsx_attribute(u32 a1, u32 a2, u32 a3, u32 a4, u32 a5) { - sys_rsx.Todo("sys_rsx_attribute(a1=0x%x, a2=0x%x, a3=0x%x, a4=0x%x, a5=0x%x)", a1, a2, a3, a4, a5); + sys_rsx.todo("sys_rsx_attribute(a1=0x%x, a2=0x%x, a3=0x%x, a4=0x%x, a5=0x%x)", a1, a2, a3, a4, a5); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/lv2/sys_rwlock.cpp b/rpcs3/Emu/SysCalls/lv2/sys_rwlock.cpp index c2d6659fdf..1145e6cb31 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_rwlock.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_rwlock.cpp @@ -48,7 +48,7 @@ void lv2_rwlock_t::notify_all(lv2_lock_t& lv2_lock) s32 sys_rwlock_create(vm::ptr rw_lock_id, vm::ptr attr) { - sys_rwlock.Warning("sys_rwlock_create(rw_lock_id=*0x%x, attr=*0x%x)", rw_lock_id, attr); + sys_rwlock.warning("sys_rwlock_create(rw_lock_id=*0x%x, attr=*0x%x)", rw_lock_id, attr); if (!rw_lock_id || !attr) { @@ -59,13 +59,13 @@ s32 sys_rwlock_create(vm::ptr rw_lock_id, vm::ptr a if (protocol != SYS_SYNC_FIFO && protocol != SYS_SYNC_PRIORITY && protocol != SYS_SYNC_PRIORITY_INHERIT) { - sys_rwlock.Error("sys_rwlock_create(): unknown protocol (0x%x)", protocol); + sys_rwlock.error("sys_rwlock_create(): unknown protocol (0x%x)", protocol); return CELL_EINVAL; } if (attr->pshared != SYS_SYNC_NOT_PROCESS_SHARED || attr->ipc_key || attr->flags) { - sys_rwlock.Error("sys_rwlock_create(): unknown attributes (pshared=0x%x, ipc_key=0x%llx, flags=0x%x)", attr->pshared, attr->ipc_key, attr->flags); + sys_rwlock.error("sys_rwlock_create(): unknown attributes (pshared=0x%x, ipc_key=0x%llx, flags=0x%x)", attr->pshared, attr->ipc_key, attr->flags); return CELL_EINVAL; } @@ -76,7 +76,7 @@ s32 sys_rwlock_create(vm::ptr rw_lock_id, vm::ptr a s32 sys_rwlock_destroy(u32 rw_lock_id) { - sys_rwlock.Warning("sys_rwlock_destroy(rw_lock_id=0x%x)", rw_lock_id); + sys_rwlock.warning("sys_rwlock_destroy(rw_lock_id=0x%x)", rw_lock_id); LV2_LOCK; @@ -99,7 +99,7 @@ s32 sys_rwlock_destroy(u32 rw_lock_id) s32 sys_rwlock_rlock(PPUThread& ppu, u32 rw_lock_id, u64 timeout) { - sys_rwlock.Log("sys_rwlock_rlock(rw_lock_id=0x%x, timeout=0x%llx)", rw_lock_id, timeout); + sys_rwlock.trace("sys_rwlock_rlock(rw_lock_id=0x%x, timeout=0x%llx)", rw_lock_id, timeout); const u64 start_time = get_system_time(); @@ -156,7 +156,7 @@ s32 sys_rwlock_rlock(PPUThread& ppu, u32 rw_lock_id, u64 timeout) s32 sys_rwlock_tryrlock(u32 rw_lock_id) { - sys_rwlock.Log("sys_rwlock_tryrlock(rw_lock_id=0x%x)", rw_lock_id); + sys_rwlock.trace("sys_rwlock_tryrlock(rw_lock_id=0x%x)", rw_lock_id); LV2_LOCK; @@ -182,7 +182,7 @@ s32 sys_rwlock_tryrlock(u32 rw_lock_id) s32 sys_rwlock_runlock(u32 rw_lock_id) { - sys_rwlock.Log("sys_rwlock_runlock(rw_lock_id=0x%x)", rw_lock_id); + sys_rwlock.trace("sys_rwlock_runlock(rw_lock_id=0x%x)", rw_lock_id); LV2_LOCK; @@ -208,7 +208,7 @@ s32 sys_rwlock_runlock(u32 rw_lock_id) s32 sys_rwlock_wlock(PPUThread& ppu, u32 rw_lock_id, u64 timeout) { - sys_rwlock.Log("sys_rwlock_wlock(rw_lock_id=0x%x, timeout=0x%llx)", rw_lock_id, timeout); + sys_rwlock.trace("sys_rwlock_wlock(rw_lock_id=0x%x, timeout=0x%llx)", rw_lock_id, timeout); const u64 start_time = get_system_time(); @@ -279,7 +279,7 @@ s32 sys_rwlock_wlock(PPUThread& ppu, u32 rw_lock_id, u64 timeout) s32 sys_rwlock_trywlock(PPUThread& ppu, u32 rw_lock_id) { - sys_rwlock.Log("sys_rwlock_trywlock(rw_lock_id=0x%x)", rw_lock_id); + sys_rwlock.trace("sys_rwlock_trywlock(rw_lock_id=0x%x)", rw_lock_id); LV2_LOCK; @@ -307,7 +307,7 @@ s32 sys_rwlock_trywlock(PPUThread& ppu, u32 rw_lock_id) s32 sys_rwlock_wunlock(PPUThread& ppu, u32 rw_lock_id) { - sys_rwlock.Log("sys_rwlock_wunlock(rw_lock_id=0x%x)", rw_lock_id); + sys_rwlock.trace("sys_rwlock_wunlock(rw_lock_id=0x%x)", rw_lock_id); LV2_LOCK; diff --git a/rpcs3/Emu/SysCalls/lv2/sys_semaphore.cpp b/rpcs3/Emu/SysCalls/lv2/sys_semaphore.cpp index 8865deaaec..089c38f814 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_semaphore.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_semaphore.cpp @@ -14,7 +14,7 @@ extern u64 get_system_time(); s32 sys_semaphore_create(vm::ptr sem_id, vm::ptr attr, s32 initial_val, s32 max_val) { - sys_semaphore.Warning("sys_semaphore_create(sem_id=*0x%x, attr=*0x%x, initial_val=%d, max_val=%d)", sem_id, attr, initial_val, max_val); + sys_semaphore.warning("sys_semaphore_create(sem_id=*0x%x, attr=*0x%x, initial_val=%d, max_val=%d)", sem_id, attr, initial_val, max_val); if (!sem_id || !attr) { @@ -23,7 +23,7 @@ s32 sys_semaphore_create(vm::ptr sem_id, vm::ptr if (max_val <= 0 || initial_val > max_val || initial_val < 0) { - sys_semaphore.Error("sys_semaphore_create(): invalid parameters (initial_val=%d, max_val=%d)", initial_val, max_val); + sys_semaphore.error("sys_semaphore_create(): invalid parameters (initial_val=%d, max_val=%d)", initial_val, max_val); return CELL_EINVAL; } @@ -31,13 +31,13 @@ s32 sys_semaphore_create(vm::ptr sem_id, vm::ptr if (protocol != SYS_SYNC_FIFO && protocol != SYS_SYNC_PRIORITY && protocol != SYS_SYNC_PRIORITY_INHERIT) { - sys_semaphore.Error("sys_semaphore_create(): unknown protocol (0x%x)", protocol); + sys_semaphore.error("sys_semaphore_create(): unknown protocol (0x%x)", protocol); return CELL_EINVAL; } if (attr->pshared != SYS_SYNC_NOT_PROCESS_SHARED || attr->ipc_key || attr->flags) { - sys_semaphore.Error("sys_semaphore_create(): unknown attributes (pshared=0x%x, ipc_key=0x%x, flags=0x%x)", attr->pshared, attr->ipc_key, attr->flags); + sys_semaphore.error("sys_semaphore_create(): unknown attributes (pshared=0x%x, ipc_key=0x%x, flags=0x%x)", attr->pshared, attr->ipc_key, attr->flags); return CELL_EINVAL; } @@ -48,7 +48,7 @@ s32 sys_semaphore_create(vm::ptr sem_id, vm::ptr s32 sys_semaphore_destroy(u32 sem_id) { - sys_semaphore.Warning("sys_semaphore_destroy(sem_id=0x%x)", sem_id); + sys_semaphore.warning("sys_semaphore_destroy(sem_id=0x%x)", sem_id); LV2_LOCK; @@ -71,7 +71,7 @@ s32 sys_semaphore_destroy(u32 sem_id) s32 sys_semaphore_wait(PPUThread& ppu, u32 sem_id, u64 timeout) { - sys_semaphore.Log("sys_semaphore_wait(sem_id=0x%x, timeout=0x%llx)", sem_id, timeout); + sys_semaphore.trace("sys_semaphore_wait(sem_id=0x%x, timeout=0x%llx)", sem_id, timeout); const u64 start_time = get_system_time(); @@ -120,7 +120,7 @@ s32 sys_semaphore_wait(PPUThread& ppu, u32 sem_id, u64 timeout) s32 sys_semaphore_trywait(u32 sem_id) { - sys_semaphore.Log("sys_semaphore_trywait(sem_id=0x%x)", sem_id); + sys_semaphore.trace("sys_semaphore_trywait(sem_id=0x%x)", sem_id); LV2_LOCK; @@ -143,7 +143,7 @@ s32 sys_semaphore_trywait(u32 sem_id) s32 sys_semaphore_post(u32 sem_id, s32 count) { - sys_semaphore.Log("sys_semaphore_post(sem_id=0x%x, count=%d)", sem_id, count); + sys_semaphore.trace("sys_semaphore_post(sem_id=0x%x, count=%d)", sem_id, count); LV2_LOCK; @@ -189,7 +189,7 @@ s32 sys_semaphore_post(u32 sem_id, s32 count) s32 sys_semaphore_get_value(u32 sem_id, vm::ptr count) { - sys_semaphore.Log("sys_semaphore_get_value(sem_id=0x%x, count=*0x%x)", sem_id, count); + sys_semaphore.trace("sys_semaphore_get_value(sem_id=0x%x, count=*0x%x)", sem_id, count); LV2_LOCK; diff --git a/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp b/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp index 30b754fb0f..470c644dc1 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp @@ -49,7 +49,7 @@ s32 spu_image_import(sys_spu_image& img, u32 src, u32 type) s32 sys_spu_initialize(u32 max_usable_spu, u32 max_raw_spu) { - sys_spu.Warning("sys_spu_initialize(max_usable_spu=%d, max_raw_spu=%d)", max_usable_spu, max_raw_spu); + sys_spu.warning("sys_spu_initialize(max_usable_spu=%d, max_raw_spu=%d)", max_usable_spu, max_raw_spu); if (max_raw_spu > 5) { @@ -61,12 +61,12 @@ s32 sys_spu_initialize(u32 max_usable_spu, u32 max_raw_spu) s32 sys_spu_image_open(vm::ptr img, vm::cptr path) { - sys_spu.Warning("sys_spu_image_open(img=*0x%x, path=*0x%x)", img, path); + sys_spu.warning("sys_spu_image_open(img=*0x%x, path=*0x%x)", img, path); vfsFile f(path.get_ptr()); if(!f.IsOpened()) { - sys_spu.Error("sys_spu_image_open error: '%s' not found!", path.get_ptr()); + sys_spu.error("sys_spu_image_open error: '%s' not found!", path.get_ptr()); return CELL_ENOENT; } @@ -75,7 +75,7 @@ s32 sys_spu_image_open(vm::ptr img, vm::cptr path) if (hdr.CheckMagic()) { - sys_spu.Error("sys_spu_image_open error: '%s' is encrypted! Decrypt SELF and try again.", path.get_ptr()); + sys_spu.error("sys_spu_image_open error: '%s' is encrypted! Decrypt SELF and try again.", path.get_ptr()); Emu.Pause(); return CELL_ENOENT; } @@ -97,7 +97,7 @@ u32 spu_thread_initialize(u32 group_id, u32 spu_num, vm::ptr img, { if (option) { - sys_spu.Error("Unsupported SPU Thread options (0x%x)", option); + sys_spu.error("Unsupported SPU Thread options (0x%x)", option); } const auto spu = idm::make_ptr(name, spu_num); @@ -136,7 +136,7 @@ u32 spu_thread_initialize(u32 group_id, u32 spu_num, vm::ptr img, s32 sys_spu_thread_initialize(vm::ptr thread, u32 group_id, u32 spu_num, vm::ptr img, vm::ptr attr, vm::ptr arg) { - sys_spu.Warning("sys_spu_thread_initialize(thread=*0x%x, group=0x%x, spu_num=%d, img=*0x%x, attr=*0x%x, arg=*0x%x)", thread, group_id, spu_num, img, attr, arg); + sys_spu.warning("sys_spu_thread_initialize(thread=*0x%x, group=0x%x, spu_num=%d, img=*0x%x, attr=*0x%x, arg=*0x%x)", thread, group_id, spu_num, img, attr, arg); LV2_LOCK; @@ -163,7 +163,7 @@ s32 sys_spu_thread_initialize(vm::ptr thread, u32 group_id, u32 spu_num, vm s32 sys_spu_thread_set_argument(u32 id, vm::ptr arg) { - sys_spu.Warning("sys_spu_thread_set_argument(id=0x%x, arg=*0x%x)", id, arg); + sys_spu.warning("sys_spu_thread_set_argument(id=0x%x, arg=*0x%x)", id, arg); LV2_LOCK; @@ -196,7 +196,7 @@ s32 sys_spu_thread_set_argument(u32 id, vm::ptr arg) s32 sys_spu_thread_get_exit_status(u32 id, vm::ptr status) { - sys_spu.Warning("sys_spu_thread_get_exit_status(id=0x%x, status=*0x%x)", id, status); + sys_spu.warning("sys_spu_thread_get_exit_status(id=0x%x, status=*0x%x)", id, status); LV2_LOCK; @@ -221,7 +221,7 @@ s32 sys_spu_thread_get_exit_status(u32 id, vm::ptr status) s32 sys_spu_thread_group_create(vm::ptr id, u32 num, s32 prio, vm::ptr attr) { - sys_spu.Warning("sys_spu_thread_group_create(id=*0x%x, num=%d, prio=%d, attr=*0x%x)", id, num, prio, attr); + sys_spu.warning("sys_spu_thread_group_create(id=*0x%x, num=%d, prio=%d, attr=*0x%x)", id, num, prio, attr); // TODO: max num value should be affected by sys_spu_initialize() settings @@ -232,7 +232,7 @@ s32 sys_spu_thread_group_create(vm::ptr id, u32 num, s32 prio, vm::ptrtype) { - sys_spu.Todo("Unsupported SPU Thread Group type (0x%x)", attr->type); + sys_spu.todo("Unsupported SPU Thread Group type (0x%x)", attr->type); } *id = idm::make(std::string{ attr->name.get_ptr(), attr->nsize - 1 }, num, prio, attr->type, attr->ct); @@ -242,7 +242,7 @@ s32 sys_spu_thread_group_create(vm::ptr id, u32 num, s32 prio, vm::ptr cause, vm::ptr status) { - sys_spu.Warning("sys_spu_thread_group_join(id=0x%x, cause=*0x%x, status=*0x%x)", id, cause, status); + sys_spu.warning("sys_spu_thread_group_join(id=0x%x, cause=*0x%x, status=*0x%x)", id, cause, status); LV2_LOCK; @@ -597,7 +597,7 @@ s32 sys_spu_thread_group_join(u32 id, vm::ptr cause, vm::ptr status) s32 sys_spu_thread_write_ls(u32 id, u32 lsa, u64 value, u32 type) { - sys_spu.Log("sys_spu_thread_write_ls(id=0x%x, lsa=0x%05x, value=0x%llx, type=%d)", id, lsa, value, type); + sys_spu.trace("sys_spu_thread_write_ls(id=0x%x, lsa=0x%05x, value=0x%llx, type=%d)", id, lsa, value, type); LV2_LOCK; @@ -639,7 +639,7 @@ s32 sys_spu_thread_write_ls(u32 id, u32 lsa, u64 value, u32 type) s32 sys_spu_thread_read_ls(u32 id, u32 lsa, vm::ptr value, u32 type) { - sys_spu.Log("sys_spu_thread_read_ls(id=0x%x, lsa=0x%05x, value=*0x%x, type=%d)", id, lsa, value, type); + sys_spu.trace("sys_spu_thread_read_ls(id=0x%x, lsa=0x%05x, value=*0x%x, type=%d)", id, lsa, value, type); LV2_LOCK; @@ -681,7 +681,7 @@ s32 sys_spu_thread_read_ls(u32 id, u32 lsa, vm::ptr value, u32 type) s32 sys_spu_thread_write_spu_mb(u32 id, u32 value) { - sys_spu.Warning("sys_spu_thread_write_spu_mb(id=0x%x, value=0x%x)", id, value); + sys_spu.warning("sys_spu_thread_write_spu_mb(id=0x%x, value=0x%x)", id, value); LV2_LOCK; @@ -717,7 +717,7 @@ s32 sys_spu_thread_write_spu_mb(u32 id, u32 value) s32 sys_spu_thread_set_spu_cfg(u32 id, u64 value) { - sys_spu.Warning("sys_spu_thread_set_spu_cfg(id=0x%x, value=0x%x)", id, value); + sys_spu.warning("sys_spu_thread_set_spu_cfg(id=0x%x, value=0x%x)", id, value); LV2_LOCK; @@ -740,7 +740,7 @@ s32 sys_spu_thread_set_spu_cfg(u32 id, u64 value) s32 sys_spu_thread_get_spu_cfg(u32 id, vm::ptr value) { - sys_spu.Warning("sys_spu_thread_get_spu_cfg(id=0x%x, value=*0x%x)", id, value); + sys_spu.warning("sys_spu_thread_get_spu_cfg(id=0x%x, value=*0x%x)", id, value); LV2_LOCK; @@ -758,7 +758,7 @@ s32 sys_spu_thread_get_spu_cfg(u32 id, vm::ptr value) s32 sys_spu_thread_write_snr(u32 id, u32 number, u32 value) { - sys_spu.Log("sys_spu_thread_write_snr(id=0x%x, number=%d, value=0x%x)", id, number, value); + sys_spu.trace("sys_spu_thread_write_snr(id=0x%x, number=%d, value=0x%x)", id, number, value); LV2_LOCK; @@ -793,7 +793,7 @@ s32 sys_spu_thread_write_snr(u32 id, u32 number, u32 value) s32 sys_spu_thread_group_connect_event(u32 id, u32 eq, u32 et) { - sys_spu.Warning("sys_spu_thread_group_connect_event(id=0x%x, eq=0x%x, et=%d)", id, eq, et); + sys_spu.warning("sys_spu_thread_group_connect_event(id=0x%x, eq=0x%x, et=%d)", id, eq, et); LV2_LOCK; @@ -839,7 +839,7 @@ s32 sys_spu_thread_group_connect_event(u32 id, u32 eq, u32 et) } default: { - sys_spu.Error("sys_spu_thread_group_connect_event(): unknown event type (%d)", et); + sys_spu.error("sys_spu_thread_group_connect_event(): unknown event type (%d)", et); return CELL_EINVAL; } } @@ -849,7 +849,7 @@ s32 sys_spu_thread_group_connect_event(u32 id, u32 eq, u32 et) s32 sys_spu_thread_group_disconnect_event(u32 id, u32 et) { - sys_spu.Warning("sys_spu_thread_group_disconnect_event(id=0x%x, et=%d)", id, et); + sys_spu.warning("sys_spu_thread_group_disconnect_event(id=0x%x, et=%d)", id, et); LV2_LOCK; @@ -894,7 +894,7 @@ s32 sys_spu_thread_group_disconnect_event(u32 id, u32 et) } default: { - sys_spu.Error("sys_spu_thread_group_disconnect_event(): unknown event type (%d)", et); + sys_spu.error("sys_spu_thread_group_disconnect_event(): unknown event type (%d)", et); return CELL_EINVAL; } } @@ -904,7 +904,7 @@ s32 sys_spu_thread_group_disconnect_event(u32 id, u32 et) s32 sys_spu_thread_connect_event(u32 id, u32 eq, u32 et, u8 spup) { - sys_spu.Warning("sys_spu_thread_connect_event(id=0x%x, eq=0x%x, et=%d, spup=%d)", id, eq, et, spup); + sys_spu.warning("sys_spu_thread_connect_event(id=0x%x, eq=0x%x, et=%d, spup=%d)", id, eq, et, spup); LV2_LOCK; @@ -918,7 +918,7 @@ s32 sys_spu_thread_connect_event(u32 id, u32 eq, u32 et, u8 spup) if (et != SYS_SPU_THREAD_EVENT_USER || spup > 63 || queue->type != SYS_PPU_QUEUE) { - sys_spu.Error("sys_spu_thread_connect_event(): invalid arguments (et=%d, spup=%d, queue->type=%d)", et, spup, queue->type); + sys_spu.error("sys_spu_thread_connect_event(): invalid arguments (et=%d, spup=%d, queue->type=%d)", et, spup, queue->type); return CELL_EINVAL; } @@ -936,7 +936,7 @@ s32 sys_spu_thread_connect_event(u32 id, u32 eq, u32 et, u8 spup) s32 sys_spu_thread_disconnect_event(u32 id, u32 et, u8 spup) { - sys_spu.Warning("sys_spu_thread_disconnect_event(id=0x%x, et=%d, spup=%d)", id, et, spup); + sys_spu.warning("sys_spu_thread_disconnect_event(id=0x%x, et=%d, spup=%d)", id, et, spup); LV2_LOCK; @@ -949,7 +949,7 @@ s32 sys_spu_thread_disconnect_event(u32 id, u32 et, u8 spup) if (et != SYS_SPU_THREAD_EVENT_USER || spup > 63) { - sys_spu.Error("sys_spu_thread_disconnect_event(): invalid arguments (et=%d, spup=%d)", et, spup); + sys_spu.error("sys_spu_thread_disconnect_event(): invalid arguments (et=%d, spup=%d)", et, spup); return CELL_EINVAL; } @@ -967,7 +967,7 @@ s32 sys_spu_thread_disconnect_event(u32 id, u32 et, u8 spup) s32 sys_spu_thread_bind_queue(u32 id, u32 spuq, u32 spuq_num) { - sys_spu.Warning("sys_spu_thread_bind_queue(id=0x%x, spuq=0x%x, spuq_num=0x%x)", id, spuq, spuq_num); + sys_spu.warning("sys_spu_thread_bind_queue(id=0x%x, spuq=0x%x, spuq_num=0x%x)", id, spuq, spuq_num); LV2_LOCK; @@ -1011,7 +1011,7 @@ s32 sys_spu_thread_bind_queue(u32 id, u32 spuq, u32 spuq_num) s32 sys_spu_thread_unbind_queue(u32 id, u32 spuq_num) { - sys_spu.Warning("sys_spu_thread_unbind_queue(id=0x%x, spuq_num=0x%x)", id, spuq_num); + sys_spu.warning("sys_spu_thread_unbind_queue(id=0x%x, spuq_num=0x%x)", id, spuq_num); LV2_LOCK; @@ -1037,7 +1037,7 @@ s32 sys_spu_thread_unbind_queue(u32 id, u32 spuq_num) s32 sys_spu_thread_group_connect_event_all_threads(u32 id, u32 eq, u64 req, vm::ptr spup) { - sys_spu.Warning("sys_spu_thread_group_connect_event_all_threads(id=0x%x, eq=0x%x, req=0x%llx, spup=*0x%x)", id, eq, req, spup); + sys_spu.warning("sys_spu_thread_group_connect_event_all_threads(id=0x%x, eq=0x%x, req=0x%llx, spup=*0x%x)", id, eq, req, spup); LV2_LOCK; @@ -1108,7 +1108,7 @@ s32 sys_spu_thread_group_connect_event_all_threads(u32 id, u32 eq, u64 req, vm:: s32 sys_spu_thread_group_disconnect_event_all_threads(u32 id, u8 spup) { - sys_spu.Warning("sys_spu_thread_group_disconnect_event_all_threads(id=0x%x, spup=%d)", id, spup); + sys_spu.warning("sys_spu_thread_group_disconnect_event_all_threads(id=0x%x, spup=%d)", id, spup); LV2_LOCK; @@ -1137,7 +1137,7 @@ s32 sys_spu_thread_group_disconnect_event_all_threads(u32 id, u8 spup) s32 sys_raw_spu_create(vm::ptr id, vm::ptr attr) { - sys_spu.Warning("sys_raw_spu_create(id=*0x%x, attr=*0x%x)", id, attr); + sys_spu.warning("sys_raw_spu_create(id=*0x%x, attr=*0x%x)", id, attr); LV2_LOCK; @@ -1159,7 +1159,7 @@ s32 sys_raw_spu_create(vm::ptr id, vm::ptr attr) s32 sys_raw_spu_destroy(PPUThread& ppu, u32 id) { - sys_spu.Warning("sys_raw_spu_destroy(id=%d)", id); + sys_spu.warning("sys_raw_spu_destroy(id=%d)", id); LV2_LOCK; @@ -1196,7 +1196,7 @@ s32 sys_raw_spu_destroy(PPUThread& ppu, u32 id) s32 sys_raw_spu_create_interrupt_tag(u32 id, u32 class_id, u32 hwthread, vm::ptr intrtag) { - sys_spu.Warning("sys_raw_spu_create_interrupt_tag(id=%d, class_id=%d, hwthread=0x%x, intrtag=*0x%x)", id, class_id, hwthread, intrtag); + sys_spu.warning("sys_raw_spu_create_interrupt_tag(id=%d, class_id=%d, hwthread=0x%x, intrtag=*0x%x)", id, class_id, hwthread, intrtag); LV2_LOCK; @@ -1228,7 +1228,7 @@ s32 sys_raw_spu_create_interrupt_tag(u32 id, u32 class_id, u32 hwthread, vm::ptr s32 sys_raw_spu_set_int_mask(u32 id, u32 class_id, u64 mask) { - sys_spu.Log("sys_raw_spu_set_int_mask(id=%d, class_id=%d, mask=0x%llx)", id, class_id, mask); + sys_spu.trace("sys_raw_spu_set_int_mask(id=%d, class_id=%d, mask=0x%llx)", id, class_id, mask); if (class_id != 0 && class_id != 2) { @@ -1249,7 +1249,7 @@ s32 sys_raw_spu_set_int_mask(u32 id, u32 class_id, u64 mask) s32 sys_raw_spu_get_int_mask(u32 id, u32 class_id, vm::ptr mask) { - sys_spu.Log("sys_raw_spu_get_int_mask(id=%d, class_id=%d, mask=*0x%x)", id, class_id, mask); + sys_spu.trace("sys_raw_spu_get_int_mask(id=%d, class_id=%d, mask=*0x%x)", id, class_id, mask); if (class_id != 0 && class_id != 2) { @@ -1270,7 +1270,7 @@ s32 sys_raw_spu_get_int_mask(u32 id, u32 class_id, vm::ptr mask) s32 sys_raw_spu_set_int_stat(u32 id, u32 class_id, u64 stat) { - sys_spu.Log("sys_raw_spu_set_int_stat(id=%d, class_id=%d, stat=0x%llx)", id, class_id, stat); + sys_spu.trace("sys_raw_spu_set_int_stat(id=%d, class_id=%d, stat=0x%llx)", id, class_id, stat); if (class_id != 0 && class_id != 2) { @@ -1291,7 +1291,7 @@ s32 sys_raw_spu_set_int_stat(u32 id, u32 class_id, u64 stat) s32 sys_raw_spu_get_int_stat(u32 id, u32 class_id, vm::ptr stat) { - sys_spu.Log("sys_raw_spu_get_int_stat(id=%d, class_id=%d, stat=*0x%x)", id, class_id, stat); + sys_spu.trace("sys_raw_spu_get_int_stat(id=%d, class_id=%d, stat=*0x%x)", id, class_id, stat); if (class_id != 0 && class_id != 2) { @@ -1312,7 +1312,7 @@ s32 sys_raw_spu_get_int_stat(u32 id, u32 class_id, vm::ptr stat) s32 sys_raw_spu_read_puint_mb(u32 id, vm::ptr value) { - sys_spu.Log("sys_raw_spu_read_puint_mb(id=%d, value=*0x%x)", id, value); + sys_spu.trace("sys_raw_spu_read_puint_mb(id=%d, value=*0x%x)", id, value); const auto thread = Emu.GetCPU().GetRawSPUThread(id); @@ -1336,7 +1336,7 @@ s32 sys_raw_spu_read_puint_mb(u32 id, vm::ptr value) s32 sys_raw_spu_set_spu_cfg(u32 id, u32 value) { - sys_spu.Log("sys_raw_spu_set_spu_cfg(id=%d, value=0x%x)", id, value); + sys_spu.trace("sys_raw_spu_set_spu_cfg(id=%d, value=0x%x)", id, value); if (value > 3) { @@ -1357,7 +1357,7 @@ s32 sys_raw_spu_set_spu_cfg(u32 id, u32 value) s32 sys_raw_spu_get_spu_cfg(u32 id, vm::ptr value) { - sys_spu.Log("sys_raw_spu_get_spu_afg(id=%d, value=*0x%x)", id, value); + sys_spu.trace("sys_raw_spu_get_spu_afg(id=%d, value=*0x%x)", id, value); const auto thread = Emu.GetCPU().GetRawSPUThread(id); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_time.cpp b/rpcs3/Emu/SysCalls/lv2/sys_time.cpp index b9b4101cf8..bdaed94974 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_time.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_time.cpp @@ -106,7 +106,7 @@ u64 get_system_time() // Functions s32 sys_time_get_timezone(vm::ptr timezone, vm::ptr summertime) { - sys_time.Warning("sys_time_get_timezone(timezone=*0x%x, summertime=*0x%x)", timezone, summertime); + sys_time.warning("sys_time_get_timezone(timezone=*0x%x, summertime=*0x%x)", timezone, summertime); *timezone = 180; *summertime = 0; @@ -116,7 +116,7 @@ s32 sys_time_get_timezone(vm::ptr timezone, vm::ptr summertime) s32 sys_time_get_current_time(vm::ptr sec, vm::ptr nsec) { - sys_time.Log("sys_time_get_current_time(sec=*0x%x, nsec=*0x%x)", sec, nsec); + sys_time.trace("sys_time_get_current_time(sec=*0x%x, nsec=*0x%x)", sec, nsec); #ifdef _WIN32 LARGE_INTEGER count; @@ -149,7 +149,7 @@ s32 sys_time_get_current_time(vm::ptr sec, vm::ptr nsec) u64 sys_time_get_timebase_frequency() { - sys_time.Log("sys_time_get_timebase_frequency()"); + sys_time.trace("sys_time_get_timebase_frequency()"); return g_timebase_freq; } diff --git a/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp b/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp index dea05baa2a..6fa2ba5001 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp @@ -66,7 +66,7 @@ lv2_timer_t::lv2_timer_t() s32 sys_timer_create(vm::ptr timer_id) { - sys_timer.Warning("sys_timer_create(timer_id=*0x%x)", timer_id); + sys_timer.warning("sys_timer_create(timer_id=*0x%x)", timer_id); *timer_id = idm::make(); @@ -75,7 +75,7 @@ s32 sys_timer_create(vm::ptr timer_id) s32 sys_timer_destroy(u32 timer_id) { - sys_timer.Warning("sys_timer_destroy(timer_id=0x%x)", timer_id); + sys_timer.warning("sys_timer_destroy(timer_id=0x%x)", timer_id); LV2_LOCK; @@ -98,7 +98,7 @@ s32 sys_timer_destroy(u32 timer_id) s32 sys_timer_get_information(u32 timer_id, vm::ptr info) { - sys_timer.Warning("sys_timer_get_information(timer_id=0x%x, info=*0x%x)", timer_id, info); + sys_timer.warning("sys_timer_get_information(timer_id=0x%x, info=*0x%x)", timer_id, info); LV2_LOCK; @@ -119,7 +119,7 @@ s32 sys_timer_get_information(u32 timer_id, vm::ptr inf s32 _sys_timer_start(u32 timer_id, u64 base_time, u64 period) { - sys_timer.Warning("_sys_timer_start(timer_id=0x%x, base_time=0x%llx, period=0x%llx)", timer_id, base_time, period); + sys_timer.warning("_sys_timer_start(timer_id=0x%x, base_time=0x%llx, period=0x%llx)", timer_id, base_time, period); const u64 start_time = get_system_time(); @@ -177,7 +177,7 @@ s32 _sys_timer_start(u32 timer_id, u64 base_time, u64 period) s32 sys_timer_stop(u32 timer_id) { - sys_timer.Warning("sys_timer_stop()"); + sys_timer.warning("sys_timer_stop()"); LV2_LOCK; @@ -195,7 +195,7 @@ s32 sys_timer_stop(u32 timer_id) s32 sys_timer_connect_event_queue(u32 timer_id, u32 queue_id, u64 name, u64 data1, u64 data2) { - sys_timer.Warning("sys_timer_connect_event_queue(timer_id=0x%x, queue_id=0x%x, name=0x%llx, data1=0x%llx, data2=0x%llx)", timer_id, queue_id, name, data1, data2); + sys_timer.warning("sys_timer_connect_event_queue(timer_id=0x%x, queue_id=0x%x, name=0x%llx, data1=0x%llx, data2=0x%llx)", timer_id, queue_id, name, data1, data2); LV2_LOCK; @@ -222,7 +222,7 @@ s32 sys_timer_connect_event_queue(u32 timer_id, u32 queue_id, u64 name, u64 data s32 sys_timer_disconnect_event_queue(u32 timer_id) { - sys_timer.Warning("sys_timer_disconnect_event_queue(timer_id=0x%x)", timer_id); + sys_timer.warning("sys_timer_disconnect_event_queue(timer_id=0x%x)", timer_id); LV2_LOCK; @@ -246,7 +246,7 @@ s32 sys_timer_disconnect_event_queue(u32 timer_id) s32 sys_timer_sleep(u32 sleep_time) { - sys_timer.Log("sys_timer_sleep(sleep_time=%d)", sleep_time); + sys_timer.trace("sys_timer_sleep(sleep_time=%d)", sleep_time); const u64 start_time = get_system_time(); @@ -271,7 +271,7 @@ s32 sys_timer_sleep(u32 sleep_time) s32 sys_timer_usleep(u64 sleep_time) { - sys_timer.Log("sys_timer_usleep(sleep_time=0x%llx)", sleep_time); + sys_timer.trace("sys_timer_usleep(sleep_time=0x%llx)", sleep_time); const u64 start_time = get_system_time(); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_trace.cpp b/rpcs3/Emu/SysCalls/lv2/sys_trace.cpp index 7e6b76e7d1..f7b3d29c7e 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_trace.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_trace.cpp @@ -9,60 +9,60 @@ SysCallBase sys_trace("sys_trace"); s32 sys_trace_create() { - sys_trace.Todo("sys_trace_create()"); + sys_trace.todo("sys_trace_create()"); return CELL_OK; } s32 sys_trace_start() { - sys_trace.Todo("sys_trace_start()"); + sys_trace.todo("sys_trace_start()"); return CELL_OK; } s32 sys_trace_stop() { - sys_trace.Todo("sys_trace_stop()"); + sys_trace.todo("sys_trace_stop()"); return CELL_OK; } s32 sys_trace_update_top_index() { - sys_trace.Todo("sys_trace_update_top_index()"); + sys_trace.todo("sys_trace_update_top_index()"); return CELL_OK; } s32 sys_trace_destroy() { - sys_trace.Todo("sys_trace_destroy()"); + sys_trace.todo("sys_trace_destroy()"); return CELL_OK; } s32 sys_trace_drain() { - sys_trace.Todo("sys_trace_drain()"); + sys_trace.todo("sys_trace_drain()"); return CELL_OK; } s32 sys_trace_attach_process() { - sys_trace.Todo("sys_trace_attach_process()"); + sys_trace.todo("sys_trace_attach_process()"); return CELL_OK; } s32 sys_trace_allocate_buffer() { - sys_trace.Todo("sys_trace_allocate_buffer()"); + sys_trace.todo("sys_trace_allocate_buffer()"); return CELL_OK; } s32 sys_trace_free_buffer() { - sys_trace.Todo("sys_trace_free_buffer()"); + sys_trace.todo("sys_trace_free_buffer()"); return CELL_OK; } s32 sys_trace_create2() { - sys_trace.Todo("sys_trace_create2()"); + sys_trace.todo("sys_trace_create2()"); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/lv2/sys_tty.cpp b/rpcs3/Emu/SysCalls/lv2/sys_tty.cpp index b674c5f87d..8dadf61685 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_tty.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_tty.cpp @@ -9,7 +9,7 @@ SysCallBase sys_tty("sys_tty"); s32 sys_tty_read(s32 ch, vm::ptr buf, u32 len, vm::ptr preadlen) { - sys_tty.Error("sys_tty_read(ch=%d, buf=*0x%x, len=%d, preadlen=*0x%x)", ch, buf, len, preadlen); + sys_tty.todo("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 *preadlen = 0; @@ -19,7 +19,7 @@ s32 sys_tty_read(s32 ch, vm::ptr buf, u32 len, vm::ptr preadlen) s32 sys_tty_write(s32 ch, vm::cptr buf, u32 len, vm::ptr pwritelen) { - sys_tty.Log("sys_tty_write(ch=%d, buf=*0x%x, len=%d, pwritelen=*0x%x)", ch, buf, len, pwritelen); + sys_tty.notice("sys_tty_write(ch=%d, buf=*0x%x, len=%d, pwritelen=*0x%x)", ch, buf, len, pwritelen); if (ch > 15) { @@ -33,8 +33,8 @@ s32 sys_tty_write(s32 ch, vm::cptr buf, u32 len, vm::ptr pwritelen) return CELL_OK; } - log_message(Log::LogType::TTY, ch == SYS_TTYP_PPU_STDERR ? Log::Severity::Error : Log::Severity::Notice, { buf.get_ptr(), len }); - + _log::g_tty_file.log({ buf.get_ptr(), len }); + *pwritelen = len; return CELL_OK; diff --git a/rpcs3/Emu/SysCalls/lv2/sys_vm.cpp b/rpcs3/Emu/SysCalls/lv2/sys_vm.cpp index c1ac82e38c..3e9361bedb 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_vm.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_vm.cpp @@ -11,7 +11,7 @@ SysCallBase sys_vm("sys_vm"); s32 sys_vm_memory_map(u32 vsize, u32 psize, u32 cid, u64 flag, u64 policy, vm::ptr addr) { - sys_vm.Error("sys_vm_memory_map(vsize=0x%x, psize=0x%x, cid=0x%x, flags=0x%llx, policy=0x%llx, addr=*0x%x)", vsize, psize, cid, flag, policy, addr); + sys_vm.error("sys_vm_memory_map(vsize=0x%x, psize=0x%x, cid=0x%x, flags=0x%llx, policy=0x%llx, addr=*0x%x)", vsize, psize, cid, flag, policy, addr); LV2_LOCK; @@ -35,7 +35,7 @@ s32 sys_vm_memory_map(u32 vsize, u32 psize, u32 cid, u64 flag, u64 policy, vm::p s32 sys_vm_unmap(u32 addr) { - sys_vm.Error("sys_vm_unmap(addr=0x%x)", addr); + sys_vm.error("sys_vm_unmap(addr=0x%x)", addr); LV2_LOCK; @@ -49,70 +49,70 @@ s32 sys_vm_unmap(u32 addr) s32 sys_vm_append_memory(u32 addr, u32 size) { - sys_vm.Todo("sys_vm_append_memory(addr=0x%x, size=0x%x)", addr, size); + sys_vm.todo("sys_vm_append_memory(addr=0x%x, size=0x%x)", addr, size); return CELL_OK; } s32 sys_vm_return_memory(u32 addr, u32 size) { - sys_vm.Todo("sys_vm_return_memory(addr=0x%x, size=0x%x)", addr, size); + sys_vm.todo("sys_vm_return_memory(addr=0x%x, size=0x%x)", addr, size); return CELL_OK; } s32 sys_vm_lock(u32 addr, u32 size) { - sys_vm.Todo("sys_vm_lock(addr=0x%x, size=0x%x)", addr, size); + sys_vm.todo("sys_vm_lock(addr=0x%x, size=0x%x)", addr, size); return CELL_OK; } s32 sys_vm_unlock(u32 addr, u32 size) { - sys_vm.Todo("sys_vm_unlock(addr=0x%x, size=0x%x)", addr, size); + sys_vm.todo("sys_vm_unlock(addr=0x%x, size=0x%x)", addr, size); return CELL_OK; } s32 sys_vm_touch(u32 addr, u32 size) { - sys_vm.Todo("sys_vm_touch(addr=0x%x, size=0x%x)", addr, size); + sys_vm.todo("sys_vm_touch(addr=0x%x, size=0x%x)", addr, size); return CELL_OK; } s32 sys_vm_flush(u32 addr, u32 size) { - sys_vm.Todo("sys_vm_flush(addr=0x%x, size=0x%x)", addr, size); + sys_vm.todo("sys_vm_flush(addr=0x%x, size=0x%x)", addr, size); return CELL_OK; } s32 sys_vm_invalidate(u32 addr, u32 size) { - sys_vm.Todo("sys_vm_invalidate(addr=0x%x, size=0x%x)", addr, size); + sys_vm.todo("sys_vm_invalidate(addr=0x%x, size=0x%x)", addr, size); return CELL_OK; } s32 sys_vm_store(u32 addr, u32 size) { - sys_vm.Todo("sys_vm_store(addr=0x%x, size=0x%x)", addr, size); + sys_vm.todo("sys_vm_store(addr=0x%x, size=0x%x)", addr, size); return CELL_OK; } s32 sys_vm_sync(u32 addr, u32 size) { - sys_vm.Todo("sys_vm_sync(addr=0x%x, size=0x%x)", addr, size); + sys_vm.todo("sys_vm_sync(addr=0x%x, size=0x%x)", addr, size); return CELL_OK; } s32 sys_vm_test(u32 addr, u32 size, vm::ptr result) { - sys_vm.Todo("sys_vm_test(addr=0x%x, size=0x%x, result=*0x%x)", addr, size, result); + sys_vm.todo("sys_vm_test(addr=0x%x, size=0x%x, result=*0x%x)", addr, size, result); *result = SYS_VM_STATE_ON_MEMORY; @@ -121,7 +121,7 @@ s32 sys_vm_test(u32 addr, u32 size, vm::ptr result) s32 sys_vm_get_statistics(u32 addr, vm::ptr stat) { - sys_vm.Todo("sys_vm_get_statistics(addr=0x%x, stat=*0x%x)", addr, stat); + sys_vm.todo("sys_vm_get_statistics(addr=0x%x, stat=*0x%x)", addr, stat); stat->page_fault_ppu = 0; stat->page_fault_spu = 0; diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 7a53f25d75..9168206802 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -435,7 +435,7 @@ void Emulator::Stop() for (auto& v : decltype(g_armv7_dump)(std::move(g_armv7_dump))) { - LOG_NOTICE(ARMv7, v.second); + LOG_NOTICE(ARMv7, "%s", v.second); } m_rsx_callback = 0; diff --git a/rpcs3/Gui/ConLogFrame.cpp b/rpcs3/Gui/ConLogFrame.cpp index 51d2f3f440..ad235866a0 100644 --- a/rpcs3/Gui/ConLogFrame.cpp +++ b/rpcs3/Gui/ConLogFrame.cpp @@ -1,145 +1,41 @@ -#include "stdafx.h" +#include "stdafx.h" #include "stdafx_gui.h" #include "Emu/state.h" #include "Gui/ConLogFrame.h" -wxDEFINE_EVENT(EVT_LOG_COMMAND, wxCommandEvent); - -//amount of memory in bytes used to buffer log messages for the gui -const int BUFFER_MAX_SIZE = 1048576; // 1MB - -//amount of characters in the TextCtrl text-buffer for the emulation log -const int GUI_BUFFER_MAX_SIZE = 1048576; // 1MB - enum { - id_log_copy, //Copy log to ClipBoard - id_log_clear //Clear log -}; - -struct wxWriter : Log::LogListener -{ - wxTextCtrl *m_log; - wxTextCtrl *m_tty; - wxTextAttr m_color_white; - wxTextAttr m_color_yellow; - wxTextAttr m_color_red; - wxTextAttr m_color_green; - MTRingbuffer messages; - std::atomic newLog; - bool inited; - - wxWriter(wxTextCtrl* p_log, wxTextCtrl* p_tty) - : m_color_white(wxColour(255, 255, 255)) - , m_color_yellow(wxColour(255, 255, 0)) - , m_color_red(wxColour(255, 0, 0)) - , m_color_green(wxColour(0, 255, 0)) - , m_log(p_log) - , m_tty(p_tty) - , newLog(false) - , inited(false) - { - m_log->Bind(EVT_LOG_COMMAND, [this](wxCommandEvent &evt){ this->write(evt); }); - } - - wxWriter(wxWriter &other) = delete; - - //read messages from buffer and write them to the screen - void write(wxCommandEvent &) - { - if (messages.size() > 0) - { - messages.lockGet(); - size_t size = messages.size(); - std::vector local_messages(size); - messages.popN(&local_messages.front(), size); - messages.unlockGet(); - newLog = false; - - u32 cursor = 0; - u32 removed = 0; - while (cursor < local_messages.size()) - { - Log::LogMessage msg = Log::LogMessage::deserialize(local_messages.data() + cursor, &removed); - cursor += removed; - if (removed <= 0) - { - break; - } - wxTextCtrl *llogcon = (msg.mType == Log::TTY) ? m_tty : m_log; - if (llogcon) - { - switch (msg.mServerity) - { - case Log::Severity::Notice: - llogcon->SetDefaultStyle(m_color_white); - break; - case Log::Severity::Warning: - llogcon->SetDefaultStyle(m_color_yellow); - break; - case Log::Severity::Error: - llogcon->SetDefaultStyle(m_color_red); - break; - case Log::Severity::Success: - llogcon->SetDefaultStyle(m_color_green); - break; - default: - break; - } - llogcon->AppendText(fmt::FromUTF8(msg.mText)); - } - } - if (m_log->GetLastPosition() > GUI_BUFFER_MAX_SIZE) - { - m_log->Remove(0, m_log->GetLastPosition() - (GUI_BUFFER_MAX_SIZE/2)); - } - } - } - - //put message into the log buffer - void log(const Log::LogMessage &msg) override - { - u8 logLevel = (u8)rpcs3::config.misc.log.level.value(); - if (msg.mType != Log::TTY && logLevel != 0) - { - if (logLevel > static_cast(msg.mServerity)) - { - return; - } - } - - size_t size = msg.size(); - std::vector temp_buffer(size); - msg.serialize(temp_buffer.data()); - messages.pushRange(temp_buffer.begin(), temp_buffer.end()); - if (!newLog.load()) - { - newLog = true; - m_log->GetEventHandler()->QueueEvent(new wxCommandEvent(EVT_LOG_COMMAND)); - } - } + id_log_copy, // Copy log to ClipBoard + id_log_clear, // Clear log + id_timer, }; BEGIN_EVENT_TABLE(LogFrame, wxPanel) EVT_CLOSE(LogFrame::OnQuit) +EVT_TIMER(id_timer, LogFrame::OnTimer) END_EVENT_TABLE() LogFrame::LogFrame(wxWindow* parent) -: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(600, 500)) -, m_tabs(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_TOP | wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_MOVE | wxAUI_NB_SCROLL_BUTTONS) -, m_log(new wxTextCtrl(&m_tabs, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH2)) -, m_tty(new wxTextCtrl(&m_tabs, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH2)) + : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(600, 500)) + , m_tabs(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_TOP | wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_MOVE | wxAUI_NB_SCROLL_BUTTONS) + , m_log(new wxTextCtrl(&m_tabs, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH2)) + , m_tty(new wxTextCtrl(&m_tabs, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH2)) + , m_timer(this, id_timer) { - listener.reset(new wxWriter(m_log,m_tty)); + // Open or create RPCS3.log; TTY.log + m_log_file.open(fs::get_config_dir() + "RPCS3.log", fom::read | fom::create); + m_tty_file.open(fs::get_config_dir() + "TTY.log", fom::read | fom::create); + + // Check for updates every ~10 ms + m_timer.Start(10); + m_tty->SetBackgroundColour(wxColour("Black")); m_log->SetBackgroundColour(wxColour("Black")); m_tty->SetFont(wxFont(8, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); m_tabs.AddPage(m_log, "Log"); m_tabs.AddPage(m_tty, "TTY"); - Log::LogManager::getInstance().addListener(listener); - wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); s_main->Add(&m_tabs, 1, wxEXPAND); SetSizer(s_main); @@ -154,7 +50,6 @@ LogFrame::LogFrame(wxWindow* parent) LogFrame::~LogFrame() { - Log::LogManager::getInstance().removeListener(listener); } bool LogFrame::Close(bool force) @@ -167,7 +62,7 @@ void LogFrame::OnQuit(wxCloseEvent& event) event.Skip(); } -//Deals with the RightClick on Log Console, shows up the Context Menu. +// Deals with the RightClick on Log Console, shows up the Context Menu. void LogFrame::OnRightClick(wxMouseEvent& event) { wxMenu* menu = new wxMenu(); @@ -178,7 +73,8 @@ void LogFrame::OnRightClick(wxMouseEvent& event) PopupMenu(menu); } -//Well you can bind more than one control to a single handler. + +// Well you can bind more than one control to a single handler. void LogFrame::OnContextMenu(wxCommandEvent& event) { int id = event.GetId(); @@ -202,3 +98,113 @@ void LogFrame::OnContextMenu(wxCommandEvent& event) event.Skip(); } } + +void LogFrame::OnTimer(wxTimerEvent& event) +{ + char buf[8192]; + + const auto stamp0 = std::chrono::high_resolution_clock::now(); + + auto get_utf8 = [&](const fs::file& file, u64 size) -> wxString + { + // Bruteforce valid UTF-8 (TODO) + for (u64 read = file.read(buf, size); read; read--) + { + wxString text = wxString::FromUTF8(buf, read); + if (!text.empty()) + { + file.seek(read - size, fs::seek_cur); + return text; + } + } + + return{}; + }; + + // Check TTY logs + while (const u64 size = std::min(sizeof(buf), _log::g_tty_file.size() - m_tty_file.seek(0, fs::seek_cur))) + { + const wxString& text = get_utf8(m_tty_file, size); + + if (text.size()) + { + m_tty->SetDefaultStyle(wxColour(255, 255, 255)); + m_tty->AppendText(text); + } + + // Limit processing time + if (std::chrono::high_resolution_clock::now() >= stamp0 + 4ms) + { + break; + } + } + + const auto stamp1 = std::chrono::high_resolution_clock::now(); + + // Check main logs + while (const u64 size = std::min(sizeof(buf), _log::g_log_file.size() - m_log_file.seek(0, fs::seek_cur))) + { + const wxString& text = get_utf8(m_log_file, size); + + std::size_t start = 0, pos = 0; + + for (; pos < text.size(); pos++) + { + if (text[pos] == L'·') + { + if (text.size() - pos <= 3) + { + // Cannot get log string: abort + m_log_file.seek(0 - text.substr(pos).ToUTF8().length(), fs::seek_cur); + break; + } + + if (text[pos + 2] == ' ') + { + _log::level level; + wxColour color; + + switch (text[pos + 1].GetValue()) + { + case 'A': level = _log::level::always; color.Set(0x00, 0xFF, 0xFF); break; // Cyan + case 'F': level = _log::level::fatal; color.Set(0xFF, 0x00, 0xFF); break; // Fuchsia + case 'E': level = _log::level::error; color.Set(0xFF, 0x00, 0x00); break; // Red + case 'U': level = _log::level::todo; color.Set(0xFF, 0x60, 0x00); break; // Orange + case 'S': level = _log::level::success; color.Set(0x00, 0xFF, 0x00); break; // Green + case 'W': level = _log::level::warning; color.Set(0xFF, 0xFF, 0x00); break; // Yellow + case '!': level = _log::level::notice; color.Set(0xFF, 0xFF, 0xFF); break; // White + case 'T': level = _log::level::trace; color.Set(0x80, 0x80, 0x80); break; // Gray + default: continue; + } + + if (pos != start && m_level <= rpcs3::config.misc.log.level.value()) + { + m_log->SetDefaultStyle(m_color); + m_log->AppendText(text.substr(start, pos - start)); + } + + start = pos + 3; + m_level = level; + m_color = color; + } + } + } + + if (pos != start && m_level <= rpcs3::config.misc.log.level.value()) + { + m_log->SetDefaultStyle(m_color); + m_log->AppendText(text.substr(start, pos - start)); + } + + if (m_log->GetLastPosition() > 1024 * 1024) + { + m_log->Remove(0, m_log->GetLastPosition() - 512 * 1024); + } + + // Limit processing time + if (std::chrono::high_resolution_clock::now() >= stamp1 + 3ms) + { + break; + } + } +} diff --git a/rpcs3/Gui/ConLogFrame.h b/rpcs3/Gui/ConLogFrame.h index e0d5a19231..e35f159d67 100644 --- a/rpcs3/Gui/ConLogFrame.h +++ b/rpcs3/Gui/ConLogFrame.h @@ -1,20 +1,22 @@ #pragma once -namespace Log +class LogFrame : public wxPanel { - struct LogListener; -} + fs::file m_log_file; + fs::file m_tty_file; + + _log::level m_level{ _log::level::always }; // current log level + wxColour m_color{ 0, 255, 255 }; // current log color -class LogFrame - : public wxPanel -{ - std::shared_ptr listener; wxAuiNotebook m_tabs; wxTextCtrl *m_log; wxTextCtrl *m_tty; + //Copy Action in Context Menu wxTextDataObject* m_tdo; + wxTimer m_timer; + public: LogFrame(wxWindow* parent); LogFrame(LogFrame &other) = delete; @@ -26,8 +28,9 @@ private: virtual void Task(){}; void OnQuit(wxCloseEvent& event); - void OnRightClick(wxMouseEvent& event); //Show context menu - void OnContextMenu(wxCommandEvent& event); //After select + void OnRightClick(wxMouseEvent& event); // Show context menu + void OnContextMenu(wxCommandEvent& event); // After select + void OnTimer(wxTimerEvent& event); DECLARE_EVENT_TABLE(); }; diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp index 64bacd7257..f313eb1ec8 100644 --- a/rpcs3/Gui/MainFrame.cpp +++ b/rpcs3/Gui/MainFrame.cpp @@ -218,7 +218,7 @@ void MainFrame::BootGame(wxCommandEvent& WXUNUSED(event)) if(Emu.BootGame(ctrl.GetPath().ToStdString())) { - LOG_SUCCESS(HLE, "Game: boot done."); + LOG_SUCCESS(GENERAL, "Game: boot done."); if (rpcs3::config.misc.always_start.value()) { @@ -227,7 +227,7 @@ void MainFrame::BootGame(wxCommandEvent& WXUNUSED(event)) } else { - LOG_ERROR(HLE, "PS3 executable not found in selected folder (%s)", fmt::ToUTF8(ctrl.GetPath())); // passing std::string (test) + LOG_ERROR(GENERAL, "PS3 executable not found in selected folder (%s)", fmt::ToUTF8(ctrl.GetPath())); // passing std::string (test) } } @@ -336,13 +336,13 @@ void MainFrame::BootElf(wxCommandEvent& WXUNUSED(event)) return; } - LOG_NOTICE(HLE, "(S)ELF: booting..."); + LOG_NOTICE(LOADER, "(S)ELF: booting..."); Emu.Stop(); Emu.SetPath(fmt::ToUTF8(ctrl.GetPath())); Emu.Load(); - LOG_SUCCESS(HLE, "(S)ELF: boot done."); + LOG_SUCCESS(LOADER, "(S)ELF: boot done."); if (rpcs3::config.misc.always_start.value() && Emu.IsReady()) { diff --git a/rpcs3/Gui/SettingsDialog.cpp b/rpcs3/Gui/SettingsDialog.cpp index a8ca4a3cc6..be5d1535bd 100644 --- a/rpcs3/Gui/SettingsDialog.cpp +++ b/rpcs3/Gui/SettingsDialog.cpp @@ -193,9 +193,7 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg) wxCheckBox* chbox_gs_overlay = new wxCheckBox(p_graphics, wxID_ANY, "Debug overlay"); wxCheckBox* chbox_audio_dump = new wxCheckBox(p_audio, wxID_ANY, "Dump to file"); wxCheckBox* chbox_audio_conv = new wxCheckBox(p_audio, wxID_ANY, "Convert to 16 bit"); - wxCheckBox* chbox_hle_logging = new wxCheckBox(p_misc, wxID_ANY, "Log everything"); wxCheckBox* chbox_rsx_logging = new wxCheckBox(p_misc, wxID_ANY, "RSX Logging"); - wxCheckBox* chbox_hle_savetty = new wxCheckBox(p_misc, wxID_ANY, "Save TTY output to file"); wxCheckBox* chbox_hle_exitonstop = new wxCheckBox(p_misc, wxID_ANY, "Exit RPCS3 when process finishes"); wxCheckBox* chbox_hle_always_start = new wxCheckBox(p_misc, wxID_ANY, "Always start after boot"); wxCheckBox* chbox_hle_use_default_ini = new wxCheckBox(p_misc, wxID_ANY, "Use default configuration"); @@ -295,11 +293,14 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg) cbox_camera_type->Append("PlayStation Eye"); cbox_camera_type->Append("USB Video Class 1.1"); - cbox_hle_loglvl->Append("All"); - cbox_hle_loglvl->Append("Warnings"); - cbox_hle_loglvl->Append("Success"); - cbox_hle_loglvl->Append("Errors"); cbox_hle_loglvl->Append("Nothing"); + cbox_hle_loglvl->Append("Fatal"); + cbox_hle_loglvl->Append("Error"); + cbox_hle_loglvl->Append("TODO"); + cbox_hle_loglvl->Append("Success"); + cbox_hle_loglvl->Append("Warning"); + cbox_hle_loglvl->Append("Notice"); + cbox_hle_loglvl->Append("All"); cbox_net_status->Append("IP Obtained"); cbox_net_status->Append("Obtaining IP"); @@ -332,9 +333,7 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg) chbox_gs_overlay->SetValue(cfg->rsx.d3d12.overlay.value()); chbox_audio_dump->SetValue(rpcs3::config.audio.dump_to_file.value()); chbox_audio_conv->SetValue(rpcs3::config.audio.convert_to_u16.value()); - chbox_hle_logging->SetValue(rpcs3::config.misc.log.hle_logging.value()); chbox_rsx_logging->SetValue(rpcs3::config.misc.log.rsx_logging.value()); - chbox_hle_savetty->SetValue(rpcs3::config.misc.log.save_tty.value()); chbox_hle_exitonstop->SetValue(rpcs3::config.misc.exit_on_stop.value()); chbox_hle_always_start->SetValue(rpcs3::config.misc.always_start.value()); chbox_hle_use_default_ini->SetValue(rpcs3::config.misc.use_default_ini.value()); @@ -447,9 +446,7 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg) // Miscellaneous s_subpanel_misc->Add(s_round_hle_log_lvl, wxSizerFlags().Border(wxALL, 5).Expand()); - s_subpanel_misc->Add(chbox_hle_logging, wxSizerFlags().Border(wxALL, 5).Expand()); s_subpanel_misc->Add(chbox_rsx_logging, wxSizerFlags().Border(wxALL, 5).Expand()); - s_subpanel_misc->Add(chbox_hle_savetty, wxSizerFlags().Border(wxALL, 5).Expand()); s_subpanel_misc->Add(chbox_hle_exitonstop, wxSizerFlags().Border(wxALL, 5).Expand()); s_subpanel_misc->Add(chbox_hle_always_start, wxSizerFlags().Border(wxALL, 5).Expand()); s_subpanel_misc->Add(chbox_hle_use_default_ini, wxSizerFlags().Border(wxALL, 5).Expand()); @@ -532,9 +529,7 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg) rpcs3::config.audio.dump_to_file = chbox_audio_dump->GetValue(); rpcs3::config.audio.convert_to_u16 = chbox_audio_conv->GetValue(); rpcs3::config.misc.log.level = cbox_hle_loglvl->GetSelection(); - rpcs3::config.misc.log.hle_logging = chbox_hle_logging->GetValue(); rpcs3::config.misc.log.rsx_logging = chbox_rsx_logging->GetValue(); - rpcs3::config.misc.log.save_tty = chbox_hle_savetty->GetValue(); rpcs3::config.misc.net.status = cbox_net_status->GetSelection(); rpcs3::config.misc.net._interface = cbox_net_interface->GetSelection(); rpcs3::config.misc.debug.auto_pause_syscall = chbox_dbg_ap_systemcall->GetValue(); diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp index 46ec67b164..dc3b3db9f5 100644 --- a/rpcs3/Loader/ELF32.cpp +++ b/rpcs3/Loader/ELF32.cpp @@ -230,7 +230,7 @@ namespace loader { if (func->module) { - LOG_NOTICE(LOADER, "Imported function '%s' in module '%s' (nid=0x%08x, addr=0x%x)", func->name, func->module->GetName(), nid, addr); + LOG_NOTICE(LOADER, "Imported function '%s' in module '%s' (nid=0x%08x, addr=0x%x)", func->name, func->module->name, nid, addr); } else { @@ -322,7 +322,7 @@ namespace loader { LOG_ERROR(LOADER, ".sceRefs: movw writing failed (ref_addr=0x%x, addr=0x%x)", code, code[1]); } - else //if (rpcs3::config.misc.log.hle_logging.value()) + else { LOG_NOTICE(LOADER, ".sceRefs: movw written at 0x%x (ref_addr=0x%x, data=0x%x)", code[1], code, data); } @@ -338,7 +338,7 @@ namespace loader { LOG_ERROR(LOADER, ".sceRefs: movt writing failed (ref_addr=0x%x, addr=0x%x)", code, code[1]); } - else //if (rpcs3::config.misc.log.hle_logging.value()) + else { LOG_NOTICE(LOADER, ".sceRefs: movt written at 0x%x (ref_addr=0x%x, data=0x%x)", code[1], code, data); } @@ -352,10 +352,7 @@ namespace loader { data = 0; - if (rpcs3::config.misc.log.hle_logging.value()) - { - LOG_NOTICE(LOADER, ".sceRefs: zero code found"); - } + LOG_TRACE(LOADER, ".sceRefs: zero code found"); break; } default: diff --git a/rpcs3/config.h b/rpcs3/config.h index 5489e4c689..d1ffdfd0db 100644 --- a/rpcs3/config.h +++ b/rpcs3/config.h @@ -460,15 +460,6 @@ namespace convert }; } -enum class misc_log_level -{ - all, - warnings, - success, - errors, - nothing -}; - enum class misc_net_status { ip_obtained, @@ -480,44 +471,56 @@ enum class misc_net_status namespace convert { template<> - struct to_impl_t + struct to_impl_t { - static std::string func(misc_log_level value) + static std::string func(_log::level value) { switch (value) { - case misc_log_level::all: return "All"; - case misc_log_level::warnings: return "Warnings"; - case misc_log_level::success: return "Success"; - case misc_log_level::errors: return "Errors"; - case misc_log_level::nothing: return "Nothing"; + case _log::level::trace: return "All"; + case _log::level::warning: return "Warning"; + case _log::level::success: return "Success"; + case _log::level::error: return "Error"; + case _log::level::always: return "Nothing"; + case _log::level::fatal: return "Fatal"; + case _log::level::todo: return "TODO"; + case _log::level::notice: return "Notice"; } - return "Unknown"; + return fmt::format("Unknown:0x%x", value); } }; template<> - struct to_impl_t + struct to_impl_t<_log::level, std::string> { - static misc_log_level func(const std::string &value) + static _log::level func(const std::string &value) { if (value == "All") - return misc_log_level::all; + return _log::level::trace; - if (value == "Warnings") - return misc_log_level::warnings; + if (value == "Warning") + return _log::level::warning; if (value == "Success") - return misc_log_level::success; + return _log::level::success; - if (value == "Errors") - return misc_log_level::errors; + if (value == "Error") + return _log::level::error; if (value == "Nothing") - return misc_log_level::nothing; + return _log::level::always; - return misc_log_level::errors; + if (value == "Fatal") + return _log::level::fatal; + + if (value == "TODO") + return _log::level::todo; + + if (value == "Notice") + return _log::level::notice; + + return _log::level::success; } }; @@ -932,10 +935,8 @@ namespace rpcs3 { log_group(group *grp) : group{ grp, "log" } {} - entry level { this, "Log Level", misc_log_level::errors }; - entry hle_logging { this, "Log everything", false }; + entry<_log::level> level { this, "Log Level", _log::level::success }; entry rsx_logging { this, "RSX Logging", false }; - entry save_tty { this, "Save TTY output to file", false }; } log{ this }; struct net_group : protected group diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index 6515b0beb8..d6c4bedf81 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -217,7 +217,6 @@ - @@ -363,7 +362,6 @@ - @@ -538,7 +536,6 @@ - diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index 61dc63dbf8..616cd98818 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -470,9 +470,6 @@ Utilities - - Emu\SysCalls - Utilities @@ -1361,9 +1358,6 @@ Utilities - - Emu\SysCalls - Emu\GPU\RSX\Null @@ -1409,9 +1403,6 @@ Emu\Io\Null - - Utilities - Utilities