summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dynarmic/arm_dynarmic_32.cpp
diff options
context:
space:
mode:
authormerry <git@mary.rs>2022-07-17 23:41:28 +0200
committerGitHub <noreply@github.com>2022-07-17 23:41:28 +0200
commit09300abe924aba145c9bcfcbb202254c20fa8673 (patch)
tree97987776d6d3391fe0b88fe1893b906ac62f5866 /src/core/arm/dynarmic/arm_dynarmic_32.cpp
parentMerge pull request #8508 from yuzu-emu/mc-speed-limit (diff)
parentdynarmic: Abort watchpoints ASAP (diff)
downloadyuzu-09300abe924aba145c9bcfcbb202254c20fa8673.tar
yuzu-09300abe924aba145c9bcfcbb202254c20fa8673.tar.gz
yuzu-09300abe924aba145c9bcfcbb202254c20fa8673.tar.bz2
yuzu-09300abe924aba145c9bcfcbb202254c20fa8673.tar.lz
yuzu-09300abe924aba145c9bcfcbb202254c20fa8673.tar.xz
yuzu-09300abe924aba145c9bcfcbb202254c20fa8673.tar.zst
yuzu-09300abe924aba145c9bcfcbb202254c20fa8673.zip
Diffstat (limited to 'src/core/arm/dynarmic/arm_dynarmic_32.cpp')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_32.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
index a780cf800..b8d2ce224 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -155,7 +155,7 @@ public:
const auto match{parent.MatchingWatchpoint(addr, size, type)};
if (match) {
parent.halted_watchpoint = match;
- ReturnException(parent.jit.load()->Regs()[15], ARM_Interface::watchpoint);
+ parent.jit.load()->HaltExecution(ARM_Interface::watchpoint);
return false;
}
@@ -204,7 +204,6 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable*
// Code cache size
config.code_cache_size = 512_MiB;
- config.far_code_offset = 400_MiB;
// Allow memory fault handling to work
if (system.DebuggerEnabled()) {
@@ -215,7 +214,6 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable*
if (!page_table) {
// Don't waste too much memory on null_jit
config.code_cache_size = 8_MiB;
- config.far_code_offset = 4_MiB;
}
// Safe optimizations