mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 14:23:22 +02:00
Merge pull request #786 from lioncash/exclusive
exclusive_monitor: Use consistent type alias for u64
This commit is contained in:
commit
25635907a2
@ -257,7 +257,7 @@ void ARM_Dynarmic::PageTableChanged() {
|
|||||||
DynarmicExclusiveMonitor::DynarmicExclusiveMonitor(size_t core_count) : monitor(core_count) {}
|
DynarmicExclusiveMonitor::DynarmicExclusiveMonitor(size_t core_count) : monitor(core_count) {}
|
||||||
DynarmicExclusiveMonitor::~DynarmicExclusiveMonitor() = default;
|
DynarmicExclusiveMonitor::~DynarmicExclusiveMonitor() = default;
|
||||||
|
|
||||||
void DynarmicExclusiveMonitor::SetExclusive(size_t core_index, u64 addr) {
|
void DynarmicExclusiveMonitor::SetExclusive(size_t core_index, VAddr addr) {
|
||||||
// Size doesn't actually matter.
|
// Size doesn't actually matter.
|
||||||
monitor.Mark(core_index, addr, 16);
|
monitor.Mark(core_index, addr, 16);
|
||||||
}
|
}
|
||||||
@ -266,28 +266,27 @@ void DynarmicExclusiveMonitor::ClearExclusive() {
|
|||||||
monitor.Clear();
|
monitor.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DynarmicExclusiveMonitor::ExclusiveWrite8(size_t core_index, u64 vaddr, u8 value) {
|
bool DynarmicExclusiveMonitor::ExclusiveWrite8(size_t core_index, VAddr vaddr, u8 value) {
|
||||||
return monitor.DoExclusiveOperation(core_index, vaddr, 1,
|
return monitor.DoExclusiveOperation(core_index, vaddr, 1,
|
||||||
[&] { Memory::Write8(vaddr, value); });
|
[&] { Memory::Write8(vaddr, value); });
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DynarmicExclusiveMonitor::ExclusiveWrite16(size_t core_index, u64 vaddr, u16 value) {
|
bool DynarmicExclusiveMonitor::ExclusiveWrite16(size_t core_index, VAddr vaddr, u16 value) {
|
||||||
return monitor.DoExclusiveOperation(core_index, vaddr, 2,
|
return monitor.DoExclusiveOperation(core_index, vaddr, 2,
|
||||||
[&] { Memory::Write16(vaddr, value); });
|
[&] { Memory::Write16(vaddr, value); });
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DynarmicExclusiveMonitor::ExclusiveWrite32(size_t core_index, u64 vaddr, u32 value) {
|
bool DynarmicExclusiveMonitor::ExclusiveWrite32(size_t core_index, VAddr vaddr, u32 value) {
|
||||||
return monitor.DoExclusiveOperation(core_index, vaddr, 4,
|
return monitor.DoExclusiveOperation(core_index, vaddr, 4,
|
||||||
[&] { Memory::Write32(vaddr, value); });
|
[&] { Memory::Write32(vaddr, value); });
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DynarmicExclusiveMonitor::ExclusiveWrite64(size_t core_index, u64 vaddr, u64 value) {
|
bool DynarmicExclusiveMonitor::ExclusiveWrite64(size_t core_index, VAddr vaddr, u64 value) {
|
||||||
return monitor.DoExclusiveOperation(core_index, vaddr, 8,
|
return monitor.DoExclusiveOperation(core_index, vaddr, 8,
|
||||||
[&] { Memory::Write64(vaddr, value); });
|
[&] { Memory::Write64(vaddr, value); });
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DynarmicExclusiveMonitor::ExclusiveWrite128(size_t core_index, u64 vaddr,
|
bool DynarmicExclusiveMonitor::ExclusiveWrite128(size_t core_index, VAddr vaddr, u128 value) {
|
||||||
std::array<std::uint64_t, 2> value) {
|
|
||||||
return monitor.DoExclusiveOperation(core_index, vaddr, 16, [&] {
|
return monitor.DoExclusiveOperation(core_index, vaddr, 16, [&] {
|
||||||
Memory::Write64(vaddr, value[0]);
|
Memory::Write64(vaddr, value[0]);
|
||||||
Memory::Write64(vaddr, value[1]);
|
Memory::Write64(vaddr, value[1]);
|
||||||
|
@ -68,15 +68,14 @@ public:
|
|||||||
explicit DynarmicExclusiveMonitor(size_t core_count);
|
explicit DynarmicExclusiveMonitor(size_t core_count);
|
||||||
~DynarmicExclusiveMonitor();
|
~DynarmicExclusiveMonitor();
|
||||||
|
|
||||||
void SetExclusive(size_t core_index, u64 addr) override;
|
void SetExclusive(size_t core_index, VAddr addr) override;
|
||||||
void ClearExclusive() override;
|
void ClearExclusive() override;
|
||||||
|
|
||||||
bool ExclusiveWrite8(size_t core_index, u64 vaddr, u8 value) override;
|
bool ExclusiveWrite8(size_t core_index, VAddr vaddr, u8 value) override;
|
||||||
bool ExclusiveWrite16(size_t core_index, u64 vaddr, u16 value) override;
|
bool ExclusiveWrite16(size_t core_index, VAddr vaddr, u16 value) override;
|
||||||
bool ExclusiveWrite32(size_t core_index, u64 vaddr, u32 value) override;
|
bool ExclusiveWrite32(size_t core_index, VAddr vaddr, u32 value) override;
|
||||||
bool ExclusiveWrite64(size_t core_index, u64 vaddr, u64 value) override;
|
bool ExclusiveWrite64(size_t core_index, VAddr vaddr, u64 value) override;
|
||||||
bool ExclusiveWrite128(size_t core_index, u64 vaddr,
|
bool ExclusiveWrite128(size_t core_index, VAddr vaddr, u128 value) override;
|
||||||
std::array<std::uint64_t, 2> value) override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend class ARM_Dynarmic;
|
friend class ARM_Dynarmic;
|
||||||
|
@ -4,20 +4,18 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
|
||||||
class ExclusiveMonitor {
|
class ExclusiveMonitor {
|
||||||
public:
|
public:
|
||||||
virtual ~ExclusiveMonitor();
|
virtual ~ExclusiveMonitor();
|
||||||
|
|
||||||
virtual void SetExclusive(size_t core_index, u64 addr) = 0;
|
virtual void SetExclusive(size_t core_index, VAddr addr) = 0;
|
||||||
virtual void ClearExclusive() = 0;
|
virtual void ClearExclusive() = 0;
|
||||||
|
|
||||||
virtual bool ExclusiveWrite8(size_t core_index, u64 vaddr, u8 value) = 0;
|
virtual bool ExclusiveWrite8(size_t core_index, VAddr vaddr, u8 value) = 0;
|
||||||
virtual bool ExclusiveWrite16(size_t core_index, u64 vaddr, u16 value) = 0;
|
virtual bool ExclusiveWrite16(size_t core_index, VAddr vaddr, u16 value) = 0;
|
||||||
virtual bool ExclusiveWrite32(size_t core_index, u64 vaddr, u32 value) = 0;
|
virtual bool ExclusiveWrite32(size_t core_index, VAddr vaddr, u32 value) = 0;
|
||||||
virtual bool ExclusiveWrite64(size_t core_index, u64 vaddr, u64 value) = 0;
|
virtual bool ExclusiveWrite64(size_t core_index, VAddr vaddr, u64 value) = 0;
|
||||||
virtual bool ExclusiveWrite128(size_t core_index, u64 vaddr,
|
virtual bool ExclusiveWrite128(size_t core_index, VAddr vaddr, u128 value) = 0;
|
||||||
std::array<std::uint64_t, 2> value) = 0;
|
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user