VERY experimental Nintendo Switch 2 emulator
C++
SMMU: Fix Right Shift UB.
Fernando Sahmkow71996e6d184b
diff --git a/src/core/device_memory_manager.h b/src/core/device_memory_manager.hindex f9cb13a7a4..cc9fd023f9 100644--- a/src/core/device_memory_manager.h+++ b/src/core/device_memory_manager.h@@ -62,13 +62,13 @@ public:DAddr subbits = static_cast<DAddr>(address & page_mask);const u32 base = compressed_device_addr[(address >> page_bits)];if ((base >> MULTI_FLAG_BITS) == 0) [[likely]] {- const DAddr d_address = static_cast<DAddr>(base << page_bits) + subbits;+ const DAddr d_address = (static_cast<DAddr>(base) << page_bits) + subbits;operation(d_address);return;}InnerGatherDeviceAddresses(buffer, address);for (u32 value : buffer) {- operation(static_cast<DAddr>(value << page_bits) + subbits);+ operation((static_cast<DAddr>(value) << page_bits) + subbits);}}diff --git a/src/core/device_memory_manager.inc b/src/core/device_memory_manager.incindex 5241293b63..d7b4abacce 100644--- a/src/core/device_memory_manager.inc+++ b/src/core/device_memory_manager.inc@@ -301,7 +301,7 @@ template <typename Traits>u8* DeviceMemoryManager<Traits>::GetSpan(const DAddr src_addr, const std::size_t size) {size_t page_index = src_addr >> page_bits;size_t subbits = src_addr & page_mask;- if ((continuity_tracker[page_index] << page_bits) >= size + subbits) {+ if ((static_cast<size_t>(continuity_tracker[page_index]) << page_bits) >= size + subbits) {return GetPointer<u8>(src_addr);}return nullptr;@@ -311,7 +311,7 @@ template <typename Traits>const u8* DeviceMemoryManager<Traits>::GetSpan(const DAddr src_addr, const std::size_t size) const {size_t page_index = src_addr >> page_bits;size_t subbits = src_addr & page_mask;- if ((continuity_tracker[page_index] << page_bits) >= size + subbits) {+ if ((static_cast<size_t>(continuity_tracker[page_index]) << page_bits) >= size + subbits) {return GetPointer<u8>(src_addr);}return nullptr;