RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

core config: Expose min/max ranges of integral settings and use it

Browse Source
This commit is contained in:
Eladash 2019-08-02 21:53:47 +03:00 committed by Ivan
parent a6c94a0eaf
commit 6d3fc3a386
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Utilities/Config.h
View File

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "Utilities/types.h"
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"
@ -235,6 +235,10 @@ namespace cfg
public: public:
int_type def; int_type def;
// Expose range
static const s64 max = Max;
static const s64 min = Min;
_int(node* owner, const std::string& name, int_type def = std::min<int_type>(Max, std::max<int_type>(Min, 0))) _int(node* owner, const std::string& name, int_type def = std::min<int_type>(Max, std::max<int_type>(Min, 0)))
: _base(type::_int, owner, name) : _base(type::_int, owner, name)
, m_value(def) , m_value(def)

4
rpcs3/Emu/Cell/lv2/sys_sync.h
View File

@ -218,7 +218,9 @@ struct lv2_obj
template<bool is_usleep = false> template<bool is_usleep = false>
static bool wait_timeout(u64 usec, cpu_thread* const cpu = nullptr) static bool wait_timeout(u64 usec, cpu_thread* const cpu = nullptr)
{ {
// Clamp to max timeout accepted (also solves potential oveflows when scaling) static_assert(UINT64_MAX / cond_variable::max_timeout >= g_cfg.core.clocks_scale.max, "timeout may overflow during scaling");
// Clamp to max timeout accepted
if (usec > cond_variable::max_timeout) usec = cond_variable::max_timeout; if (usec > cond_variable::max_timeout) usec = cond_variable::max_timeout;
// Now scale the result // Now scale the result

2
rpcs3/Emu/Memory/vm.cpp
View File

@ -66,7 +66,7 @@ namespace vm
atomic_t<u32> g_addr_lock = 0; atomic_t<u32> g_addr_lock = 0;
// Memory mutex: passive locks // Memory mutex: passive locks
std::array<atomic_t<cpu_thread*>, 4> g_locks{}; std::array<atomic_t<cpu_thread*>, g_cfg.core.ppu_threads.max> g_locks{};
std::array<atomic_t<u64>, 6> g_range_locks{}; std::array<atomic_t<u64>, 6> g_range_locks{};
static void _register_lock(cpu_thread* _cpu) static void _register_lock(cpu_thread* _cpu)