From 51150f4b07ff24a22cc0eef26bd83ac5ea920c4d Mon Sep 17 00:00:00 2001
From: Marcos Vinicius <marcos.vinicius.wz@gmail.com>
Date: Mon, 10 Jul 2023 12:48:20 -0300
Subject: [PATCH] Resolve compilation warnings (#15)

---
 hw/amdgpu/bridge/include/amdgpu/bridge/bridge.hpp | 3 ++-
 rpcsx-os/orbis-kernel-config/orbis-config.hpp     | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/amdgpu/bridge/include/amdgpu/bridge/bridge.hpp b/hw/amdgpu/bridge/include/amdgpu/bridge/bridge.hpp
index 3372e42ba..8a0891a9c 100644
--- a/hw/amdgpu/bridge/include/amdgpu/bridge/bridge.hpp
+++ b/hw/amdgpu/bridge/include/amdgpu/bridge/bridge.hpp
@@ -89,7 +89,8 @@ struct BridgePusher {
     header->vmAddress = address;
     header->vmSize = size;
     std::strncpy(header->vmName, name, sizeof(header->vmName));
-    header->flags |= static_cast<std::uint64_t>(BridgeFlags::VmConfigured);
+    header->flags =
+        header->flags | static_cast<std::uint64_t>(BridgeFlags::VmConfigured);
   }
 
   void sendMemoryProtect(std::uint64_t address, std::uint64_t size,
diff --git a/rpcsx-os/orbis-kernel-config/orbis-config.hpp b/rpcsx-os/orbis-kernel-config/orbis-config.hpp
index 4b093dc3d..cbca3f2cf 100644
--- a/rpcsx-os/orbis-kernel-config/orbis-config.hpp
+++ b/rpcsx-os/orbis-kernel-config/orbis-config.hpp
@@ -3,6 +3,7 @@
 #include "orbis/error.hpp"
 #include "orbis/thread/RegisterId.hpp"
 #include <cstdint>
+#include <cstdio>
 #include <cstring>
 #include <immintrin.h>
 #include <sys/ucontext.h>
@@ -104,6 +105,9 @@ inline uint64_t readRegister(void *context, RegisterId id) {
   case RegisterId::rflags:
     return c->gregs[REG_EFL];
   }
+  std::fprintf(stderr, "***ERROR*** Unhandled RegisterId %d\n",
+               static_cast<int>(id));
+  std::abort();
 }
 
 inline void writeRegister(void *context, RegisterId id, uint64_t value) {