diff --git a/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp b/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp index 49986a3531..d5315c74b5 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp +++ b/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp @@ -81,10 +81,9 @@ FP::FPCR A32EmitContext::FPCR(bool fpcr_controlled) const { } A32EmitX64::A32EmitX64(BlockOfCode& code, A32::UserConfig conf, A32::Jit* jit_interface) - : EmitX64(code), conf(std::move(conf)), jit_interface(jit_interface) { - if (conf.fastmem_pointer) + : EmitX64(code), conf(std::move(conf)), jit_interface(jit_interface) { + if (conf.fastmem_pointer.has_value()) GenFastmemFallbacks(); - // GenTerminalHandlers(); code.PreludeComplete(); ClearFastDispatchTable(); diff --git a/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp b/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp index 250bd75a32..ac91aec740 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp +++ b/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp @@ -54,11 +54,10 @@ FP::FPCR A64EmitContext::FPCR(bool fpcr_controlled) const { } A64EmitX64::A64EmitX64(BlockOfCode& code, A64::UserConfig conf, A64::Jit* jit_interface) - : EmitX64(code), conf(conf), jit_interface{jit_interface} { - if (conf.fastmem_pointer) - GenFastmemFallbacks(); - // + : EmitX64(code), conf(conf), jit_interface{jit_interface} { GenMemory128Accessors(); + if (conf.fastmem_pointer.has_value()) + GenFastmemFallbacks(); GenTerminalHandlers(); code.PreludeComplete(); ClearFastDispatchTable();