diff options
| author | Liam <byteslice@airmail.cc> | 2022-06-12 23:14:27 +0200 |
|---|---|---|
| committer | Liam <byteslice@airmail.cc> | 2022-06-14 02:09:32 +0200 |
| commit | ebecdd3a7458dd5a353524dc161f4050d019b7be (patch) | |
| tree | 0328113f3ceef6a4ccbfd6a98d121cd3c03e1626 | |
| parent | common/assert: add unlikely (diff) | |
| download | yuzu-ebecdd3a7458dd5a353524dc161f4050d019b7be.tar yuzu-ebecdd3a7458dd5a353524dc161f4050d019b7be.tar.gz yuzu-ebecdd3a7458dd5a353524dc161f4050d019b7be.tar.bz2 yuzu-ebecdd3a7458dd5a353524dc161f4050d019b7be.tar.lz yuzu-ebecdd3a7458dd5a353524dc161f4050d019b7be.tar.xz yuzu-ebecdd3a7458dd5a353524dc161f4050d019b7be.tar.zst yuzu-ebecdd3a7458dd5a353524dc161f4050d019b7be.zip | |
| -rw-r--r-- | externals/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/core/loader/nso.cpp | 9 | ||||
| -rw-r--r-- | src/video_core/macro/macro_jit_x64.cpp | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 64361de5f..bd01f4c4d 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -40,6 +40,11 @@ target_include_directories(mbedtls PUBLIC ./mbedtls/include) add_library(microprofile INTERFACE) target_include_directories(microprofile INTERFACE ./microprofile) +# GCC bugs +if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND MINGW) + target_compile_options(microprofile INTERFACE "-Wno-array-bounds") +endif() + # libusb if (NOT LIBUSB_FOUND OR YUZU_USE_BUNDLED_LIBUSB) add_subdirectory(libusb) diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 8a938aa83..8dd956fc6 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -128,11 +128,10 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core:: // Apply patches if necessary if (pm && (pm->HasNSOPatch(nso_header.build_id) || Settings::values.dump_nso)) { - std::vector<u8> pi_header; - pi_header.insert(pi_header.begin(), reinterpret_cast<u8*>(&nso_header), - reinterpret_cast<u8*>(&nso_header) + sizeof(NSOHeader)); - pi_header.insert(pi_header.begin() + sizeof(NSOHeader), program_image.data(), - program_image.data() + program_image.size()); + std::vector<u8> pi_header(sizeof(NSOHeader) + program_image.size()); + std::memcpy(pi_header.data(), &nso_header, sizeof(NSOHeader)); + std::memcpy(pi_header.data() + sizeof(NSOHeader), program_image.data(), + program_image.size()); pi_header = pm->PatchNSO(pi_header, nso_file.GetName()); diff --git a/src/video_core/macro/macro_jit_x64.cpp b/src/video_core/macro/macro_jit_x64.cpp index dc5376501..aca25d902 100644 --- a/src/video_core/macro/macro_jit_x64.cpp +++ b/src/video_core/macro/macro_jit_x64.cpp @@ -411,7 +411,7 @@ void MacroJITx64Impl::Compile_Branch(Macro::Opcode opcode) { Xbyak::Label end; auto value = Compile_GetRegister(opcode.src_a, eax); - test(value, value); + cmp(value, 0); // test(value, value); if (optimizer.has_delayed_pc) { switch (opcode.branch_condition) { case Macro::BranchCondition::Zero: |