Compare commits

...

4 Commits

Author SHA1 Message Date
lizzie 7da04096cb 2026-09-26 18:53:45
Signed-off-by: lizzie <lizzie@eden-emu.dev>
2026-09-26 18:53:45 +00:00
lizzie 262eb629f4 Fix license headers 2026-09-26 18:42:00 +00:00
lizzie 3f35a08662 2026-09-25 11:32:34
Signed-off-by: lizzie <lizzie@eden-emu.dev>
2026-09-26 18:42:00 +00:00
lizzie 5dc15c6269 2026-09-17 04:58:48
Signed-off-by: lizzie <lizzie@eden-emu.dev>
2026-09-26 18:42:00 +00:00
7 changed files with 15 additions and 45 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ static std::mutex vector_regions_mutex {};
// Workaround for handling non-commited memory accessed by Dynarmic; usually result of an error // Workaround for handling non-commited memory accessed by Dynarmic; usually result of an error
static LONG WINAPI FakePageFaultHandler(PEXCEPTION_POINTERS info) { static LONG WINAPI FakePageFaultHandler(PEXCEPTION_POINTERS info) {
DWORD code = info->ExceptionRecord->ExceptionCode; DWORD code = info->ExceptionRecord->ExceptionCode;
u64 exception_addr = reinterpret_cast<u64>(info->ExceptionRecord->ExceptionInformation[1]); u64 exception_addr = u64(info->ExceptionRecord->ExceptionInformation[1]);
if (code != EXCEPTION_ACCESS_VIOLATION || info->ExceptionRecord->ExceptionInformation[0] == 1) { if (code != EXCEPTION_ACCESS_VIOLATION || info->ExceptionRecord->ExceptionInformation[0] == 1) {
// Not our problem // Not our problem
+1 -1
View File
@@ -94,7 +94,7 @@ LaunchParams ParseLaunchParams(Core::System& system, int argc, char *argv[], wch
break; break;
case 'u': { case 'u': {
// Launch game with a specific user // Launch game with a specific user
bool argument_ok = isdigit(optarg[0]); bool argument_ok = bool(isdigit(optarg[0]));
p.selected_user = atoi(optarg); p.selected_user = atoi(optarg);
if (!argument_ok) { if (!argument_ok) {
// try to look it up by username, only finds the first username that matches. // try to look it up by username, only finds the first username that matches.
@@ -406,10 +406,8 @@ int RegAlloc::RealizeReadWriteImpl(const IR::Value& read_value, const IR::Inst*
} else if constexpr (kind == HostLoc::Kind::Fpr) { } else if constexpr (kind == HostLoc::Kind::Fpr) {
LoadCopyInto(read_value, oaknut::QReg{write_loc}); LoadCopyInto(read_value, oaknut::QReg{write_loc});
return write_loc; return write_loc;
} else if constexpr (kind == HostLoc::Kind::Flags) {
ASSERT(false && "Incorrect function for ReadWrite of flags");
} else { } else {
UNREACHABLE(); UNREACHABLE(); // kind == HostLoc::Kind::Flags
} }
} }
+3 -36
View File
@@ -72,40 +72,6 @@ void Block::Reset(LocationDescriptor location_) noexcept {
ASSERT(instructions.size() == 0); ASSERT(instructions.size() == 0);
} }
static std::string TerminalToString(const Term::Terminal& terminal_variant) noexcept {
// struct : boost::static_visitor<std::string> {
// std::string operator()(const std::monostate&) const {
// return "<invalid>";
// }
// 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 DumpBlock(const IR::Block& block) noexcept {
std::string ret = fmt::format("Block: location={}-{}\n", block.Location(), block.EndLocation()) std::string ret = fmt::format("Block: location={}-{}\n", block.Location(), block.EndLocation())
+ fmt::format("cycles={}", block.CycleCount()) + 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 += fmt::format(" (uses: {})", inst.UseCount()) + '\n';
} }
ret += "terminal = " + TerminalToString(block.GetTerminal()) + '\n'; return ret + "terminal = " + [](const Term::Terminal&) -> std::string {
return ret; return "";
}(block.GetTerminal()) + '\n';
} }
} // namespace Dynarmic::IR } // namespace Dynarmic::IR
+3 -1
View File
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -6,6 +6,8 @@
#pragma once #pragma once
#include <cstddef>
#include <vector>
#include "common/bit_field.h" #include "common/bit_field.h"
#include "common/common_funcs.h" #include "common/common_funcs.h"
#include "common/common_types.h" #include "common/common_types.h"
+6 -2
View File
@@ -209,8 +209,6 @@ add_executable(yuzu
util/overlay_dialog.ui util/overlay_dialog.ui
util/sequence_dialog/sequence_dialog.cpp util/sequence_dialog/sequence_dialog.cpp
util/sequence_dialog/sequence_dialog.h util/sequence_dialog/sequence_dialog.h
util/url_request_interceptor.cpp
util/url_request_interceptor.h
util/util.cpp util/util.cpp
util/util.h util/util.h
@@ -241,6 +239,12 @@ add_executable(yuzu
set_target_properties(yuzu PROPERTIES OUTPUT_NAME "eden") 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) if (YUZU_CRASH_DUMPS)
target_sources(yuzu PRIVATE target_sources(yuzu PRIVATE
breakpad.cpp breakpad.cpp
-1
View File
@@ -232,7 +232,6 @@
<property name="title"> <property name="title">
<string>&amp;Help</string> <string>&amp;Help</string>
</property> </property>
<addaction name="action_Report_Compatibility"/>
<addaction name="action_Open_Mods_Page"/> <addaction name="action_Open_Mods_Page"/>
<addaction name="action_Open_UserHandbook"/> <addaction name="action_Open_UserHandbook"/>
<addaction name="separator"/> <addaction name="separator"/>