diff --git a/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.cpp b/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.cpp index b7ab55139b..ae275c7ad4 100644 --- a/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.cpp +++ b/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.cpp @@ -406,10 +406,8 @@ int RegAlloc::RealizeReadWriteImpl(const IR::Value& read_value, const IR::Inst* } else if constexpr (kind == HostLoc::Kind::Fpr) { LoadCopyInto(read_value, oaknut::QReg{write_loc}); return write_loc; - } else if constexpr (kind == HostLoc::Kind::Flags) { - ASSERT(false && "Incorrect function for ReadWrite of flags"); } else { - UNREACHABLE(); + UNREACHABLE(); // kind == HostLoc::Kind::Flags } } diff --git a/src/dynarmic/src/dynarmic/ir/basic_block.cpp b/src/dynarmic/src/dynarmic/ir/basic_block.cpp index 4a7b2bf261..51e2f5074c 100644 --- a/src/dynarmic/src/dynarmic/ir/basic_block.cpp +++ b/src/dynarmic/src/dynarmic/ir/basic_block.cpp @@ -72,40 +72,6 @@ void Block::Reset(LocationDescriptor location_) noexcept { ASSERT(instructions.size() == 0); } -static std::string TerminalToString(const Term::Terminal& terminal_variant) noexcept { - // struct : boost::static_visitor { - // std::string operator()(const std::monostate&) const { - // return ""; - // } - // std::string operator()(const Term::ReturnToDispatch&) const { - // return "ReturnToDispatch{}"; - // } - // std::string operator()(const Term::LinkBlock& terminal) const { - // return fmt::format("LinkBlock{{{}}}", terminal.next); - // } - // std::string operator()(const Term::LinkBlockFast& terminal) const { - // return fmt::format("LinkBlockFast{{{}}}", terminal.next); - // } - // std::string operator()(const Term::PopRSBHint&) const { - // return "PopRSBHint{}"; - // } - // std::string operator()(const Term::FastDispatchHint&) const { - // return "FastDispatchHint{}"; - // } - // std::string operator()(const Term::If& terminal) const { - // return fmt::format("If{{{}, {}, {}}}", A64::CondToString(terminal.if_), TerminalToString(terminal.then_), TerminalToString(terminal.else_)); - // } - // std::string operator()(const Term::CheckBit& terminal) const { - // return fmt::format("CheckBit{{{}, {}}}", TerminalToString(terminal.then_), TerminalToString(terminal.else_)); - // } - // std::string operator()(const Term::CheckHalt& terminal) const { - // return fmt::format("CheckHalt{{{}}}", TerminalToString(terminal.else_)); - // } - // } visitor; - // return boost::apply_visitor(visitor, terminal_variant); - return ""; -} - std::string DumpBlock(const IR::Block& block) noexcept { std::string ret = fmt::format("Block: location={}-{}\n", block.Location(), block.EndLocation()) + fmt::format("cycles={}", block.CycleCount()) @@ -174,8 +140,9 @@ std::string DumpBlock(const IR::Block& block) noexcept { ret += fmt::format(" (uses: {})", inst.UseCount()) + '\n'; } - ret += "terminal = " + TerminalToString(block.GetTerminal()) + '\n'; - return ret; + return ret + "terminal = " + [](const Term::Terminal&) -> std::string { + return ""; + }(block.GetTerminal()) + '\n'; } } // namespace Dynarmic::IR diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index b93080f2a1..2bb425c7db 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -209,8 +209,6 @@ add_executable(yuzu util/overlay_dialog.ui util/sequence_dialog/sequence_dialog.cpp util/sequence_dialog/sequence_dialog.h - util/url_request_interceptor.cpp - util/url_request_interceptor.h util/util.cpp util/util.h @@ -241,6 +239,12 @@ add_executable(yuzu set_target_properties(yuzu PROPERTIES OUTPUT_NAME "eden") +if (YUZU_USE_QT_WEB_ENGINE) + target_sources(yuzu PRIVATE + util/url_request_interceptor.cpp + util/url_request_interceptor.h) +endif() + if (YUZU_CRASH_DUMPS) target_sources(yuzu PRIVATE breakpad.cpp diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui index 92b725fa11..a71f33cec6 100644 --- a/src/yuzu/main.ui +++ b/src/yuzu/main.ui @@ -232,7 +232,6 @@ &Help -