summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt11
-rw-r--r--src/common/intrusive_red_black_tree.h8
-rw-r--r--src/common/typed_address.h5
-rw-r--r--src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp10
-rw-r--r--src/core/internal_network/socket_proxy.h3
-rw-r--r--src/core/internal_network/sockets.h13
-rw-r--r--src/web_service/verify_login.cpp2
-rw-r--r--src/yuzu/configuration/configure_general.ui2
-rw-r--r--src/yuzu_cmd/default_ini.h2
9 files changed, 22 insertions, 34 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0eca8e90e..312a49f42 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -126,6 +126,17 @@ else()
add_compile_options("-stdlib=libc++")
endif()
+ # GCC bugs
+ if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ # These diagnostics would be great if they worked, but are just completely broken
+ # and produce bogus errors on external libraries like fmt.
+ add_compile_options(
+ -Wno-array-bounds
+ -Wno-stringop-overread
+ -Wno-stringop-overflow
+ )
+ endif()
+
# Set file offset size to 64 bits.
#
# On modern Unixes, this is typically already the case. The lone exception is
diff --git a/src/common/intrusive_red_black_tree.h b/src/common/intrusive_red_black_tree.h
index 5f6b34e82..bc2940fa0 100644
--- a/src/common/intrusive_red_black_tree.h
+++ b/src/common/intrusive_red_black_tree.h
@@ -96,10 +96,6 @@ public:
return m_node == rhs.m_node;
}
- constexpr bool operator!=(const Iterator& rhs) const {
- return !(*this == rhs);
- }
-
constexpr pointer operator->() const {
return m_node;
}
@@ -324,10 +320,6 @@ public:
return m_impl == rhs.m_impl;
}
- constexpr bool operator!=(const Iterator& rhs) const {
- return !(*this == rhs);
- }
-
constexpr pointer operator->() const {
return Traits::GetParent(std::addressof(*m_impl));
}
diff --git a/src/common/typed_address.h b/src/common/typed_address.h
index cf7bbeae1..64f4a07c2 100644
--- a/src/common/typed_address.h
+++ b/src/common/typed_address.h
@@ -116,7 +116,6 @@ public:
// Comparison operators.
constexpr bool operator==(const TypedAddress&) const = default;
- constexpr bool operator!=(const TypedAddress&) const = default;
constexpr auto operator<=>(const TypedAddress&) const = default;
// For convenience, also define comparison operators versus uint64_t.
@@ -124,10 +123,6 @@ public:
return m_address == rhs;
}
- constexpr inline bool operator!=(uint64_t rhs) const {
- return m_address != rhs;
- }
-
// Allow getting the address explicitly, for use in accessors.
constexpr inline uint64_t GetValue() const {
return m_address;
diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp
index 42d1fcc28..36d0d20d2 100644
--- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp
+++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp
@@ -35,11 +35,11 @@ namespace {
using namespace Common::Literals;
u32 GetMemorySizeForInit() {
- return Settings::values.use_extended_memory_layout ? Smc::MemorySize_6GB : Smc::MemorySize_4GB;
+ return Settings::values.use_extended_memory_layout ? Smc::MemorySize_8GB : Smc::MemorySize_4GB;
}
Smc::MemoryArrangement GetMemoryArrangeForInit() {
- return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_6GB
+ return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_8GB
: Smc::MemoryArrangement_4GB;
}
} // namespace
@@ -91,7 +91,8 @@ std::size_t KSystemControl::Init::GetApplicationPoolSize() {
case Smc::MemoryArrangement_6GBForAppletDev:
return 3285_MiB;
case Smc::MemoryArrangement_8GB:
- return 4916_MiB;
+ // Real kernel sets this to 4916_MiB. We are not debugging applets.
+ return 6547_MiB;
}
}();
@@ -115,7 +116,8 @@ size_t KSystemControl::Init::GetAppletPoolSize() {
case Smc::MemoryArrangement_6GBForAppletDev:
return 2193_MiB;
case Smc::MemoryArrangement_8GB:
- return 2193_MiB;
+ //! Real kernel sets this to 2193_MiB. We are not debugging applets.
+ return 562_MiB;
}
}();
diff --git a/src/core/internal_network/socket_proxy.h b/src/core/internal_network/socket_proxy.h
index 9421492bc..6e991fa38 100644
--- a/src/core/internal_network/socket_proxy.h
+++ b/src/core/internal_network/socket_proxy.h
@@ -16,9 +16,6 @@ namespace Network {
class ProxySocket : public SocketBase {
public:
- YUZU_NON_COPYABLE(ProxySocket);
- YUZU_NON_MOVEABLE(ProxySocket);
-
explicit ProxySocket(RoomNetwork& room_network_) noexcept;
~ProxySocket() override;
diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h
index 4c7489258..11e479e50 100644
--- a/src/core/internal_network/sockets.h
+++ b/src/core/internal_network/sockets.h
@@ -36,13 +36,10 @@ public:
SocketBase() = default;
explicit SocketBase(SOCKET fd_) : fd{fd_} {}
-
virtual ~SocketBase() = default;
- virtual SocketBase& operator=(const SocketBase&) = delete;
-
- // Avoid closing sockets implicitly
- virtual SocketBase& operator=(SocketBase&&) noexcept = delete;
+ YUZU_NON_COPYABLE(SocketBase);
+ YUZU_NON_MOVEABLE(SocketBase);
virtual Errno Initialize(Domain domain, Type type, Protocol protocol) = 0;
@@ -109,14 +106,8 @@ public:
~Socket() override;
- Socket(const Socket&) = delete;
- Socket& operator=(const Socket&) = delete;
-
Socket(Socket&& rhs) noexcept;
- // Avoid closing sockets implicitly
- Socket& operator=(Socket&&) noexcept = delete;
-
Errno Initialize(Domain domain, Type type, Protocol protocol) override;
Errno Close() override;
diff --git a/src/web_service/verify_login.cpp b/src/web_service/verify_login.cpp
index 050080278..d5b7161cb 100644
--- a/src/web_service/verify_login.cpp
+++ b/src/web_service/verify_login.cpp
@@ -21,7 +21,7 @@ bool VerifyLogin(const std::string& host, const std::string& username, const std
return username.empty();
}
- return username == *iter;
+ return *iter == username;
}
} // namespace WebService
diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui
index 6cd79673c..add110bb0 100644
--- a/src/yuzu/configuration/configure_general.ui
+++ b/src/yuzu/configuration/configure_general.ui
@@ -64,7 +64,7 @@
<item>
<widget class="QCheckBox" name="use_extended_memory_layout">
<property name="text">
- <string>Extended memory layout (6GB DRAM)</string>
+ <string>Extended memory layout (8GB DRAM)</string>
</property>
</widget>
</item>
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index 20e403400..209cfc28a 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -163,7 +163,7 @@ keyboard_enabled =
# 0: Disabled, 1 (default): Enabled
use_multi_core =
-# Enable extended guest system memory layout (6GB DRAM)
+# Enable extended guest system memory layout (8GB DRAM)
# 0 (default): Disabled, 1: Enabled
use_extended_memory_layout =
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-04 21:30:10 +0000