Merge branch 'grumpycoders:main' into Breakpoints-improvements

Author: rocketz

.coderabbit.yaml

@@ -0,0 +1,6 @@
+reviews:
+  high_level_summary: false
+  high_level_summary_in_walkthrough: true
+  auto_review:
+    ignore_title_keywords:
+      - "[Chores]"

Makefile

@@ -32,10 +32,14 @@ CPPFLAGS += -Ithird_party/imgui/backends
 CPPFLAGS += -Ithird_party/imgui/examples
 CPPFLAGS += -Ithird_party/imgui/misc/cpp
 CPPFLAGS += -Ithird_party/libelfin
+CPPFLAGS += -Ithird_party/llhttp
 CPPFLAGS += -Ithird_party/luajit/src
 CPPFLAGS += -Ithird_party/luv/src
 CPPFLAGS += -Ithird_party/luv/deps/lua-compat-5.3/c-api
+CPPFLAGS += -Ithird_party/magic_enum/include/magic_enum
 CPPFLAGS += -Ithird_party/md4c/src
+CPPFLAGS += -Ithird_party/multipart-parser-c
+CPPFLAGS += -Ithird_party/tracy/public
 CPPFLAGS += -Ithird_party/ucl -Ithird_party/ucl/include
 CPPFLAGS += -Ithird_party/uriparser/include
 CPPFLAGS += -Ithird_party/zep/extensions

src/cdrom/file.cc

@@ -19,9 +19,10 @@
 
 #include "cdrom/file.h"
 
+#include <magic_enum_all.hpp>
+
 #include "cdrom/cdriso.h"
 #include "iec-60908b/edcecc.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
 
 PCSX::CDRIsoFile::CDRIsoFile(std::shared_ptr<CDRIso> iso, uint32_t lba, int32_t size, SectorMode mode)
     : File(RW_SEEKABLE), m_iso(iso), m_lba(lba) {

src/core/DynaRec_aa64/recompiler.h

@@ -31,7 +31,7 @@
 #include "fmt/format.h"
 #include "regAllocation.h"
 #include "spu/interface.h"
-#include "tracy/public/tracy/Tracy.hpp"
+#include "tracy/Tracy.hpp"
 
 #define HOST_REG_CACHE_OFFSET(x) ((uintptr_t) & m_hostRegisterCache[(x)] - (uintptr_t)this)
 #define GPR_OFFSET(x) ((uintptr_t) & m_regs.GPR.r[(x)] - (uintptr_t)this)

src/core/DynaRec_x64/recompiler.h

@@ -34,7 +34,7 @@
 #include "profiler.h"
 #include "regAllocation.h"
 #include "spu/interface.h"
-#include "tracy/public/tracy/Tracy.hpp"
+#include "tracy/Tracy.hpp"
 
 #define HOST_REG_CACHE_OFFSET(x) ((uintptr_t) & m_hostRegisterCache[(x)] - (uintptr_t)this)
 #define GPR_OFFSET(x) ((uintptr_t) & m_regs.GPR.r[(x)] - (uintptr_t)this)

src/core/OpenGL_GPU/gpu_opengl.cc

@@ -29,7 +29,7 @@
 #include "core/system.h"
 #include "fmt/format.h"
 #include "gui/gui.h"
-#include "tracy/public/tracy/Tracy.hpp"
+#include "tracy/Tracy.hpp"
 
 std::unique_ptr<PCSX::GPU> PCSX::GPU::getOpenGL() { return std::unique_ptr<PCSX::GPU>(new PCSX::OpenGL_GPU()); }
 

src/core/cdrom.cc

@@ -23,11 +23,12 @@
 
 #include "core/cdrom.h"
 
+#include <magic_enum_all.hpp>
+
 #include "cdrom/iso9660-reader.h"
 #include "core/debug.h"
 #include "core/psxdma.h"
 #include "core/psxemulator.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
 #include "spu/interface.h"
 #include "support/strings-helpers.h"
 

src/core/display.cc

@@ -17,10 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 #include <algorithm>
+#include <magic_enum_all.hpp>
 
 #include "core/gpu.h"
 #include "core/psxemulator.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
 
 void PCSX::GPU::Display::reset() {
     x1 = 0x200;

src/core/disr3000a.cc

@@ -782,6 +782,14 @@ declare(disBEQ) {
     if (_Rs_ == _Rt_) {
         dOpCode("b");
         dBranch();
+    } else if (_Rs_ == 0) {
+        dOpCode("beqz");
+        GPR(_Rt_);
+        dBranch();
+    } else if (_Rt_ == 0) {
+        dOpCode("beqz");
+        GPR(_Rs_);
+        dBranch();
     } else {
         dOpCode("beq");
         GPR(_Rs_);
@@ -791,10 +799,20 @@ declare(disBEQ) {
 }
 declare(disBNE) {
     if (delaySlotNext) *delaySlotNext = true;
-    dOpCode("bne");
-    GPR(_Rs_);
-    GPR(_Rt_);
-    dBranch();
+    if (_Rs_ == 0) {
+        dOpCode("bnez");
+        GPR(_Rt_);
+        dBranch();
+    } else if (_Rt_ == 0) {
+        dOpCode("bnez");
+        GPR(_Rs_);
+        dBranch();
+    } else {
+        dOpCode("bne");
+        GPR(_Rs_);
+        GPR(_Rt_);
+        dBranch();
+    }
 }
 
 /*********************************************************

src/core/gdb-server.cc

@@ -21,14 +21,15 @@
 
 #include <assert.h>
 
+#include <magic_enum_all.hpp>
+
 #include "core/cdrom.h"
 #include "core/debug.h"
 #include "core/psxemulator.h"
 #include "core/psxmem.h"
 #include "core/r3000a.h"
 #include "core/system.h"
 #include "fmt/format.h"
-#include "magic_enum/include/magic_enum/magic_enum_all.hpp"
 #include "support/strings-helpers.h"
 
 const char PCSX::GdbClient::toHex[] = "0123456789ABCDEF";