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(BridgeFlags::VmConfigured); + header->flags = + header->flags | static_cast(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 +#include #include #include #include @@ -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(id)); + std::abort(); } inline void writeRegister(void *context, RegisterId id, uint64_t value) {