summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dynarmic
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2020-10-21 01:19:12 +0200
committerGitHub <noreply@github.com>2020-10-21 01:19:12 +0200
commit88d5140cf2f80d51dc297af3a128a4212215149f (patch)
treecd524e8ab111fba79f75a48cc672cb875251a32f /src/core/arm/dynarmic
parentMerge pull request #4390 from ogniK5377/get-applet-inf-stub (diff)
parentcore: Fix clang build (diff)
downloadyuzu-88d5140cf2f80d51dc297af3a128a4212215149f.tar
yuzu-88d5140cf2f80d51dc297af3a128a4212215149f.tar.gz
yuzu-88d5140cf2f80d51dc297af3a128a4212215149f.tar.bz2
yuzu-88d5140cf2f80d51dc297af3a128a4212215149f.tar.lz
yuzu-88d5140cf2f80d51dc297af3a128a4212215149f.tar.xz
yuzu-88d5140cf2f80d51dc297af3a128a4212215149f.tar.zst
yuzu-88d5140cf2f80d51dc297af3a128a4212215149f.zip
Diffstat (limited to 'src/core/arm/dynarmic')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_32.cpp10
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_32.h8
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_64.cpp10
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_64.h8
4 files changed, 18 insertions, 18 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
index b5f28a86e..fab694fc2 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -111,7 +111,7 @@ public:
}
return 0U;
}
- return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0);
+ return static_cast<u64>(std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0));
}
ARM_Dynarmic_32& parent;
@@ -210,19 +210,19 @@ u64 ARM_Dynarmic_32::GetPC() const {
return jit->Regs()[15];
}
-u64 ARM_Dynarmic_32::GetReg(int index) const {
+u64 ARM_Dynarmic_32::GetReg(std::size_t index) const {
return jit->Regs()[index];
}
-void ARM_Dynarmic_32::SetReg(int index, u64 value) {
+void ARM_Dynarmic_32::SetReg(std::size_t index, u64 value) {
jit->Regs()[index] = static_cast<u32>(value);
}
-u128 ARM_Dynarmic_32::GetVectorReg(int index) const {
+u128 ARM_Dynarmic_32::GetVectorReg(std::size_t index) const {
return {};
}
-void ARM_Dynarmic_32::SetVectorReg(int index, u128 value) {}
+void ARM_Dynarmic_32::SetVectorReg(std::size_t index, u128 value) {}
u32 ARM_Dynarmic_32::GetPSTATE() const {
return jit->Cpsr();
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.h b/src/core/arm/dynarmic/arm_dynarmic_32.h
index 2bab31b92..ba646c623 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.h
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.h
@@ -35,10 +35,10 @@ public:
void SetPC(u64 pc) override;
u64 GetPC() const override;
- u64 GetReg(int index) const override;
- void SetReg(int index, u64 value) override;
- u128 GetVectorReg(int index) const override;
- void SetVectorReg(int index, u128 value) override;
+ u64 GetReg(std::size_t index) const override;
+ void SetReg(std::size_t index, u64 value) override;
+ u128 GetVectorReg(std::size_t index) const override;
+ void SetVectorReg(std::size_t index, u128 value) override;
u32 GetPSTATE() const override;
void SetPSTATE(u32 pstate) override;
void Run() override;
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
index ce9968724..a2c4c2f30 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
@@ -148,7 +148,7 @@ public:
}
return 0U;
}
- return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0);
+ return static_cast<u64>(std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0));
}
u64 GetCNTPCT() override {
@@ -265,19 +265,19 @@ u64 ARM_Dynarmic_64::GetPC() const {
return jit->GetPC();
}
-u64 ARM_Dynarmic_64::GetReg(int index) const {
+u64 ARM_Dynarmic_64::GetReg(std::size_t index) const {
return jit->GetRegister(index);
}
-void ARM_Dynarmic_64::SetReg(int index, u64 value) {
+void ARM_Dynarmic_64::SetReg(std::size_t index, u64 value) {
jit->SetRegister(index, value);
}
-u128 ARM_Dynarmic_64::GetVectorReg(int index) const {
+u128 ARM_Dynarmic_64::GetVectorReg(std::size_t index) const {
return jit->GetVector(index);
}
-void ARM_Dynarmic_64::SetVectorReg(int index, u128 value) {
+void ARM_Dynarmic_64::SetVectorReg(std::size_t index, u128 value) {
jit->SetVector(index, value);
}
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.h b/src/core/arm/dynarmic/arm_dynarmic_64.h
index 403c55961..2afb7e7a4 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_64.h
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.h
@@ -33,10 +33,10 @@ public:
void SetPC(u64 pc) override;
u64 GetPC() const override;
- u64 GetReg(int index) const override;
- void SetReg(int index, u64 value) override;
- u128 GetVectorReg(int index) const override;
- void SetVectorReg(int index, u128 value) override;
+ u64 GetReg(std::size_t index) const override;
+ void SetReg(std::size_t index, u64 value) override;
+ u128 GetVectorReg(std::size_t index) const override;
+ void SetVectorReg(std::size_t index, u128 value) override;
u32 GetPSTATE() const override;
void SetPSTATE(u32 pstate) override;
void Run() override;