From 58114616f0c78b589f30be27fb04b6c84de41ef0 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 1 Feb 2022 16:36:57 +0100 Subject: [PATCH] early-access version 2458 --- README.md | 2 +- externals/dynarmic/externals/CMakeLists.txt | 3 +++ externals/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp | 3 ++- externals/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5f0e3cbaa..8131bd27d 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2457. +This is the source code for early-access 2458. ## Legal Notice diff --git a/externals/dynarmic/externals/CMakeLists.txt b/externals/dynarmic/externals/CMakeLists.txt index e20b5d026..a9fb4cc84 100755 --- a/externals/dynarmic/externals/CMakeLists.txt +++ b/externals/dynarmic/externals/CMakeLists.txt @@ -1,3 +1,6 @@ +# Always build externals as static libraries, even when dynarmic is built as shared +set(BUILD_SHARED_LIBS OFF) + # For libraries that already come with a CMakeLists file, # simply add the directory to that file as a subdirectory # to have CMake automatically recognize them. diff --git a/externals/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp b/externals/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp index e8ddbce6d..4f819825f 100755 --- a/externals/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp +++ b/externals/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.cpp @@ -715,10 +715,11 @@ void A32EmitX64::EmitA32SetGEFlagsCompressed(A32EmitContext& ctx, IR::Inst* inst void A32EmitX64::EmitA32DataSynchronizationBarrier(A32EmitContext&, IR::Inst*) { code.mfence(); + code.lfence(); } void A32EmitX64::EmitA32DataMemoryBarrier(A32EmitContext&, IR::Inst*) { - code.lfence(); + code.mfence(); } void A32EmitX64::EmitA32InstructionSynchronizationBarrier(A32EmitContext& ctx, IR::Inst*) { diff --git a/externals/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp b/externals/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp index de54a4445..8de3ee5f4 100755 --- a/externals/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp +++ b/externals/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.cpp @@ -668,10 +668,11 @@ void A64EmitX64::EmitA64InstructionCacheOperationRaised(A64EmitContext& ctx, IR: void A64EmitX64::EmitA64DataSynchronizationBarrier(A64EmitContext&, IR::Inst*) { code.mfence(); + code.lfence(); } void A64EmitX64::EmitA64DataMemoryBarrier(A64EmitContext&, IR::Inst*) { - code.lfence(); + code.mfence(); } void A64EmitX64::EmitA64InstructionSynchronizationBarrier(A64EmitContext& ctx, IR::Inst*) {