summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-05-09 00:53:13 +0200
committerFernando Sahmkow <fsahmkow27@gmail.com>2020-06-27 17:36:14 +0200
commit467d43570e10b98fa33067352d35fe62ceb3cb9e (patch)
tree830b0a3b6bc7675ce3c988c86d000f1a4287214c
parentARMInterface/Externals: Update dynarmic and fit to latest version. (diff)
downloadyuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.tar
yuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.tar.gz
yuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.tar.bz2
yuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.tar.lz
yuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.tar.xz
yuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.tar.zst
yuzu-467d43570e10b98fa33067352d35fe62ceb3cb9e.zip
-rw-r--r--src/common/atomic_ops.cpp14
-rw-r--r--src/common/atomic_ops.h2
-rw-r--r--src/common/thread.cpp30
-rw-r--r--src/core/arm/unicorn/arm_unicorn.cpp4
-rw-r--r--src/core/arm/unicorn/arm_unicorn.h4
-rw-r--r--src/core/core.h2
-rw-r--r--src/core/hle/kernel/mutex.cpp11
-rw-r--r--src/core/hle/kernel/mutex.h3
-rw-r--r--src/core/hle/kernel/physical_core.h7
-rw-r--r--src/core/hle/kernel/server_session.cpp2
-rw-r--r--src/yuzu/bootmanager.cpp1
-rw-r--r--src/yuzu/bootmanager.h3
-rw-r--r--src/yuzu/debugger/wait_tree.cpp5
-rw-r--r--src/yuzu/main.cpp9
14 files changed, 49 insertions, 48 deletions
diff --git a/src/common/atomic_ops.cpp b/src/common/atomic_ops.cpp
index 65cdfb4fd..6b2236114 100644
--- a/src/common/atomic_ops.cpp
+++ b/src/common/atomic_ops.cpp
@@ -35,26 +35,26 @@ bool AtomicCompareAndSwap(u64 volatile* pointer, u64 value, u64 expected) {
}
bool AtomicCompareAndSwap(u64 volatile* pointer, u128 value, u128 expected) {
- return _InterlockedCompareExchange128((__int64*)pointer, value[1], value[0], (__int64*)expected.data()) != 0;
+ return _InterlockedCompareExchange128((__int64*)pointer, value[1], value[0],
+ (__int64*)expected.data()) != 0;
}
-
#else
bool AtomicCompareAndSwap(u8 volatile* pointer, u8 value, u8 expected) {
- return __sync_bool_compare_and_swap (pointer, value, expected);
+ return __sync_bool_compare_and_swap(pointer, value, expected);
}
bool AtomicCompareAndSwap(u16 volatile* pointer, u16 value, u16 expected) {
- return __sync_bool_compare_and_swap (pointer, value, expected);
+ return __sync_bool_compare_and_swap(pointer, value, expected);
}
bool AtomicCompareAndSwap(u32 volatile* pointer, u32 value, u32 expected) {
- return __sync_bool_compare_and_swap (pointer, value, expected);
+ return __sync_bool_compare_and_swap(pointer, value, expected);
}
bool AtomicCompareAndSwap(u64 volatile* pointer, u64 value, u64 expected) {
- return __sync_bool_compare_and_swap (pointer, value, expected);
+ return __sync_bool_compare_and_swap(pointer, value, expected);
}
bool AtomicCompareAndSwap(u64 volatile* pointer, u128 value, u128 expected) {
@@ -62,7 +62,7 @@ bool AtomicCompareAndSwap(u64 volatile* pointer, u128 value, u128 expected) {
unsigned __int128 expected_a;
std::memcpy(&value_a, value.data(), sizeof(u128));
std::memcpy(&expected_a, expected.data(), sizeof(u128));
- return __sync_bool_compare_and_swap ((unsigned __int128*)pointer, value_a, expected_a);
+ return __sync_bool_compare_and_swap((unsigned __int128*)pointer, value_a, expected_a);
}
#endif
diff --git a/src/common/atomic_ops.h b/src/common/atomic_ops.h
index 22cb3a402..e6181d521 100644
--- a/src/common/atomic_ops.h
+++ b/src/common/atomic_ops.h
@@ -8,7 +8,7 @@
namespace Common {
-bool AtomicCompareAndSwap(u8 volatile * pointer, u8 value, u8 expected);
+bool AtomicCompareAndSwap(u8 volatile* pointer, u8 value, u8 expected);
bool AtomicCompareAndSwap(u16 volatile* pointer, u16 value, u16 expected);
bool AtomicCompareAndSwap(u32 volatile* pointer, u32 value, u32 expected);
bool AtomicCompareAndSwap(u64 volatile* pointer, u64 value, u64 expected);
diff --git a/src/common/thread.cpp b/src/common/thread.cpp
index 33c8437f5..8e5935e6a 100644
--- a/src/common/thread.cpp
+++ b/src/common/thread.cpp
@@ -31,21 +31,21 @@ void SetCurrentThreadPriority(ThreadPriority new_priority) {
auto handle = GetCurrentThread();
int windows_priority = 0;
switch (new_priority) {
- case ThreadPriority::Low:
- windows_priority = THREAD_PRIORITY_BELOW_NORMAL;
- break;
- case ThreadPriority::Normal:
- windows_priority = THREAD_PRIORITY_NORMAL;
- break;
- case ThreadPriority::High:
- windows_priority = THREAD_PRIORITY_ABOVE_NORMAL;
- break;
- case ThreadPriority::VeryHigh:
- windows_priority = THREAD_PRIORITY_HIGHEST;
- break;
- default:
- windows_priority = THREAD_PRIORITY_NORMAL;
- break;
+ case ThreadPriority::Low:
+ windows_priority = THREAD_PRIORITY_BELOW_NORMAL;
+ break;
+ case ThreadPriority::Normal:
+ windows_priority = THREAD_PRIORITY_NORMAL;
+ break;
+ case ThreadPriority::High:
+ windows_priority = THREAD_PRIORITY_ABOVE_NORMAL;
+ break;
+ case ThreadPriority::VeryHigh:
+ windows_priority = THREAD_PRIORITY_HIGHEST;
+ break;
+ default:
+ windows_priority = THREAD_PRIORITY_NORMAL;
+ break;
}
SetThreadPriority(handle, windows_priority);
}
diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp
index 9f9690454..35e8f42e8 100644
--- a/src/core/arm/unicorn/arm_unicorn.cpp
+++ b/src/core/arm/unicorn/arm_unicorn.cpp
@@ -63,8 +63,8 @@ static bool UnmappedMemoryHook(uc_engine* uc, uc_mem_type type, u64 addr, int si
return false;
}
-ARM_Unicorn::ARM_Unicorn(System& system, CPUInterrupts& interrupt_handlers,
- bool uses_wall_clock, Arch architecture, std::size_t core_index)
+ARM_Unicorn::ARM_Unicorn(System& system, CPUInterrupts& interrupt_handlers, bool uses_wall_clock,
+ Arch architecture, std::size_t core_index)
: ARM_Interface{system, interrupt_handlers, uses_wall_clock}, core_index{core_index} {
const auto arch = architecture == Arch::AArch32 ? UC_ARCH_ARM : UC_ARCH_ARM64;
CHECKED(uc_open(arch, UC_MODE_ARM, &uc));
diff --git a/src/core/arm/unicorn/arm_unicorn.h b/src/core/arm/unicorn/arm_unicorn.h
index 9b7d7f6c2..8ace8b86f 100644
--- a/src/core/arm/unicorn/arm_unicorn.h
+++ b/src/core/arm/unicorn/arm_unicorn.h
@@ -20,8 +20,8 @@ public:
AArch64, // 64-bit ARM
};
- explicit ARM_Unicorn(System& system, CPUInterrupts& interrupt_handlers,
- bool uses_wall_clock, Arch architecture, std::size_t core_index);
+ explicit ARM_Unicorn(System& system, CPUInterrupts& interrupt_handlers, bool uses_wall_clock,
+ Arch architecture, std::size_t core_index);
~ARM_Unicorn() override;
void SetPC(u64 pc) override;
diff --git a/src/core/core.h b/src/core/core.h
index 87df79d57..d2d1fcc5b 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -148,8 +148,6 @@ public:
*/
ResultStatus Pause();
-
-
/**
* Step the CPU one instruction
* @return Result status, indicating whether or not the operation succeeded.
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index 32dc1ffae..8f6c944d1 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -9,7 +9,6 @@
#include "common/assert.h"
#include "common/logging/log.h"
#include "core/core.h"
-#include "core/core.h"
#include "core/hle/kernel/errors.h"
#include "core/hle/kernel/handle_table.h"
#include "core/hle/kernel/kernel.h"
@@ -126,11 +125,11 @@ ResultCode Mutex::TryAcquire(VAddr address, Handle holding_thread_handle,
std::pair<ResultCode, std::shared_ptr<Thread>> Mutex::Unlock(std::shared_ptr<Thread> owner,
VAddr address) {
- // The mutex address must be 4-byte aligned
- if ((address % sizeof(u32)) != 0) {
- LOG_ERROR(Kernel, "Address is not 4-byte aligned! address={:016X}", address);
- return {ERR_INVALID_ADDRESS, nullptr};
- }
+ // The mutex address must be 4-byte aligned
+ if ((address % sizeof(u32)) != 0) {
+ LOG_ERROR(Kernel, "Address is not 4-byte aligned! address={:016X}", address);
+ return {ERR_INVALID_ADDRESS, nullptr};
+ }
auto [new_owner, num_waiters] = GetHighestPriorityMutexWaitingThread(owner, address);
if (new_owner == nullptr) {
diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h
index bce06ecea..3b81dc3df 100644
--- a/src/core/hle/kernel/mutex.h
+++ b/src/core/hle/kernel/mutex.h
@@ -29,7 +29,8 @@ public:
Handle requesting_thread_handle);
/// Unlocks a mutex for owner at address
- std::pair<ResultCode, std::shared_ptr<Thread>> Unlock(std::shared_ptr<Thread> owner, VAddr address);
+ std::pair<ResultCode, std::shared_ptr<Thread>> Unlock(std::shared_ptr<Thread> owner,
+ VAddr address);
/// Releases the mutex at the specified address.
ResultCode Release(VAddr address);
diff --git a/src/core/hle/kernel/physical_core.h b/src/core/hle/kernel/physical_core.h
index 751b994a7..85f6dec05 100644
--- a/src/core/hle/kernel/physical_core.h
+++ b/src/core/hle/kernel/physical_core.h
@@ -10,7 +10,7 @@
#include "core/arm/cpu_interrupt_handler.h"
namespace Common {
- class SpinLock;
+class SpinLock;
}
namespace Kernel {
@@ -27,9 +27,8 @@ namespace Kernel {
class PhysicalCore {
public:
- PhysicalCore(Core::System& system, std::size_t id,
- Kernel::Scheduler& scheduler,
- Core::CPUInterruptHandler& interrupt_handler);
+ PhysicalCore(Core::System& system, std::size_t id, Kernel::Scheduler& scheduler,
+ Core::CPUInterruptHandler& interrupt_handler);
~PhysicalCore();
PhysicalCore(const PhysicalCore&) = delete;
diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp
index e988a3f22..7b23a6889 100644
--- a/src/core/hle/kernel/server_session.cpp
+++ b/src/core/hle/kernel/server_session.cpp
@@ -17,9 +17,9 @@
#include "core/hle/kernel/hle_ipc.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/process.h"
+#include "core/hle/kernel/scheduler.h"
#include "core/hle/kernel/server_session.h"
#include "core/hle/kernel/session.h"
-#include "core/hle/kernel/scheduler.h"
#include "core/hle/kernel/thread.h"
#include "core/memory.h"
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index 5f93bd432..4bfce48a4 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -71,7 +71,6 @@ void EmuThread::run() {
gpu.ReleaseContext();
-
// Holds whether the cpu was running during the last iteration,
// so that the DebugModeLeft signal can be emitted before the
// next execution step
diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h
index 768568b3e..6c59b4d5c 100644
--- a/src/yuzu/bootmanager.h
+++ b/src/yuzu/bootmanager.h
@@ -62,7 +62,8 @@ public:
if (!running) {
running_wait.Set();
/// Wait until effectively paused
- while (running_guard);
+ while (running_guard)
+ ;
}
}
diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp
index 0226ae2e2..9bb0a0109 100644
--- a/src/yuzu/debugger/wait_tree.cpp
+++ b/src/yuzu/debugger/wait_tree.cpp
@@ -127,11 +127,12 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeCallstack::GetChildren() cons
return list;
}
- auto backtrace = Core::ARM_Interface::GetBacktraceFromContext(Core::System::GetInstance(), thread.GetContext64());
+ auto backtrace = Core::ARM_Interface::GetBacktraceFromContext(Core::System::GetInstance(),
+ thread.GetContext64());
for (auto& entry : backtrace) {
std::string s = fmt::format("{:20}{:016X} {:016X} {:016X} {}", entry.module, entry.address,
- entry.original_address, entry.offset, entry.name);
+ entry.original_address, entry.offset, entry.name);
list.push_back(std::make_unique<WaitTreeText>(QString::fromStdString(s)));
}
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index f1d9ec326..53790c89c 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -534,7 +534,8 @@ void GMainWindow::InitializeWidgets() {
if (emulation_running) {
return;
}
- bool is_async = !Settings::values.use_asynchronous_gpu_emulation || Settings::values.use_multi_core;
+ bool is_async =
+ !Settings::values.use_asynchronous_gpu_emulation || Settings::values.use_multi_core;
Settings::values.use_asynchronous_gpu_emulation = is_async;
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation);
Settings::Apply();
@@ -552,7 +553,8 @@ void GMainWindow::InitializeWidgets() {
return;
}
Settings::values.use_multi_core = !Settings::values.use_multi_core;
- bool is_async = Settings::values.use_asynchronous_gpu_emulation || Settings::values.use_multi_core;
+ bool is_async =
+ Settings::values.use_asynchronous_gpu_emulation || Settings::values.use_multi_core;
Settings::values.use_asynchronous_gpu_emulation = is_async;
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation);
multicore_status_button->setChecked(Settings::values.use_multi_core);
@@ -1958,7 +1960,8 @@ void GMainWindow::OnConfigure() {
dock_status_button->setChecked(Settings::values.use_docked_mode);
multicore_status_button->setChecked(Settings::values.use_multi_core);
- Settings::values.use_asynchronous_gpu_emulation = Settings::values.use_asynchronous_gpu_emulation || Settings::values.use_multi_core;
+ Settings::values.use_asynchronous_gpu_emulation =
+ Settings::values.use_asynchronous_gpu_emulation || Settings::values.use_multi_core;
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation);
#ifdef HAS_VULKAN