From 49f44c133467fb004c08e3b84076e91105eed0eb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 11 Dec 2023 18:00:34 -0500 Subject: [PATCH 1/6] VertexManagerBase: Resolve -Wsign-compare warning --- Source/Core/VideoCommon/VertexManagerBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp index 65772f3dad..ac4446abba 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/VertexManagerBase.cpp @@ -598,7 +598,7 @@ void VertexManagerBase::Flush() std::optional custom_pixel_shader; std::vector custom_pixel_texture_names; std::span custom_pixel_shader_uniforms; - for (int i = 0; i < texture_names.size(); i++) + for (size_t i = 0; i < texture_names.size(); i++) { const std::string& texture_name = texture_names[i]; const u32 texture_unit = texture_units[i]; From f97316a1e6980141082c811d6c44ca820c309850 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 11 Dec 2023 18:01:29 -0500 Subject: [PATCH 2/6] TraversalClient: Resolve -Wsign-compare warning --- Source/Core/Common/TraversalClient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp index 3198144479..44b8390f90 100644 --- a/Source/Core/Common/TraversalClient.cpp +++ b/Source/Core/Common/TraversalClient.cpp @@ -373,7 +373,7 @@ void TraversalClient::HandleTraversalTest() waitCondition = 0; break; } - else if (rv < sizeof(packet) || raddr.host != m_ServerAddress.host || + else if (rv < int(sizeof(packet)) || raddr.host != m_ServerAddress.host || raddr.host != m_portAlt || packet.requestId != m_TestRequestId) { // irrelevant packet, ignore From 4bef3b93b4c1fe76f274b317d45882fb96ab09a4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 11 Dec 2023 18:06:40 -0500 Subject: [PATCH 3/6] AndroidCommon: Resolve -Wsign-compare warning --- Source/Android/jni/AndroidCommon/AndroidCommon.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Android/jni/AndroidCommon/AndroidCommon.h b/Source/Android/jni/AndroidCommon/AndroidCommon.h index 733d2882f6..cc86795418 100644 --- a/Source/Android/jni/AndroidCommon/AndroidCommon.h +++ b/Source/Android/jni/AndroidCommon/AndroidCommon.h @@ -19,8 +19,9 @@ jobjectArray VectorToJStringArray(JNIEnv* env, const std::vector& v template jobjectArray VectorToJObjectArray(JNIEnv* env, const std::vector& vector, jclass clazz, F f) { - jobjectArray result = env->NewObjectArray(vector.size(), clazz, nullptr); - for (jsize i = 0; i < vector.size(); ++i) + const auto vector_size = static_cast(vector.size()); + jobjectArray result = env->NewObjectArray(vector_size, clazz, nullptr); + for (jsize i = 0; i < vector_size; ++i) { jobject obj = f(env, vector[i]); env->SetObjectArrayElement(result, i, obj); From 017b9a0af7eb49af012a32846aac2d8391ef1494 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 11 Dec 2023 18:08:52 -0500 Subject: [PATCH 4/6] FloatUtilsTest: Resolve -Wsign-compare warning --- Source/UnitTests/Common/FloatUtilsTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/UnitTests/Common/FloatUtilsTest.cpp b/Source/UnitTests/Common/FloatUtilsTest.cpp index e0172c5643..61b7f80974 100644 --- a/Source/UnitTests/Common/FloatUtilsTest.cpp +++ b/Source/UnitTests/Common/FloatUtilsTest.cpp @@ -85,7 +85,7 @@ TEST(FloatUtils, ApproximateReciprocalSquareRoot) 0x7FF8'0000'0000'0000, 0x7FF8'0000'0000'0000, 0x3FEA'2040'0000'0000, 0x3FA0'3108'0000'0000, 0x7FF8'0000'0000'0000}; - for (int i = 0; i < double_test_values.size(); ++i) + for (size_t i = 0; i < double_test_values.size(); ++i) { u64 ivalue = double_test_values[i]; double dvalue = Common::BitCast(ivalue); From 4c3a5eb1c524eb7fed32fb946eabbf6edbc2b212 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 11 Dec 2023 18:11:34 -0500 Subject: [PATCH 5/6] JitArm64_SystemRegisters: Resolve -Wsign-compare warning --- .../Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp index fda306984f..3521f9c66b 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp @@ -236,9 +236,9 @@ void JitArm64::twx(UGeckoInstruction inst) constexpr std::array conditions{{CC_LT, CC_GT, CC_EQ, CC_VC, CC_VS}}; Common::SmallVector fixups; - for (int i = 0; i < conditions.size(); i++) + for (size_t i = 0; i < conditions.size(); i++) { - if (inst.TO & (1 << i)) + if (inst.TO & (1U << i)) { FixupBranch f = B(conditions[i]); fixups.push_back(f); From 0e51c0f8fc28052f819f5d940ef6d23150c22057 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 11 Dec 2023 18:15:50 -0500 Subject: [PATCH 6/6] JitArm64_RegCache: Resolve -Wsign-compare warning --- Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp index c5484da30b..8538f2c040 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp @@ -248,7 +248,7 @@ void Arm64GPRCache::FlushRegisters(BitSet32 regs, bool maintain_state, ARM64Reg ASSERT_MSG(DYNA_REC, m_guest_registers[GUEST_GPR_OFFSET + i].GetType() != RegType::Discarded, "Attempted to flush discarded register"); - if (i + 1 < GUEST_GPR_COUNT && regs[i + 1]) + if (i + 1 < int(GUEST_GPR_COUNT) && regs[i + 1]) { // We've got two guest registers in a row to store OpArg& reg1 = m_guest_registers[GUEST_GPR_OFFSET + i];