From 87c42aeaf4c867bef16a55748e80930545ffef7e Mon Sep 17 00:00:00 2001 From: Ty Lamontagne Date: Wed, 26 Jul 2023 20:06:47 -0400 Subject: [PATCH] Debugger: Fix mismatch sign compare & bitwise on different enum warnings --- pcsx2-qt/Debugger/CpuWidget.cpp | 2 +- pcsx2-qt/Debugger/Models/BreakpointModel.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pcsx2-qt/Debugger/CpuWidget.cpp b/pcsx2-qt/Debugger/CpuWidget.cpp index e7794a8042..8d2d4e721c 100644 --- a/pcsx2-qt/Debugger/CpuWidget.cpp +++ b/pcsx2-qt/Debugger/CpuWidget.cpp @@ -589,7 +589,7 @@ static std::vector searchWorkerByteArray(DebugInterface* cpu, u32 start, u3 bool hit = true; for (qsizetype i = 0; i < value.length(); i++) { - if (cpu->read8(addr + i) != value[i]) + if (static_cast(cpu->read8(addr + i)) != value[i]) { hit = false; break; diff --git a/pcsx2-qt/Debugger/Models/BreakpointModel.cpp b/pcsx2-qt/Debugger/Models/BreakpointModel.cpp index 03a5d859c2..360df3a0ff 100644 --- a/pcsx2-qt/Debugger/Models/BreakpointModel.cpp +++ b/pcsx2-qt/Debugger/Models/BreakpointModel.cpp @@ -78,7 +78,7 @@ QVariant BreakpointModel::data(const QModelIndex& index, int role) const { QString type(""); type += (mc->cond & MEMCHECK_READ) ? tr("Read") : ""; - type += ((mc->cond & MEMCHECK_BOTH) == MEMCHECK_BOTH) ? ", " : " "; + type += ((mc->cond & MEMCHECK_READWRITE) == MEMCHECK_READWRITE) ? ", " : " "; //: (C) = changes, as in "look for changes". type += (mc->cond & MEMCHECK_WRITE) ? (mc->cond & MEMCHECK_WRITE_ONCHANGE) ? tr("Write(C)") : tr("Write") : ""; return type;