diff options
author | bunnei <bunneidev@gmail.com> | 2023-06-13 18:45:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-13 18:45:09 +0200 |
commit | 14d25e2c75454fbdcfa3408257d3b9092e284973 (patch) | |
tree | ea205f4376325f5c31b62072bd57bf8ce27c1a28 /src/core/arm/dynarmic/arm_dynarmic_64.h | |
parent | Merge pull request #10746 from bunnei/update-android-settings (diff) | |
parent | core: decouple ARM interface from Dynarmic (diff) | |
download | yuzu-14d25e2c75454fbdcfa3408257d3b9092e284973.tar yuzu-14d25e2c75454fbdcfa3408257d3b9092e284973.tar.gz yuzu-14d25e2c75454fbdcfa3408257d3b9092e284973.tar.bz2 yuzu-14d25e2c75454fbdcfa3408257d3b9092e284973.tar.lz yuzu-14d25e2c75454fbdcfa3408257d3b9092e284973.tar.xz yuzu-14d25e2c75454fbdcfa3408257d3b9092e284973.tar.zst yuzu-14d25e2c75454fbdcfa3408257d3b9092e284973.zip |
Diffstat (limited to 'src/core/arm/dynarmic/arm_dynarmic_64.h')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_64.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.h b/src/core/arm/dynarmic/arm_dynarmic_64.h index e83599e82..af2aa1f1c 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.h +++ b/src/core/arm/dynarmic/arm_dynarmic_64.h @@ -43,8 +43,11 @@ public: void SetTPIDR_EL0(u64 value) override; u64 GetTPIDR_EL0() const override; - void SaveContext(ThreadContext32& ctx) override {} - void SaveContext(ThreadContext64& ctx) override; + Architecture GetArchitecture() const override { + return Architecture::Aarch64; + } + void SaveContext(ThreadContext32& ctx) const override {} + void SaveContext(ThreadContext64& ctx) const override; void LoadContext(const ThreadContext32& ctx) override {} void LoadContext(const ThreadContext64& ctx) override; @@ -57,14 +60,9 @@ public: void PageTableChanged(Common::PageTable& new_page_table, std::size_t new_address_space_size_in_bits) override; - static std::vector<BacktraceEntry> GetBacktraceFromContext(System& system, - const ThreadContext64& ctx); - - std::vector<BacktraceEntry> GetBacktrace() const override; - protected: - Dynarmic::HaltReason RunJit() override; - Dynarmic::HaltReason StepJit() override; + HaltReason RunJit() override; + HaltReason StepJit() override; u32 GetSvcNumber() const override; const Kernel::DebugWatchpoint* HaltedWatchpoint() const override; void RewindBreakpointInstruction() override; @@ -73,8 +71,6 @@ private: std::shared_ptr<Dynarmic::A64::Jit> MakeJit(Common::PageTable* page_table, std::size_t address_space_bits) const; - static std::vector<BacktraceEntry> GetBacktrace(Core::System& system, u64 fp, u64 lr, u64 pc); - using JitCacheKey = std::pair<Common::PageTable*, std::size_t>; using JitCacheType = std::unordered_map<JitCacheKey, std::shared_ptr<Dynarmic::A64::Jit>, Common::PairHash>; |