diff options
author | MerryMage <MerryMage@users.noreply.github.com> | 2018-01-09 22:33:46 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-01-12 23:48:29 +0100 |
commit | d2fbc7832080955598c9fb6f083414eca47f0f19 (patch) | |
tree | 4f4b63aa2d37b86c39fdd17b12731bceda8bc90c /src/core/arm/unicorn | |
parent | core: Include <algorithm> where used. (diff) | |
download | yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar.gz yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar.bz2 yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar.lz yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar.xz yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.tar.zst yuzu-d2fbc7832080955598c9fb6f083414eca47f0f19.zip |
Diffstat (limited to 'src/core/arm/unicorn')
-rw-r--r-- | src/core/arm/unicorn/arm_unicorn.cpp | 20 | ||||
-rw-r--r-- | src/core/arm/unicorn/arm_unicorn.h | 5 |
2 files changed, 14 insertions, 11 deletions
diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index 1d15152e5..dc886a4f7 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp @@ -108,13 +108,13 @@ void ARM_Unicorn::SetReg(int regn, u64 val) { CHECKED(uc_reg_write(uc, treg, &val)); } -const u128& ARM_Unicorn::GetExtReg(int /*index*/) const { +u128 ARM_Unicorn::GetExtReg(int /*index*/) const { UNIMPLEMENTED(); static constexpr u128 res{}; return res; } -void ARM_Unicorn::SetExtReg(int /*index*/, u128& /*value*/) { +void ARM_Unicorn::SetExtReg(int /*index*/, u128 /*value*/) { UNIMPLEMENTED(); } @@ -168,10 +168,12 @@ void ARM_Unicorn::SaveContext(ARM_Interface::ThreadContext& ctx) { uregs[i] = UC_ARM64_REG_X0 + i; tregs[i] = &ctx.cpu_registers[i]; } + uregs[29] = UC_ARM64_REG_X29; + tregs[29] = (void*)&ctx.cpu_registers[29]; + uregs[30] = UC_ARM64_REG_X30; + tregs[30] = (void*)&ctx.cpu_registers[30]; - CHECKED(uc_reg_read_batch(uc, uregs, tregs, 29)); - CHECKED(uc_reg_read(uc, UC_ARM64_REG_X29, &ctx.cpu_registers[29])); - CHECKED(uc_reg_read(uc, UC_ARM64_REG_X30, &ctx.lr)); + CHECKED(uc_reg_read_batch(uc, uregs, tregs, 31)); ctx.tls_address = GetTlsAddress(); @@ -195,10 +197,12 @@ void ARM_Unicorn::LoadContext(const ARM_Interface::ThreadContext& ctx) { uregs[i] = UC_ARM64_REG_X0 + i; tregs[i] = (void*)&ctx.cpu_registers[i]; } + uregs[29] = UC_ARM64_REG_X29; + tregs[29] = (void*)&ctx.cpu_registers[29]; + uregs[30] = UC_ARM64_REG_X30; + tregs[30] = (void*)&ctx.cpu_registers[30]; - CHECKED(uc_reg_write_batch(uc, uregs, tregs, 29)); - CHECKED(uc_reg_write(uc, UC_ARM64_REG_X29, &ctx.cpu_registers[29])); - CHECKED(uc_reg_write(uc, UC_ARM64_REG_X30, &ctx.lr)); + CHECKED(uc_reg_write_batch(uc, uregs, tregs, 31)); SetTlsAddress(ctx.tls_address); diff --git a/src/core/arm/unicorn/arm_unicorn.h b/src/core/arm/unicorn/arm_unicorn.h index 90db3eb7f..81cce0721 100644 --- a/src/core/arm/unicorn/arm_unicorn.h +++ b/src/core/arm/unicorn/arm_unicorn.h @@ -9,7 +9,6 @@ #include "core/arm/arm_interface.h" class ARM_Unicorn final : public ARM_Interface { - public: ARM_Unicorn(); ~ARM_Unicorn(); @@ -19,8 +18,8 @@ public: u64 GetPC() const override; u64 GetReg(int index) const override; void SetReg(int index, u64 value) override; - const u128& GetExtReg(int index) const override; - void SetExtReg(int index, u128& value) override; + u128 GetExtReg(int index) const override; + void SetExtReg(int index, u128 value) override; u32 GetVFPReg(int index) const override; void SetVFPReg(int index, u32 value) override; u32 GetCPSR() const override; |