1
0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00

Minor changes

This commit is contained in:
Nekotekina 2017-01-25 02:22:19 +03:00 committed by Ivan
parent 1c14d872a8
commit 9232ddf0ab
16 changed files with 73 additions and 32 deletions

View File

@ -261,6 +261,22 @@ void cfg::node::from_default()
} }
} }
void cfg::bool_entry::from_default()
{
value = def;
}
void cfg::string_entry::from_default()
{
*this = def;
}
void cfg::set_entry::from_default()
{
std::lock_guard<std::mutex> lock(m_mutex);
m_set = {};
}
cfg::root_node& cfg::get_root() cfg::root_node& cfg::get_root()
{ {
// Magic static // Magic static

View File

@ -141,10 +141,7 @@ namespace cfg
return *this; return *this;
} }
void from_default() override void from_default() override;
{
value = def;
}
std::string to_string() const override std::string to_string() const override
{ {
@ -428,10 +425,7 @@ namespace cfg
return m_value.size(); return m_value.size();
} }
void from_default() override void from_default() override;
{
*this = def;
}
std::string to_string() const override std::string to_string() const override
{ {
@ -473,11 +467,7 @@ namespace cfg
m_set = std::move(set); m_set = std::move(set);
} }
void from_default() override void from_default() override;
{
std::lock_guard<std::mutex> lock(m_mutex);
m_set = {};
}
std::vector<std::string> to_list() const override std::vector<std::string> to_list() const override
{ {

View File

@ -136,6 +136,18 @@ namespace fs
static device_manager instance; static device_manager instance;
return instance; return instance;
} }
file_base::~file_base()
{
}
dir_base::~dir_base()
{
}
device_base::~device_base()
{
}
} }
std::shared_ptr<fs::device_base> fs::device_manager::get_device(const std::string& path) std::shared_ptr<fs::device_base> fs::device_manager::get_device(const std::string& path)

View File

@ -57,7 +57,7 @@ namespace fs
// File handle base // File handle base
struct file_base struct file_base
{ {
virtual ~file_base() = default; virtual ~file_base();
virtual stat_t stat() = 0; virtual stat_t stat() = 0;
virtual bool trunc(u64 length) = 0; virtual bool trunc(u64 length) = 0;
@ -76,7 +76,7 @@ namespace fs
// Directory handle base // Directory handle base
struct dir_base struct dir_base
{ {
virtual ~dir_base() = default; virtual ~dir_base();
virtual bool read(dir_entry&) = 0; virtual bool read(dir_entry&) = 0;
virtual void rewind() = 0; virtual void rewind() = 0;
@ -85,7 +85,7 @@ namespace fs
// Virtual device // Virtual device
struct device_base struct device_base
{ {
virtual ~device_base() = default; virtual ~device_base();
virtual bool stat(const std::string& path, stat_t& info) = 0; virtual bool stat(const std::string& path, stat_t& info) = 0;
virtual bool remove_dir(const std::string& path) = 0; virtual bool remove_dir(const std::string& path) = 0;

View File

@ -76,6 +76,10 @@ namespace logs
channel ARMv7("ARMv7"); channel ARMv7("ARMv7");
} }
logs::listener::~listener()
{
}
void logs::listener::add(logs::listener* _new) void logs::listener::add(logs::listener* _new)
{ {
// Get first (main) listener // Get first (main) listener

View File

@ -40,7 +40,7 @@ namespace logs
public: public:
constexpr listener() = default; constexpr listener() = default;
virtual ~listener() = default; virtual ~listener();
// Process log message // Process log message
virtual void log(const message& msg, const std::string& prefix, const std::string& text) = 0; virtual void log(const message& msg, const std::string& prefix, const std::string& text) = 0;

View File

@ -73,16 +73,6 @@ namespace std {
}; // class bad_variant_access }; // class bad_variant_access
template <typename R = void>
struct MAPBOX_VARIANT_DEPRECATED static_visitor
{
using result_type = R;
protected:
static_visitor() {}
~static_visitor() {}
};
namespace detail { namespace detail {
static constexpr std::size_t invalid_value = std::size_t(-1); static constexpr std::size_t invalid_value = std::size_t(-1);

View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#define POLARSSL_AES_ROM_TABLES
/** /**
* \file aes.h * \file aes.h
* *

View File

@ -1,5 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "AudioDumper.h" #include "AudioDumper.h"
#include "AudioThread.h"
AudioThread::~AudioThread()
{
}
AudioDumper::AudioDumper(u16 ch) AudioDumper::AudioDumper(u16 ch)
: m_header(ch) : m_header(ch)

View File

@ -3,7 +3,7 @@
class AudioThread class AudioThread
{ {
public: public:
virtual ~AudioThread() = default; virtual ~AudioThread();
virtual void Play() = 0; virtual void Play() = 0;
virtual void Open(const void* src, int size) = 0; virtual void Open(const void* src, int size) = 0;

View File

@ -149,7 +149,7 @@ void cpu_thread::run()
void cpu_thread::set_signal() void cpu_thread::set_signal()
{ {
verify("cpu_flag::signal" HERE), !state.test_and_set(cpu_flag::signal); verify("cpu_flag::signal" HERE), !state.test_and_set(cpu_flag::signal);
notify(); // TODO: lock_notify? notify();
} }
std::string cpu_thread::dump() const std::string cpu_thread::dump() const

View File

@ -64,6 +64,22 @@ enum : u32
MFC_SPU_MAX_QUEUE_SPACE = 0x10, MFC_SPU_MAX_QUEUE_SPACE = 0x10,
}; };
enum : u32
{
MFC_DMA_TAG_STATUS_UPDATE_EVENT = 0x00000001,
MFC_DMA_TAG_CMD_STALL_NOTIFY_EVENT = 0x00000002,
MFC_DMA_QUEUE_VACANCY_EVENT = 0x00000008,
MFC_SPU_MAILBOX_WRITTEN_EVENT = 0x00000010,
MFC_DECREMENTER_EVENT = 0x00000020,
MFC_PU_INT_MAILBOX_AVAIL_EVENT = 0x00000040,
MFC_PU_MAILBOX_AVAIL_EVENT = 0x00000080,
MFC_SIGNAL_2_EVENT = 0x00000100,
MFC_SIGNAL_1_EVENT = 0x00000200,
MFC_LLR_LOST_EVENT = 0x00000400,
MFC_PRIV_ATTN_EVENT = 0x00000800,
MFG_MULTISOURCE_SYNC_EVENT = 0x00001000,
};
struct spu_mfc_arg_t struct spu_mfc_arg_t
{ {
union union

View File

@ -10,6 +10,10 @@
extern logs::channel cellSysutil; extern logs::channel cellSysutil;
MsgDialogBase::~MsgDialogBase()
{
}
s32 cellMsgDialogOpen() s32 cellMsgDialogOpen()
{ {
fmt::throw_exception("Unimplemented" HERE); fmt::throw_exception("Unimplemented" HERE);

View File

@ -80,7 +80,7 @@ public:
std::function<void(s32 status)> on_close; std::function<void(s32 status)> on_close;
virtual ~MsgDialogBase() = default; virtual ~MsgDialogBase();
virtual void Create(const std::string& msg) = 0; virtual void Create(const std::string& msg) = 0;
virtual void CreateOsk(const std::string& msg, char16_t* osk_text) = 0; virtual void CreateOsk(const std::string& msg, char16_t* osk_text) = 0;
virtual void ProgressBarSetMsg(u32 progressBarIndex, const std::string& msg) = 0; virtual void ProgressBarSetMsg(u32 progressBarIndex, const std::string& msg) = 0;

View File

@ -8,6 +8,10 @@
extern u64 get_system_time(); extern u64 get_system_time();
spu_recompiler_base::~spu_recompiler_base()
{
}
void spu_recompiler_base::enter(SPUThread& spu) void spu_recompiler_base::enter(SPUThread& spu)
{ {
if (spu.pc >= 0x40000 || spu.pc % 4) if (spu.pc >= 0x40000 || spu.pc % 4)

View File

@ -15,7 +15,7 @@ protected:
u32 m_pos; // current position u32 m_pos; // current position
public: public:
virtual ~spu_recompiler_base() = default; virtual ~spu_recompiler_base();
// Compile specified function // Compile specified function
virtual void compile(spu_function_t& f) = 0; virtual void compile(spu_function_t& f) = 0;