summaryrefslogtreecommitdiff
path: root/src/core/arm/arm_interface.cpp
diff options
context:
space:
mode:
authorGravatar Liam2023-03-17 21:26:04 -0400
committerGravatar Liam2023-03-22 09:35:16 -0400
commitfb49ec19c1fb6030fcc960077e82c998290d0ab8 (patch)
treeaa5f53cbbfc2b255923bcf362ee0009938ed8187 /src/core/arm/arm_interface.cpp
parentMerge pull request #9955 from liamwhite/color-blend-equation (diff)
downloadyuzu-fb49ec19c1fb6030fcc960077e82c998290d0ab8.tar.gz
yuzu-fb49ec19c1fb6030fcc960077e82c998290d0ab8.tar.xz
yuzu-fb49ec19c1fb6030fcc960077e82c998290d0ab8.zip
kernel: use KTypedAddress for addresses
Diffstat (limited to 'src/core/arm/arm_interface.cpp')
-rw-r--r--src/core/arm/arm_interface.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp
index 4a331d4c1..be3f55cd2 100644
--- a/src/core/arm/arm_interface.cpp
+++ b/src/core/arm/arm_interface.cpp
@@ -168,21 +168,21 @@ void ARM_Interface::LoadWatchpointArray(const WatchpointArray& wp) {
168} 168}
169 169
170const Kernel::DebugWatchpoint* ARM_Interface::MatchingWatchpoint( 170const Kernel::DebugWatchpoint* ARM_Interface::MatchingWatchpoint(
171 VAddr addr, u64 size, Kernel::DebugWatchpointType access_type) const { 171 u64 addr, u64 size, Kernel::DebugWatchpointType access_type) const {
172 if (!watchpoints) { 172 if (!watchpoints) {
173 return nullptr; 173 return nullptr;
174 } 174 }
175 175
176 const VAddr start_address{addr}; 176 const u64 start_address{addr};
177 const VAddr end_address{addr + size}; 177 const u64 end_address{addr + size};
178 178
179 for (size_t i = 0; i < Core::Hardware::NUM_WATCHPOINTS; i++) { 179 for (size_t i = 0; i < Core::Hardware::NUM_WATCHPOINTS; i++) {
180 const auto& watch{(*watchpoints)[i]}; 180 const auto& watch{(*watchpoints)[i]};
181 181
182 if (end_address <= watch.start_address) { 182 if (end_address <= GetInteger(watch.start_address)) {
183 continue; 183 continue;
184 } 184 }
185 if (start_address >= watch.end_address) { 185 if (start_address >= GetInteger(watch.end_address)) {
186 continue; 186 continue;
187 } 187 }
188 if ((access_type & watch.type) == Kernel::DebugWatchpointType::None) { 188 if ((access_type & watch.type) == Kernel::DebugWatchpointType::None) {