Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[dynarmic] fix qlaunch on android (#3310)

lizzie8d9607ec6056
diff --git a/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64_memory.cpp b/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64_memory.cpp
index 5205287850..25020523c3 100644
--- a/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64_memory.cpp
+++ b/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64_memory.cpp
@@ -268,7 +268,10 @@ std::pair<oaknut::XReg, oaknut::XReg> InlinePageTableEmitVAddrLookup(oaknut::Cod
code.B(NE, *fallback);
}
- code.LDR(Xscratch0, Xpagetable, Xscratch0, LSL, ctx.conf.page_table_log2_stride);
+ // index = index << log2
+ code.SBFIZ(Xscratch0, Xscratch0, ctx.conf.page_table_log2_stride, 32);
+ // load x0 = *<(u8*)pagetable + index>
+ code.LDR(Xscratch0, Xpagetable, Xscratch0);
if (ctx.conf.page_table_pointer_mask_bits != 0) {
const u64 mask = u64(~u64(0)) << ctx.conf.page_table_pointer_mask_bits;